Updated the country flags

This resolves all the warnings about the previous version because it wasn't targeting .NET Core
CriticalFlaw · Aug 27, 2024 · 59456da · 59456da
1 parent ded5299
commit 59456da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/TF2HUD.Editor/HUDEditor.csproj b/src/TF2HUD.Editor/HUDEditor.csproj
@@ -55,8 +55,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-		<PackageReference Include="CountryFlag" Version="2.1.0" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.0" />
+		<PackageReference Include="CountryFlag.Wpf" Version="1.0.0" />
 		<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.115" />
 		<PackageReference Include="log4net" Version="2.0.17" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/src/TF2HUD.Editor/Options.xaml b/src/TF2HUD.Editor/Options.xaml
@@ -4,7 +4,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:lex="http://wpflocalizeextension.codeplex.com"
-        xmlns:cf="clr-namespace:CountryFlag;assembly=CountryFlag"
+        xmlns:cf="clr-namespace:CountryFlag.Wpf;assembly=CountryFlag.Wpf"
         xmlns:classes="clr-namespace:HUDEditor.Classes"
         lex:LocalizeDictionary.DesignCulture="en"
         lex:ResxLocalizationProvider.DefaultAssembly="TF2HUD.Editor"
@@ -41,22 +41,22 @@
                 <GroupBox Header="Language" Grid.Row="1" Foreground="White">
                     <WrapPanel HorizontalAlignment="Center">
                         <RadioButton x:Name="BtnLocalizeEn" Checked="BtnLocalize_OnClick" ToolBar.OverflowMode="Always" Margin="5">
-                            <cf:CountryFlag Code="US" Width="60" />
+                            <cf:CountryFlag CountryCode="US" Width="60" />
                         </RadioButton>
                         <RadioButton x:Name="BtnLocalizeFr" Checked="BtnLocalize_OnClick" ToolBar.OverflowMode="Always" Margin="5">
-                            <cf:CountryFlag Code="FR" Width="50" />
+                            <cf:CountryFlag CountryCode="FR" Width="50" />
                         </RadioButton>
                         <RadioButton x:Name="BtnLocalizeRu" Checked="BtnLocalize_OnClick" ToolBar.OverflowMode="Always" Margin="5">
-                            <cf:CountryFlag Code="RU" Width="50" />
+                            <cf:CountryFlag CountryCode="RU" Width="50" />
                         </RadioButton>
                         <RadioButton x:Name="BtnLocalizeBr" Checked="BtnLocalize_OnClick" ToolBar.OverflowMode="Always" Margin="5">
-                            <cf:CountryFlag Code="BR" Width="50" />
+                            <cf:CountryFlag CountryCode="BR" Width="50" />
                         </RadioButton>
                         <RadioButton x:Name="BtnLocalizeIt" Checked="BtnLocalize_OnClick" ToolBar.OverflowMode="Always" Margin="5">
-                            <cf:CountryFlag Code="IT" Width="50" />
+                            <cf:CountryFlag CountryCode="IT" Width="50" />
                         </RadioButton>
                         <RadioButton x:Name="BtnLocalizeChs" Checked="BtnLocalize_OnClick" ToolBar.OverflowMode="Always" Margin="5">
-                            <cf:CountryFlag Code="CN" Width="50" />
+                            <cf:CountryFlag CountryCode="CN" Width="50" />
                         </RadioButton>
                     </WrapPanel>
                 </GroupBox>