Adding .NET7 target

Also updated to use latest tooling
MaterialDesignInXAML · Nov 24, 2022 · d54b947 · d54b947
1 parent 4861917
commit d54b947
Show file tree

Hide file tree

Showing 19 changed files with 149 additions and 150 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -16,7 +16,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 ##### XAML/XML files #####
-[*.{xaml,xml,csproj,targets,props}]
+[*.{xaml,xml,csproj,targets,props,nuspec}]
 
 # Indentation and spacing
 indent_size = 2

diff --git a/.github/actions/build-and-test/action.yml b/.github/actions/build-and-test/action.yml
@@ -20,6 +20,7 @@ runs:
           3.1.x
           5.x
           6.x
+          7.x
       env:
         NUGET_AUTH_TOKEN: ${{ inputs.nugetToken }}
 
@@ -40,4 +41,4 @@ runs:
       uses: actions/upload-artifact@v2
       with:
         name: Screenshots-${{ github.run_number }}
-        path: ${{ github.workspace }}/MaterialDesignThemes.UITests/bin/${{ inputs.buildConfiguration }}/net6.0-windows/Screenshots
+        path: ${{ github.workspace }}/MaterialDesignThemes.UITests/bin/${{ inputs.buildConfiguration }}/net7.0-windows/Screenshots
diff --git a/.github/workflows/icon_update.yml b/.github/workflows/icon_update.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.x
+        dotnet-version: 7.x
 
     - name: Run Icon Generation
       run: dotnet run -c Release -- icons

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,10 +1,9 @@
 <Project>
   <PropertyGroup>
-    <Copyright>Copyright © 2020</Copyright>
+    <Copyright>Copyright © 2022</Copyright>
     <Company>Mulholland Software/James Willock</Company>
 
-    <Configurations>Debug;Release</Configurations>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
     <ErrorReport>prompt</ErrorReport>
 
     <SignAssembly>true</SignAssembly>

diff --git a/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj b/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/MainDemo.Wpf/MaterialDesignDemo.csproj b/MainDemo.Wpf/MaterialDesignDemo.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Prefer32Bit>true</Prefer32Bit>
     <ApplicationIcon>favicon.ico</ApplicationIcon>

diff --git a/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj b/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Prefer32Bit>true</Prefer32Bit>
     <ApplicationIcon>favicon.ico</ApplicationIcon>

diff --git a/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj b/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp3.1;net6.0-windows</TargetFrameworks>
-        <AssemblyTitle>MaterialDesignColors.Wpf.Tests</AssemblyTitle>
-        <Product>MaterialDesignColors.Wpf.Tests</Product>
-    </PropertyGroup>
-    <ItemGroup Condition="'$(TargetFramework)'=='net472'">
-        <Reference Include="PresentationCore" />
-        <Reference Include="PresentationFramework" />
-        <Reference Include="System" />
-        <Reference Include="System.Core" />
-        <Reference Include="System.Xaml" />
-        <Reference Include="System.Xml.Linq" />
-        <Reference Include="System.Data.DataSetExtensions" />
-        <Reference Include="Microsoft.CSharp" />
-        <Reference Include="System.Data" />
-        <Reference Include="System.Xml" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="xunit" />
-        <PackageReference Include="xunit.runner.visualstudio" />
-        <PackageReference Include="Shouldly" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net472;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <AssemblyTitle>MaterialDesignColors.Wpf.Tests</AssemblyTitle>
+    <Product>MaterialDesignColors.Wpf.Tests</Product>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net472'">
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="Shouldly" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+  </ItemGroup>
 </Project>
diff --git a/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj b/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>MaterialDesignColors</RootNamespace>
     <AssemblyName>MaterialDesignColors</AssemblyName>
-    <TargetFrameworks>net462;netcoreapp3.1;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <MDIXColorsVersion Condition="$(MDIXColorsVersion) == '' Or $(MDIXColorsVersion) == '*Undefined*'">1.0.1</MDIXColorsVersion>
     <AssemblyTitle>MaterialDesignColors.Wpf</AssemblyTitle>

diff --git a/MaterialDesignColors.nuspec b/MaterialDesignColors.nuspec
@@ -18,11 +18,13 @@
       <group targetFramework="net462" />
       <group targetFramework="netcoreapp3.1" />
       <group targetFramework="net6.0" />
+      <group targetFramework="net7.0" />
     </dependencies>
   </metadata>
   <files>
     <file src="MaterialDesignColors.Wpf\bin\$configuration$\net462\MaterialDesignColors.*" target="lib\net462" exclude="**\*.json" />
     <file src="MaterialDesignColors.Wpf\bin\$configuration$\netcoreapp3.1\MaterialDesignColors.*" target="lib\netcoreapp3.1" exclude="**\*.json" />
     <file src="MaterialDesignColors.Wpf\bin\$configuration$\net6.0-windows\MaterialDesignColors.*" target="lib\net6.0" exclude="**\*.json" />
