diff --git a/Source/3rdparty/Dragablz b/Source/3rdparty/Dragablz index d8436d9a02..bb3801fbd3 160000 --- a/Source/3rdparty/Dragablz +++ b/Source/3rdparty/Dragablz @@ -1 +1 @@ -Subproject commit d8436d9a025a422175f0cd4541babaee007181e5 +Subproject commit bb3801fbd33a979ed64b44b1945dbd9edca5c98d diff --git a/Source/NETworkManager.Controls/NETworkManager.Controls.csproj b/Source/NETworkManager.Controls/NETworkManager.Controls.csproj index c3dd726682..c17b65f738 100644 --- a/Source/NETworkManager.Controls/NETworkManager.Controls.csproj +++ b/Source/NETworkManager.Controls/NETworkManager.Controls.csproj @@ -1,10 +1,10 @@ - + {95EA884C-E498-4A47-A316-DC890BF7F0D2} Library NETworkManager.Controls NETworkManager.Controls - net8.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 win-x64 x64 false @@ -15,4 +15,5 @@ - \ No newline at end of file + + diff --git a/Source/NETworkManager.Converters/NETworkManager.Converters.csproj b/Source/NETworkManager.Converters/NETworkManager.Converters.csproj index 4ca2f9653c..90cc84633b 100644 --- a/Source/NETworkManager.Converters/NETworkManager.Converters.csproj +++ b/Source/NETworkManager.Converters/NETworkManager.Converters.csproj @@ -1,11 +1,11 @@ - + {BD4DDC21-7B64-41B2-BAC7-8173E0FE84BE} Library Properties NETworkManager.Converters NETworkManager.Converters - net8.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 win-x64 x64 false @@ -30,4 +30,5 @@ - \ No newline at end of file + + diff --git a/Source/NETworkManager.Documentation/NETworkManager.Documentation.csproj b/Source/NETworkManager.Documentation/NETworkManager.Documentation.csproj index f09f4d2c47..5b2aac3088 100644 --- a/Source/NETworkManager.Documentation/NETworkManager.Documentation.csproj +++ b/Source/NETworkManager.Documentation/NETworkManager.Documentation.csproj @@ -1,11 +1,11 @@ - + {95CE4AD5-14C0-4486-9C11-5D6A5EC48176} Library Properties NETworkManager.Documentation NETworkManager.Documentation - net8.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 win-x64 x64 false @@ -113,4 +113,5 @@ - \ No newline at end of file + + diff --git a/Source/NETworkManager.Localization/NETworkManager.Localization.csproj b/Source/NETworkManager.Localization/NETworkManager.Localization.csproj index 323b4d5b90..c88748e61e 100644 --- a/Source/NETworkManager.Localization/NETworkManager.Localization.csproj +++ b/Source/NETworkManager.Localization/NETworkManager.Localization.csproj @@ -1,10 +1,10 @@ - + {FF225C2E-AA67-4B10-939A-6C046CEF8697} Library NETworkManager.Localization NETworkManager.Localization - net8.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 win-x64 x64 false @@ -86,4 +86,5 @@ Strings.Designer.cs - \ No newline at end of file + + diff --git a/Source/NETworkManager.Models/NETworkManager.Models.csproj b/Source/NETworkManager.Models/NETworkManager.Models.csproj index eeb052a75a..5996d14349 100644 --- a/Source/NETworkManager.Models/NETworkManager.Models.csproj +++ b/Source/NETworkManager.Models/NETworkManager.Models.csproj @@ -1,10 +1,10 @@ - + {8A2859DC-38B6-4E9D-A6B2-1828DC6641B3} Library NETworkManager.Models NETworkManager.Models - net8.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 win-x64 x64 false @@ -61,4 +61,5 @@ PreserveNewest - \ No newline at end of file + + diff --git a/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj b/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj index ba799e99a2..81cd58a873 100644 --- a/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj +++ b/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj @@ -1,10 +1,10 @@ - + {D3B37F13-E8E6-4218-9E8E-96D52432A9CF} Library NETworkManager.Profiles NETworkManager.Profiles - net8.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 win-x64 x64 false @@ -27,4 +27,5 @@ - \ No newline at end of file + + diff --git a/Source/NETworkManager.Settings/NETworkManager.Settings.csproj b/Source/NETworkManager.Settings/NETworkManager.Settings.csproj index 3f3fa129b1..bf4c4c3015 100644 --- a/Source/NETworkManager.Settings/NETworkManager.Settings.csproj +++ b/Source/NETworkManager.Settings/NETworkManager.Settings.csproj @@ -1,10 +1,10 @@ - + {954E8703-3E6E-42BF-BD28-F0B19BE10E0C} Library NETworkManager.Settings NETworkManager.Settings - net8.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 win-x64 x64 false @@ -59,4 +59,5 @@ - \ No newline at end of file + + diff --git a/Source/NETworkManager.Update/NETworkManager.Update.csproj b/Source/NETworkManager.Update/NETworkManager.Update.csproj index 6e138b1ee3..397549eb31 100644 --- a/Source/NETworkManager.Update/NETworkManager.Update.csproj +++ b/Source/NETworkManager.Update/NETworkManager.Update.csproj @@ -1,11 +1,11 @@ - + {008467AF-D83F-4B1E-8733-B65136F595F2} Library Properties NETworkManager.Update NETworkManager.Update - net8.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 win-x64 x64 false @@ -20,4 +20,5 @@ - \ No newline at end of file + + diff --git a/Source/NETworkManager.Utilities.WPF/NETworkManager.Utilities.WPF.csproj b/Source/NETworkManager.Utilities.WPF/NETworkManager.Utilities.WPF.csproj index d594795187..9a39c13938 100644 --- a/Source/NETworkManager.Utilities.WPF/NETworkManager.Utilities.WPF.csproj +++ b/Source/NETworkManager.Utilities.WPF/NETworkManager.Utilities.WPF.csproj @@ -1,10 +1,10 @@ - + {93733008-7269-460D-8390-AB281C75DB91} Library NETworkManager.Utilities.WPF NETworkManager.Utilities.WPF - net8.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 win-x64 x64 false @@ -18,4 +18,5 @@ - \ No newline at end of file + + diff --git a/Source/NETworkManager.Utilities/NETworkManager.Utilities.csproj b/Source/NETworkManager.Utilities/NETworkManager.Utilities.csproj index 5be81dc456..1885720150 100644 --- a/Source/NETworkManager.Utilities/NETworkManager.Utilities.csproj +++ b/Source/NETworkManager.Utilities/NETworkManager.Utilities.csproj @@ -1,10 +1,10 @@ - + {5C3D1749-D260-4566-B448-B94B3AD9EEFF} Library NETworkManager.Utilities NETworkManager.Utilities - net8.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 win-x64 x64 false @@ -20,4 +20,5 @@ - \ No newline at end of file + + diff --git a/Source/NETworkManager.Validators/NETworkManager.Validators.csproj b/Source/NETworkManager.Validators/NETworkManager.Validators.csproj index 800e18430a..d80f31acbb 100644 --- a/Source/NETworkManager.Validators/NETworkManager.Validators.csproj +++ b/Source/NETworkManager.Validators/NETworkManager.Validators.csproj @@ -1,10 +1,10 @@ - + {29172E71-52AF-4E64-9683-30C5F4D0C746} Library NETworkManager.Validators NETworkManager.Validators - net8.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 win-x64 x64 false @@ -22,4 +22,5 @@ - \ No newline at end of file + + diff --git a/Source/NETworkManager/NETworkManager.csproj b/Source/NETworkManager/NETworkManager.csproj index 6bfdefad2d..8d0cfb546b 100644 --- a/Source/NETworkManager/NETworkManager.csproj +++ b/Source/NETworkManager/NETworkManager.csproj @@ -1,8 +1,8 @@ - + WinExe - net8.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 win-x64 x64 false @@ -150,4 +150,5 @@ - \ No newline at end of file + + diff --git a/Source/global.json b/Source/global.json index c0b2baf93a..fe7e453b1c 100644 --- a/Source/global.json +++ b/Source/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.415", + "version": "10.0.100", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md index d06032b5cf..2057076589 100644 --- a/Website/docs/changelog/next-release.md +++ b/Website/docs/changelog/next-release.md @@ -13,10 +13,13 @@ Release date: **xx.xx.2025** **System requirements** - Windows 10 / Server x64 (22H2 or later) -- [.NET Desktop Runtime 8.0 (LTS) - x64](https://dotnet.microsoft.com/en-us/download/dotnet/8.0/runtime) +- [.NET Desktop Runtime 10.0 (LTS) - x64](https://dotnet.microsoft.com/en-us/download/dotnet/10.0/runtime) ## Breaking Changes +- Migrated from .NET 8.0 (LTS) to .NET 10.0 (LTS). + Upgrade your [.NET Desktop Runtime to version 10.0 (LTS) - x64](https://dotnet.microsoft.com/en-us/download/dotnet/10.0/runtime) before you install this version. [#3229](https://github.com/BornToBeRoot/NETworkManager/pull/3229) + ## What's new? **Remote Desktop** diff --git a/appveyor.yml b/appveyor.yml index b9a40a3826..6721bb16a7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,6 +3,9 @@ configuration: Release platform: x64 install: - git submodule update --init + - ps: | + Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1" + & $env:temp\dotnet-install.ps1 -Architecture x64 -Version '10.0.100' -InstallDir "$env:ProgramFiles\dotnet" before_build: - dotnet restore %APPVEYOR_BUILD_FOLDER%\Source\NETworkManager.sln - ps: | @@ -47,7 +50,7 @@ after_build: } # Build path - $BuildPath = "$($env:APPVEYOR_BUILD_FOLDER)\Source\NETworkManager\bin\Release\net8.0-windows10.0.22621.0\win-x64" + $BuildPath = "$($env:APPVEYOR_BUILD_FOLDER)\Source\NETworkManager\bin\Release\net10.0-windows10.0.22621.0\win-x64" $SetupPath = "$($env:APPVEYOR_BUILD_FOLDER)\Source\NETworkManager.Setup\bin\x64\Release\en-US\NETworkManager.Setup.msi" $ArtifactsPath = "$($env:APPVEYOR_BUILD_FOLDER)\Artifacts"