Skip to content

Commit ee1a7cd

Browse files
punker76punker76
committed
chore: update package refs
1 parent c371d6f commit ee1a7cd

File tree

10 files changed

+60
-36
lines changed

10 files changed

+60
-36
lines changed

‎src/Directory.Build.Props‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,14 @@
6767

6868
<!-- Add the references for all projects and targets -->
6969
<ItemGroup>
70-
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" IncludeAssets="build;compile" />
71-
<PackageReference Include="WpfAnalyzers" PrivateAssets="all" IncludeAssets="build;analyzers" />
70+
<PackageReference Include="JetBrains.Annotations">
71+
<PrivateAssets>all</PrivateAssets>
72+
<IncludeAssets>compile; build</IncludeAssets>
73+
</PackageReference>
74+
<PackageReference Include="WpfAnalyzers">
75+
<PrivateAssets>all</PrivateAssets>
76+
<IncludeAssets>build;analyzers</IncludeAssets>
77+
</PackageReference>
7278
</ItemGroup>
7379

7480
<ItemGroup>

‎src/Directory.packages.props‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,34 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup Label="Build">
7-
<PackageVersion Include="ControlzEx" version="7.0.0-alpha0104" />
7+
<PackageVersion Include="ControlzEx" version="7.0.0-rc0118" />
88
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
99
<PackageVersion Include="XAMLTools.MSBuild" Version="1.0.0-alpha0167" />
10-
<PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
10+
<PackageVersion Include="JetBrains.Annotations" Version="2024.2.0" />
1111
<PackageVersion Include="Caliburn.Micro" Version="4.0.212" />
12-
<PackageVersion Include="MahApps.Metro.IconPacks.Entypo" Version="4.11.0" />
13-
<PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
14-
<PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="4.11.0" />
15-
<PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="4.11.0" />
16-
<PackageVersion Include="MahApps.Metro.IconPacks.Octicons" Version="4.11.0" />
12+
<PackageVersion Include="MahApps.Metro.IconPacks.Entypo" Version="5.0.0" />
13+
<PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.0.0" />
14+
<PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="5.0.0" />
15+
<PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="5.0.0" />
16+
<PackageVersion Include="MahApps.Metro.IconPacks.Octicons" Version="5.0.0" />
1717
<PackageVersion Include="MaterialDesignThemes" Version="3.0.1" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
1818
<PackageVersion Include="MaterialDesignColors" Version="1.2.7" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
1919
<PackageVersion Include="MaterialDesignThemes" Version="4.9.0" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
2020
<PackageVersion Include="MaterialDesignColors" Version="2.1.4" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
2121
<PackageVersion Include="NHotkey.Wpf" Version="3.0.0" />
22-
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2277.86" />
23-
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta" />
22+
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
23+
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
2424
<PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
25-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
25+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
26+
<PackageVersion Include="System.Memory" Version="4.5.5" />
27+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" Condition="'$(TargetFramework)' != 'net8.0-windows'" />
2628
<PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
2729
</ItemGroup>
2830
<ItemGroup Label="Test">
29-
<PackageVersion Include="xunit" Version="2.7.0" />
30-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
31-
<PackageVersion Include="xunit.runner.console" Version="2.7.0" />
32-
<PackageVersion Include="xunit.analyzers" Version="1.11.0" />
33-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
31+
<PackageVersion Include="xunit" Version="2.9.2" />
32+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
33+
<PackageVersion Include="xunit.runner.console" Version="2.9.2" />
34+
<PackageVersion Include="xunit.analyzers" Version="1.16.0" />
35+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
3436
</ItemGroup>
3537
</Project>

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@
329329

