MaterialDesignInXAML · corvinsz · Oct 24, 2024 · Oct 24, 2024 · Oct 29, 2024 · Nov 4, 2024
diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
@@ -32,8 +32,8 @@ jobs:
               uses: actions/setup-dotnet@v4
               with:
                   dotnet-version: |
-                      6.x
                       8.x
+                      9.x
 
             - name: Restore dependencies
               run: dotnet restore ${{ env.solution }}
@@ -54,7 +54,7 @@ jobs:
               uses: actions/upload-artifact@v4
               with:
                   name: Screenshots-${{ github.run_number }}
-                  path: ${{ github.workspace }}tests\MaterialDesignThemes.UITests\bin\${{ inputs.build-configuration }}\net8.0-windows7\Screenshots
+                  path: ${{ github.workspace }}\tests\MaterialDesignThemes.UITests\bin\${{ inputs.build-configuration }}\net9.0-windows\Screenshots
                   if-no-files-found: ignore
 
             - name: Build NuGets

diff --git a/Directory.packages.props b/Directory.packages.props
@@ -1,9 +1,9 @@
 <Project>
   <ItemGroup>
     <PackageVersion Include="BluwolfIcons" Version="1.0.1" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="Dragablz" Version="0.0.3.234" />
-    <PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="MahApps.Metro" Version="2.4.10" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
@@ -14,7 +14,7 @@
     <PackageVersion Include="Microsoft.Composition" Version="1.0.31" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageVersion Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="Microsoft.Toolkit.MVVM" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -24,11 +24,10 @@
     <PackageVersion Include="ShowMeTheXAML.MSBuild" Version="2.0.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageVersion Include="TUnit" Version="0.25.21" />
     <PackageVersion Include="VirtualizingWrapPanel" Version="1.5.8" />
-    <PackageVersion Include="XAMLTest" Version="1.2.2" />
-    <PackageVersion Include="xunit" Version="2.6.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />
-    <PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
+    <PackageVersion Include="XAMLTest" Version="1.3.0-ci616" />
   </ItemGroup>
 </Project>
diff --git a/MaterialDesignToolkit.Full.sln b/MaterialDesignToolkit.Full.sln
@@ -33,9 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.packages.props = Directory.packages.props
 		.config\dotnet-tools.json = .config\dotnet-tools.json
 		global.json = global.json
-		MaterialDesignColors.nuspec = MaterialDesignColors.nuspec
-		MaterialDesignThemes.MahApps.nuspec = MaterialDesignThemes.MahApps.nuspec
-		MaterialDesignThemes.nuspec = MaterialDesignThemes.nuspec
 		build\MigrateBrushes.ps1 = build\MigrateBrushes.ps1
 		nuget.config = nuget.config
 		README.md = README.md

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "9.0.300",
     "rollForward": "latestMinor"
   }
 }
diff --git a/src/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj b/src/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;net6.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/src/MainDemo.Wpf/App.xaml b/src/MainDemo.Wpf/App.xaml
@@ -22,7 +22,7 @@
         If you would prefer to use your own colors, there is an option for that as well:
         PrimaryColor and SecondaryColor also support the constant string "Inherit" to specify the color should use the system theme accent color
         -->
-        <materialDesign:CustomColorTheme BaseTheme="Light" PrimaryColor="Aqua" SecondaryColor="#FF006400" />
+        <!--<materialDesign:CustomColorTheme BaseTheme="Light" PrimaryColor="Aqua" SecondaryColor="#FF006400" />-->
 
         <!-- You can also use the built-in theme dictionaries: -->
         <!--

diff --git a/src/MainDemo.Wpf/Buttons.xaml b/src/MainDemo.Wpf/Buttons.xaml
@@ -2,13 +2,13 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
+             xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
-             d:DataContext="{d:DesignInstance domain:ButtonsViewModel}"
+             d:DataContext="{d:DesignInstance sharedDomain:ButtonsViewModel}"
              d:DesignHeight="2000"
              d:DesignWidth="800"
              mc:Ignorable="d">

diff --git a/src/MainDemo.Wpf/Cards.xaml b/src/MainDemo.Wpf/Cards.xaml
@@ -24,6 +24,22 @@
     <TextBlock Style="{StaticResource PageTitleTextBlock}" Text="Card" />
 
     <WrapPanel>
+
+      <smtx:XamlDisplay Margin="0,0,8,8" UniqueKey="cards_11111">
+        <Grid Background="Blue">
+          <materialDesign:Card materialDesign:ElevationAssist.Elevation="Dp24" Margin="25" UniformCornerRadius="100" Padding="0" BorderThickness="0" >
+            <Grid Background="Black" Height="300" Width="300" Margin="0">
+              <TextBlock HorizontalAlignment="Center"
+                         VerticalAlignment="Center"
+                         Foreground="White"
+                         Text="The quick brown fox jumps over the lazy dog"
+                         Margin="20"
+                         TextWrapping="Wrap"/>
+            </Grid>
+          </materialDesign:Card>
+        </Grid>
+      </smtx:XamlDisplay>
+
       <smtx:XamlDisplay Margin="0,0,8,8" UniqueKey="cards_1">
         <materialDesign:Card Width="200">
           <Grid>

diff --git a/src/MainDemo.Wpf/ColorTool.xaml b/src/MainDemo.Wpf/ColorTool.xaml
@@ -3,13 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:converters="clr-namespace:MaterialDesignDemo.Shared.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
+             xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
              xmlns:local="clr-namespace:MaterialDesignDemo"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:materialDesignColors="clr-namespace:MaterialDesignColors;assembly=MaterialDesignColors"
              xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             d:DataContext="{d:DesignInstance Type=domain:ColorToolViewModel}"
+             d:DataContext="{d:DesignInstance Type=sharedDomain:ColorToolViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="600"
              mc:Ignorable="d">

diff --git a/src/MainDemo.Wpf/ComboBoxes.xaml b/src/MainDemo.Wpf/ComboBoxes.xaml
@@ -1,15 +1,15 @@
 <UserControl x:Class="MaterialDesignDemo.ComboBoxes"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:colorsDomain="clr-namespace:MaterialDesignDemo.Domain"
+             xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
              xmlns:converters="clr-namespace:MaterialDesignDemo.Shared.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:demoAppDomain="clr-namespace:MaterialDesignDemo.Domain"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:materialDesignDemo="clr-namespace:MaterialDesignDemo"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
-             d:DataContext="{d:DesignInstance colorsDomain:ComboBoxesViewModel,
+             d:DataContext="{d:DesignInstance sharedDomain:ComboBoxesViewModel,
                                               IsDesignTimeCreatable=False}"
              d:DesignHeight="1080"
              d:DesignWidth="1920"