update to net 9 for new wpf

pieckenst · Nov 6, 2024 · c629370 · c629370
1 parent 33b758d
commit c629370
Show file tree

Hide file tree

Showing 165 changed files with 3,096 additions and 140 deletions.
diff --git a/.vs/handlerlaunch/v17/.suo b/.vs/handlerlaunch/v17/.suo
diff --git a/.vs/handlerlaunch/v17/DocumentLayout.backup.json b/.vs/handlerlaunch/v17/DocumentLayout.backup.json
diff --git a/.vs/handlerlaunch/v17/DocumentLayout.json b/.vs/handlerlaunch/v17/DocumentLayout.json
diff --git a/CoreLibLaunchSupport/obj/Debug/net6.0/CoreLibLaunchSupport.AssemblyInfo.cs b/CoreLibLaunchSupport/obj/Debug/net6.0/CoreLibLaunchSupport.AssemblyInfo.cs
@@ -1,6 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -13,7 +14,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("CoreLibLaunchSupport")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+097b81fe44918b1c117fe8308123a33effe517b5")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+33b758d9ffd36c0403256a95bd25f2b9cff55a28")]
 [assembly: System.Reflection.AssemblyProductAttribute("CoreLibLaunchSupport")]
 [assembly: System.Reflection.AssemblyTitleAttribute("CoreLibLaunchSupport")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

diff --git a/CoreLibLaunchSupport/obj/Debug/net6.0/CoreLibLaunchSupport.AssemblyInfoInputs.cache b/CoreLibLaunchSupport/obj/Debug/net6.0/CoreLibLaunchSupport.AssemblyInfoInputs.cache
@@ -1 +1 @@
-0ae6a45511de78addd365a611b84525390eccc4e977b805d29eea817d851526a
+1fa639bcba58111f6ea159c81b7571c3a1acd122d8c7f9082bea1f1615cb2e89
diff --git a/LaunchApp/obj/Debug/net8.0/LaunchApp.AssemblyInfo.cs b/LaunchApp/obj/Debug/net8.0/LaunchApp.AssemblyInfo.cs
@@ -1,6 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -13,7 +14,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("LaunchApp")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+097b81fe44918b1c117fe8308123a33effe517b5")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+33b758d9ffd36c0403256a95bd25f2b9cff55a28")]
 [assembly: System.Reflection.AssemblyProductAttribute("LaunchApp")]
 [assembly: System.Reflection.AssemblyTitleAttribute("LaunchApp")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

diff --git a/LaunchApp/obj/Debug/net8.0/LaunchApp.AssemblyInfoInputs.cache b/LaunchApp/obj/Debug/net8.0/LaunchApp.AssemblyInfoInputs.cache
@@ -1 +1 @@
-b9edc6e8c7ecf0bd147b04d90d3d987d2ae774029eed019046f8721286ab4634
+e530ff03ecc11f649f99b0cc67454355f41cda5f2cf5033ba8b5d05338b579d9
diff --git a/LibDalamud/obj/Debug/net6.0/LibDalamud.AssemblyInfo.cs b/LibDalamud/obj/Debug/net6.0/LibDalamud.AssemblyInfo.cs
@@ -1,6 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -13,7 +14,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("LibDalamud")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+097b81fe44918b1c117fe8308123a33effe517b5")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+33b758d9ffd36c0403256a95bd25f2b9cff55a28")]
 [assembly: System.Reflection.AssemblyProductAttribute("LibDalamud")]
 [assembly: System.Reflection.AssemblyTitleAttribute("LibDalamud")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

diff --git a/LibDalamud/obj/Debug/net6.0/LibDalamud.AssemblyInfoInputs.cache b/LibDalamud/obj/Debug/net6.0/LibDalamud.AssemblyInfoInputs.cache
@@ -1 +1 @@
-cca48619553c0c3c13b7b713b3a114b0add2728cc76fc67a85e260537db2a562
+faaebe5c838b1f0f1b43181094b6e06c9a05e0001021b3da1ecd78dae3fe056b
diff --git a/SpinningWheelLib/Dictionary1.xaml b/SpinningWheelLib/Dictionary1.xaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Themes/Fluent.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/SpinningWheelLib/SettingsWindow.xaml b/SpinningWheelLib/SettingsWindow.xaml
@@ -6,6 +6,9 @@
         Background="#ECE9D8">
 
     <Window.Resources>
+        <ResourceDictionary>
+
+
         <Style x:Key="FeatureCardStyle" TargetType="Border">
             <Setter Property="Background" Value="#FFFFFF"/>
             <Setter Property="BorderBrush" Value="#ACA899"/>
@@ -82,6 +85,7 @@
                 </Setter.Value>
             </Setter>
         </Style>
+        </ResourceDictionary>
     </Window.Resources>
 
     <Grid>

diff --git a/SpinningWheelLib/SettingsWindow.xaml.cs b/SpinningWheelLib/SettingsWindow.xaml.cs
@@ -19,8 +19,16 @@ namespace SpinningWheelLib
     /// </summary>
     public partial class SettingsWindow : Window
     {
+        private bool IsWindows11OrGreater => Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= 22000;
         public SettingsWindow()
         {
+            if (IsWindows11OrGreater)
+        {
+            Resources.MergedDictionaries.Add(new ResourceDictionary
+            {
+                Source = new Uri("Dictionary1.xaml", UriKind.Relative)
+            });
+        }
             InitializeComponent();
         }
     }

diff --git a/SpinningWheelLib/SpinningWheelLib.csproj b/SpinningWheelLib/SpinningWheelLib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
 	<EnableWindowsTargeting>true</EnableWindowsTargeting>
@@ -17,6 +17,8 @@
     <PackageReference Include="XamlAnimatedGif" Version="2.0.3" />
   </ItemGroup>
 
+
+
   <ItemGroup>
     <Resource Include="output-onlinegiftools.gif" />
     <Resource Include="roundrect.png" />

diff --git a/SpinningWheelLib/SpinningWheelLib.csproj.user b/SpinningWheelLib/SpinningWheelLib.csproj.user
@@ -10,6 +10,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Page Update="Dictionary1.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Window1.xaml">
       <SubType>Designer</SubType>
     </Page>

diff --git a/SpinningWheelLib/Window1.xaml b/SpinningWheelLib/Window1.xaml
@@ -17,6 +17,9 @@
         ResizeMode="NoResize">
 
     <Window.Resources>
+        <ResourceDictionary>
+
+
         <Style x:Key="XPButton" TargetType="Button">
             <Setter Property="Background" Value="#ECE9D8"/>
             <Setter Property="BorderBrush" Value="#ACA899"/>
@@ -36,6 +39,7 @@
                 </Setter.Value>
             </Setter>
         </Style>
+        </ResourceDictionary>
     </Window.Resources>
 
     <Grid x:Name="MainGrid">

diff --git a/SpinningWheelLib/Window1.xaml.cs b/SpinningWheelLib/Window1.xaml.cs
@@ -63,6 +63,7 @@ public override void WriteLine(string? value)
 }
     public partial class Window1 : Window
 {
+    private bool IsWindows11OrGreater => Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= 22000;
     private readonly DispatcherTimer _timer;
     private readonly Stopwatch _stopwatch;
     private readonly double _estimatedDuration;
@@ -89,6 +90,13 @@ public Window1(double estimatedDurationInSeconds = 30, bool isMessageBox = false
         bool hideButtons = false, int? autoCloseSeconds = null)
     {
         InitializeComponent();
+        if (IsWindows11OrGreater)
+        {
+            Resources.MergedDictionaries.Add(new ResourceDictionary
+            {
+                Source = new Uri("Dictionary1.xaml", UriKind.Relative)
+            });
+        }
         _estimatedDuration = estimatedDurationInSeconds;
         _stopwatch = new Stopwatch();
 

diff --git a/SpinningWheelLib/bin/Debug/net9.0-windows7.0/SpinningWheelLib.deps.json b/SpinningWheelLib/bin/Debug/net9.0-windows7.0/SpinningWheelLib.deps.json
@@ -0,0 +1,41 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v9.0",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v9.0": {
+      "SpinningWheelLib/1.0.0": {
+        "dependencies": {
+          "XamlAnimatedGif": "2.0.3"
+        },
+        "runtime": {
+          "SpinningWheelLib.dll": {}
+        }
+      },
+      "XamlAnimatedGif/2.0.3": {
+        "runtime": {
+          "lib/net5.0-windows7.0/XamlAnimatedGif.dll": {
+            "assemblyVersion": "2.0.0.0",
+            "fileVersion": "2.0.3.0"
+          }
+        }
+      }
+    }
+  },
+  "libraries": {
+    "SpinningWheelLib/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "XamlAnimatedGif/2.0.3": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-1qsjrI6Z48RSahLdb5P0Z/NEi+r5e3Si60ZhtmZbcsvxG7jdLT4AEG92lPPsEDV9HW7ZlaUjt+2OJlKwffZ4Lg==",
+      "path": "xamlanimatedgif/2.0.3",
+      "hashPath": "xamlanimatedgif.2.0.3.nupkg.sha512"
+    }
+  }
+}
diff --git a/SpinningWheelLib/bin/Debug/net9.0-windows7.0/SpinningWheelLib.dll b/SpinningWheelLib/bin/Debug/net9.0-windows7.0/SpinningWheelLib.dll
diff --git a/SpinningWheelLib/bin/Debug/net9.0-windows7.0/SpinningWheelLib.pdb b/SpinningWheelLib/bin/Debug/net9.0-windows7.0/SpinningWheelLib.pdb
diff --git a/SpinningWheelLib/obj/Debug/net6.0-windows/SpinningWheelLib.AssemblyInfo.cs b/SpinningWheelLib/obj/Debug/net6.0-windows/SpinningWheelLib.AssemblyInfo.cs
@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -14,7 +13,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("SpinningWheelLib")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+4eab5e1ef3f5cbb76c429b912a5ae9a61f5c6daf")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+33b758d9ffd36c0403256a95bd25f2b9cff55a28")]
 [assembly: System.Reflection.AssemblyProductAttribute("SpinningWheelLib")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SpinningWheelLib")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

diff --git a/SpinningWheelLib/obj/Debug/net6.0-windows/SpinningWheelLib.AssemblyInfoInputs.cache b/SpinningWheelLib/obj/Debug/net6.0-windows/SpinningWheelLib.AssemblyInfoInputs.cache
@@ -1 +1 @@
-e828a1cb334bf3e71f02d57d20686a396da0f636b9e3f9e88ef4f33e11fbf7b0
+d9cf18d5f856fd42e841fa9b2b265b8626b37cf90a7ab263168c355979d67a28
diff --git a/SpinningWheelLib/obj/Debug/net9.0-windows7.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs b/SpinningWheelLib/obj/Debug/net9.0-windows7.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs
@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v9.0", FrameworkDisplayName = ".NET 9.0")]
diff --git a/SpinningWheelLib/obj/Debug/net9.0-windows7.0/CircularProgressBar.baml b/SpinningWheelLib/obj/Debug/net9.0-windows7.0/CircularProgressBar.baml
diff --git a/SpinningWheelLib/obj/Debug/net9.0-windows7.0/CircularProgressBar.g.cs b/SpinningWheelLib/obj/Debug/net9.0-windows7.0/CircularProgressBar.g.cs
@@ -0,0 +1,112 @@
+#pragma checksum "..\..\..\CircularProgressBar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B5C8C19190A2BD24FEF30C93D43550294FCB14E2"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Controls.Ribbon;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Forms.Integration;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace SpinningWheelLib {
+
+
+    /// <summary>
+    /// CircularProgressBar
+    /// </summary>
+    public partial class CircularProgressBar : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
+
+
+        #line 9 "..\..\..\CircularProgressBar.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Shapes.Path BackgroundArc;
+
+        #line default
+        #line hidden
+
+
+        #line 13 "..\..\..\CircularProgressBar.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Canvas ProgressCanvas;
+
+        #line default
+        #line hidden
+
+
+        #line 14 "..\..\..\CircularProgressBar.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock ProgressText;
+
+        #line default
+        #line hidden
+
+        private bool _contentLoaded;
+
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.0.0")]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Uri resourceLocater = new System.Uri("/SpinningWheelLib;component/circularprogressbar.xaml", System.UriKind.Relative);
+
+            #line 1 "..\..\..\CircularProgressBar.xaml"
+            System.Windows.Application.LoadComponent(this, resourceLocater);
+
+            #line default
+            #line hidden
+        }
+
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.0.0")]
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.BackgroundArc = ((System.Windows.Shapes.Path)(target));
+            return;
+            case 2:
+            this.ProgressCanvas = ((System.Windows.Controls.Canvas)(target));
+            return;
+            case 3:
+            this.ProgressText = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            }
+            this._contentLoaded = true;
+        }
+    }
+}
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0ae6a45511de78addd365a611b84525390eccc4e977b805d29eea817d851526a
		1fa639bcba58111f6ea159c81b7571c3a1acd122d8c7f9082bea1f1615cb2e89
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b9edc6e8c7ecf0bd147b04d90d3d987d2ae774029eed019046f8721286ab4634
		e530ff03ecc11f649f99b0cc67454355f41cda5f2cf5033ba8b5d05338b579d9
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		cca48619553c0c3c13b7b713b3a114b0add2728cc76fc67a85e260537db2a562
		faaebe5c838b1f0f1b43181094b6e06c9a05e0001021b3da1ecd78dae3fe056b
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e828a1cb334bf3e71f02d57d20686a396da0f636b9e3f9e88ef4f33e11fbf7b0
		d9cf18d5f856fd42e841fa9b2b265b8626b37cf90a7ab263168c355979d67a28