+    <file src="MaterialDesignColors.Wpf\bin\$configuration$\net7.0-windows\MaterialDesignColors.*" target="lib\net7.0" exclude="**\*.json" />
   </files>
 </package>
diff --git a/MaterialDesignThemes.MahApps.nuspec b/MaterialDesignThemes.MahApps.nuspec
@@ -16,25 +16,31 @@
     <tags>WPF XAML MahApps Material Design Theme Colour Color UI UX</tags>
     <dependencies>
       <group targetFramework="net462">
-        <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
-        <dependency id="MaterialDesignThemes" version="[3.0.0, 4.0)" />
-        <dependency id="MahApps.Metro" version="[2.0.0-alpha0748, 3.0)" />
+        <dependency id="MaterialDesignColors" version="0.0.0" />
+        <dependency id="MaterialDesignThemes" version="0.0.0" />
+        <dependency id="MahApps.Metro" version="2.0.0" />
       </group>
       <group targetFramework="netcoreapp3.1">
-        <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
-        <dependency id="MaterialDesignThemes" version="[3.0.0, 4.0)" />
-        <dependency id="MahApps.Metro" version="[2.0.0, 3.0)" />
+        <dependency id="MaterialDesignColors" version="0.0.0" />
+        <dependency id="MaterialDesignThemes" version="0.0.0" />
+        <dependency id="MahApps.Metro" version="2.0.0" />
       </group>
       <group targetFramework="net6.0">
-        <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
-        <dependency id="MaterialDesignThemes" version="[3.0.0, 4.0)" />
-        <dependency id="MahApps.Metro" version="[2.0.0, 3.0)" />
+        <dependency id="MaterialDesignColors" version="0.0.0" />
+        <dependency id="MaterialDesignThemes" version="0.0.0" />
+        <dependency id="MahApps.Metro" version="2.0.0" />
+      </group>
+      <group targetFramework="net7.0">
+        <dependency id="MaterialDesignColors" version="0.0.0" />
+        <dependency id="MaterialDesignThemes" version="0.0.0" />
+        <dependency id="MahApps.Metro" version="2.0.0" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <file src="MaterialDesignThemes.MahApps\bin\$configuration$\net462\MaterialDesignThemes.MahApps.*" target="lib\net462" exclude="**\*.json" />
     <file src="MaterialDesignThemes.MahApps\bin\$configuration$\netcoreapp3.1\MaterialDesignThemes.MahApps.*" target="lib\netcoreapp3.1" exclude="**\*.json" />
     <file src="MaterialDesignThemes.MahApps\bin\$configuration$\net6.0-windows\MaterialDesignThemes.MahApps.*" target="lib\net6.0" exclude="**\*.json" />
+    <file src="MaterialDesignThemes.MahApps\bin\$configuration$\net7.0-windows\MaterialDesignThemes.MahApps.*" target="lib\net7.0" exclude="**\*.json" />
   </files>
-</package>
+</package>
diff --git a/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj b/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFrameworks>net462;netcoreapp3.1;net6.0-windows</TargetFrameworks>
-        <UseWPF>true</UseWPF>
-        <MDIXMahAppsVersion Condition="$(MDIXMahAppsVersion) == '' Or $(MDIXMahAppsVersion) == '*Undefined*'">1.0.1</MDIXMahAppsVersion>
-        <AssemblyTitle>MaterialDesignThemes.MahApps</AssemblyTitle>
-        <Product>MaterialDesignThemes.MahApps</Product>
-        <Version>$(MDIXMahAppsVersion)</Version>
-        <AssemblyVersion>$(MDIXMahAppsVersion)</AssemblyVersion>
-        <UseWPF>true</UseWPF>
-    </PropertyGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
-        <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="MahApps.Metro" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net462;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <UseWPF>true</UseWPF>
+    <MDIXMahAppsVersion Condition="$(MDIXMahAppsVersion) == '' Or $(MDIXMahAppsVersion) == '*Undefined*'">1.0.1</MDIXMahAppsVersion>
+    <AssemblyTitle>MaterialDesignThemes.MahApps</AssemblyTitle>
+    <Product>MaterialDesignThemes.MahApps</Product>
+    <Version>$(MDIXMahAppsVersion)</Version>
+    <AssemblyVersion>$(MDIXMahAppsVersion)</AssemblyVersion>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
+    <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="MahApps.Metro" />
+  </ItemGroup>
 </Project>
diff --git a/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj b/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <IsPackable>false</IsPackable>
     <SignAssembly>false</SignAssembly>
     <UseWPF>true</UseWPF>

