diff --git a/NuGet.Config b/NuGet.Config index c276e9b7e..1c9b13f99 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -4,12 +4,9 @@ - - - \ No newline at end of file diff --git a/src/Bundle/Sucrose.Bundle/App.net6.0-windows.config b/src/Bundle/Sucrose.Bundle/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Bundle/Sucrose.Bundle/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Bundle/Sucrose.Bundle/App.net7.0-windows.config b/src/Bundle/Sucrose.Bundle/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Bundle/Sucrose.Bundle/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Bundle/Sucrose.Bundle/Main.xaml.cs b/src/Bundle/Sucrose.Bundle/Main.xaml.cs index e2595a858..b0d5c1559 100644 --- 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 deleted file mode 100644 index 78fb5b0ea..000000000 --- a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - ARM64.pubxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Release - ARM64 - net6.0-windows - ..\..\Sucrose\App\$(TargetFramework)\$(Platform)\ - FileSystem - <_TargetId>Folder - win-arm64 - false - false - - \ No newline at end of file diff --git a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - x64.pubxml b/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - x64.pubxml deleted file mode 100644 index 75054f088..000000000 --- a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - x64.pubxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Release - x64 - net6.0-windows - ..\..\Sucrose\App\$(TargetFramework)\$(Platform)\ - FileSystem - <_TargetId>Folder - win-x64 - false - false - - \ No newline at end of file diff --git a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - x86.pubxml b/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - x86.pubxml deleted file mode 100644 index 19b66af87..000000000 --- a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 6 - x86.pubxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Release - x86 - net6.0-windows - ..\..\Sucrose\App\$(TargetFramework)\$(Platform)\ - FileSystem - <_TargetId>Folder - win-x86 - false - false - - \ No newline at end of file diff --git a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - ARM64.pubxml b/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - ARM64.pubxml deleted file mode 100644 index a102c86db..000000000 --- a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - ARM64.pubxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Release - ARM64 - net7.0-windows - ..\..\Sucrose\App\$(TargetFramework)\$(Platform)\ - FileSystem - <_TargetId>Folder - win-arm64 - false - false - - \ No newline at end of file diff --git a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - x64.pubxml b/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - x64.pubxml deleted file mode 100644 index 94f5d3b87..000000000 --- a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - x64.pubxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Release - x64 - net7.0-windows - ..\..\Sucrose\App\$(TargetFramework)\$(Platform)\ - FileSystem - <_TargetId>Folder - win-x64 - false - false - - \ No newline at end of file diff --git a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - x86.pubxml b/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - x86.pubxml deleted file mode 100644 index a600e9e9a..000000000 --- a/src/Bundle/Sucrose.Bundle/Properties/PublishProfiles/.NET 7 - x86.pubxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Release - x86 - net7.0-windows - ..\..\Sucrose\App\$(TargetFramework)\$(Platform)\ - FileSystem - <_TargetId>Folder - win-x86 - false - false - - \ No newline at end of file diff --git a/src/Bundle/Sucrose.Bundle/Sucrose.Bundle.csproj b/src/Bundle/Sucrose.Bundle/Sucrose.Bundle.csproj index 4c45d13e8..e5b735ff3 100644 --- a/src/Bundle/Sucrose.Bundle/Sucrose.Bundle.csproj +++ b/src/Bundle/Sucrose.Bundle/Sucrose.Bundle.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Bundle.App enable diff --git a/src/Launcher/Sucrose.Launcher/App.net6.0-windows.config b/src/Launcher/Sucrose.Launcher/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Launcher/Sucrose.Launcher/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Launcher/Sucrose.Launcher/App.net7.0-windows.config b/src/Launcher/Sucrose.Launcher/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Launcher/Sucrose.Launcher/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj b/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj index ae662448d..f5c2b09ba 100644 --- a/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj +++ b/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Launcher.App enable diff --git a/src/Library/Sucrose.Manager/Sucrose.Manager.csproj b/src/Library/Sucrose.Manager/Sucrose.Manager.csproj index d9983444a..b2db60586 100644 --- a/src/Library/Sucrose.Manager/Sucrose.Manager.csproj +++ b/src/Library/Sucrose.Manager/Sucrose.Manager.csproj @@ -2,10 +2,10 @@ $([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd)) - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows ..\..\Sucrose\Library\Manager\ARM64 ..\..\Sucrose\Library\Manager\x64 ..\..\Sucrose\Library\Manager\x86 + net48;net481;net8.0-windows;net9.0-windows win-arm64;win-x64;win-x86 $(Version) enable diff --git a/src/Library/Sucrose.Memory/Sucrose.Memory.csproj b/src/Library/Sucrose.Memory/Sucrose.Memory.csproj index f1389d4cb..fc8ded30a 100644 --- a/src/Library/Sucrose.Memory/Sucrose.Memory.csproj +++ b/src/Library/Sucrose.Memory/Sucrose.Memory.csproj @@ -2,10 +2,10 @@ $([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd)) - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows ..\..\Sucrose\Library\Memory\ARM64 ..\..\Sucrose\Library\Memory\x64 ..\..\Sucrose\Library\Memory\x86 + net48;net481;net8.0-windows;net9.0-windows win-arm64;win-x64;win-x86 $(Version) enable diff --git a/src/Library/Sucrose.Mpv.NET/API/Interop/Utils/PlatformDll.cs b/src/Library/Sucrose.Mpv.NET/API/Interop/Utils/PlatformDll.cs index 32eca52ed..3d41e71ac 100644 --- 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 index 36b862443..d4f04c15e 100644 --- a/src/Library/Sucrose.Mpv.NET/Sucrose.Mpv.NET.csproj +++ b/src/Library/Sucrose.Mpv.NET/Sucrose.Mpv.NET.csproj @@ -2,13 +2,13 @@ $([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd)) - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows ..\..\Sucrose\Library\Mpv.NET\ARM64 $(DefineConstants);ARM64 ..\..\Sucrose\Library\Mpv.NET\x64 ..\..\Sucrose\Library\Mpv.NET\x86 $(DefineConstants);X64 $(DefineConstants);X86 + net48;net481;net8.0-windows;net9.0-windows win-arm64;win-x64;win-x86 $(Version) enable diff --git a/src/Library/Sucrose.Pipe/Sucrose.Pipe.csproj b/src/Library/Sucrose.Pipe/Sucrose.Pipe.csproj index fc9a2df88..c243ecd85 100644 --- a/src/Library/Sucrose.Pipe/Sucrose.Pipe.csproj +++ b/src/Library/Sucrose.Pipe/Sucrose.Pipe.csproj @@ -2,10 +2,10 @@ $([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd)) - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows ..\..\Sucrose\Library\Pipe\ARM64 ..\..\Sucrose\Library\Pipe\x64 ..\..\Sucrose\Library\Pipe\x86 + net48;net481;net8.0-windows;net9.0-windows win-arm64;win-x64;win-x86 $(Version) enable diff --git a/src/Library/Sucrose.Resources/Sucrose.Resources.csproj b/src/Library/Sucrose.Resources/Sucrose.Resources.csproj index 0618a6b69..ea29cbf41 100644 --- a/src/Library/Sucrose.Resources/Sucrose.Resources.csproj +++ b/src/Library/Sucrose.Resources/Sucrose.Resources.csproj @@ -2,10 +2,10 @@ $([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd)) - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows ..\..\Sucrose\Library\Resources\ARM64 ..\..\Sucrose\Library\Resources\x64 ..\..\Sucrose\Library\Resources\x86 + net48;net481;net8.0-windows;net9.0-windows win-arm64;win-x64;win-x86 $(Version) enable diff --git a/src/Library/Sucrose.Signal/Sucrose.Signal.csproj b/src/Library/Sucrose.Signal/Sucrose.Signal.csproj index 0ca1083ea..79656a712 100644 --- a/src/Library/Sucrose.Signal/Sucrose.Signal.csproj +++ b/src/Library/Sucrose.Signal/Sucrose.Signal.csproj @@ -2,10 +2,10 @@ $([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd)) - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows ..\..\Sucrose\Library\Signal\ARM64 ..\..\Sucrose\Library\Signal\x64 ..\..\Sucrose\Library\Signal\x86 + net48;net481;net8.0-windows;net9.0-windows win-arm64;win-x64;win-x86 $(Version) enable diff --git a/src/Library/Sucrose.XamlAnimatedGif/Sucrose.XamlAnimatedGif.csproj b/src/Library/Sucrose.XamlAnimatedGif/Sucrose.XamlAnimatedGif.csproj index daaa8a82b..98fd2d962 100644 --- a/src/Library/Sucrose.XamlAnimatedGif/Sucrose.XamlAnimatedGif.csproj +++ b/src/Library/Sucrose.XamlAnimatedGif/Sucrose.XamlAnimatedGif.csproj @@ -3,9 +3,9 @@ $([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd)) $(DefineConstants);LACKS_STREAM_MEMORY_OVERLOADS ..\..\Sucrose\Library\XamlAnimatedGif\ARM64 - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows ..\..\Sucrose\Library\XamlAnimatedGif\x64 ..\..\Sucrose\Library\XamlAnimatedGif\x86 + net48;net481;net8.0-windows;net9.0-windows win-arm64;win-x64;win-x86 $(Version) enable diff --git a/src/Live/Sucrose.Live.Aurora/App.net6.0-windows.config b/src/Live/Sucrose.Live.Aurora/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.Aurora/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.Aurora/App.net7.0-windows.config b/src/Live/Sucrose.Live.Aurora/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.Aurora/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj b/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj index b14b0bffb..65c945ab5 100644 --- a/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj +++ b/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Live.Aurora.App enable diff --git a/src/Live/Sucrose.Live.CefSharp/App.net6.0-windows.config b/src/Live/Sucrose.Live.CefSharp/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.CefSharp/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.CefSharp/App.net7.0-windows.config b/src/Live/Sucrose.Live.CefSharp/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.CefSharp/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj b/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj index 99f0e1077..4d0bc9bab 100644 --- a/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj +++ b/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Live.CefSharp.App enable diff --git a/src/Live/Sucrose.Live.MpvPlayer/App.net6.0-windows.config b/src/Live/Sucrose.Live.MpvPlayer/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.MpvPlayer/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.MpvPlayer/App.net7.0-windows.config b/src/Live/Sucrose.Live.MpvPlayer/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.MpvPlayer/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj b/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj index ac881d15d..d11309b5f 100644 --- a/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj +++ b/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Live.MpvPlayer.App enable diff --git a/src/Live/Sucrose.Live.Nebula/App.net6.0-windows.config b/src/Live/Sucrose.Live.Nebula/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.Nebula/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.Nebula/App.net7.0-windows.config b/src/Live/Sucrose.Live.Nebula/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.Nebula/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj b/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj index 97e10abaf..92a86a19b 100644 --- a/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj +++ b/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Live.Nebula.App enable diff --git a/src/Live/Sucrose.Live.Vexana/App.net6.0-windows.config b/src/Live/Sucrose.Live.Vexana/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.Vexana/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.Vexana/App.net7.0-windows.config b/src/Live/Sucrose.Live.Vexana/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.Vexana/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj b/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj index 168ee9326..fccee6b06 100644 --- a/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj +++ b/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Live.Vexana.App enable diff --git a/src/Live/Sucrose.Live.WebView/App.net6.0-windows.config b/src/Live/Sucrose.Live.WebView/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.WebView/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.WebView/App.net7.0-windows.config b/src/Live/Sucrose.Live.WebView/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.WebView/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj b/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj index 43f325396..108929e49 100644 --- a/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj +++ b/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Live.WebView.App enable diff --git a/src/Live/Sucrose.Live.Xavier/App.net6.0-windows.config b/src/Live/Sucrose.Live.Xavier/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.Xavier/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.Xavier/App.net7.0-windows.config b/src/Live/Sucrose.Live.Xavier/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Live/Sucrose.Live.Xavier/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Live/Sucrose.Live.Xavier/Sucrose.Live.Xavier.csproj b/src/Live/Sucrose.Live.Xavier/Sucrose.Live.Xavier.csproj index 6c102e9a4..ebd246368 100644 --- a/src/Live/Sucrose.Live.Xavier/Sucrose.Live.Xavier.csproj +++ b/src/Live/Sucrose.Live.Xavier/Sucrose.Live.Xavier.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Live.Xavier.App enable diff --git a/src/Localizer/Sucrose.Localizer/App.net6.0-windows.config b/src/Localizer/Sucrose.Localizer/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Localizer/Sucrose.Localizer/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Localizer/Sucrose.Localizer/App.net7.0-windows.config b/src/Localizer/Sucrose.Localizer/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Localizer/Sucrose.Localizer/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Localizer/Sucrose.Localizer/Sucrose.Localizer.csproj b/src/Localizer/Sucrose.Localizer/Sucrose.Localizer.csproj index 8388b90db..778c7c4f6 100644 --- a/src/Localizer/Sucrose.Localizer/Sucrose.Localizer.csproj +++ b/src/Localizer/Sucrose.Localizer/Sucrose.Localizer.csproj @@ -2,7 +2,7 @@ Exe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Localizer.App enable diff --git a/src/Portal/Sucrose.Portal/App.net6.0-windows.config b/src/Portal/Sucrose.Portal/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Portal/Sucrose.Portal/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Portal/Sucrose.Portal/App.net7.0-windows.config b/src/Portal/Sucrose.Portal/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Portal/Sucrose.Portal/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj b/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj index 419d375fa..ea95f3184 100644 --- a/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj +++ b/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Portal.App enable diff --git a/src/Project/Sucrose.Backgroundog/App.net6.0-windows.config b/src/Project/Sucrose.Backgroundog/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Project/Sucrose.Backgroundog/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Project/Sucrose.Backgroundog/App.net7.0-windows.config b/src/Project/Sucrose.Backgroundog/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Project/Sucrose.Backgroundog/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Project/Sucrose.Backgroundog/Sucrose.Backgroundog.csproj b/src/Project/Sucrose.Backgroundog/Sucrose.Backgroundog.csproj index 126002414..5f68c007e 100644 --- a/src/Project/Sucrose.Backgroundog/Sucrose.Backgroundog.csproj +++ b/src/Project/Sucrose.Backgroundog/Sucrose.Backgroundog.csproj @@ -2,7 +2,7 @@ Exe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Backgroundog.App enable diff --git a/src/Project/Sucrose.Commandog/App.net6.0-windows.config b/src/Project/Sucrose.Commandog/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Project/Sucrose.Commandog/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Project/Sucrose.Commandog/App.net7.0-windows.config b/src/Project/Sucrose.Commandog/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Project/Sucrose.Commandog/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Project/Sucrose.Commandog/Helper/Arguments.cs b/src/Project/Sucrose.Commandog/Helper/Arguments.cs index a9c63f189..b961b08b1 100644 --- a/src/Project/Sucrose.Commandog/Helper/Arguments.cs +++ b/src/Project/Sucrose.Commandog/Helper/Arguments.cs @@ -31,7 +31,7 @@ public static async Task Parse(string[] Arguments) if (Combined.StartsWith(SMMRG.StartCommand) && Combined.Contains(SMMRG.ValueSeparatorChar)) { -#if NET6_0_OR_GREATER +#if NET8_0_OR_GREATER string[] ArgumentParts = Combined[1..].Split(SMMRG.ValueSeparatorChar); #else string[] ArgumentParts = Combined.Substring(1).Split(SMMRG.ValueSeparatorChar); @@ -41,7 +41,7 @@ public static async Task Parse(string[] Arguments) { string Name = ArgumentParts[0]; -#if NET6_0_OR_GREATER +#if NET8_0_OR_GREATER List Values = new(ArgumentParts[1..]); #else List Values = new(); diff --git a/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj b/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj index a3a19c2ad..8c843fb28 100644 --- a/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj +++ b/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj @@ -2,7 +2,7 @@ Exe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Commandog.App enable diff --git a/src/Project/Sucrose.Property/App.net6.0-windows.config b/src/Project/Sucrose.Property/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Project/Sucrose.Property/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Project/Sucrose.Property/App.net7.0-windows.config b/src/Project/Sucrose.Property/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Project/Sucrose.Property/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Project/Sucrose.Property/Sucrose.Property.csproj b/src/Project/Sucrose.Property/Sucrose.Property.csproj index 3e17368d5..5f3fd074e 100644 --- a/src/Project/Sucrose.Property/Sucrose.Property.csproj +++ b/src/Project/Sucrose.Property/Sucrose.Property.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Property.App enable diff --git a/src/Project/Sucrose.Reportdog/App.net6.0-windows.config b/src/Project/Sucrose.Reportdog/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Project/Sucrose.Reportdog/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Project/Sucrose.Reportdog/App.net7.0-windows.config b/src/Project/Sucrose.Reportdog/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Project/Sucrose.Reportdog/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Project/Sucrose.Reportdog/Sucrose.Reportdog.csproj b/src/Project/Sucrose.Reportdog/Sucrose.Reportdog.csproj index 96a18e78a..846c583bd 100644 --- a/src/Project/Sucrose.Reportdog/Sucrose.Reportdog.csproj +++ b/src/Project/Sucrose.Reportdog/Sucrose.Reportdog.csproj @@ -2,7 +2,7 @@ Exe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Reportdog.App enable diff --git a/src/Project/Sucrose.Undo/App.net6.0-windows.config b/src/Project/Sucrose.Undo/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Project/Sucrose.Undo/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Project/Sucrose.Undo/App.net7.0-windows.config b/src/Project/Sucrose.Undo/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Project/Sucrose.Undo/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Project/Sucrose.Undo/Sucrose.Undo.csproj b/src/Project/Sucrose.Undo/Sucrose.Undo.csproj index 9d60b4557..7bb1b0fe6 100644 --- a/src/Project/Sucrose.Undo/Sucrose.Undo.csproj +++ b/src/Project/Sucrose.Undo/Sucrose.Undo.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Undo.App enable diff --git a/src/Project/Sucrose.Watchdog/App.net6.0-windows.config b/src/Project/Sucrose.Watchdog/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Project/Sucrose.Watchdog/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Project/Sucrose.Watchdog/App.net7.0-windows.config b/src/Project/Sucrose.Watchdog/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Project/Sucrose.Watchdog/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Project/Sucrose.Watchdog/Sucrose.Watchdog.csproj b/src/Project/Sucrose.Watchdog/Sucrose.Watchdog.csproj index c159ea7a9..294acb36e 100644 --- a/src/Project/Sucrose.Watchdog/Sucrose.Watchdog.csproj +++ b/src/Project/Sucrose.Watchdog/Sucrose.Watchdog.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Watchdog.App enable diff --git a/src/Shared/Sucrose.Shared.Space/Helper/Instance.cs b/src/Shared/Sucrose.Shared.Space/Helper/Instance.cs index 2ba309a6e..06ea7d211 100644 --- a/src/Shared/Sucrose.Shared.Space/Helper/Instance.cs +++ b/src/Shared/Sucrose.Shared.Space/Helper/Instance.cs @@ -41,7 +41,7 @@ public static bool Basic(string Name, string Application) public static bool Single(string Name, string Application) { -#if NET6_0_OR_GREATER +#if NET8_0_OR_GREATER return SWUSI.IsAppMutexRunning(Name) && SSSHP.WorkCount(Application) <= 1; #else _Mutex = new(true, Name); diff --git a/src/Update/Sucrose.Update/App.net6.0-windows.config b/src/Update/Sucrose.Update/App.net6.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Update/Sucrose.Update/App.net6.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Update/Sucrose.Update/App.net7.0-windows.config b/src/Update/Sucrose.Update/App.net7.0-windows.config deleted file mode 100644 index 99ddf3e08..000000000 --- a/src/Update/Sucrose.Update/App.net7.0-windows.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Update/Sucrose.Update/Sucrose.Update.csproj b/src/Update/Sucrose.Update/Sucrose.Update.csproj index 8eb04aa33..47018c38f 100644 --- a/src/Update/Sucrose.Update/Sucrose.Update.csproj +++ b/src/Update/Sucrose.Update/Sucrose.Update.csproj @@ -2,7 +2,7 @@ WinExe - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + net48;net481;net8.0-windows;net9.0-windows Assets\ICO.ico Sucrose.Update.App enable