Skip to content

Commit be858f0

Browse files
TheJoeFinTheJoeFin
authored
Merge pull request #68 from TheJoeFin/dev
Dev
2 parents 6a12709 + 3659f54 commit be858f0

4 files changed

Lines changed: 139 additions & 136 deletions

File tree

‎Simple Icon File Maker/Simple Icon File Maker (Package)/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Identity
1111
Name="40087JoeFinApps.SimpleIconFileMaker"
1212
Publisher="CN=153F3B0F-BA3D-4964-8098-71AC78A1DF6A"
13-
Version="1.15.0.0" />
13+
Version="1.15.1.0" />
1414

1515

1616
<Properties>

‎Simple Icon File Maker/Simple Icon File Maker (Package)/Simple Icon File Maker (Package).wapproj‎

Lines changed: 132 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,135 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
4-
<VisualStudioVersion>15.0</VisualStudioVersion>
5-
</PropertyGroup>
6-
<ItemGroup Label="ProjectConfigurations">
7-
<ProjectConfiguration Include="Debug|x86">
8-
<Configuration>Debug</Configuration>
9-
<Platform>x86</Platform>
10-
</ProjectConfiguration>
11-
<ProjectConfiguration Include="Release|x86">
12-
<Configuration>Release</Configuration>
13-
<Platform>x86</Platform>
14-
</ProjectConfiguration>
15-
<ProjectConfiguration Include="Debug|x64">
16-
<Configuration>Debug</Configuration>
17-
<Platform>x64</Platform>
18-
</ProjectConfiguration>
19-
<ProjectConfiguration Include="Release|x64">
20-
<Configuration>Release</Configuration>
21-
<Platform>x64</Platform>
22-
</ProjectConfiguration>
23-
<ProjectConfiguration Include="Debug|arm64">
24-
<Configuration>Debug</Configuration>
25-
<Platform>arm64</Platform>
26-
</ProjectConfiguration>
27-
<ProjectConfiguration Include="Release|arm64">
28-
<Configuration>Release</Configuration>
29-
<Platform>arm64</Platform>
30-
</ProjectConfiguration>
31-
</ItemGroup>
32-
<PropertyGroup>
33-
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
34-
<PathToXAMLWinRTImplementations>Simple Icon File Maker\</PathToXAMLWinRTImplementations>
35-
</PropertyGroup>
36-
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
37-
<PropertyGroup>
38-
<ProjectGuid>7887a19f-b1cd-4106-a9aa-abaacfe770a9</ProjectGuid>
39-
<TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
40-
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
41-
<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
42-
<AssetTargetFallback>net9.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
43-
<DefaultLanguage>en-US</DefaultLanguage>
44-
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
45-
<EntryPointProjectUniqueName>..\Simple Icon File Maker\Simple Icon File Maker.csproj</EntryPointProjectUniqueName>
46-
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
47-
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
48-
<GenerateTestArtifacts>True</GenerateTestArtifacts>
49-
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
50-
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
51-
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
52-
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
53-
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
54-
<AppxOSMinVersionReplaceManifestVersion>false</AppxOSMinVersionReplaceManifestVersion>
55-
<AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
56-
<PublishAot>true</PublishAot>
57-
</PropertyGroup>
58-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
59-
<AppxBundle>Always</AppxBundle>
60-
</PropertyGroup>
61-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
62-
<AppxBundle>Always</AppxBundle>
63-
</PropertyGroup>
64-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
65-
<AppxBundle>Always</AppxBundle>
66-
</PropertyGroup>
67-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
68-
<AppxBundle>Always</AppxBundle>
69-
</PropertyGroup>
70-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
71-
<AppxBundle>Always</AppxBundle>
72-
</PropertyGroup>
73-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
74-
<AppxBundle>Always</AppxBundle>
75-
</PropertyGroup>
76-
<ItemGroup>
77-
<AppxManifest Include="Package.appxmanifest">
78-
<SubType>Designer</SubType>
79-
</AppxManifest>
80-
</ItemGroup>
81-
<ItemGroup>
82-
<Content Include="Images\BadgeLogo.scale-100.png" />
83-
<Content Include="Images\BadgeLogo.scale-200.png" />
84-
<Content Include="Images\BadgeLogo.scale-400.png" />
85-
<Content Include="Images\Image128.png" />
86-
<Content Include="Images\LargeTile.scale-100.png" />
87-
<Content Include="Images\LargeTile.scale-200.png" />
88-
<Content Include="Images\LargeTile.scale-400.png" />
89-
<Content Include="Images\SmallTile.scale-100.png" />
90-
<Content Include="Images\SmallTile.scale-200.png" />
91-
<Content Include="Images\SmallTile.scale-400.png" />
92-
<Content Include="Images\SplashScreen.scale-100.png" />
93-
<Content Include="Images\SplashScreen.scale-200.png" />
94-
<Content Include="Images\SplashScreen.scale-400.png" />
95-
<Content Include="Images\Square150x150Logo.scale-100.png" />
96-
<Content Include="Images\Square150x150Logo.scale-200.png" />
97-
<Content Include="Images\Square150x150Logo.scale-400.png" />
98-
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
99-
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
100-
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
101-
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
102-
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
103-
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
104-
<Content Include="Images\Square44x44Logo.scale-100.png" />
105-
<Content Include="Images\Square44x44Logo.scale-200.png" />
106-
<Content Include="Images\Square44x44Logo.scale-400.png" />
107-
<Content Include="Images\Square44x44Logo.targetsize-16.png" />
108-
<Content Include="Images\Square44x44Logo.targetsize-256.png" />
109-
<Content Include="Images\Square44x44Logo.targetsize-48.png" />
110-
<Content Include="Images\StoreLogo.scale-100.png" />
111-
<Content Include="Images\StoreLogo.scale-200.png" />
112-
<Content Include="Images\StoreLogo.scale-400.png" />
113-
<Content Include="Images\Wide310x150Logo.scale-100.png" />
114-
<Content Include="Images\Wide310x150Logo.scale-200.png" />
115-
<Content Include="Images\Wide310x150Logo.scale-400.png" />
116-
<None Include="Package.StoreAssociation.xml" />
117-
</ItemGroup>
118-
<ItemGroup>
119-
<ProjectReference Include="..\Simple Icon File Maker\Simple Icon File Maker.csproj">
120-
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
121-
<PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
122-
</ProjectReference>
123-
</ItemGroup>
124-
<ItemGroup>
125-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260209005">
126-
<IncludeAssets>build</IncludeAssets>
127-
</PackageReference>
128-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705">
129-
<IncludeAssets>build</IncludeAssets>
130-
</PackageReference>
131-
<PackageReference Include="WinUIEx" Version="2.9.0" />
132-
</ItemGroup>
133-
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
3+
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
4+
<VisualStudioVersion>15.0</VisualStudioVersion>
5+
</PropertyGroup>
6+
<ItemGroup Label="ProjectConfigurations">
7+
<ProjectConfiguration Include="Debug|x86">
8+
<Configuration>Debug</Configuration>
9+
<Platform>x86</Platform>
10+
</ProjectConfiguration>
11+
<ProjectConfiguration Include="Release|x86">
12+
<Configuration>Release</Configuration>
13+
<Platform>x86</Platform>
14+
</ProjectConfiguration>
15+
<ProjectConfiguration Include="Debug|x64">
16+
<Configuration>Debug</Configuration>
17+
<Platform>x64</Platform>
18+
</ProjectConfiguration>
19+
<ProjectConfiguration Include="Release|x64">
20+
<Configuration>Release</Configuration>
21+
<Platform>x64</Platform>
22+
</ProjectConfiguration>
23+
<ProjectConfiguration Include="Debug|arm64">
24+
<Configuration>Debug</Configuration>
25+
<Platform>arm64</Platform>
26+
</ProjectConfiguration>
27+
<ProjectConfiguration Include="Release|arm64">
28+
<Configuration>Release</Configuration>
29+
<Platform>arm64</Platform>
30+
</ProjectConfiguration>
31+
</ItemGroup>
32+
<PropertyGroup>
33+
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
34+
<PathToXAMLWinRTImplementations>Simple Icon File Maker\</PathToXAMLWinRTImplementations>
35+
</PropertyGroup>
36+
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
37+
<PropertyGroup>
38+
<ProjectGuid>7887a19f-b1cd-4106-a9aa-abaacfe770a9</ProjectGuid>
39+
<TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
40+
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
41+
<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
42+
<AssetTargetFallback>net9.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
43+
<DefaultLanguage>en-US</DefaultLanguage>
44+
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
45+
<EntryPointProjectUniqueName>..\Simple Icon File Maker\Simple Icon File Maker.csproj</EntryPointProjectUniqueName>
46+
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
47+
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
48+
<GenerateTestArtifacts>False</GenerateTestArtifacts>
49+
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
50+
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
51+
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
52+
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
53+
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
54+
<AppxOSMinVersionReplaceManifestVersion>false</AppxOSMinVersionReplaceManifestVersion>
55+
<AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
56+
<PublishAot>true</PublishAot>
57+
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
58+
</PropertyGroup>
59+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
60+
<AppxBundle>Always</AppxBundle>
61+
</PropertyGroup>
62+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
63+
<AppxBundle>Always</AppxBundle>
64+
</PropertyGroup>
65+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
66+
<AppxBundle>Always</AppxBundle>
67+
</PropertyGroup>
68+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
69+
<AppxBundle>Always</AppxBundle>
70+
</PropertyGroup>
71+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
72+
<AppxBundle>Always</AppxBundle>
73+
</PropertyGroup>
74+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
75+
<AppxBundle>Always</AppxBundle>
76+
</PropertyGroup>
77+
<ItemGroup>
78+
<AppxManifest Include="Package.appxmanifest">
79+
<SubType>Designer</SubType>
80+
</AppxManifest>
81+
</ItemGroup>
82+
<ItemGroup>
83+
<Content Include="Images\BadgeLogo.scale-100.png" />
84+
<Content Include="Images\BadgeLogo.scale-200.png" />
85+
<Content Include="Images\BadgeLogo.scale-400.png" />
86+
<Content Include="Images\Image128.png" />
87+
<Content Include="Images\LargeTile.scale-100.png" />
88+
<Content Include="Images\LargeTile.scale-200.png" />
89+
<Content Include="Images\LargeTile.scale-400.png" />
90+
<Content Include="Images\SmallTile.scale-100.png" />
91+
<Content Include="Images\SmallTile.scale-200.png" />
92+
<Content Include="Images\SmallTile.scale-400.png" />
93+
<Content Include="Images\SplashScreen.scale-100.png" />
94+
<Content Include="Images\SplashScreen.scale-200.png" />
95+
<Content Include="Images\SplashScreen.scale-400.png" />
96+
<Content Include="Images\Square150x150Logo.scale-100.png" />
97+
<Content Include="Images\Square150x150Logo.scale-200.png" />
98+
<Content Include="Images\Square150x150Logo.scale-400.png" />
99+
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
100+
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
101+
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
102+
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
103+
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
104+
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
105+
<Content Include="Images\Square44x44Logo.scale-100.png" />
106+
<Content Include="Images\Square44x44Logo.scale-200.png" />
107+
<Content Include="Images\Square44x44Logo.scale-400.png" />
108+
<Content Include="Images\Square44x44Logo.targetsize-16.png" />
109+
<Content Include="Images\Square44x44Logo.targetsize-256.png" />
110+
<Content Include="Images\Square44x44Logo.targetsize-48.png" />
111+
<Content Include="Images\StoreLogo.scale-100.png" />
112+
<Content Include="Images\StoreLogo.scale-200.png" />
113+
<Content Include="Images\StoreLogo.scale-400.png" />
114+
<Content Include="Images\Wide310x150Logo.scale-100.png" />
115+
<Content Include="Images\Wide310x150Logo.scale-200.png" />
116+
<Content Include="Images\Wide310x150Logo.scale-400.png" />
117+
<None Include="Package.StoreAssociation.xml" />
118+
</ItemGroup>
119+
<ItemGroup>
120+
<ProjectReference Include="..\Simple Icon File Maker\Simple Icon File Maker.csproj">
121+
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
122+
<PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
123+
</ProjectReference>
124+
</ItemGroup>
125+
<ItemGroup>
126+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260209005">
127+
<IncludeAssets>build</IncludeAssets>
128+
</PackageReference>
129+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705">
130+
<IncludeAssets>build</IncludeAssets>
131+
</PackageReference>
132+
<PackageReference Include="WinUIEx" Version="2.9.0" />
133+
</ItemGroup>
134+
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
134135
</Project>

‎Simple Icon File Maker/Simple Icon File Maker/Helpers/FilePickerHelper.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ public static async Task TrySetSuggestedFolderFromSourceImage(FileSavePicker sav
1717
if (File.Exists(imagePath))
1818
{
1919
StorageFile sourceFile = await StorageFile.GetFileFromPathAsync(imagePath);
20-
string name = Path.GetFileNameWithoutExtension(imagePath);
21-
await sourceFile.RenameAsync(name);
2220
savePicker.SuggestedSaveFile = sourceFile;
21+
22+
// SuggestedSaveFile overrides SuggestedFileName, so re-set
23+
// the name without the source extension to avoid names like "file.png.ico"
24+
savePicker.SuggestedFileName = Path.GetFileNameWithoutExtension(imagePath);
2325
}
2426
}
2527
catch

‎Simple Icon File Maker/Simple Icon File Maker/Simple Icon File Maker.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.251219" />
4444
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.251219" />
4545
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.251219" />
46-
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.2" />
46+
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.4" />
4747
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
48-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
48+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
4949
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260209005" />
5050
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705" />
5151
<PackageReference Include="WinUIEx" Version="2.9.0" />

0 commit comments

Comments
 (0)