chore: Updated application packages (#254)

feat(Genshin): Added Nilou skin and Kirara skin chore: Updated WinAppSDK to 1.6
Jorixon · Sep 13, 2024 · c17fe45 · c17fe45
1 parent b48ccf3
commit c17fe45
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 26 deletions.
diff --git a/src/CommunityToolkitWrapper/CommunityToolkitWrapper.csproj b/src/CommunityToolkitWrapper/CommunityToolkitWrapper.csproj
@@ -10,6 +10,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
+      <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240821" />
   </ItemGroup>
 </Project>
diff --git a/src/GIMI-ModManager.Core/GIMI-ModManager.Core.csproj b/src/GIMI-ModManager.Core/GIMI-ModManager.Core.csproj
@@ -33,9 +33,9 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="OneOf" Version="3.0.271" />
-    <PackageReference Include="Polly" Version="8.4.0" />
-    <PackageReference Include="Polly.RateLimiting" Version="8.4.0" />
-    <PackageReference Include="Serilog" Version="4.0.0" />
+    <PackageReference Include="Polly" Version="8.4.1" />
+    <PackageReference Include="Polly.RateLimiting" Version="8.4.1" />
+    <PackageReference Include="Serilog" Version="4.0.1" />
     <PackageReference Include="SharpCompress" Version="0.37.2" />
   </ItemGroup>
 </Project>
diff --git a/...nUI/Assets/Games/Genshin/Images/AltCharacterSkins/Character_Skin_KiraraPhantom_Thumb.webp b/...nUI/Assets/Games/Genshin/Images/AltCharacterSkins/Character_Skin_KiraraPhantom_Thumb.webp
diff --git a/...WinUI/Assets/Games/Genshin/Images/AltCharacterSkins/Character_Skin_NilouBreeze_Thumb.webp b/...WinUI/Assets/Games/Genshin/Images/AltCharacterSkins/Character_Skin_NilouBreeze_Thumb.webp
diff --git a/src/GIMI-ModManager.WinUI/Assets/Games/Genshin/characters.json b/src/GIMI-ModManager.WinUI/Assets/Games/Genshin/characters.json
@@ -649,7 +649,14 @@
       "Inazuma"
     ],
     "ModFilesName": "Kirara",
-    "InGameSkins": [],
+    "InGameSkins": [
+		{
+			"ModFilesName": "KiraraPhantom",
+			"Image": "Character_Skin_KiraraPhantom_Thumb.webp",
+			"InternalName": "Kirara Phantom in Boots",
+			"DisplayName": "Phantom in Boots"
+		  }
+	],
     "InternalName": "Kirara",
     "DisplayName": "Kirara"
   },
@@ -894,7 +901,14 @@
       "Sumeru"
     ],
     "ModFilesName": "Nilou",
-    "InGameSkins": [],
+    "InGameSkins": [
+		{
+			"ModFilesName": "NilouBreeze",
+			"Image": "Character_Skin_NilouBreeze_Thumb.webp",
+			"InternalName": "Nilou Breeze of Sabaa",
+			"DisplayName": "Breeze of Sabaa"
+		  }
+	],
     "InternalName": "Nilou",
     "DisplayName": "Nilou"
   },

diff --git a/src/GIMI-ModManager.WinUI/GIMI-ModManager.WinUI.csproj b/src/GIMI-ModManager.WinUI/GIMI-ModManager.WinUI.csproj
@@ -20,6 +20,7 @@
 		<!-- x-release-please-end -->
 		<Title>JASM - Just Another Skin Manager</Title>
 		<AssemblyName>JASM - Just Another Skin Manager</AssemblyName>
+		<WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
 	</PropertyGroup>
 
 
@@ -67,12 +68,14 @@
 		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_KaeyaSailwind_Thumb.webp" />
 		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_KeqingOpulent_Thumb.png" />
 		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_KeqingOpulent_Thumb.webp" />
+		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_KiraraPhantom_Thumb.webp" />
 		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_KleeBlossoming_Thumb.png" />
 		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_KleeBlossoming_Thumb.webp" />
 		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_LisaSobriquet_Thumb.png" />
 		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_LisaSobriquet_Thumb.webp" />
 		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_MonaCN_Thumb.png" />
 		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_MonaCN_Thumb.webp" />
+		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_NilouBreeze_Thumb.webp" />
 		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_NingguangOrchid_Thumb.png" />
 		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_NingguangOrchid_Thumb.webp" />
 		<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_RosariaCN_Thumb.png" />
@@ -635,9 +638,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.0.240109" />
-		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.1.240821" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240821" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Layout" Version="7.1.2" />
@@ -646,30 +649,30 @@
 		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.8" />
 		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240607001" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
 		<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
 		<PackageReference Include="OneOf" Version="3.0.271" />
-		<PackageReference Include="Polly" Version="8.4.0" />
+		<PackageReference Include="Polly" Version="8.4.1" />
 		<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
-		<PackageReference Include="Polly.Extensions" Version="8.4.0" />
+		<PackageReference Include="Polly.Extensions" Version="8.4.1" />
 		<PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
-		<PackageReference Include="Polly.RateLimiting" Version="8.4.0" />
-		<PackageReference Include="Serilog" Version="4.0.0" />
+		<PackageReference Include="Polly.RateLimiting" Version="8.4.1" />
+		<PackageReference Include="Serilog" Version="4.0.1" />
 		<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
 		<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
-		<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1" />
+		<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2" />
 		<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
 		<PackageReference Include="Serilog.Sinks.EventLog" Version="4.0.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
 		<PackageReference Include="System.Memory" Version="4.5.5" />
 		<PackageReference Include="WindowsDisplayAPI" Version="1.3.0.13" />
 		<PackageReference Include="WinUI3Localizer" Version="2.2.0" />
-		<PackageReference Include="WinUIEx" Version="2.3.4" />
+		<PackageReference Include="WinUIEx" Version="2.4.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/JASM.AutoUpdater/JASM.AutoUpdater.csproj b/src/JASM.AutoUpdater/JASM.AutoUpdater.csproj
@@ -8,6 +8,7 @@
     <Platforms>x86;x64;ARM64</Platforms>
 	<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
+	<WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
     <UseWinUI>true</UseWinUI>
 		<Nullable>enable</Nullable>
 	  <EnableMsixTooling>true</EnableMsixTooling>
@@ -27,19 +28,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.0.240109" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.1.240821" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240607001" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Serilog" Version="4.0.0" />
+    <PackageReference Include="Serilog" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-    <PackageReference Include="WinUIEx" Version="2.3.4" />
+    <PackageReference Include="WinUIEx" Version="2.4.0" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 

diff --git a/src/JASM.Tests/CharactersJsonTests.cs b/src/JASM.Tests/CharactersJsonTests.cs
@@ -68,7 +68,7 @@ public async Task CheckFor_DuplicateSubSkinNames()
                 $"Duplicate subskin name: {characterSkins.First().InternalName} in characters: {string.Join(", ", characterSkins.Select(skin => skin.Character.InternalName))}");
         }
 
-        Assert.Empty(subSkins.GroupBy(subSkin => subSkin.InternalName.Id).Where(g => g.Count() > 1));
+        Assert.DoesNotContain(subSkins.GroupBy(subSkin => subSkin.InternalName.Id), g => g.Count() > 1);
     }
 
     public void Dispose()

diff --git a/src/JASM.Tests/JASM.Tests.csproj b/src/JASM.Tests/JASM.Tests.csproj
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>