330330
<mah:ToggleSwitch Margin="{StaticResource ControlMargin}"
331331
Header="Header"
332-
Toggled="ToggleSwitch_OnToggled"
333-
IsOn="{Binding CanUseToggleSwitch, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
332+
IsOn="{Binding CanUseToggleSwitch, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
333+
Toggled="ToggleSwitch_OnToggled" />
334334
<mah:ToggleSwitch Margin="{StaticResource ControlMargin}"
335335
CommandParameter="{Binding}"
336336
OffCommand="{Binding ToggleSwitchOffCommand}"

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
88
xmlns:local="clr-namespace:MetroDemo"
99
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
10+
xmlns:markup="clr-namespace:MetroDemo.Markup"
1011
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1112
xmlns:system="clr-namespace:System;assembly=mscorlib"
12-
xmlns:markup="clr-namespace:MetroDemo.Markup"
1313
d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
1414
d:DesignHeight="600"
1515
d:DesignWidth="800"

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SplitViewExamples.xaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,11 @@
124124
FontSize="20"
125125
Foreground="Black"
126126
Text="{Binding ElementName=sliderTest, Path=Value, Mode=OneWay, FallbackValue=0}" />
127-
<Slider x:Name="sliderTest" Margin="10" Minimum="0" Maximum="100" Value="42" />
127+
<Slider x:Name="sliderTest"
128+
Margin="10"
129+
Maximum="100"
130+
Minimum="0"
131+
Value="42" />
128132
</StackPanel>
129133
</Grid>
130134

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,9 @@
376376
</mah:MetroHeader>
377377

378378
<mah:MetroHeader Header="Min">
379-
<mah:NumericUpDown AutomationProperties.AutomationId="AutomationIdTested"
380-
Margin="{StaticResource ControlMargin}"
379+
<mah:NumericUpDown Margin="{StaticResource ControlMargin}"
381380
mah:TextBoxHelper.ClearTextButton="True"
381+
AutomationProperties.AutomationId="AutomationIdTested"
382382
Maximum="{Binding ElementName=NUD, Path=Maximum, Mode=OneWay}"
383383
Value="{Binding ElementName=NUD, Path=Minimum, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
384384
</mah:MetroHeader>

‎src/MahApps.Metro.sln.DotSettings‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,10 @@ See the LICENSE file in the project root for more information.&#xD;
709709
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="PART_" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
710710
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
711711
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
712+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=236f7aa5_002D7b06_002D43ca_002Dbf2a_002D9b31bfcff09a/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="PART_" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;&lt;/Policy&gt;</s:String>
713+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
712714
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=d042ea60_002Decd9_002D4779_002Db28d_002De9203ebec0ba/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Public" Description="Test methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="TEST_TYPE" /&gt;&lt;Kind Name="TEST_MEMBER" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" /&gt;&lt;/Policy&gt;</s:String>
715+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
713716
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
714717
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
715718
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
@@ -796,11 +799,13 @@ See the LICENSE file in the project root for more information.&#xD;
796799
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
797800
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
798801
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
802+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
799803
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
800804
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
801805
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
802806
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
803807
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
808+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
804809
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
805810
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
806811
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>

‎src/MahApps.Metro/MahApps.Metro.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
33
<!-- Project properties -->
44
<PropertyGroup>
@@ -33,6 +33,12 @@
3333
<PrivateAssets>all</PrivateAssets>
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3535
</PackageReference>
36+
37+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Condition="'$(TargetFramework)' != 'net8.0-windows'" />
38+
</ItemGroup>
39+
40+
<ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == true">
41+
<PackageReference Include="System.Memory" />
3642
</ItemGroup>
3743

3844
<ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">

‎src/MahApps.Metro/Themes/DateTimePicker.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,8 @@
356356
ItemsSource="{TemplateBinding SourceHours}" />
357357
<Label x:Name="PART_HourMinuteColon"
358358
Grid.Column="1"
359-
Visibility="Collapsed"
360-
Content=":" />
359+
Content=":"
360+
Visibility="Collapsed" />
361361
<ComboBox x:Name="PART_MinutePicker"
362362
Grid.Column="2"
363363
FontFamily="{TemplateBinding FontFamily}"
@@ -366,8 +366,8 @@
366366
ItemsSource="{TemplateBinding SourceMinutes}" />
367367
<Label x:Name="PART_MinuteSecondColon"
368368
Grid.Column="3"
369-
Visibility="Collapsed"
370-
Content=":" />
369+
Content=":"
370+
Visibility="Collapsed" />
371371
<ComboBox x:Name="PART_SecondPicker"
372372
Grid.Column="4"
373373
FontFamily="{TemplateBinding FontFamily}"

