Merge pull request #49 from OpenSpartan/release-1.0.9

1.0.9 Release (Service Patch)
OpenSpartan · Sep 22, 2024 · e11f16a · e11f16a
2 parents 376845a + e1319fa
commit e11f16a
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -21,12 +21,12 @@ The benefit of using OpenSpartan Workshop is that for any more complex analysis
 
 You can download the application from this repository, in the **Releases** section.
 
-<a href="https://github.com/OpenSpartan/openspartan-workshop/releases/download/1.0.8/OpenSpartan.Workshop.Installer.Bundle.exe"><img alt="Download for Windows button" src="media/windows-download.gif" width="200"></a>
+<a href="https://github.com/OpenSpartan/openspartan-workshop/releases/download/1.0.9/OpenSpartan.Workshop.Installer.Bundle.exe"><img alt="Download for Windows button" src="media/windows-download.gif" width="200"></a>
 
 >[!IMPORTANT]
->Requires Windows 10 (20H1 - `10.0.19041.0`) or later, [.NET Desktop Runtime 8.0+](https://dotnet.microsoft.com/download/dotnet/8.0), and the [latest Windows App SDK](https://learn.microsoft.com/windows/apps/windows-app-sdk/downloads). Both are bundled with the installer.
+>Requires Windows 10 (20H1 - `10.0.19041.0`) or later, [.NET Desktop Runtime 8.0+](https://dotnet.microsoft.com/download/dotnet/8.0), and the [latest Windows App SDK](https://learn.microsoft.com/windows/apps/windows-app-sdk/downloads). Both are bundled with the installer and should install automatically as you 
 
-This application is not available through Microsoft Store at this time. Any version there is **not maintained by me**.
+This application is not available through Microsoft Store or any other channel other than this repository at this time. Any version outside this repository is **not maintained by me** and you are taking on quite a bit of risk if you download it from other sources (who knows what's included in it).
 
 ## Features
 

diff --git a/src/OpenSpartan.Workshop.Installer.Bundle/Bundle.wxs b/src/OpenSpartan.Workshop.Installer.Bundle/Bundle.wxs
@@ -2,7 +2,7 @@
 	 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
 	 xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
 
-	<Bundle Name="OpenSpartan Workshop" Manufacturer="Den Delimarsky" Version="1.0.2.0" UpgradeCode="cf3576f5-2f23-4095-94b9-c6c44e6b4891">
+	<Bundle Name="OpenSpartan Workshop" Manufacturer="Den Delimarsky" Version="1.0.9.0" UpgradeCode="cf3576f5-2f23-4095-94b9-c6c44e6b4891">
 		<netfx:DotNetCoreSearchRef Id="SearchForDotNet8" />
 
 		<BootstrapperApplication>
@@ -23,7 +23,7 @@
 			<!-- .NET 8, latest preview as used by this installer and the projects -->
 			<ExePackage
 				DisplayName="Microsoft .NET 8 Desktop Runtime"
-				SourceFile="Dependencies\windowsdesktop-runtime-8.0.2-win-x64.exe"
+				SourceFile="Dependencies\windowsdesktop-runtime-8.0.8-win-x64.exe"
 				Permanent="true"
 				Compressed="true"
 				InstallCondition="VersionNT64"

diff --git a/src/OpenSpartan.Workshop.Installer.Bundle/Dependencies/WindowsAppRuntimeInstall-x64.exe b/src/OpenSpartan.Workshop.Installer.Bundle/Dependencies/WindowsAppRuntimeInstall-x64.exe
diff --git a/.../windowsdesktop-runtime-8.0.2-win-x64.exe → .../windowsdesktop-runtime-8.0.8-win-x64.exe b/.../windowsdesktop-runtime-8.0.2-win-x64.exe → .../windowsdesktop-runtime-8.0.8-win-x64.exe
diff --git a/src/OpenSpartan.Workshop.Installer.Bundle/OpenSpartan.Workshop.Installer.Bundle.wixproj b/src/OpenSpartan.Workshop.Installer.Bundle/OpenSpartan.Workshop.Installer.Bundle.wixproj
@@ -14,6 +14,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Dependencies\WindowsAppRuntimeInstall-x64.exe" />
-    <None Include="Dependencies\windowsdesktop-runtime-8.0.2-win-x64.exe" />
+    <None Include="Dependencies\windowsdesktop-runtime-8.0.8-win-x64.exe" />
   </ItemGroup>
 </Project>
diff --git a/src/OpenSpartan.Workshop.Installer/OpenSpartan.Workshop.Installer.wixproj b/src/OpenSpartan.Workshop.Installer/OpenSpartan.Workshop.Installer.wixproj
@@ -3,7 +3,7 @@
 		<ProjectReference Include="..\OpenSpartan.Workshop\OpenSpartan.Workshop.csproj" />
 	</ItemGroup>
 	<PropertyGroup>
-		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+		<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
 		<DefineConstants>$(DefineConstants);TargetFramework=$(ApplicationFilesPath);</DefineConstants>
 		<ApplicationFilesPath>../OpenSpartan.Workshop/bin/$(Platform)/$(Configuration)/$(TargetFramework)</ApplicationFilesPath>
 		<DefineConstants>$(DefineConstants);ApplicationFilesPath=$(ApplicationFilesPath);</DefineConstants>

diff --git a/src/OpenSpartan.Workshop.Installer/Package.wxs b/src/OpenSpartan.Workshop.Installer/Package.wxs
@@ -1,7 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
 	 xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"
 	 xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
-	<Package Name="OpenSpartan Workshop" Manufacturer="Den.Dev" Version="1.0.2.0" UpgradeCode="2e9d46f4-33fc-4625-8c17-382391347e00">
+	<Package Name="OpenSpartan Workshop" Manufacturer="Den.Dev" Version="1.0.9.0" UpgradeCode="2e9d46f4-33fc-4625-8c17-382391347e00">
 		<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
 		<netfx:DotNetCompatibilityCheck
@@ -15,7 +15,6 @@
 			 Message="Make sure that the .NET Desktop 8 Runtime is installed."
 			 Condition="(DOTNETRUNTIMECHECK=0)"/>
 
-
 		<WixVariable Id="WixUILicenseRtf" Value="$(DocumentsResourcesDirectory)/license.rtf" />
 		<!--<WixVariable Id="WixUIBannerBmp" Value="$(ImageResourcesDirectory)/logo-icon.png"/>-->
 

diff --git a/src/OpenSpartan.Workshop/Converters/MedalDifficultyToBrushConverter.cs b/src/OpenSpartan.Workshop/Converters/MedalDifficultyToBrushConverter.cs
@@ -11,7 +11,7 @@ public object Convert(object value, Type targetType, object parameter, string la
         {
             if (value is int typeIndex)
             {
-                GradientStopCollection gCollection = new GradientStopCollection();
+                GradientStopCollection gCollection = [];
 
                 switch (typeIndex)
                 {

diff --git a/src/OpenSpartan.Workshop/Converters/MedalTypeIndexToStringConverter.cs b/src/OpenSpartan.Workshop/Converters/MedalTypeIndexToStringConverter.cs
@@ -1,6 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Globalization;
 
 namespace OpenSpartan.Workshop.Converters
 {

diff --git a/src/OpenSpartan.Workshop/Core/Configuration.cs b/src/OpenSpartan.Workshop/Core/Configuration.cs
@@ -11,8 +11,8 @@ internal sealed class Configuration
         internal const string HaloWaypointCsrImageEndpoint = "https://www.halowaypoint.com/images/halo-infinite/csr/";
 
         // Build-related metadata.
-        internal const string Version = "1.0.8";
-        internal const string BuildId = "SLIPSPACE-06282024";
+        internal const string Version = "1.0.9";
+        internal const string BuildId = "GRUNT-07302024";
         internal const string PackageName = "OpenSpartan.Workshop";
 
         // Authentication and setting-related metadata.
@@ -25,7 +25,7 @@ internal sealed class Configuration
         // API-related default metadata.
         internal const string DefaultRelease = "1.8";
         internal const string DefaultAPIVersion = "1";
-        internal const string DefaultHeaderImage = "progression/Switcher/Season_Switcher_S8_Fleetcom.png";
+        internal const string DefaultHeaderImage = "progression/Switcher/Season_Switcher_S8_Champions.png";
         internal const string DefaultSandbox = "UNUSED";
         internal const string DefaultBuild = "259234.24.07.25.1725-2";
 

diff --git a/src/OpenSpartan.Workshop/Core/LogEngine.cs b/src/OpenSpartan.Workshop/Core/LogEngine.cs
@@ -9,7 +9,7 @@ internal class LogEngine
     {
         private static readonly NLog.Logger Logger = LogManager.GetCurrentClassLogger();
 
-        internal static void Log(string message, LogSeverity severity = LogSeverity.Info, [CallerMemberName] string caller = null)
+        internal static void Log(string message, LogSeverity severity = LogSeverity.Info, [CallerMemberName] string caller = "")
         {
             if (SettingsViewModel.Instance.EnableLogging)
             {

diff --git a/src/OpenSpartan.Workshop/Core/UserContextManager.cs b/src/OpenSpartan.Workshop/Core/UserContextManager.cs
@@ -9,7 +9,6 @@
 using Microsoft.Identity.Client.Extensions.Msal;
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
-using NLog;
 using OpenSpartan.Workshop.Data;
 using OpenSpartan.Workshop.Models;
 using OpenSpartan.Workshop.ViewModels;

diff --git a/src/OpenSpartan.Workshop/Data/DataHandler.cs b/src/OpenSpartan.Workshop/Data/DataHandler.cs
@@ -1,7 +1,6 @@
 using Den.Dev.Orion.Converters;
 using Den.Dev.Orion.Models.HaloInfinite;
 using Microsoft.Data.Sqlite;
-using Microsoft.UI.Xaml.Controls;
 using OpenSpartan.Workshop.Core;
 using OpenSpartan.Workshop.Models;
 using OpenSpartan.Workshop.ViewModels;
@@ -13,7 +12,6 @@
 using System.Linq;
 using System.Text;
 using System.Text.Json;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Xml;
 

diff --git a/src/OpenSpartan.Workshop/NLog.config b/src/OpenSpartan.Workshop/NLog.config
@@ -2,8 +2,8 @@
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-	<variable name="versionId" value="1.0.4" />
-	<variable name="buildId" value="URDIDACT-03112024" />
+	<variable name="versionId" value="1.0.9" />
+	<variable name="buildId" value="GRUNT-07302024" />
 
 	<targets>
 		<target name="logfile" xsi:type="File" fileName="${specialfolder:folder=LocalApplicationData}/OpenSpartan.Workshop/logs/${date:format=yyyy-MM-dd_HH}_${var:buildId}.txt" createDirs="true">

diff --git a/src/OpenSpartan.Workshop/OpenSpartan.Workshop.csproj b/src/OpenSpartan.Workshop/OpenSpartan.Workshop.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+		<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+		<WindowsSdkPackageVersion>10.0.26100.41</WindowsSdkPackageVersion>
 		<RootNamespace>OpenSpartan.Workshop</RootNamespace>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<Platforms>x86;x64;ARM64</Platforms>
@@ -12,8 +13,8 @@
 		<WindowsPackageType>None</WindowsPackageType>
 		<EnableMsixTooling>true</EnableMsixTooling>
 		<AnalysisMode>All</AnalysisMode>
-		<AssemblyVersion>1.0.8.0</AssemblyVersion>
-		<FileVersion>1.0.8.0</FileVersion>
+		<AssemblyVersion>1.0.9.0</AssemblyVersion>
+		<FileVersion>1.0.9.0</FileVersion>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
@@ -63,18 +64,18 @@
 		</Content>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.WinUI.Collections" Version="8.0.240109" />
-		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
-		<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
+		<PackageReference Include="CommunityToolkit.WinUI.Collections" Version="8.1.240916" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240916" />
+		<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.1.240916" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
 		<PackageReference Include="Den.Dev.Orion" Version="1.0.58" />
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.6" />
-		<PackageReference Include="Microsoft.Identity.Client" Version="4.61.3" />
-		<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.61.3" />
-		<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.61.3" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
+		<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.8" />
+		<PackageReference Include="Microsoft.Identity.Client" Version="4.64.1" />
+		<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.64.1" />
+		<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.64.1" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
-		<PackageReference Include="NLog" Version="5.3.2" />
+		<PackageReference Include="NLog" Version="5.3.4" />
 		<PackageReference Include="SkiaSharp" Version="2.88.8" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />

diff --git a/src/OpenSpartan.Workshop/ViewModels/MatchesViewModel.cs b/src/OpenSpartan.Workshop/ViewModels/MatchesViewModel.cs
@@ -1,5 +1,4 @@
-using CommunityToolkit.WinUI;
-using CommunityToolkit.WinUI.Collections;
+using CommunityToolkit.WinUI.Collections;
 using OpenSpartan.Workshop.Core;
 using OpenSpartan.Workshop.Data;
 using OpenSpartan.Workshop.Models;

diff --git a/src/OpenSpartan.Workshop/Views/SettingsView.xaml.cs b/src/OpenSpartan.Workshop/Views/SettingsView.xaml.cs
@@ -17,7 +17,7 @@ public SettingsView()
 
         private async void btnLogOut_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
-            ContentDialog deleteFileDialog = new ContentDialog
+            ContentDialog deleteFileDialog = new()
             {
                 Title = "Log out",
                 Content = "Are you sure you want to log out? Your data will not be deleted.",