Skip to content

fix: #303 #292 Drop the UWP support #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2025
Merged

fix: #303 #292 Drop the UWP support #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GitVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
assembly-versioning-scheme: Major
assembly-file-versioning-scheme: MajorMinorPatchTag
next-version: 5.2.0
next-version: 6.0.0
mode: ContinuousDeployment
branches:
master:
Expand Down
25 changes: 18 additions & 7 deletions src/Directory.build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,26 @@

<!-- Project properties -->
<PropertyGroup>
<TargetFrameworks>net8.0-windows;net6.0-windows;net47;net462;uap10.0.18362</TargetFrameworks>
<!--<TargetFrameworks>net8.0-windows;net6.0-windows;net47;net462;uap10.0.18362</TargetFrameworks>-->
<TargetFrameworks>net8.0-windows;net6.0-windows;net47;net462</TargetFrameworks>

<IsUwp Condition="'$(IsUwp)'==''">false</IsUwp>
<IsUwp Condition="$(TargetFramework.Contains('10.0'))">true</IsUwp>
<IsWpf Condition="'$(IsWpf)'==''">false</IsWpf>
<IsWpf Condition="'$(IsUwp)' == 'false'">true</IsWpf>

<IsBuildingForLegacyFramework>false</IsBuildingForLegacyFramework>
<IsBuildingForLegacyFramework Condition="$(TargetFramework.StartsWith('net4'))">true</IsBuildingForLegacyFramework>

<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsAotCompatible>

<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateLibraryLayout>true</GenerateLibraryLayout>
<AutoGenerateBindingRedirects Condition=" $(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('uap')) ">true</AutoGenerateBindingRedirects>
<AutoGenerateBindingRedirects Condition="'$(IsBuildingForLegacyFramework)' == 'true' or '$(IsUwp)' == 'true'">true</AutoGenerateBindingRedirects>

<LangVersion>latest</LangVersion>

<NoWarn>$(NoWarn);CS1591;CS0618</NoWarn>
<NoError>$(NoError);CS1591;CS0618</NoError>
</PropertyGroup>
Expand All @@ -22,12 +36,12 @@
</PropertyGroup>

<!-- .NET Framework and Core -->
<PropertyGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
<PropertyGroup Condition="'$(IsWpf)' == 'true'">
<UseWpf>true</UseWpf>
</PropertyGroup>

