Skip to content

Commit 6c3bb3b

Browse files
KebooKeboo
authored
Adding .NET7 target (#2975)
Also updated to use latest tooling
1 parent 08d7307 commit 6c3bb3b

File tree

21 files changed

+163
-165
lines changed

21 files changed

+163
-165
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ insert_final_newline = true
1616
trim_trailing_whitespace = true
1717

1818
##### XAML/XML files #####
19-
[*.{xaml,xml,csproj,targets,props}]
19+
[*.{xaml,xml,csproj,targets,props,nuspec}]
2020

2121
# Indentation and spacing
2222
indent_size = 2

‎.github/actions/build-and-test/action.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ runs:
2020
3.1.x
2121
5.x
2222
6.x
23+
7.x
2324
env:
2425
NUGET_AUTH_TOKEN: ${{ inputs.nugetToken }}
2526

@@ -40,4 +41,4 @@ runs:
4041
uses: actions/upload-artifact@v2
4142
with:
4243
name: Screenshots-${{ github.run_number }}
43-
path: ${{ github.workspace }}/MaterialDesignThemes.UITests/bin/${{ inputs.buildConfiguration }}/net6.0-windows/Screenshots
44+
path: ${{ github.workspace }}/MaterialDesignThemes.UITests/bin/${{ inputs.buildConfiguration }}/net7.0-windows/Screenshots

‎.github/workflows/icon_update.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup .NET
1818
uses: actions/setup-dotnet@v3
1919
with:
20-
dotnet-version: 6.x
20+
dotnet-version: 7.x
2121

2222
- name: Run Icon Generation
2323
run: dotnet run -c Release -- icons

‎Directory.Build.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<Project>
22
<PropertyGroup>
3-
<Copyright>Copyright © 2020</Copyright>
3+
<Copyright>Copyright © 2022</Copyright>
44
<Company>Mulholland Software/James Willock</Company>
55

6-
<Configurations>Debug;Release</Configurations>
7-
<LangVersion>10.0</LangVersion>
6+
<LangVersion>11.0</LangVersion>
87
<ErrorReport>prompt</ErrorReport>
98

109
<SignAssembly>true</SignAssembly>

‎MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net472;netcoreapp3.1;net6.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net472;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
88
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
99
<AssemblyTitle>MahMaterialDragablzMashUp</AssemblyTitle>
1010
<Product>MahMaterialDragablzMashUp</Product>
11-
<Prefer32Bit>true</Prefer32Bit>
11+
<Prefer32Bit Condition="'$(TargetFramework)' == 'net472'">true</Prefer32Bit>
1212
<SignAssembly>false</SignAssembly>
1313
</PropertyGroup>
1414
<ItemGroup>

‎MainDemo.Wpf/MaterialDesignDemo.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net472;netcoreapp3.1;net6.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net472;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
7-
<Prefer32Bit>true</Prefer32Bit>
7+
<Prefer32Bit Condition="'$(TargetFramework)' == 'net472'">true</Prefer32Bit>
88
<ApplicationIcon>favicon.ico</ApplicationIcon>
99
<UseWPF>true</UseWPF>
1010
<SignAssembly>false</SignAssembly>

‎MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net472;netcoreapp3.1;net6.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net472;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
7-
<Prefer32Bit>true</Prefer32Bit>
7+
<Prefer32Bit Condition="'$(TargetFramework)' == 'net472'">true</Prefer32Bit>
88
<ApplicationIcon>favicon.ico</ApplicationIcon>
99
<UseWPF>true</UseWPF>
1010
<SignAssembly>false</SignAssembly>

‎MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3-
<PropertyGroup>
4-
<TargetFrameworks>net472;netcoreapp3.1;net6.0-windows</TargetFrameworks>
5-
<AssemblyTitle>MaterialDesignColors.Wpf.Tests</AssemblyTitle>
6-
<Product>MaterialDesignColors.Wpf.Tests</Product>
7-
</PropertyGroup>
8-
<ItemGroup Condition="'$(TargetFramework)'=='net472'">
9-
<Reference Include="PresentationCore" />
10-
<Reference Include="PresentationFramework" />
11-
<Reference Include="System" />
12-
<Reference Include="System.Core" />
13-
<Reference Include="System.Xaml" />
14-
<Reference Include="System.Xml.Linq" />
15-
<Reference Include="System.Data.DataSetExtensions" />
16-
<Reference Include="Microsoft.CSharp" />
17-
<Reference Include="System.Data" />
18-
<Reference Include="System.Xml" />
19-
</ItemGroup>
20-
<ItemGroup>
21-
<ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
22-
</ItemGroup>
23-
<ItemGroup>
24-
<PackageReference Include="xunit" />
25-
<PackageReference Include="xunit.runner.visualstudio" />
26-
<PackageReference Include="Shouldly" />
27-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
28-
</ItemGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>net472;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
5+
<AssemblyTitle>MaterialDesignColors.Wpf.Tests</AssemblyTitle>
6+
<Product>MaterialDesignColors.Wpf.Tests</Product>
7+
</PropertyGroup>
8+
<ItemGroup Condition="'$(TargetFramework)'=='net472'">
9+
<Reference Include="PresentationCore" />
10+
<Reference Include="PresentationFramework" />
11+
<Reference Include="System" />
12+
<Reference Include="System.Core" />
13+
<Reference Include="System.Xaml" />
14+
<Reference Include="System.Xml.Linq" />
15+
<Reference Include="System.Data.DataSetExtensions" />
16+
<Reference Include="Microsoft.CSharp" />
17+
<Reference Include="System.Data" />
18+
<Reference Include="System.Xml" />
19+
</ItemGroup>
20+
<ItemGroup>
21+
<ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
22+
</ItemGroup>
23+
<ItemGroup>
24+
<PackageReference Include="xunit" />
25+
<PackageReference Include="xunit.runner.visualstudio" />
26+
<PackageReference Include="Shouldly" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
28+
</ItemGroup>
2929
</Project>

‎MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<RootNamespace>MaterialDesignColors</RootNamespace>
44
<AssemblyName>MaterialDesignColors</AssemblyName>
5-
<TargetFrameworks>net462;netcoreapp3.1;net6.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net462;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
<MDIXColorsVersion Condition="$(MDIXColorsVersion) == '' Or $(MDIXColorsVersion) == '*Undefined*'">1.0.1</MDIXColorsVersion>
88
<AssemblyTitle>MaterialDesignColors.Wpf</AssemblyTitle>

‎MaterialDesignColors.nuspec‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@
1818
<group targetFramework="net462" />
1919
<group targetFramework="netcoreapp3.1" />
2020
<group targetFramework="net6.0" />
21+
<group targetFramework="net7.0" />
2122
</dependencies>
2223
</metadata>
2324
<files>
2425
<file src="MaterialDesignColors.Wpf\bin\$configuration$\net462\MaterialDesignColors.*" target="lib\net462" exclude="**\*.json" />
2526
<file src="MaterialDesignColors.Wpf\bin\$configuration$\netcoreapp3.1\MaterialDesignColors.*" target="lib\netcoreapp3.1" exclude="**\*.json" />
2627
<file src="MaterialDesignColors.Wpf\bin\$configuration$\net6.0-windows\MaterialDesignColors.*" target="lib\net6.0" exclude="**\*.json" />
28+
<file src="MaterialDesignColors.Wpf\bin\$configuration$\net7.0-windows\MaterialDesignColors.*" target="lib\net7.0" exclude="**\*.json" />
2729
</files>
2830
</package>

0 commit comments

Comments
 (0)