‎src/Mahapps.Metro.Tests/Tests/MultiSelectorHelperTests.cs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System.Threading.Tasks;
56
using MahApps.Metro.Tests.TestHelpers;
67
using Xunit;
78

@@ -16,7 +17,7 @@ public MultiSelectorHelperTests(MultiSelectorHelperTestsFixture fixture)
1617

1718
[Fact]
1819
[DisplayTestMethodName]
19-
public async void SelectedItemsShouldBeSyncedByMultiSelectionHelper()
20+
public async Task SelectedItemsShouldBeSyncedByMultiSelectionHelper()
2021
{
2122
await this.fixture.PrepareForTestAsync();
2223
await TestHost.SwitchToAppThread();
@@ -37,7 +38,7 @@ public async void SelectedItemsShouldBeSyncedByMultiSelectionHelper()
3738

3839
[Fact]
3940
[DisplayTestMethodName]
40-
public async void PreSelectedItemsShouldBeSyncedByMultiSelectionHelper()
41+
public async Task PreSelectedItemsShouldBeSyncedByMultiSelectionHelper()
4142
{
4243
await this.fixture.PrepareForTestAsync();
4344
await TestHost.SwitchToAppThread();
@@ -58,7 +59,7 @@ public async void PreSelectedItemsShouldBeSyncedByMultiSelectionHelper()
5859

5960
[Fact]
6061
[DisplayTestMethodName]
61-
public async void SelectedItemsShouldBeSyncedAndContainsOnlyOnce()
62+
public async Task SelectedItemsShouldBeSyncedAndContainsOnlyOnce()
6263
{
6364
await this.fixture.PrepareForTestAsync();
6465
await TestHost.SwitchToAppThread();
@@ -87,7 +88,7 @@ public async void SelectedItemsShouldBeSyncedAndContainsOnlyOnce()
8788

8889
[Fact]
8990
[DisplayTestMethodName]
90-
public async void AddedItemShouldBeSynced()
91+
public async Task AddedItemShouldBeSynced()
9192
{
9293
await this.fixture.PrepareForTestAsync();
9394
await TestHost.SwitchToAppThread();
@@ -126,7 +127,7 @@ public async void AddedItemShouldBeSynced()
126127

127128
[Fact]
128129
[DisplayTestMethodName]
129-
public async void RemovedItemShouldBeSynced()
130+
public async Task RemovedItemShouldBeSynced()
130131
{
131132
await this.fixture.PrepareForTestAsync();
132133
await TestHost.SwitchToAppThread();
@@ -153,7 +154,7 @@ public async void RemovedItemShouldBeSynced()
153154

154155
[Fact]
155156
[DisplayTestMethodName]
156-
public async void MovedItemShouldBeSynced()
157+
public async Task MovedItemShouldBeSynced()
157158
{
158159
await this.fixture.PrepareForTestAsync();
159160
await TestHost.SwitchToAppThread();
@@ -192,7 +193,7 @@ public async void MovedItemShouldBeSynced()
192193

193194
[Fact]
194195
[DisplayTestMethodName]
195-
public async void ReplacedItemShouldBeSynced()
196+
public async Task ReplacedItemShouldBeSynced()
196197
{
197198
await this.fixture.PrepareForTestAsync();
198199
await TestHost.SwitchToAppThread();
@@ -238,7 +239,7 @@ public async void ReplacedItemShouldBeSynced()
238239

239240
[Fact]
240241
[DisplayTestMethodName]
241-
public async void ClearedItemShouldBeSynced()
242+
public async Task ClearedItemShouldBeSynced()
242243
{
243244
await this.fixture.PrepareForTestAsync();
244245
await TestHost.SwitchToAppThread();

0 commit comments

Comments
 (0)