chore: update package references

MahApps · Oct 15, 2023 · 41f48d3 · 41f48d3
1 parent 7dbbda9
commit 41f48d3
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 106 deletions.
diff --git a/src/Directory.packages.props b/src/Directory.packages.props
@@ -4,41 +4,41 @@
         <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     </PropertyGroup>
 
-    <ItemGroup>
+    <ItemGroup Label="Build">
         <PackageVersion Include="ControlzEx" Version="6.0.0" />
-        <PackageVersion Include="XAMLTools.MSBuild" Version="1.0.0-alpha0143" />
         <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-    </ItemGroup>
-
-    <ItemGroup Label="Test">
-        <PackageVersion Include="xunit" Version="2.4.2" />
-        <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    </ItemGroup>
+        <PackageVersion Include="XAMLTools.MSBuild" Version="1.0.0-alpha0143" />
 
-    <ItemGroup Label="Build">
-        <PackageVersion Include="JetBrains.Annotations" Version="2022.3.1" />
-        <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.188-beta" />
-        <PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+        <PackageVersion Include="Caliburn.Micro" Version="4.0.212" />
+        <PackageVersion Include="JetBrains.Annotations" Version="2023.2.0" />
         <PackageVersion Include="MahApps.Metro.IconPacks.Entypo" Version="4.11.0" />
         <PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
         <PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="4.11.0" />
         <PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="4.11.0" />
         <PackageVersion Include="MahApps.Metro.IconPacks.Octicons" Version="4.11.0" />
-        <PackageVersion Include="NHotkey.Wpf" Version="2.1.0" />
-        <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.1518.46" />
 
-        <PackageVersion Include="System.ComponentModel.Composition" Version="5.0.0" />
-        <PackageVersion Include="Caliburn.Micro" Version="4.0.212" />
+        <PackageVersion Include="MaterialDesignThemes" Version="3.0.1" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
+        <PackageVersion Include="MaterialDesignColors" Version="1.2.7" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
+        <PackageVersion Include="MaterialDesignThemes" Version="4.9.0" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
+        <PackageVersion Include="MaterialDesignColors" Version="2.1.4" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
+
+        <PackageVersion Include="NHotkey.Wpf" Version="2.1.1" />
+        <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2045.28" />
+        <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.252-beta" />
+
+        <PackageVersion Include="System.ComponentModel.Composition" Version="6.0.0" Condition=" $(DefineConstants.Contains(NET6_0_OR_GREATER)) == false " />
+        <PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.0" Condition=" $(DefineConstants.Contains(NET6_0_OR_GREATER)) == false " />
+        <PackageVersion Include="System.ComponentModel.Composition" Version="7.0.0" Condition=" $(DefineConstants.Contains(NET6_0_OR_GREATER)) == true " />
+        <PackageVersion Include="System.Configuration.ConfigurationManager" Version="7.0.0" Condition=" $(DefineConstants.Contains(NET6_0_OR_GREATER)) == true " />
 
         <PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
     </ItemGroup>
-    <ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">
-        <PackageVersion Include="MaterialDesignThemes" Version="3.0.1" />
-        <PackageVersion Include="MaterialDesignColors" Version="1.2.7" />
-    </ItemGroup>
-    <ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == true">
-        <PackageVersion Include="MaterialDesignThemes" Version="4.1.0" />
-        <PackageVersion Include="MaterialDesignColors" Version="2.0.1" />
+
+    <ItemGroup Label="Test">
+        <PackageVersion Include="xunit" Version="2.5.2" />
+        <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+        <PackageVersion Include="xunit.runner.console" Version="2.5.2" />
+        <PackageVersion Include="xunit.analyzers" Version="1.4.0" />
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     </ItemGroup>
 </Project>
diff --git a/src/Mahapps.Metro.Tests/MahApps.Metro.Tests.csproj b/src/Mahapps.Metro.Tests/MahApps.Metro.Tests.csproj
@@ -32,7 +32,9 @@
 
     <ItemGroup>
         <PackageReference Include="xunit" />
-        <PackageReference Include="xunit.runner.visualstudio" />
+        <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
+        <PackageReference Include="xunit.runner.console" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
+        <PackageReference Include="xunit.analyzers" PrivateAssets="all" IncludeAssets="build;analyzers" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
     </ItemGroup>
 

