Skip to content

Commit 4cd8884

Browse files
punker76punker76
committed
Merge branch 'develop'
2 parents 8ec9966 + 0ede510 commit 4cd8884

File tree

9 files changed

+60
-62
lines changed

9 files changed

+60
-62
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
dotnet-version: |
2323
6.x
2424
8.x
25+
9.x
2526
- name: List dotnet sdks
2627
run: dotnet --info
2728
- name: Run the Cake script

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.401",
3+
"version": "9.0.301",
44
"rollForward": "feature",
55
"allowPrerelease": false
66
}

‎src/Directory.Build.Props‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@
1010
<TargetFrameworks>net8.0-windows;net6.0-windows;net462</TargetFrameworks>
1111
<LangVersion>latestmajor</LangVersion>
1212

13+
<IsBuildingForLegacyFramework>false</IsBuildingForLegacyFramework>
14+
<IsBuildingForLegacyFramework Condition="$(TargetFramework.Contains('net46')) == 'true' or $(TargetFramework.Contains('net47')) == 'true' or $(TargetFramework.Contains('net48')) == 'true'">true</IsBuildingForLegacyFramework>
15+
1316
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
1417
<GenerateDocumentationFile>false</GenerateDocumentationFile>
1518
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
16-
<AutoGenerateBindingRedirects Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">true</AutoGenerateBindingRedirects>
19+
20+
<AutoGenerateBindingRedirects Condition="'$(IsBuildingForLegacyFramework)' == 'true'">true</AutoGenerateBindingRedirects>
1721

1822
<UseWPF>true</UseWPF>
1923
<Nullable>enable</Nullable>

‎src/Directory.packages.props‎

Lines changed: 36 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,38 @@
11
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5-
</PropertyGroup>
6-
<ItemGroup Label="Build">
7-
<PackageVersion Include="ControlzEx" version="7.0.1-rc0014" />
8-
<PackageVersion Include="XAMLTools.MSBuild" Version="1.0.0-alpha0167" />
9-
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
10-
11-
<PackageVersion Include="Caliburn.Micro" Version="4.0.230" />
12-
13-
<PackageVersion Include="MahApps.Metro.IconPacks.Entypo" Version="5.1.0" />
14-
<PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0" />
15-
<PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="5.1.0" />
16-
<PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="5.1.0" />
17-
<PackageVersion Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0" />
18-
19-
<PackageVersion Include="MaterialDesignThemes" Version="3.0.1" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
20-
<PackageVersion Include="MaterialDesignColors" Version="1.2.7" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
21-
<PackageVersion Include="MaterialDesignThemes" Version="4.9.0" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
22-
<PackageVersion Include="MaterialDesignColors" Version="2.1.4" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
23-
24-
<PackageVersion Include="NHotkey.Wpf" Version="3.0.0" />
25-
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3124.44" />
26-
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.162" />
27-
28-
<PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
29-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
30-
<PackageVersion Include="System.Memory" Version="4.6.2" />
31-
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.1" Condition="'$(TargetFramework)' != 'net8.0-windows'" />
32-
<PackageVersion Include="System.ValueTuple" Version="4.6.1" Condition="$(DefineConstants.Contains(NETCOREAPP)) == false" />
33-
34-
<PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
35-
</ItemGroup>
36-
37-
<ItemGroup Label="Test">
38-
<PackageVersion Include="NUnit" Version="4.3.2" />
39-
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
40-
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
41-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
42-
</ItemGroup>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<ItemGroup Label="Library">
7+
<PackageVersion Include="ControlzEx" version="7.0.2" />
8+
<PackageVersion Include="XAMLTools.MSBuild" Version="1.0.0-alpha0167" />
9+
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.162" />
10+
<PackageVersion Include="System.Memory" Version="4.6.3" />
11+
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
12+
</ItemGroup>
13+
<ItemGroup Label="Additional">
14+
<PackageVersion Include="JetBrains.Annotations" Version="2025.2.2" />
15+
<PackageVersion Include="Caliburn.Micro" Version="4.0.230" />
16+
<PackageVersion Include="MahApps.Metro.IconPacks.Entypo" Version="6.1.0" />
17+
<PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome5" Version="6.1.0" />
18+
<PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="6.1.0" />
19+
<PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="6.1.0" />
20+
<PackageVersion Include="MahApps.Metro.IconPacks.Octicons" Version="6.1.0" />
21+
<PackageVersion Include="MaterialDesignThemes" Version="3.0.1" Condition="'$(IsBuildingForLegacyFramework)' == 'true'" />
22+
<PackageVersion Include="MaterialDesignColors" Version="1.2.7" Condition="'$(IsBuildingForLegacyFramework)' == 'true'" />
23+
<PackageVersion Include="MaterialDesignThemes" Version="4.9.0" Condition="'$(IsBuildingForLegacyFramework)' == 'false'" />
24+
<PackageVersion Include="MaterialDesignColors" Version="2.1.4" Condition="'$(IsBuildingForLegacyFramework)' == 'false'" />
25+
<PackageVersion Include="NHotkey.Wpf" Version="3.0.0" />
26+
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3537.50" />
27+
<PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
28+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
29+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
30+
<PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
31+
</ItemGroup>
32+
<ItemGroup Label="Test">
33+
<PackageVersion Include="NUnit" Version="4.4.0" />
34+
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
35+
<PackageVersion Include="NUnit.Analyzers" Version="4.10.0" />
36+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
37+
</ItemGroup>
4338
</Project>

‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
33
<!-- Project properties -->
44
<PropertyGroup>
5+
<TargetFrameworks>net9.0-windows;net8.0-windows;net6.0-windows;net462</TargetFrameworks>
56
<AssemblyName>MahApps.Metro.Caliburn.Demo</AssemblyName>
67
<RootNamespace>Caliburn.Metro.Demo</RootNamespace>
78
<!-- Workaround for https://github.com/dotnet/sourcelink/issues/91 -->
@@ -20,7 +21,7 @@
2021
<None Include="app.manifest" />
2122
</ItemGroup>
2223

23-
<ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">
24+
<ItemGroup Condition="'$(IsBuildingForLegacyFramework)' == 'true'">
2425
<Reference Include="System.ComponentModel.DataAnnotations" />
2526
</ItemGroup>
2627

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TilesExample.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
Margin="3"
6868
mah:ControlsHelper.MouseOverBorderBrush="{DynamicResource MahApps.Brushes.ThemeForeground}"
6969
Style="{StaticResource LargeTileStyle}">
70-
<iconPacks:PackIconFontAwesome Width="40"
71-
Height="40"
72-
Kind="DesktopSolid" />
70+
<iconPacks:PackIconFontAwesome5 Width="40"
71+
Height="40"
72+
Kind="DesktopSolid" />
7373
</mah:Tile>
7474
<mah:Tile Title="Finance"
7575
Background="DimGray"

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
33
<!-- Project properties -->
44
<PropertyGroup>
5+
<TargetFrameworks>net9.0-windows;net8.0-windows;net6.0-windows;net462</TargetFrameworks>
56
<AssemblyName>MahApps.Metro.Demo</AssemblyName>
67
<RootNamespace>MetroDemo</RootNamespace>
78
<!-- Workaround for https://github.com/dotnet/sourcelink/issues/91 -->
@@ -20,15 +21,15 @@
2021
<None Include="app.manifest" />
2122
</ItemGroup>
2223

23-
<ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">
24+
<ItemGroup Condition="'$(IsBuildingForLegacyFramework)' == 'true'">
2425
<Reference Include="System.ComponentModel.DataAnnotations" />
2526
</ItemGroup>
2627

2728
<ItemGroup>
2829
<PackageReference Include="MaterialDesignThemes" />
2930
<PackageReference Include="MaterialDesignColors" />
3031
<PackageReference Include="MahApps.Metro.IconPacks.Entypo" />
31-
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" />
32+
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome5" />
3233
<PackageReference Include="MahApps.Metro.IconPacks.Material" />
3334
<PackageReference Include="MahApps.Metro.IconPacks.Modern" />
3435
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" />

‎src/MahApps.Metro/MahApps.Metro.csproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,13 @@
3333
<PrivateAssets>all</PrivateAssets>
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3535
</PackageReference>
36-
37-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Condition="'$(TargetFramework)' != 'net8.0-windows'" />
38-
</ItemGroup>
39-
40-
<ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == true">
41-
<PackageReference Include="System.Memory" />
36+
<PackageReference Include="System.Memory" Condition="'$(IsBuildingForLegacyFramework)' == 'false'" />
37+
<PackageReference Include="System.ValueTuple" Condition="'$(IsBuildingForLegacyFramework)' == 'true'" />
4238
</ItemGroup>
4339

44-
<ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">
40+
<ItemGroup Condition="'$(IsBuildingForLegacyFramework)' == 'true'">
4541
<Reference Include="System.ComponentModel.DataAnnotations" />
4642
<Reference Include="System.Configuration" />
47-
<PackageReference Include="System.ValueTuple" />
4843
</ItemGroup>
4944

5045
<!-- Items include -->

‎src/Mahapps.Metro.Tests/MahApps.Metro.Tests.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
33
<!-- Project properties -->
44
<PropertyGroup>
5+
<TargetFrameworks>net9.0-windows;net8.0-windows;net6.0-windows;net462</TargetFrameworks>
56
<AssemblyName>MahApps.Metro.Tests</AssemblyName>
67
<RootNamespace>MahApps.Metro.Tests</RootNamespace>
78

89
<IsTestProject>true</IsTestProject>
910
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
10-
11+
1112
<!-- Workaround for https://github.com/dotnet/sourcelink/issues/91 -->
1213
<DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
13-
14+
1415
<Nullable>annotations</Nullable>
1516
</PropertyGroup>
1617

1718
<ItemGroup>
1819
<ProjectReference Include="..\MahApps.Metro\MahApps.Metro.csproj" />
1920
</ItemGroup>
2021

21-
<ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">
22+
<ItemGroup Condition="'$(IsBuildingForLegacyFramework)' == 'true'">
2223
<Reference Include="Microsoft.CSharp" />
2324
<Reference Include="System.ComponentModel.DataAnnotations" />
2425
</ItemGroup>
2526

26-
<ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == true">
27+
<ItemGroup Condition="'$(IsBuildingForLegacyFramework)' == 'false'">
2728
<!-- Use NLS instead of ICU https://docs.microsoft.com/en-us/dotnet/standard/globalization-localization/globalization-icu -->
2829
<RuntimeHostConfigurationOption Include="System.Globalization.UseNls" Value="true" />
2930

0 commit comments

Comments
 (0)