diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index b26c0ad90e..7b928254b7 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -41,13 +41,13 @@ The MaterialDesignInXamlToolkit is a **theme library** for WPF applications that
### Build and Test
```powershell
# Restore dependencies
-dotnet restore MaterialDesignToolkit.Full.sln
+dotnet restore MaterialDesignToolkit.Full.slnx
# Build (requires Windows)
-dotnet build MaterialDesignToolkit.Full.sln --configuration Release --no-restore -p:Platform="Any CPU" -p:TreatWarningsAsErrors=True
+dotnet build MaterialDesignToolkit.Full.slnx --configuration Release --no-restore -p:Platform="Any CPU" -p:TreatWarningsAsErrors=True
# Run tests
-dotnet test MaterialDesignToolkit.Full.sln --configuration Release --no-build
+dotnet test MaterialDesignToolkit.Full.slnx --configuration Release --no-build
# Build NuGet packages
.\build\BuildNugets.ps1 -MDIXVersion "x.x.x" -MDIXColorsVersion "x.x.x" -MDIXMahAppsVersion "x.x.x"
diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index 0ace05cb3d..d8e5eaf149 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -1,73 +1,74 @@
name: Build Artifacts
on:
- workflow_call:
- inputs:
- build-configuration:
- default: "Release"
- required: false
- type: string
- mdix-version:
- required: true
- type: string
- mdix-colors-version:
- required: true
- type: string
- mdix-mahapps-version:
- required: true
- type: string
+ workflow_call:
+ inputs:
+ build-configuration:
+ default: "Release"
+ required: false
+ type: string
+ mdix-version:
+ required: true
+ type: string
+ mdix-colors-version:
+ required: true
+ type: string
+ mdix-mahapps-version:
+ required: true
+ type: string
jobs:
- build:
- name: Build and Test
- runs-on: windows-latest
+ build:
+ name: Build and Test
+ runs-on: windows-latest
- env:
- solution: MaterialDesignToolkit.Full.sln
+ env:
+ solution: MaterialDesignToolkit.Full.slnx
- steps:
- - uses: actions/checkout@v5
+ steps:
+ - uses: actions/checkout@v5
- - name: Setup .NET
- uses: actions/setup-dotnet@v5
- with:
- dotnet-version: |
- 8.x
- 9.x
+ - name: Setup .NET
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: |
+ 8.x
+ 9.x
+ 10.x
- - name: Restore dependencies
- run: dotnet restore ${{ env.solution }}
+ - name: Restore dependencies
+ run: dotnet restore ${{ env.solution }}
- - name: Build
- run: dotnet build ${{ env.solution }} --configuration ${{ inputs.build-configuration }} --no-restore -p:Platform="Any CPU" -p:TreatWarningsAsErrors=True
- env:
- MDIXVersion: ${{ inputs.mdix-version }}
- MDIXColorsVersion: ${{ inputs.mdix-colors-version }}
- MDIXMahAppsVersion: ${{ inputs.mdix-mahapps-version }}
+ - name: Build
+ run: dotnet build ${{ env.solution }} --configuration ${{ inputs.build-configuration }} --no-restore -p:Platform="Any CPU" -p:TreatWarningsAsErrors=True
+ env:
+ MDIXVersion: ${{ inputs.mdix-version }}
+ MDIXColorsVersion: ${{ inputs.mdix-colors-version }}
+ MDIXMahAppsVersion: ${{ inputs.mdix-mahapps-version }}
- - name: Test
- timeout-minutes: 20
- run: dotnet test ${{ env.solution }} --configuration ${{ inputs.build-configuration }} --no-build --blame-crash --logger GitHubActions
+ - name: Test
+ timeout-minutes: 20
+ run: dotnet test ${{ env.solution }} --configuration ${{ inputs.build-configuration }} --no-build --blame-crash --logger GitHubActions
- - name: Upload Screenshots
- if: ${{ always() }}
- uses: actions/upload-artifact@v5
- with:
- name: Screenshots-${{ github.run_number }}
- path: ${{ github.workspace }}\tests\MaterialDesignThemes.UITests\bin\${{ inputs.build-configuration }}\net9.0-windows\Screenshots
- if-no-files-found: ignore
+ - name: Upload Screenshots
+ if: ${{ always() }}
+ uses: actions/upload-artifact@v5
+ with:
+ name: Screenshots-${{ github.run_number }}
+ path: ${{ github.workspace }}\tests\MaterialDesignThemes.UITests\bin\${{ inputs.build-configuration }}\net9.0-windows\Screenshots
+ if-no-files-found: ignore
- - name: Build NuGets
- run: .\build\BuildNugets.ps1 -MDIXVersion ${{ inputs.mdix-version }} -MDIXColorsVersion ${{ inputs.mdix-colors-version }} -MDIXMahAppsVersion ${{ inputs.mdix-mahapps-version }}
+ - name: Build NuGets
+ run: .\build\BuildNugets.ps1 -MDIXVersion ${{ inputs.mdix-version }} -MDIXColorsVersion ${{ inputs.mdix-colors-version }} -MDIXMahAppsVersion ${{ inputs.mdix-mahapps-version }}
- - name: Upload NuGets
- uses: actions/upload-artifact@v5
- with:
- name: NuGets
- path: "*.nupkg"
+ - name: Upload NuGets
+ uses: actions/upload-artifact@v5
+ with:
+ name: NuGets
+ path: "*.nupkg"
- - name: Upload Demo App
- uses: actions/upload-artifact@v5
- with:
- name: DemoApp
- path: "src/MainDemo.Wpf/bin/${{ env.buildConfiguration }}"
+ - name: Upload Demo App
+ uses: actions/upload-artifact@v5
+ with:
+ name: DemoApp
+ path: "src/MainDemo.Wpf/bin/${{ env.buildConfiguration }}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ab0ec4edd0..073292d114 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
type: string
env:
- solution: MaterialDesignToolkit.Full.sln
+ solution: MaterialDesignToolkit.Full.slnx
GITHUB_TOKEN: ${{ secrets.SA_PAT }}
defaults:
diff --git a/Directory.Build.props b/Directory.Build.props
index 4028aeac9e..8e6dedb941 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
Copyright © 2022
Mulholland Software/James Willock
- 13.0
+ 14.0
prompt
true
diff --git a/Directory.packages.props b/Directory.packages.props
index 25bc3d59a7..7b5df4715f 100644
--- a/Directory.packages.props
+++ b/Directory.packages.props
@@ -12,6 +12,7 @@
+
@@ -29,15 +30,12 @@
-
-
-
diff --git a/MaterialDesignToolkit.Full.sln b/MaterialDesignToolkit.Full.sln
deleted file mode 100644
index af6bccf7f0..0000000000
--- a/MaterialDesignToolkit.Full.sln
+++ /dev/null
@@ -1,326 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31612.314
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesignDemo", "src\MainDemo.Wpf\MaterialDesignDemo.csproj", "{CF0A27A8-EF82-44E5-B673-ECCC150C48ED}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesignThemes.Wpf", "src\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj", "{F079FB0A-A8ED-4216-B6A5-345756751A04}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesignColors.Wpf", "src\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj", "{90B53209-C60C-4655-B28D-A1B3E1044BA3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MahAppsDragablzDemo", "src\MahMaterialDragablzMashUp\MahAppsDragablzDemo.csproj", "{803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "web", "web", "{7D0AC158-FD01-4EA3-8F8A-D19C085C77DF}"
- ProjectSection(SolutionItems) = preProject
- src\web\images\MashUp.gif = src\web\images\MashUp.gif
- src\web\PaletteBuilder.html = src\web\PaletteBuilder.html
- src\web\scripts\PaletteBuilder.js = src\web\scripts\PaletteBuilder.js
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{D34BE232-DE51-43C1-ABDC-B69003BB50FF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesignColors.Wpf.Tests", "tests\MaterialDesignColors.Wpf.Tests\MaterialDesignColors.Wpf.Tests.csproj", "{FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesignThemes.MahApps", "src\MaterialDesignThemes.MahApps\MaterialDesignThemes.MahApps.csproj", "{81556A2D-D467-43E7-945B-FD987C676CF6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesignThemes.Wpf.Tests", "tests\MaterialDesignThemes.Wpf.Tests\MaterialDesignThemes.Wpf.Tests.csproj", "{A361C80E-F6CD-4C57-A96C-002DB159C1F4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{55087897-5F09-45CA-8E12-12B36B45F262}"
- ProjectSection(SolutionItems) = preProject
- .editorconfig = .editorconfig
- build\BuildNugets.ps1 = build\BuildNugets.ps1
- Directory.Build.props = Directory.Build.props
- Directory.packages.props = Directory.packages.props
- .config\dotnet-tools.json = .config\dotnet-tools.json
- global.json = global.json
- build\MigrateBrushes.ps1 = build\MigrateBrushes.ps1
- nuget.config = nuget.config
- README.md = README.md
- Settings.XAMLStyler = Settings.XAMLStyler
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesignThemes.UITests", "tests\MaterialDesignThemes.UITests\MaterialDesignThemes.UITests.csproj", "{594D2254-3623-4088-A8BD-D74B6E96DE9F}"
- ProjectSection(ProjectDependencies) = postProject
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED} = {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{9E303A4A-3712-44B9-91EE-830FDC087795}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesignToolkit.ResourceGeneration", "src\MaterialDesignToolkit.ResourceGeneration\MaterialDesignToolkit.ResourceGeneration.csproj", "{59CE50AC-D176-4CC0-B465-26F66054A15E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{18401177-A30E-4330-8F6B-101DF876CE99}"
- ProjectSection(SolutionItems) = preProject
- .github\workflows\build_artifacts.yml = .github\workflows\build_artifacts.yml
- .github\workflows\control_styles.yml = .github\workflows\control_styles.yml
- .github\workflows\get_versions.yml = .github\workflows\get_versions.yml
- .github\workflows\icon_update.yml = .github\workflows\icon_update.yml
- .github\workflows\nightly_release.yml = .github\workflows\nightly_release.yml
- .github\workflows\pr_verification.yml = .github\workflows\pr_verification.yml
- .github\workflows\release.yml = .github\workflows\release.yml
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesign3Demo", "src\MaterialDesign3.Demo.Wpf\MaterialDesign3Demo.csproj", "{98627CBE-F009-482E-97E9-C69C7135E91F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignDemo.Shared", "src\MaterialDesignDemo.Shared\MaterialDesignDemo.Shared.csproj", "{B39795A7-D66A-4F2F-9F41-050838D14048}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialColorUtilities", "src\MaterialDesign3.MaterialColorUtilities\MaterialColorUtilities.csproj", "{2C29B80E-1689-43CE-85AC-71799666B4AC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialColorUtilities.Tests", "tests\MaterialColorUtilities.Tests\MaterialColorUtilities.Tests.csproj", "{91485BEA-759F-406E-87B7-68D94CF66DE4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignThemes.Motion", "src\MaterialDesign3.Motion\Motion.csproj", "{3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|ARM = Debug|ARM
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
- Release|ARM = Release|ARM
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Debug|ARM.Build.0 = Debug|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Debug|x64.ActiveCfg = Debug|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Debug|x64.Build.0 = Debug|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Debug|x86.ActiveCfg = Debug|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Debug|x86.Build.0 = Debug|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Release|Any CPU.Build.0 = Release|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Release|ARM.ActiveCfg = Release|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Release|ARM.Build.0 = Release|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Release|x64.ActiveCfg = Release|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Release|x64.Build.0 = Release|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Release|x86.ActiveCfg = Release|Any CPU
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED}.Release|x86.Build.0 = Release|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Debug|ARM.Build.0 = Debug|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Debug|x64.ActiveCfg = Debug|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Debug|x64.Build.0 = Debug|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Debug|x86.ActiveCfg = Debug|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Debug|x86.Build.0 = Debug|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Release|Any CPU.Build.0 = Release|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Release|ARM.ActiveCfg = Release|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Release|ARM.Build.0 = Release|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Release|x64.ActiveCfg = Release|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Release|x64.Build.0 = Release|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Release|x86.ActiveCfg = Release|Any CPU
- {F079FB0A-A8ED-4216-B6A5-345756751A04}.Release|x86.Build.0 = Release|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Debug|ARM.Build.0 = Debug|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Debug|x64.ActiveCfg = Debug|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Debug|x64.Build.0 = Debug|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Debug|x86.ActiveCfg = Debug|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Debug|x86.Build.0 = Debug|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Release|Any CPU.Build.0 = Release|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Release|ARM.ActiveCfg = Release|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Release|ARM.Build.0 = Release|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Release|x64.ActiveCfg = Release|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Release|x64.Build.0 = Release|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Release|x86.ActiveCfg = Release|Any CPU
- {90B53209-C60C-4655-B28D-A1B3E1044BA3}.Release|x86.Build.0 = Release|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Debug|ARM.Build.0 = Debug|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Debug|x64.ActiveCfg = Debug|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Debug|x64.Build.0 = Debug|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Debug|x86.Build.0 = Debug|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Release|Any CPU.Build.0 = Release|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Release|ARM.ActiveCfg = Release|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Release|ARM.Build.0 = Release|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Release|x64.ActiveCfg = Release|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Release|x64.Build.0 = Release|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Release|x86.ActiveCfg = Release|Any CPU
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}.Release|x86.Build.0 = Release|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Debug|ARM.Build.0 = Debug|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Debug|x64.ActiveCfg = Debug|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Debug|x64.Build.0 = Debug|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Debug|x86.ActiveCfg = Debug|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Debug|x86.Build.0 = Debug|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Release|Any CPU.Build.0 = Release|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Release|ARM.ActiveCfg = Release|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Release|ARM.Build.0 = Release|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Release|x64.ActiveCfg = Release|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Release|x64.Build.0 = Release|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Release|x86.ActiveCfg = Release|Any CPU
- {FD1D557A-251C-4D00-9FDE-6FF9FFA747B8}.Release|x86.Build.0 = Release|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Debug|ARM.Build.0 = Debug|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Debug|x64.ActiveCfg = Debug|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Debug|x64.Build.0 = Debug|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Debug|x86.ActiveCfg = Debug|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Debug|x86.Build.0 = Debug|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Release|Any CPU.Build.0 = Release|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Release|ARM.ActiveCfg = Release|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Release|ARM.Build.0 = Release|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Release|x64.ActiveCfg = Release|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Release|x64.Build.0 = Release|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Release|x86.ActiveCfg = Release|Any CPU
- {81556A2D-D467-43E7-945B-FD987C676CF6}.Release|x86.Build.0 = Release|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Debug|ARM.Build.0 = Debug|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Debug|x64.ActiveCfg = Debug|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Debug|x64.Build.0 = Debug|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Debug|x86.Build.0 = Debug|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Release|Any CPU.Build.0 = Release|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Release|ARM.ActiveCfg = Release|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Release|ARM.Build.0 = Release|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Release|x64.ActiveCfg = Release|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Release|x64.Build.0 = Release|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Release|x86.ActiveCfg = Release|Any CPU
- {A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Release|x86.Build.0 = Release|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Debug|ARM.Build.0 = Debug|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Debug|x64.ActiveCfg = Debug|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Debug|x64.Build.0 = Debug|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Debug|x86.ActiveCfg = Debug|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Debug|x86.Build.0 = Debug|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Release|Any CPU.Build.0 = Release|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Release|ARM.ActiveCfg = Release|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Release|ARM.Build.0 = Release|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Release|x64.ActiveCfg = Release|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Release|x64.Build.0 = Release|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Release|x86.ActiveCfg = Release|Any CPU
- {594D2254-3623-4088-A8BD-D74B6E96DE9F}.Release|x86.Build.0 = Release|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Debug|ARM.Build.0 = Debug|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Debug|x64.Build.0 = Debug|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Debug|x86.Build.0 = Debug|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Release|Any CPU.Build.0 = Release|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Release|ARM.ActiveCfg = Release|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Release|ARM.Build.0 = Release|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Release|x64.ActiveCfg = Release|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Release|x64.Build.0 = Release|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Release|x86.ActiveCfg = Release|Any CPU
- {59CE50AC-D176-4CC0-B465-26F66054A15E}.Release|x86.Build.0 = Release|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Debug|ARM.Build.0 = Debug|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Debug|x64.ActiveCfg = Debug|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Debug|x64.Build.0 = Debug|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Debug|x86.ActiveCfg = Debug|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Debug|x86.Build.0 = Debug|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Release|Any CPU.Build.0 = Release|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Release|ARM.ActiveCfg = Release|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Release|ARM.Build.0 = Release|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x64.ActiveCfg = Release|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x64.Build.0 = Release|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x86.ActiveCfg = Release|Any CPU
- {98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x86.Build.0 = Release|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|ARM.Build.0 = Debug|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x64.ActiveCfg = Debug|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x64.Build.0 = Debug|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x86.ActiveCfg = Debug|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x86.Build.0 = Debug|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Release|Any CPU.Build.0 = Release|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Release|ARM.ActiveCfg = Release|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Release|ARM.Build.0 = Release|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x64.ActiveCfg = Release|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x64.Build.0 = Release|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x86.ActiveCfg = Release|Any CPU
- {B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x86.Build.0 = Release|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Debug|ARM.Build.0 = Debug|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Debug|x64.ActiveCfg = Debug|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Debug|x64.Build.0 = Debug|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Debug|x86.ActiveCfg = Debug|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Debug|x86.Build.0 = Debug|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Release|Any CPU.Build.0 = Release|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Release|ARM.ActiveCfg = Release|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Release|ARM.Build.0 = Release|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Release|x64.ActiveCfg = Release|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Release|x64.Build.0 = Release|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Release|x86.ActiveCfg = Release|Any CPU
- {2C29B80E-1689-43CE-85AC-71799666B4AC}.Release|x86.Build.0 = Release|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Debug|ARM.Build.0 = Debug|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Debug|x64.ActiveCfg = Debug|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Debug|x64.Build.0 = Debug|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Debug|x86.ActiveCfg = Debug|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Debug|x86.Build.0 = Debug|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Release|Any CPU.Build.0 = Release|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Release|ARM.ActiveCfg = Release|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Release|ARM.Build.0 = Release|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Release|x64.ActiveCfg = Release|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Release|x64.Build.0 = Release|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Release|x86.ActiveCfg = Release|Any CPU
- {91485BEA-759F-406E-87B7-68D94CF66DE4}.Release|x86.Build.0 = Release|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Debug|ARM.Build.0 = Debug|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Debug|x64.ActiveCfg = Debug|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Debug|x64.Build.0 = Debug|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Debug|x86.ActiveCfg = Debug|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Debug|x86.Build.0 = Debug|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Release|Any CPU.Build.0 = Release|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Release|ARM.ActiveCfg = Release|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Release|ARM.Build.0 = Release|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Release|x64.ActiveCfg = Release|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Release|x64.Build.0 = Release|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Release|x86.ActiveCfg = Release|Any CPU
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F}.Release|x86.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {CF0A27A8-EF82-44E5-B673-ECCC150C48ED} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
- {803954E5-3A35-4D8B-95A7-F6E9B63EC0DF} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
- {59CE50AC-D176-4CC0-B465-26F66054A15E} = {9E303A4A-3712-44B9-91EE-830FDC087795}
- {18401177-A30E-4330-8F6B-101DF876CE99} = {55087897-5F09-45CA-8E12-12B36B45F262}
- {98627CBE-F009-482E-97E9-C69C7135E91F} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
- {B39795A7-D66A-4F2F-9F41-050838D14048} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
- {2C29B80E-1689-43CE-85AC-71799666B4AC} = {9E303A4A-3712-44B9-91EE-830FDC087795}
- {91485BEA-759F-406E-87B7-68D94CF66DE4} = {9E303A4A-3712-44B9-91EE-830FDC087795}
- {3F7E3CFD-BAE6-4DC4-9C8D-A001138BD87F} = {9E303A4A-3712-44B9-91EE-830FDC087795}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {730B2F9E-74AE-46CE-9E61-89AA5C6D5DD3}
- EndGlobalSection
-EndGlobal
diff --git a/MaterialDesignToolkit.Full.slnx b/MaterialDesignToolkit.Full.slnx
new file mode 100644
index 0000000000..fec850efe9
--- /dev/null
+++ b/MaterialDesignToolkit.Full.slnx
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/global.json b/global.json
index 99e8a932cd..1e7fdfa95f 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "9.0.306",
+ "version": "10.0.100",
"rollForward": "latestMinor"
}
}
diff --git a/src/MaterialDesign3.MaterialColorUtilities/MaterialColorUtilities.csproj b/src/MaterialDesign3.MaterialColorUtilities/MaterialColorUtilities.csproj
index b8257c495d..9c1b0a7d53 100644
--- a/src/MaterialDesign3.MaterialColorUtilities/MaterialColorUtilities.csproj
+++ b/src/MaterialDesign3.MaterialColorUtilities/MaterialColorUtilities.csproj
@@ -2,7 +2,7 @@
MaterialColorUtilities
MaterialColorUtilities
- net462;net8.0-windows
+ net462;net8.0-windows;net10.0-windows
13
disable
MaterialColorUtilities
diff --git a/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj b/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj
index 5b13473873..eb3bcc14c9 100644
--- a/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj
+++ b/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj
@@ -2,7 +2,7 @@
MaterialDesignColors
MaterialDesignColors
- net462;net8.0-windows
+ net462;net8.0-windows;net10.0-windows
true
1.0.1
$([System.Text.RegularExpressions.Regex]::Replace("$(MDIXColorsVersion)", "-ci\d+$", ""))
diff --git a/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj b/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj
index 8ed6ec4df8..dcd0a840f8 100644
--- a/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj
+++ b/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj
@@ -1,7 +1,7 @@
- net462;net8.0-windows
+ net462;net8.0-windows;net10.0-windows
true
1.0.1
$([System.Text.RegularExpressions.Regex]::Replace("$(MDIXMahAppsVersion)", "-ci\d+$", ""))
diff --git a/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj b/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
index 1b70e4ddc6..33b714ea4d 100644
--- a/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
+++ b/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
@@ -1,7 +1,7 @@
- net462;net8.0-windows
+ net462;net8.0-windows;net10.0-windows
true
1.0.1
$([System.Text.RegularExpressions.Regex]::Replace("$(MDIXVersion)", "-ci\d+$", ""))
diff --git a/src/MaterialDesignToolkit.ResourceGeneration/MaterialDesignToolkit.ResourceGeneration.csproj b/src/MaterialDesignToolkit.ResourceGeneration/MaterialDesignToolkit.ResourceGeneration.csproj
index 7c3e2ff9d7..b3f40e3596 100644
--- a/src/MaterialDesignToolkit.ResourceGeneration/MaterialDesignToolkit.ResourceGeneration.csproj
+++ b/src/MaterialDesignToolkit.ResourceGeneration/MaterialDesignToolkit.ResourceGeneration.csproj
@@ -1,7 +1,7 @@
Exe
- net8.0-windows
+ net10.0-windows
true
diff --git a/tests/MaterialColorUtilities.Tests/MaterialColorUtilities.Tests.csproj b/tests/MaterialColorUtilities.Tests/MaterialColorUtilities.Tests.csproj
index 2b8d7795ea..0c99ed5703 100644
--- a/tests/MaterialColorUtilities.Tests/MaterialColorUtilities.Tests.csproj
+++ b/tests/MaterialColorUtilities.Tests/MaterialColorUtilities.Tests.csproj
@@ -1,7 +1,7 @@
- net8.0-windows
+ net8.0-windows;net10.0-windows
MaterialColorUtilities.Tests
MaterialColorUtilities.Tests
Exe
@@ -23,8 +23,6 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
diff --git a/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj b/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
index 079e511042..0dd149338f 100644
--- a/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
+++ b/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
@@ -1,7 +1,7 @@
- net472;net8.0-windows
+ net472;net8.0-windows;net10.0-windows
MaterialDesignColors.Wpf.Tests
MaterialDesignColors.Wpf.Tests
true
@@ -28,9 +28,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
\ No newline at end of file
diff --git a/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj b/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
index 8e78308ec4..5129a4d107 100644
--- a/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
+++ b/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
@@ -1,6 +1,6 @@
- net9.0-windows
+ net10.0-windows
false
false
true
@@ -19,8 +19,6 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
diff --git a/tests/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj b/tests/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
index 82fa1fac42..d7326ce603 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
+++ b/tests/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
@@ -1,7 +1,7 @@
- net8.0-windows
+ net10.0-windows
MaterialDesignThemes.Wpf.Tests
MaterialDesignThemes.Wpf.Tests
Exe
@@ -22,8 +22,6 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-