Merge branch 'hotfix/5.2.2'

WildGums · Dec 17, 2024 · ea02ae2 · ea02ae2
2 parents e90bcf3 + a8422ea
commit ea02ae2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/src/Orc.NuGetExplorer.Example/Orc.NuGetExplorer.Example.csproj b/src/Orc.NuGetExplorer.Example/Orc.NuGetExplorer.Example.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
     <TargetFrameworks>net8.0-windows</TargetFrameworks>
     <AssemblyName>Orc.NuGetExplorer.Example</AssemblyName>
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
     <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
     <PackageReference Include="Orc.Notifications" Version="5.0.0" />
-    <PackageReference Include="Orchestra.Core" Version="7.0.1" />
+    <PackageReference Include="Orchestra.Core" Version="7.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Orc.NuGetExplorer.Tests/Packaging/PackagePathResolverFacts.cs b/src/Orc.NuGetExplorer.Tests/Packaging/PackagePathResolverFacts.cs
@@ -15,7 +15,7 @@ public class PackagePathResolverFacts
     [Explicit]
     public void CheckPathAreExpected()
     {
-        var applicationDataService = ServiceLocator.Default.ResolveType<IAppDataService>();
+        var applicationDataService = ServiceLocator.Default.ResolveRequiredType<IAppDataService>();
         var contentPath = System.IO.Path.Combine(applicationDataService.GetApplicationDataDirectory(Catel.IO.ApplicationDataTarget.UserRoaming),
             @"WildGums\PM\");
         var pathResolver = new PackagePathResolver(contentPath);

diff --git a/src/Orc.NuGetExplorer.Xaml/Orc.NuGetExplorer.Xaml.csproj b/src/Orc.NuGetExplorer.Xaml/Orc.NuGetExplorer.Xaml.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows</TargetFrameworks>
     <AssemblyName>Orc.NuGetExplorer.Xaml</AssemblyName>
     <RootNamespace>Orc.NuGetExplorer</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
@@ -27,7 +27,7 @@
     <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
     <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
     <PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="all" />
-    <PackageReference Include="Orc.Controls" Version="5.0.5" />
+    <PackageReference Include="Orc.Controls" Version="5.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Orc.NuGetExplorer.Xaml/Views/NuGetSettingsWindow.xaml.cs b/src/Orc.NuGetExplorer.Xaml/Views/NuGetSettingsWindow.xaml.cs
@@ -1,6 +1,8 @@
 namespace Orc.NuGetExplorer.Views;
 
 using System;
+using Catel.IoC;
+using Catel.Services;
 using Catel.Windows;
 using Orc.Controls;
 using Orc.NuGetExplorer.ViewModels;
@@ -27,13 +29,15 @@ protected override void OnLoaded(EventArgs e)
     {
         base.OnLoaded(e);
 
-        this.LoadWindowSize(true);
+        var appDataService = ServiceLocator.Default.ResolveRequiredType<IAppDataService>();
+        appDataService?.LoadWindowSize(this, true);
     }
 
     protected override void OnUnloaded(EventArgs e)
     {
-        this.SaveWindowSize();
+        var appDataService = ServiceLocator.Default.ResolveRequiredType<IAppDataService>();
+        appDataService?.SaveWindowSize(this);
 
         base.OnUnloaded(e);
     }
-}
+}
diff --git a/src/Orc.NuGetExplorer/Orc.NuGetExplorer.csproj b/src/Orc.NuGetExplorer/Orc.NuGetExplorer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows</TargetFrameworks>
     <AssemblyName>Orc.NuGetExplorer</AssemblyName>
     <RootNamespace>Orc.NuGetExplorer</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>