<!-- UAP -->
<PropertyGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
<PropertyGroup Condition="'$(IsUwp)' == 'true'">
<DefaultTargetPlatformVersion>18362</DefaultTargetPlatformVersion>
<DefaultTargetPlatformMinVersion>18362</DefaultTargetPlatformMinVersion>
<UseWindowsDesktopSdk>true</UseWindowsDesktopSdk>
Expand All @@ -36,9 +50,6 @@
<!-- This is valid for platforms other than .NET Framework (and is needed for the UWP targets -->
<NoWarn>$(NoWarn);8002;CS0618</NoWarn>
<NoError>$(NoError);CS0618</NoError>
</PropertyGroup>

<PropertyGroup Condition=" $(TargetFramework.StartsWith('uap')) and '$(Configuration)' == 'Release' ">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

Expand Down
10 changes: 5 additions & 5 deletions src/MahApps.Metro.IconPacks.BootstrapIcons/MahApps.Metro.IconPacks.BootstrapIcons.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras">
<!-- Project properties -->
<PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<DefineConstants>$(DefineConstants);BOOTSTRAPICONS</DefineConstants>
<IconsName>BootstrapIcons</IconsName>
<AssemblyName>MahApps.Metro.IconPacks.BootstrapIcons</AssemblyName>
Expand All @@ -19,14 +19,14 @@
</ItemGroup>

<!-- WPF Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
<ItemGroup Condition="'$(IsWpf)' == 'true'">
<None Remove="**\*.rd.xml" />
<Compile Remove="Path*.*" />
<Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
</ItemGroup>

<!-- UWP Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<Compile Remove="*Image*.cs;*Cursor*.cs" />
<Compile Remove="Themes\**\*.*" />
<EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />
Expand Down
10 changes: 5 additions & 5 deletions src/MahApps.Metro.IconPacks.BoxIcons/MahApps.Metro.IconPacks.BoxIcons.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras">
<!-- Project properties -->
<PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<DefineConstants>$(DefineConstants);BOXICONS</DefineConstants>
<IconsName>BoxIcons</IconsName>
<AssemblyName>MahApps.Metro.IconPacks.BoxIcons</AssemblyName>
Expand All @@ -19,14 +19,14 @@
</ItemGroup>

<!-- WPF Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
<ItemGroup Condition="'$(IsWpf)' == 'true'">
<None Remove="**\*.rd.xml" />
<Compile Remove="Path*.*" />
<Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
</ItemGroup>

<!-- UWP Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<Compile Remove="*Image*.cs;*Cursor*.cs" />
<Compile Remove="Themes\**\*.*" />
<EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />
Expand Down
10 changes: 5 additions & 5 deletions src/MahApps.Metro.IconPacks.CircumIcons/MahApps.Metro.IconPacks.CircumIcons.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras">
<!-- Project properties -->
<PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<DefineConstants>$(DefineConstants);CIRCUMICONS</DefineConstants>
<IconsName>CircumIcons</IconsName>
<AssemblyName>MahApps.Metro.IconPacks.CircumIcons</AssemblyName>
Expand All @@ -19,14 +19,14 @@
</ItemGroup>

<!-- WPF Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
<ItemGroup Condition="'$(IsWpf)' == 'true'">
<None Remove="**\*.rd.xml" />
<Compile Remove="Path*.*" />
<Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
</ItemGroup>

<!-- UWP Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<Compile Remove="*Image*.cs;*Cursor*.cs" />
<Compile Remove="Themes\**\*.*" />
<EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />
Expand Down
10 changes: 5 additions & 5 deletions src/MahApps.Metro.IconPacks.Codicons/MahApps.Metro.IconPacks.Codicons.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras">
<!-- Project properties -->
<PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<DefineConstants>$(DefineConstants);CODICONS</DefineConstants>
<IconsName>Codicons</IconsName>
<AssemblyName>MahApps.Metro.IconPacks.Codicons</AssemblyName>
Expand All @@ -19,14 +19,14 @@
</ItemGroup>

<!-- WPF Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
<ItemGroup Condition="'$(IsWpf)' == 'true'">
<None Remove="**\*.rd.xml" />
<Compile Remove="Path*.*" />
<Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
</ItemGroup>

<!-- UWP Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<Compile Remove="*Image*.cs;*Cursor*.cs" />
<Compile Remove="Themes\**\*.*" />
<EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />
Expand Down
10 changes: 5 additions & 5 deletions src/MahApps.Metro.IconPacks.Coolicons/MahApps.Metro.IconPacks.Coolicons.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras">
<!-- Project properties -->
<PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<DefineConstants>$(DefineConstants);COOLICONS</DefineConstants>
<IconsName>Coolicons</IconsName>
<AssemblyName>MahApps.Metro.IconPacks.Coolicons</AssemblyName>
Expand All @@ -19,14 +19,14 @@
</ItemGroup>

<!-- WPF Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
<ItemGroup Condition="'$(IsWpf)' == 'true'">
<None Remove="**\*.rd.xml" />
<Compile Remove="Path*.*" />
<Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
</ItemGroup>

<!-- UWP Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<Compile Remove="*Image*.cs;*Cursor*.cs" />
<Compile Remove="Themes\**\*.*" />
<EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />
Expand Down
13 changes: 6 additions & 7 deletions src/MahApps.Metro.IconPacks.Core/MahApps.Metro.IconPacks.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>

<Project Sdk="MSBuild.Sdk.Extras">
<!-- Project properties -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>MahApps.Metro.IconPacks.Core</AssemblyName>
<Title>MahApps.Metro.IconPacks.Core</Title>
Expand All @@ -10,21 +9,21 @@
</PropertyGroup>

<ItemGroup>
<Reference Include="System.Web" Condition="'$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net47'" />
<Reference Include="System.Web.Extensions" Condition="'$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net47'" />
<Reference Include="System.Web" Condition="'$(IsBuildingForLegacyFramework)' == 'true'" />
<Reference Include="System.Web.Extensions" Condition="'$(IsBuildingForLegacyFramework)' == 'true'" />
<PackageReference Include="System.Text.Json" Version="6.0.10" Condition="'$(TargetFramework)' == 'net6.0-windows'" />
<PackageReference Include="System.Text.Json" Version="8.0.5" Condition="'$(TargetFramework)' == 'net8.0-windows' or '$(TargetFramework)' == 'uap10.0.18362'" />
<PackageReference Include="System.Text.Json" Version="8.0.5" Condition="'$(TargetFramework)' == 'net8.0-windows' or '$(IsUwp)' == 'true'" />
</ItemGroup>

<!-- WPF Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
<ItemGroup Condition="'$(IsWpf)' == 'true'">
<None Remove="**\*.rd.xml" />
<Compile Remove="PathIcon*.cs" />
<Compile Remove="Attributes\DescriptionAttribute.cs" />
</ItemGroup>

<!-- UWP Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<Compile Remove="Converter\PackIconKindToImageConverterBase.cs;PackIconImageExtension.cs;PackIconCursorExtension.cs;PackIconCursorHelper.cs" />
<EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />
<Page Include="**\*.xaml" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
Expand Down
10 changes: 5 additions & 5 deletions src/MahApps.Metro.IconPacks.Entypo/MahApps.Metro.IconPacks.Entypo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras">
<!-- Project properties -->
<PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<DefineConstants>$(DefineConstants);ENTYPO</DefineConstants>
<IconsName>Entypo</IconsName>
<AssemblyName>MahApps.Metro.IconPacks.Entypo</AssemblyName>
Expand All @@ -19,14 +19,14 @@
</ItemGroup>

<!-- WPF Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
<ItemGroup Condition="'$(IsWpf)' == 'true'">
<None Remove="**\*.rd.xml" />
<Compile Remove="Path*.*" />
<Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
</ItemGroup>

<!-- UWP Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<Compile Remove="*Image*.cs;*Cursor*.cs" />
<Compile Remove="Themes\**\*.*" />
<EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />
Expand Down
10 changes: 5 additions & 5 deletions src/MahApps.Metro.IconPacks.EvaIcons/MahApps.Metro.IconPacks.EvaIcons.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras">
<!-- Project properties -->
<PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<DefineConstants>$(DefineConstants);EVAICONS</DefineConstants>
<IconsName>EvaIcons</IconsName>
<AssemblyName>MahApps.Metro.IconPacks.EvaIcons</AssemblyName>
Expand All @@ -19,14 +19,14 @@
</ItemGroup>

<!-- WPF Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
<ItemGroup Condition="'$(IsWpf)' == 'true'">
<None Remove="**\*.rd.xml" />
<Compile Remove="Path*.*" />
<Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
</ItemGroup>

<!-- UWP Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<Compile Remove="*Image*.cs;*Cursor*.cs" />
<Compile Remove="Themes\**\*.*" />
<EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />
Expand Down
10 changes: 5 additions & 5 deletions src/MahApps.Metro.IconPacks.FeatherIcons/MahApps.Metro.IconPacks.FeatherIcons.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras">
<!-- Project properties -->
<PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<DefineConstants>$(DefineConstants);FEATHERICONS</DefineConstants>
<IconsName>FeatherIcons</IconsName>
<AssemblyName>MahApps.Metro.IconPacks.FeatherIcons</AssemblyName>
Expand All @@ -19,14 +19,14 @@
</ItemGroup>

<!-- WPF Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
<ItemGroup Condition="'$(IsWpf)' == 'true'">
<None Remove="**\*.rd.xml" />
<Compile Remove="Path*.*" />
<Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
</ItemGroup>

<!-- UWP Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<Compile Remove="*Image*.cs;*Cursor*.cs" />
<Compile Remove="Themes\**\*.*" />
<EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />
Expand Down
10 changes: 5 additions & 5 deletions src/MahApps.Metro.IconPacks.FileIcons/MahApps.Metro.IconPacks.FileIcons.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras">
<!-- Project properties -->
<PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<DefineConstants>$(DefineConstants);FILEICONS</DefineConstants>
<IconsName>FileIcons</IconsName>
<AssemblyName>MahApps.Metro.IconPacks.FileIcons</AssemblyName>
Expand All @@ -19,14 +19,14 @@
</ItemGroup>

<!-- WPF Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
<ItemGroup Condition="'$(IsWpf)' == 'true'">
<None Remove="**\*.rd.xml" />
<Compile Remove="Path*.*" />
<Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
</ItemGroup>

<!-- UWP Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<Compile Remove="*Image*.cs;*Cursor*.cs" />
<Compile Remove="Themes\**\*.*" />
<EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />
Expand Down
10 changes: 5 additions & 5 deletions src/MahApps.Metro.IconPacks.FontAwesome/MahApps.Metro.IconPacks.FontAwesome.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras">
<!-- Project properties -->
<PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<DefineConstants>$(DefineConstants);FONTAWESOME</DefineConstants>
<IconsName>FontAwesome</IconsName>
<AssemblyName>MahApps.Metro.IconPacks.FontAwesome</AssemblyName>
Expand All @@ -19,14 +19,14 @@
</ItemGroup>

<!-- WPF Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
<ItemGroup Condition="'$(IsWpf)' == 'true'">
<None Remove="**\*.rd.xml" />
<Compile Remove="Path*.*" />
<Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
</ItemGroup>

<!-- UWP Items include -->
<ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<Compile Remove="*Image*.cs;*Cursor*.cs" />
<Compile Remove="Themes\**\*.*" />
<EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />
Expand Down
Loading
Loading