diff --git a/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj b/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp3.1;net6.0-windows</TargetFrameworks>
-        <AssemblyTitle>MaterialDesignThemes.Wpf.Tests</AssemblyTitle>
-        <Product>MaterialDesignThemes.Wpf.Tests</Product>
-    </PropertyGroup>
-    <ItemGroup Condition="'$(TargetFramework)'=='net472'">
-        <Reference Include="PresentationCore" />
-        <Reference Include="PresentationFramework" />
-        <Reference Include="System" />
-        <Reference Include="System.Core" />
-        <Reference Include="System.Xaml" />
-        <Reference Include="System.Xml.Linq" />
-        <Reference Include="System.Data.DataSetExtensions" />
-        <Reference Include="Microsoft.CSharp" />
-        <Reference Include="System.Data" />
-        <Reference Include="System.Xml" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
-        <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="xunit" />
-        <PackageReference Include="xunit.runner.visualstudio" />
-        <PackageReference Include="Xunit.StaFact" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net472;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <AssemblyTitle>MaterialDesignThemes.Wpf.Tests</AssemblyTitle>
+    <Product>MaterialDesignThemes.Wpf.Tests</Product>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net472'">
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
+    <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="Xunit.StaFact" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+  </ItemGroup>
 </Project>
diff --git a/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj b/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.1;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <MDIXVersion Condition="$(MDIXVersion) == '' Or $(MDIXVersion) == '*Undefined*'">1.0.1</MDIXVersion>
     <AssemblyTitle>MaterialDesignThemes.Wpf</AssemblyTitle>

diff --git a/MaterialDesignThemes.nuspec b/MaterialDesignThemes.nuspec
@@ -16,23 +16,28 @@
     <tags>WPF XAML Material Design Theme Colour Color UI UX</tags>
     <dependencies>
       <group targetFramework="net462">
-        <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
-        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="[1.1.39, 2.0)" />
+        <dependency id="MaterialDesignColors" version="0.0.0" />
+        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" />
       </group>
       <group targetFramework="netcoreapp3.1">
-        <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
-        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="[1.1.39, 2.0)" />
+        <dependency id="MaterialDesignColors" version="0.0.0" />
+        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" />
       </group>
       <group targetFramework="net6.0">
-        <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
-        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="[1.1.39, 2.0)" />
+        <dependency id="MaterialDesignColors" version="0.0.0" />
+        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" />
+      </group>
+      <group targetFramework="net7.0">
+        <dependency id="MaterialDesignColors" version="0.0.0" />
+        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <file src="MaterialDesignThemes.Wpf\bin\$configuration$\net462\MaterialDesignThemes.Wpf.*" target="lib\net462" exclude="**\*.json" />
     <file src="MaterialDesignThemes.Wpf\bin\$configuration$\netcoreapp3.1\MaterialDesignThemes.Wpf.*" target="lib\netcoreapp3.1" exclude="**\*.json" />
     <file src="MaterialDesignThemes.Wpf\bin\$configuration$\net6.0-windows\MaterialDesignThemes.Wpf.*" target="lib\net6.0" exclude="**\*.json" />
+    <file src="MaterialDesignThemes.Wpf\bin\$configuration$\net7.0-windows\MaterialDesignThemes.Wpf.*" target="lib\net7.0" exclude="**\*.json" />
     <file src="MaterialDesignThemes.Wpf\Resources\Roboto\*.ttf" target="build\Resources\Roboto" />
     <file src="MaterialDesignThemes.Wpf\MaterialDesignThemes.targets" target="build" />
     <file src="MaterialDesignThemes.Wpf\VisualStudioToolsManifest.xml" target="tools" />

diff --git a/Scripts/BuildNugets.ps1 b/Scripts/BuildNugets.ps1
@@ -40,28 +40,14 @@ function Update-Versions {
 
   foreach($dependency in $xml.package.metadata.dependencies.group.dependency){
     if ($dependency.id -eq "MaterialDesignColors") {
-      $dependency.version = Get-VersionString $MDIXColorsVersion
+      $dependency.version = $MDIXColorsVersion
     } elseif ($dependency.id -eq "MaterialDesignThemes") {
-      $dependency.version = Get-VersionString $MDIXVersion
+      $dependency.version = $MDIXVersion
     }
   }
   $xml.Save($Path)
 }
 
-function Get-VersionString {
-  param (
-    [string]$Version
-  )
-
-  $callback = {
-    [int]$args[0].Groups[1].Value + 1
-  }
-
-  $re = [regex]"^(\d+).*"
-  $nextVersion = $re.Replace($Version, $callback)
-  return "[$Version,$nextVersion.0)"
-}
-
 function New-Nuget {
   param (
     [string]$NuSpecPath,
@@ -83,4 +69,4 @@ New-Nuget .\MaterialDesignColors.nuspec $MDIXColorsVersion
 New-Nuget .\MaterialDesignThemes.nuspec $MDIXVersion
 New-Nuget .\MaterialDesignThemes.MahApps.nuspec $MDIXMahAppsVersion
 
-Pop-Location
+Pop-Location
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.300",
+    "version": "7.0.100",
     "rollForward": "latestMinor"
   }
 }