Major Changes

Taiizor · Jan 14, 2025 · 4610173 · 4610173
1 parent 2de9f76
commit 4610173
Show file tree

Hide file tree

Showing 72 changed files with 32 additions and 245 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -4,12 +4,9 @@
     <packageSources>
         <clear />
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-        <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
-        <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
         <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
         <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
         <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
         <add key="public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
-        <add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
     </packageSources>
 </configuration>
diff --git a/src/Bundle/Sucrose.Bundle/App.net6.0-windows.config b/src/Bundle/Sucrose.Bundle/App.net6.0-windows.config
diff --git a/src/Bundle/Sucrose.Bundle/App.net7.0-windows.config b/src/Bundle/Sucrose.Bundle/App.net7.0-windows.config
diff --git a/src/Bundle/Sucrose.Bundle/Main.xaml.cs b/src/Bundle/Sucrose.Bundle/Main.xaml.cs
@@ -22,7 +22,7 @@
 using SWNM = Skylark.Wing.Native.Methods;
 using SWUD = Skylark.Wing.Utility.Desktop;
 
-#if NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
 using SWHSR = Skylark.Wing.Helper.ShortcutRuntime;
 #endif
 
@@ -237,7 +237,7 @@ private static async Task CreateShortcuts()
                 {
                     bool CreateDesktopShortcut = true;
 
-#if NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
                     try
                     {
                         SWHSR.Create(Path.GetDirectoryName(DesktopShortcut), Shortcut, Text, null, Launcher, null, Path.GetDirectoryName(Launcher), null, SWNM.WindowStyle.Normal);
@@ -268,7 +268,7 @@ private static async Task CreateShortcuts()
                 {
                     bool CreateStartMenuShortcut = true;
 
-#if NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
                     try
                     {
                         SWHSR.Create(Path.GetDirectoryName(StartMenuProgramsShortcut), Shortcut, Text, null, Launcher, null, Path.GetDirectoryName(Launcher), null, SWNM.WindowStyle.Normal);

diff --git a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - ARM64.pubxml b/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - ARM64.pubxml
diff --git a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - x64.pubxml b/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - x64.pubxml
diff --git a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - x86.pubxml b/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - x86.pubxml
diff --git a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - ARM64.pubxml b/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - ARM64.pubxml
diff --git a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - x64.pubxml b/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - x64.pubxml
diff --git a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - x86.pubxml b/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - x86.pubxml
diff --git a/src/Bundle/Sucrose.Bundle/Sucrose.Bundle.csproj b/src/Bundle/Sucrose.Bundle/Sucrose.Bundle.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <ApplicationIcon>Assets\ICO.ico</ApplicationIcon>
         <StartupObject>Sucrose.Bundle.App</StartupObject>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Launcher/Sucrose.Launcher/App.net6.0-windows.config b/src/Launcher/Sucrose.Launcher/App.net6.0-windows.config
diff --git a/src/Launcher/Sucrose.Launcher/App.net7.0-windows.config b/src/Launcher/Sucrose.Launcher/App.net7.0-windows.config
diff --git a/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj b/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <ApplicationIcon>Assets\ICO.ico</ApplicationIcon>
         <StartupObject>Sucrose.Launcher.App</StartupObject>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Library/Sucrose.Manager/Sucrose.Manager.csproj b/src/Library/Sucrose.Manager/Sucrose.Manager.csproj
@@ -2,10 +2,10 @@
 
     <PropertyGroup>
         <Version>$([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd))</Version>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
         <OutputPath Condition="'$(PlatformTarget)' == 'arm64'">..\..\Sucrose\Library\Manager\ARM64</OutputPath>
         <OutputPath Condition="'$(PlatformTarget)' == 'x64'">..\..\Sucrose\Library\Manager\x64</OutputPath>
         <OutputPath Condition="'$(PlatformTarget)' == 'x86'">..\..\Sucrose\Library\Manager\x86</OutputPath>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <RuntimeIdentifiers>win-arm64;win-x64;win-x86</RuntimeIdentifiers>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Library/Sucrose.Memory/Sucrose.Memory.csproj b/src/Library/Sucrose.Memory/Sucrose.Memory.csproj
@@ -2,10 +2,10 @@
 
     <PropertyGroup>
         <Version>$([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd))</Version>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
         <OutputPath Condition="'$(PlatformTarget)' == 'arm64'">..\..\Sucrose\Library\Memory\ARM64</OutputPath>
         <OutputPath Condition="'$(PlatformTarget)' == 'x64'">..\..\Sucrose\Library\Memory\x64</OutputPath>
         <OutputPath Condition="'$(PlatformTarget)' == 'x86'">..\..\Sucrose\Library\Memory\x86</OutputPath>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <RuntimeIdentifiers>win-arm64;win-x64;win-x86</RuntimeIdentifiers>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Library/Sucrose.Mpv.NET/API/Interop/Utils/PlatformDll.cs b/src/Library/Sucrose.Mpv.NET/API/Interop/Utils/PlatformDll.cs
@@ -8,7 +8,7 @@ public static class PlatformDll
 
         private static IDllLoadUtils SelectDllLoadUtils()
         {
-#if NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 return new WindowsDllLoadUtils();

diff --git a/src/Library/Sucrose.Mpv.NET/Sucrose.Mpv.NET.csproj b/src/Library/Sucrose.Mpv.NET/Sucrose.Mpv.NET.csproj
@@ -2,13 +2,13 @@
 
     <PropertyGroup>
         <Version>$([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd))</Version>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
         <OutputPath Condition="'$(PlatformTarget)' == 'arm64'">..\..\Sucrose\Library\Mpv.NET\ARM64</OutputPath>
         <DefineConstants Condition="'$(PlatformTarget)' == 'arm64'">$(DefineConstants);ARM64</DefineConstants>
         <OutputPath Condition="'$(PlatformTarget)' == 'x64'">..\..\Sucrose\Library\Mpv.NET\x64</OutputPath>
         <OutputPath Condition="'$(PlatformTarget)' == 'x86'">..\..\Sucrose\Library\Mpv.NET\x86</OutputPath>
         <DefineConstants Condition="'$(PlatformTarget)' == 'x64'">$(DefineConstants);X64</DefineConstants>
         <DefineConstants Condition="'$(PlatformTarget)' == 'x86'">$(DefineConstants);X86</DefineConstants>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <RuntimeIdentifiers>win-arm64;win-x64;win-x86</RuntimeIdentifiers>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Library/Sucrose.Pipe/Sucrose.Pipe.csproj b/src/Library/Sucrose.Pipe/Sucrose.Pipe.csproj
@@ -2,10 +2,10 @@
 
     <PropertyGroup>
         <Version>$([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd))</Version>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
         <OutputPath Condition="'$(PlatformTarget)' == 'arm64'">..\..\Sucrose\Library\Pipe\ARM64</OutputPath>
         <OutputPath Condition="'$(PlatformTarget)' == 'x64'">..\..\Sucrose\Library\Pipe\x64</OutputPath>
         <OutputPath Condition="'$(PlatformTarget)' == 'x86'">..\..\Sucrose\Library\Pipe\x86</OutputPath>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <RuntimeIdentifiers>win-arm64;win-x64;win-x86</RuntimeIdentifiers>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Library/Sucrose.Resources/Sucrose.Resources.csproj b/src/Library/Sucrose.Resources/Sucrose.Resources.csproj
@@ -2,10 +2,10 @@
 
     <PropertyGroup>
         <Version>$([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd))</Version>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
         <OutputPath Condition="'$(PlatformTarget)' == 'arm64'">..\..\Sucrose\Library\Resources\ARM64</OutputPath>
         <OutputPath Condition="'$(PlatformTarget)' == 'x64'">..\..\Sucrose\Library\Resources\x64</OutputPath>
         <OutputPath Condition="'$(PlatformTarget)' == 'x86'">..\..\Sucrose\Library\Resources\x86</OutputPath>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <RuntimeIdentifiers>win-arm64;win-x64;win-x86</RuntimeIdentifiers>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Library/Sucrose.Signal/Sucrose.Signal.csproj b/src/Library/Sucrose.Signal/Sucrose.Signal.csproj
@@ -2,10 +2,10 @@
 
     <PropertyGroup>
         <Version>$([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd))</Version>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
         <OutputPath Condition="'$(PlatformTarget)' == 'arm64'">..\..\Sucrose\Library\Signal\ARM64</OutputPath>
         <OutputPath Condition="'$(PlatformTarget)' == 'x64'">..\..\Sucrose\Library\Signal\x64</OutputPath>
         <OutputPath Condition="'$(PlatformTarget)' == 'x86'">..\..\Sucrose\Library\Signal\x86</OutputPath>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <RuntimeIdentifiers>win-arm64;win-x64;win-x86</RuntimeIdentifiers>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Library/Sucrose.XamlAnimatedGif/Sucrose.XamlAnimatedGif.csproj b/src/Library/Sucrose.XamlAnimatedGif/Sucrose.XamlAnimatedGif.csproj
@@ -3,9 +3,9 @@
         <Version>$([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd))</Version>
         <DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);LACKS_STREAM_MEMORY_OVERLOADS</DefineConstants>
         <OutputPath Condition="'$(PlatformTarget)' == 'arm64'">..\..\Sucrose\Library\XamlAnimatedGif\ARM64</OutputPath>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
         <OutputPath Condition="'$(PlatformTarget)' == 'x64'">..\..\Sucrose\Library\XamlAnimatedGif\x64</OutputPath>
         <OutputPath Condition="'$(PlatformTarget)' == 'x86'">..\..\Sucrose\Library\XamlAnimatedGif\x86</OutputPath>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <RuntimeIdentifiers>win-arm64;win-x64;win-x86</RuntimeIdentifiers>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Live/Sucrose.Live.Aurora/App.net6.0-windows.config b/src/Live/Sucrose.Live.Aurora/App.net6.0-windows.config
diff --git a/src/Live/Sucrose.Live.Aurora/App.net7.0-windows.config b/src/Live/Sucrose.Live.Aurora/App.net7.0-windows.config
diff --git a/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj b/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <ApplicationIcon>Assets\ICO.ico</ApplicationIcon>
         <StartupObject>Sucrose.Live.Aurora.App</StartupObject>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Live/Sucrose.Live.CefSharp/App.net6.0-windows.config b/src/Live/Sucrose.Live.CefSharp/App.net6.0-windows.config
diff --git a/src/Live/Sucrose.Live.CefSharp/App.net7.0-windows.config b/src/Live/Sucrose.Live.CefSharp/App.net7.0-windows.config
diff --git a/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj b/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <ApplicationIcon>Assets\ICO.ico</ApplicationIcon>
         <StartupObject>Sucrose.Live.CefSharp.App</StartupObject>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Live/Sucrose.Live.MpvPlayer/App.net6.0-windows.config b/src/Live/Sucrose.Live.MpvPlayer/App.net6.0-windows.config
diff --git a/src/Live/Sucrose.Live.MpvPlayer/App.net7.0-windows.config b/src/Live/Sucrose.Live.MpvPlayer/App.net7.0-windows.config
diff --git a/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj b/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <ApplicationIcon>Assets\ICO.ico</ApplicationIcon>
         <StartupObject>Sucrose.Live.MpvPlayer.App</StartupObject>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Live/Sucrose.Live.Nebula/App.net6.0-windows.config b/src/Live/Sucrose.Live.Nebula/App.net6.0-windows.config
diff --git a/src/Live/Sucrose.Live.Nebula/App.net7.0-windows.config b/src/Live/Sucrose.Live.Nebula/App.net7.0-windows.config
diff --git a/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj b/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <ApplicationIcon>Assets\ICO.ico</ApplicationIcon>
         <StartupObject>Sucrose.Live.Nebula.App</StartupObject>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Live/Sucrose.Live.Vexana/App.net6.0-windows.config b/src/Live/Sucrose.Live.Vexana/App.net6.0-windows.config
diff --git a/src/Live/Sucrose.Live.Vexana/App.net7.0-windows.config b/src/Live/Sucrose.Live.Vexana/App.net7.0-windows.config
diff --git a/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj b/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
+        <TargetFrameworks>net48;net481;net8.0-windows;net9.0-windows</TargetFrameworks>
         <ApplicationIcon>Assets\ICO.ico</ApplicationIcon>
         <StartupObject>Sucrose.Live.Vexana.App</StartupObject>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Live/Sucrose.Live.WebView/App.net6.0-windows.config b/src/Live/Sucrose.Live.WebView/App.net6.0-windows.config
diff --git a/src/Live/Sucrose.Live.WebView/App.net7.0-windows.config b/src/Live/Sucrose.Live.WebView/App.net7.0-windows.config