diff --git a/src/Mahapps.Metro.Tests/Tests/AnimatedTabControlTest.cs b/src/Mahapps.Metro.Tests/Tests/AnimatedTabControlTest.cs
@@ -19,7 +19,7 @@ public async Task MetroAnimatedSingleRowTabControlShouldSelectTheCorrectTemplate
         {
             await TestHost.SwitchToAppThread();
 
-            var window = await WindowHelpers.CreateInvisibleWindowAsync<AnimatedTabControlWindow>().ConfigureAwait(false);
+            var window = await WindowHelpers.CreateInvisibleWindowAsync<AnimatedTabControlWindow>();
             var templateSelector = window.TryFindResource("TabControlContentTemplateSelector") as TabControlContentTemplateSelector;
             Assert.NotNull(templateSelector);
 
@@ -46,7 +46,7 @@ public async Task TabControlWithAnimatedSingleRowTabControlStyleShouldSelectTheC
         {
             await TestHost.SwitchToAppThread();
 
-            var window = await WindowHelpers.CreateInvisibleWindowAsync<AnimatedTabControlWindow>().ConfigureAwait(false);
+            var window = await WindowHelpers.CreateInvisibleWindowAsync<AnimatedTabControlWindow>();
             var templateSelector = window.TryFindResource("TabControlContentTemplateSelector") as TabControlContentTemplateSelector;
             Assert.NotNull(templateSelector);
 
@@ -73,7 +73,7 @@ public async Task MetroAnimatedTabControlShouldSelectTheCorrectTemplate()
         {
             await TestHost.SwitchToAppThread();
 
-            var window = await WindowHelpers.CreateInvisibleWindowAsync<AnimatedTabControlWindow>().ConfigureAwait(false);
+            var window = await WindowHelpers.CreateInvisibleWindowAsync<AnimatedTabControlWindow>();
             var templateSelector = window.TryFindResource("TabControlContentTemplateSelector") as TabControlContentTemplateSelector;
             Assert.NotNull(templateSelector);
 
@@ -100,7 +100,7 @@ public async Task TabControlWithAnimatedTabControlStyleShouldSelectTheCorrectTem
         {
             await TestHost.SwitchToAppThread();
 
-            var window = await WindowHelpers.CreateInvisibleWindowAsync<AnimatedTabControlWindow>().ConfigureAwait(false);
+            var window = await WindowHelpers.CreateInvisibleWindowAsync<AnimatedTabControlWindow>();
             var templateSelector = window.TryFindResource("TabControlContentTemplateSelector") as TabControlContentTemplateSelector;
             Assert.NotNull(templateSelector);
 

diff --git a/src/Mahapps.Metro.Tests/Tests/AutoWatermarkTest.cs b/src/Mahapps.Metro.Tests/Tests/AutoWatermarkTest.cs
@@ -18,7 +18,7 @@ public async Task TestAutoWatermark()
         {
             await TestHost.SwitchToAppThread();
 
-            var window = await WindowHelpers.CreateInvisibleWindowAsync<AutoWatermarkTestWindow>().ConfigureAwait(false);
+            var window = await WindowHelpers.CreateInvisibleWindowAsync<AutoWatermarkTestWindow>();
 
             window.Invoke(() =>
                 {

diff --git a/src/Mahapps.Metro.Tests/Tests/ButtonTests.cs b/src/Mahapps.Metro.Tests/Tests/ButtonTests.cs
@@ -35,7 +35,7 @@ public async Task DefaultButtonTextIsUpperCase()
         [DisplayTestMethodName]
         public async Task DefaultButtonRespectsControlsHelperContentCharacterCasing()
         {
-            await this.fixture.PrepareForTestAsync(new[] { ControlsHelper.ContentCharacterCasingProperty.Name }).ConfigureAwait(false);
+            await this.fixture.PrepareForTestAsync(new[] { ControlsHelper.ContentCharacterCasingProperty.Name });
             await TestHost.SwitchToAppThread();
 
             Button defaultButton = this.fixture.Window?.DefaultButton;
@@ -71,7 +71,7 @@ public async Task SquareButtonButtonTextIsLowerCase()
         [DisplayTestMethodName]
         public async Task SquareButtonRespectsButtonHelperContentCharacterCasing()
         {
-            await this.fixture.PrepareForTestAsync(new[] { ControlsHelper.ContentCharacterCasingProperty.Name }).ConfigureAwait(false);
+            await this.fixture.PrepareForTestAsync(new[] { ControlsHelper.ContentCharacterCasingProperty.Name });
             await TestHost.SwitchToAppThread();
 
             Button squareButton = this.fixture.Window?.SquareButton;
@@ -95,7 +95,7 @@ public async Task SquareButtonRespectsButtonHelperContentCharacterCasing()
         [DisplayTestMethodName]
         public async Task DropDownButtonShouldRespectParentIsEnabledProperty()
         {
-            await this.fixture.PrepareForTestAsync(new[] { UIElement.IsEnabledProperty.Name }).ConfigureAwait(false);
+            await this.fixture.PrepareForTestAsync(new[] { UIElement.IsEnabledProperty.Name });
             await TestHost.SwitchToAppThread();
 
             this.fixture.Window?.TheStackPanel.SetCurrentValue(UIElement.IsEnabledProperty, false);
@@ -109,7 +109,7 @@ public async Task DropDownButtonShouldRespectParentIsEnabledProperty()
         [DisplayTestMethodName]
         public async Task SplitButtonShouldRespectParentIsEnabledProperty()
         {
-            await this.fixture.PrepareForTestAsync(new[] { UIElement.IsEnabledProperty.Name }).ConfigureAwait(false);
+            await this.fixture.PrepareForTestAsync(new[] { UIElement.IsEnabledProperty.Name });
             await TestHost.SwitchToAppThread();
 
             this.fixture.Window?.TheStackPanel.SetCurrentValue(UIElement.IsEnabledProperty, false);

diff --git a/src/Mahapps.Metro.Tests/Tests/CleanWindowTest.cs b/src/Mahapps.Metro.Tests/Tests/CleanWindowTest.cs
@@ -19,7 +19,7 @@ public async Task DefaultWindowCommandColorIsBlack()
         {
             await TestHost.SwitchToAppThread();
 
-            var window = await WindowHelpers.CreateInvisibleWindowAsync<CleanWindow>().ConfigureAwait(false);
+            var window = await WindowHelpers.CreateInvisibleWindowAsync<CleanWindow>();
 
             var theme = ThemeManager.Current.DetectTheme();
             Assert.NotNull(theme);