diff --git a/.editorconfig b/.editorconfig index f1c8050e00..6d4b3ee65d 100644 --- 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 index 912cb73b6e..5052f2f65a 100644 --- 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 index b32e4f4f8f..82dc4a0900 100644 --- 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 index 3a0d06265b..2278279d74 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,10 +1,9 @@ - Copyright © 2020 + Copyright © 2022 Mulholland Software/James Willock - Debug;Release - 10.0 + 11.0 prompt true diff --git a/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj b/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj index 23e373c28e..38d9623cd3 100644 --- a/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj +++ b/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj @@ -2,13 +2,13 @@ WinExe - net472;netcoreapp3.1;net6.0-windows + net472;netcoreapp3.1;net6.0-windows;net7.0-windows true ..\ true MahMaterialDragablzMashUp MahMaterialDragablzMashUp - true + true false diff --git a/MainDemo.Wpf/MaterialDesignDemo.csproj b/MainDemo.Wpf/MaterialDesignDemo.csproj index e75b384937..d95c28d211 100644 --- a/MainDemo.Wpf/MaterialDesignDemo.csproj +++ b/MainDemo.Wpf/MaterialDesignDemo.csproj @@ -2,9 +2,9 @@ WinExe - net472;netcoreapp3.1;net6.0-windows + net472;netcoreapp3.1;net6.0-windows;net7.0-windows true - true + true favicon.ico true false diff --git a/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj b/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj index fdf309f0fe..ceaf4104ab 100644 --- a/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj +++ b/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj @@ -2,9 +2,9 @@ WinExe - net472;netcoreapp3.1;net6.0-windows + net472;netcoreapp3.1;net6.0-windows;net7.0-windows true - true + true favicon.ico true false diff --git a/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj b/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj index a61d21e625..5613bdd23c 100644 --- a/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj +++ b/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj @@ -1,29 +1,29 @@  - - net472;netcoreapp3.1;net6.0-windows - MaterialDesignColors.Wpf.Tests - MaterialDesignColors.Wpf.Tests - - - - - - - - - - - - - - - - - - - - - - + + net472;netcoreapp3.1;net6.0-windows;net7.0-windows + MaterialDesignColors.Wpf.Tests + MaterialDesignColors.Wpf.Tests + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj b/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj index ad6ffc2697..1acf0251fb 100644 --- a/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj +++ b/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj @@ -2,7 +2,7 @@ MaterialDesignColors MaterialDesignColors - net462;netcoreapp3.1;net6.0-windows + net462;netcoreapp3.1;net6.0-windows;net7.0-windows true 1.0.1 MaterialDesignColors.Wpf diff --git a/MaterialDesignColors.nuspec b/MaterialDesignColors.nuspec index b8d031a009..f2dc806dd9 100644 --- a/MaterialDesignColors.nuspec +++ b/MaterialDesignColors.nuspec @@ -18,11 +18,13 @@ + + \ No newline at end of file diff --git a/MaterialDesignThemes.MahApps.nuspec b/MaterialDesignThemes.MahApps.nuspec index 21f8b3e26c..3226b18399 100644 --- a/MaterialDesignThemes.MahApps.nuspec +++ b/MaterialDesignThemes.MahApps.nuspec @@ -16,19 +16,24 @@ WPF XAML MahApps Material Design Theme Colour Color UI UX - - - + + + - - - + + + - - - + + + + + + + + @@ -36,5 +41,6 @@ + - \ No newline at end of file + diff --git a/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj b/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj index e4e98cd918..1068242ed4 100644 --- a/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj +++ b/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj @@ -1,20 +1,20 @@  - - net462;netcoreapp3.1;net6.0-windows - true - 1.0.1 - MaterialDesignThemes.MahApps - MaterialDesignThemes.MahApps - $(MDIXMahAppsVersion) - $(MDIXMahAppsVersion) - true - - - - - - - - + + net462;netcoreapp3.1;net6.0-windows;net7.0-windows + true + 1.0.1 + MaterialDesignThemes.MahApps + MaterialDesignThemes.MahApps + $(MDIXMahAppsVersion) + $(MDIXMahAppsVersion) + true + + + + + + + + \ No newline at end of file diff --git a/MaterialDesignThemes.UITests/XamlTestMixins.cs b/MaterialDesignThemes.UITests/XamlTestMixins.cs index d9f097fa25..54bba9e08d 100644 --- a/MaterialDesignThemes.UITests/XamlTestMixins.cs +++ b/MaterialDesignThemes.UITests/XamlTestMixins.cs @@ -24,8 +24,8 @@ public static async Task InitializeWithMaterialDesign(this IApp app, - - + + "; diff --git a/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj b/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj index 10b781624a..55503b0dae 100644 --- a/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj +++ b/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj @@ -1,30 +1,30 @@  - - net472;netcoreapp3.1;net6.0-windows - MaterialDesignThemes.Wpf.Tests - MaterialDesignThemes.Wpf.Tests - - - - - - - - - - - - - - - - - - - - - - - + + net472;netcoreapp3.1;net6.0-windows;net7.0-windows + MaterialDesignThemes.Wpf.Tests + MaterialDesignThemes.Wpf.Tests + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj b/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj index 7237e43629..c20299e99b 100644 --- a/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj +++ b/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj @@ -1,7 +1,7 @@  - net462;netcoreapp3.1;net6.0-windows + net462;netcoreapp3.1;net6.0-windows;net7.0-windows true 1.0.1 MaterialDesignThemes.Wpf diff --git a/MaterialDesignThemes.nuspec b/MaterialDesignThemes.nuspec index a32b60437a..b1e3c09eb5 100644 --- a/MaterialDesignThemes.nuspec +++ b/MaterialDesignThemes.nuspec @@ -16,16 +16,20 @@ WPF XAML Material Design Theme Colour Color UI UX - - + + - - + + - - + + + + + + @@ -33,6 +37,7 @@ + diff --git a/Scripts/BuildNugets.ps1 b/Scripts/BuildNugets.ps1 index d4d3e8862a..9c4de698e7 100644 --- 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 \ No newline at end of file +Pop-Location diff --git a/global.json b/global.json index 3e6303bfc9..1bf76a5867 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.300", + "version": "7.0.100", "rollForward": "latestMinor" } } diff --git a/mdresgen/MdPalette.cs b/mdresgen/MdPalette.cs index 29f3ae10a9..04f47ea7a0 100644 --- a/mdresgen/MdPalette.cs +++ b/mdresgen/MdPalette.cs @@ -1,14 +1,13 @@ -namespace mdresgen +namespace mdresgen; + +public class MdPalette { - class MdPalette - { - public string[]? shades { get; set; } - public palette[]? palettes { get; set; } + public string[]? shades { get; set; } + public Palette[]? palettes { get; set; } - public class palette - { - public string? name { get; set; } - public string[]? hexes { get; set; } - } + public class Palette + { + public string? name { get; set; } + public string[]? hexes { get; set; } } } diff --git a/mdresgen/Program.cs b/mdresgen/Program.cs index baed5bd54d..f9da8f4a82 100644 --- a/mdresgen/Program.cs +++ b/mdresgen/Program.cs @@ -75,7 +75,7 @@ static async Task Main(string[] args) private static void GenerateClasses(MdPalette palettes) { - foreach (var palette in palettes.palettes ?? Enumerable.Empty()) + foreach (var palette in palettes.palettes ?? Enumerable.Empty()) { var sb = new StringBuilder(); diff --git a/mdresgen/mdresgen.csproj b/mdresgen/mdresgen.csproj index 9fc7284d49..b60638e4d1 100644 --- a/mdresgen/mdresgen.csproj +++ b/mdresgen/mdresgen.csproj @@ -1,36 +1,36 @@  - - Exe - net6 - - - - PreserveNewest - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - - - - - - - - - - + + Exe + net7 + + + + PreserveNewest + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + + + + +