Skip to content

Commit 8f4429c

Browse files
punker76punker76
committed
feat: update to latest changes for MahApps.IconPacks v5
1 parent 3a16567 commit 8f4429c

File tree

7 files changed

+30
-1316
lines changed

7 files changed

+30
-1316
lines changed

‎NuGet.Config

+9
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,19 @@
99
</packageRestore>
1010
<packageSources>
1111
<clear />
12+
<!-- <add key="CI.MahApps.IconPacks" value="d:\source\github_orgs\MahApps.Metro.IconPacks\Publish\" /> -->
1213
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
1314
</packageSources>
1415
<activePackageSource>
1516
<clear />
1617
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
1718
</activePackageSource>
19+
<packageSourceMapping>
20+
<!-- <packageSource key="CI.MahApps.IconPacks">
21+
<package pattern="*" />
22+
</packageSource> -->
23+
<packageSource key="nuget.org">
24+
<package pattern="*" />
25+
</packageSource>
26+
</packageSourceMapping>
1827
</configuration>

‎build/_build.csproj.DotSettings

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
1717
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
1818
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
19+
<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>
20+
<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>
1921
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
2022
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
2123
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -24,4 +26,5 @@
2426
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
2527
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
2628
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
27-
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
29+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
30+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎src/IconPacks.Browser.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30114.105
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.9.34728.123
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IconPacks.Browser", "IconPacks.Browser\IconPacks.Browser.csproj", "{F38D3286-EE3A-4ADA-83F1-F2C919B5EE2C}"
77
EndProject

‎src/IconPacks.Browser/Controls/CopyToClipboardTextBox.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
Width="22"
2828
Command="{x:Static vm:MainViewModel.CopyTextToClipboardCommand}"
2929
CommandParameter="{Binding ElementName=ucCopyToClipboardTextBox, Path=TextToCopy}"
30-
Content="{iconPacks:Octicons Kind=Clippy}"
30+
Content="{iconPacks:Octicons Kind=Copy}"
3131
ToolTip="Copy">
3232
<Button.Style>
3333
<Style BasedOn="{StaticResource MahApps.Styles.Button.Chromeless}" TargetType="{x:Type Button}">

‎src/IconPacks.Browser/IconPacks.Browser.csproj

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net47;net5.0-windows</TargetFrameworks>
4+
<TargetFrameworks>net47;net6.0-windows</TargetFrameworks>
55
<OutputType>WinExe</OutputType>
66
<UseWPF>true</UseWPF>
77
<AssemblyName>IconPacks.Browser</AssemblyName>
@@ -19,20 +19,20 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
22+
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
2323
<PackageReference Include="WpfAnalyzers" Version="4.1.1">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2626
</PackageReference>
27-
<PackageReference Include="MahApps.Metro.IconPacks" Version="4.11.0" />
28-
<PackageReference Include="MahApps.Metro" Version="2.4.9" />
29-
<PackageReference Include="AsyncAwaitBestPractices" Version="6.0.5" />
30-
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
31-
<PackageReference Include="VirtualizingWrapPanel" Version="1.5.7" />
27+
<PackageReference Include="MahApps.Metro.IconPacks" Version="5.0.0-*" />
28+
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
29+
<PackageReference Include="AsyncAwaitBestPractices" Version="6.0.6" />
30+
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
31+
<PackageReference Include="VirtualizingWrapPanel" Version="1.5.8" />
3232
</ItemGroup>
3333
<ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == true">
34-
<PackageReference Include="MaterialDesignThemes" Version="4.6.0" />
35-
<PackageReference Include="MaterialDesignColors" Version="2.0.7" />
34+
<PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
35+
<PackageReference Include="MaterialDesignColors" Version="2.0.9" />
3636
</ItemGroup>
3737
<ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">
3838
<PackageReference Include="MaterialDesignThemes" Version="3.0.1" />

0 commit comments

Comments
 (0)