[Build] Switch to .NET 5.0 (fixes stride3d#912)

xen2 · Nov 25, 2020 · fe5501e · fe5501e
1 parent 754e0a7
commit fe5501e
Show file tree

Hide file tree

Showing 40 changed files with 71 additions and 64 deletions.
diff --git a/build/Stride.Launcher.Build.props b/build/Stride.Launcher.Build.props
@@ -6,6 +6,6 @@
     <!-- Defines the platform used by Stride - Values are Windows/Android/iOS...etc. -->
     <StridePlatform Condition=" '$(StridePlatform)' == '' ">Windows</StridePlatform>
 
-    <StrideEditorTargetFrameworks>netcoreapp3.1</StrideEditorTargetFrameworks>
+    <StrideEditorTargetFrameworks>net5.0-windows</StrideEditorTargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/sources/assets/Stride.Core.Assets.CompilerApp/build/Stride.Core.Assets.CompilerApp.targets b/sources/assets/Stride.Core.Assets.CompilerApp/build/Stride.Core.Assets.CompilerApp.targets
@@ -113,11 +113,12 @@
       <StrideCompileAssetCommandPath Condition="Exists('$(MSBuildThisFileDirectory)..\Stride.Core.Assets.CompilerApp.csproj')">$(MSBuildThisFileDirectory)..\bin\$(Configuration)</StrideCompileAssetCommandPath>
 
       <!-- Try to guess correct which version of asset compiler to use depending on user TargetFramework -->
-      <StrideCompileAssetTargetFramework Condition="'$(StrideCompileAssetTargetFramework)' == '' And Exists('$(StrideCompileAssetCommandPath)\netcoreapp3.1\Stride.Core.Assets.CompilerApp.exe') And $(TargetFramework.StartsWith('netcoreapp'))">netcoreapp3.1</StrideCompileAssetTargetFramework>
+      <StrideCompileAssetTargetFramework Condition="'$(StrideCompileAssetTargetFramework)' == '' And Exists('$(StrideCompileAssetCommandPath)\net5.0-windows7.0\Stride.Core.Assets.CompilerApp.exe') And $(TargetFramework.StartsWith('net5'))">net5.0-windows7.0</StrideCompileAssetTargetFramework>
+      <StrideCompileAssetTargetFramework Condition="'$(StrideCompileAssetTargetFramework)' == '' And Exists('$(StrideCompileAssetCommandPath)\net5.0-windows7.0\Stride.Core.Assets.CompilerApp.exe') And $(TargetFramework.StartsWith('netcoreapp'))">net5.0-windows7.0</StrideCompileAssetTargetFramework>
       <StrideCompileAssetTargetFramework Condition="'$(StrideCompileAssetTargetFramework)' == '' And Exists('$(StrideCompileAssetCommandPath)\net472\Stride.Core.Assets.CompilerApp.exe') And $(TargetFramework.StartsWith('net4'))">net472</StrideCompileAssetTargetFramework>
 
       <!-- Otherwise, fallback to whichever framework is available -->
-      <StrideCompileAssetTargetFramework Condition="'$(StrideCompileAssetTargetFramework)' == '' And Exists('$(StrideCompileAssetCommandPath)\netcoreapp3.1\Stride.Core.Assets.CompilerApp.exe')">netcoreapp3.1</StrideCompileAssetTargetFramework>
+      <StrideCompileAssetTargetFramework Condition="'$(StrideCompileAssetTargetFramework)' == '' And Exists('$(StrideCompileAssetCommandPath)\net5.0-windows7.0\Stride.Core.Assets.CompilerApp.exe')">net5.0-windows7.0</StrideCompileAssetTargetFramework>
       <StrideCompileAssetTargetFramework Condition="'$(StrideCompileAssetTargetFramework)' == '' And Exists('$(StrideCompileAssetCommandPath)\net472\Stride.Core.Assets.CompilerApp.exe')">net472</StrideCompileAssetTargetFramework>
 
       <StrideCompileAssetCommand Condition="'$(StrideCompileAssetCommand)' == ''">$(StrideCompileAssetCommandPath)\$(StrideCompileAssetTargetFramework)\Stride.Core.Assets.CompilerApp.exe</StrideCompileAssetCommand>

diff --git a/sources/assets/Stride.Core.Assets.CompilerApp/global.json b/sources/assets/Stride.Core.Assets.CompilerApp/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "3.1.100",
+    "version": "5.0.100",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }

diff --git a/sources/assets/Stride.Core.Assets/PackageSessionPublicHelper.cs b/sources/assets/Stride.Core.Assets/PackageSessionPublicHelper.cs
@@ -33,7 +33,7 @@ public static void FindAndSetMSBuildVersion()
             if (MSBuildInstance == null && Interlocked.Increment(ref MSBuildLocatorCount) == 1)
             {
                 // Detect either .NET Core SDK or Visual Studio depending on current runtime
-                var isNETCore = RuntimeInformation.FrameworkDescription.StartsWith(".NET Core");
+                var isNETCore = !RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework");
                 MSBuildInstance = MSBuildLocator.QueryVisualStudioInstances().FirstOrDefault(x => isNETCore
                     ? x.DiscoveryType == DiscoveryType.DotNetSdk && x.Version.Major >= 3
                     : (x.DiscoveryType == DiscoveryType.VisualStudioSetup || x.DiscoveryType == DiscoveryType.DeveloperConsole) && x.Version.Major >= 16);

diff --git a/sources/assets/Stride.Core.Packages/NugetStore.cs b/sources/assets/Stride.Core.Packages/NugetStore.cs
@@ -85,23 +85,6 @@ public NugetStore(string oldRootDirectory)
             sourceRepositoryProvider = new NugetSourceRepositoryProvider(packageSourceProvider, this);
         }
 
-        /// <summary>
-        /// Increase nuget HTTP timeout from 100 sec to something much higher (workaround for https://github.com/NuGet/Home/issues/8120).
-        /// </summary>
-        /// <remarks>
-        /// This needs to be called before any NuGet function is called, otherwise it will lead to a FieldAccessException (HttpSourceRequest already initialized).
-        /// </remarks>
-        public static void RemoveHttpTimeout()
-        {
-            // Workaround for https://github.com/NuGet/Home/issues/8120
-            //  set timeout to something much higher than 100 sec
-            var defaultRequestTimeoutField = typeof(HttpSourceRequest).GetField(nameof(HttpSourceRequest.DefaultRequestTimeout), BindingFlags.Static | BindingFlags.Public);
-            if (defaultRequestTimeoutField != null)
-            {
-                defaultRequestTimeoutField.SetValue(null, TimeSpan.FromMinutes(60));
-            }
-        }
-
         private static void RemoveSources(ISettings settings, string prefixName)
         {
             var packageSources = settings.GetSection("packageSources");

diff --git a/sources/assets/Stride.Core.Packages/Stride.Core.Packages.csproj b/sources/assets/Stride.Core.Packages/Stride.Core.Packages.csproj
@@ -8,8 +8,8 @@
     <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NuGet.Protocol" Version="5.5.1" />
-    <PackageReference Include="Stride.NuGet.PackageManagement" Version="5.5.1" />
+    <PackageReference Include="NuGet.Protocol" Version="5.8.0" />
+    <PackageReference Include="Stride.NuGet.PackageManagement" Version="5.8.0" />
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/sources/core/Stride.Core.Design/Stride.Core.Design.csproj b/sources/core/Stride.Core.Design/Stride.Core.Design.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="2.3.2262-g94fae01e" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
-    <PackageReference Include="NuGet.Configuration" Version="5.5.1" />
+    <PackageReference Include="NuGet.Configuration" Version="5.8.0" />
     <PackageReference Include="SharpDX" Version="4.2.0" />
     <PackageReference Include="System.Management" Version="4.7.0" />
   </ItemGroup>

diff --git a/sources/core/Stride.Core.Design/TypeConverters/Half2Converter.cs b/sources/core/Stride.Core.Design/TypeConverters/Half2Converter.cs
@@ -52,6 +52,7 @@
 using System.Reflection;
 using Stride.Core.Annotations;
 using Stride.Core.Mathematics;
+using Half = Stride.Core.Mathematics.Half;
 
 namespace Stride.Core.TypeConverters
 {

diff --git a/sources/core/Stride.Core.Design/TypeConverters/Half3Converter.cs b/sources/core/Stride.Core.Design/TypeConverters/Half3Converter.cs
@@ -52,6 +52,7 @@
 using System.Reflection;
 using Stride.Core.Annotations;
 using Stride.Core.Mathematics;
+using Half = Stride.Core.Mathematics.Half;
 
 namespace Stride.Core.TypeConverters
 {

diff --git a/sources/core/Stride.Core.Design/TypeConverters/Half4Converter.cs b/sources/core/Stride.Core.Design/TypeConverters/Half4Converter.cs
@@ -52,6 +52,7 @@
 using System.Reflection;
 using Stride.Core.Annotations;
 using Stride.Core.Mathematics;
+using Half = Stride.Core.Mathematics.Half;
 
 namespace Stride.Core.TypeConverters
 {

diff --git a/sources/core/Stride.Core.Design/TypeConverters/HalfConverter.cs b/sources/core/Stride.Core.Design/TypeConverters/HalfConverter.cs
@@ -50,6 +50,7 @@
 using System.Globalization;
 
 using Stride.Core.Mathematics;
+using Half = Stride.Core.Mathematics.Half;
 
 namespace Stride.Core.TypeConverters
 {

diff --git a/sources/core/Stride.Core/Stride.Core.csproj b/sources/core/Stride.Core/Stride.Core.csproj
@@ -1,6 +1,7 @@
 <Project>
   <PropertyGroup>
     <StrideRuntime>true</StrideRuntime>
+    <StrideRuntimeNet5>true</StrideRuntimeNet5>
   </PropertyGroup>
   <Import Project="..\..\targets\Stride.Core.props" />
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.1.6" />

diff --git a/sources/editor/Stride.Assets.Presentation/Module.cs b/sources/editor/Stride.Assets.Presentation/Module.cs
@@ -16,7 +16,7 @@ namespace Stride.Assets.Presentation
 {
     internal class Module
     {
-        [ModuleInitializer]
+        [Core.ModuleInitializer]
         public static void Initialize()
         {
             RuntimeHelpers.RunModuleConstructor(typeof(SpriteFontAsset).Module.ModuleHandle);

diff --git a/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj b/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj
@@ -16,6 +16,7 @@
     <EnableDefaultPageItems>false</EnableDefaultPageItems>
     <StrideRoslynPadTargetFramework Condition="$(TargetFramework.StartsWith('net4'))">net462</StrideRoslynPadTargetFramework>
     <StrideRoslynPadTargetFramework Condition="$(TargetFramework.StartsWith('netcoreapp'))">netcoreapp3.1</StrideRoslynPadTargetFramework>
+    <StrideRoslynPadTargetFramework Condition="$(TargetFramework.StartsWith('net5'))">netcoreapp3.1</StrideRoslynPadTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />

diff --git a/...Stride.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/$ProjectName$.csproj.t4 b/...Stride.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/$ProjectName$.csproj.t4
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
     <OutputType>WinExe</OutputType>

diff --git a/...Stride.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/$ProjectName$.csproj.t4 b/...Stride.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/$ProjectName$.csproj.t4
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
     <OutputType>WinExe</OutputType>

diff --git a/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj b/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj
@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <Import Project="..\Stride.PrivacyPolicy\Stride.PrivacyPolicy.projitems" Label="Shared" Condition="Exists('..\Stride.PrivacyPolicy\Stride.PrivacyPolicy.projitems')" />
   <Import Project="..\..\shared\Stride.Core.ShellHelper\Stride.Core.ShellHelper.projitems" Label="Shared" />
   <Import Project="..\..\tools\Stride.Core.VisualStudio\Stride.Core.VisualStudio.projitems" Label="Shared" />
@@ -40,6 +40,7 @@
     <PackageReference Include="Mono.Cecil" Version="0.11.2" />
     <Reference Include="Stride.Core.AssemblyProcessor" >
       <HintPath Condition="$(TargetFramework.StartsWith('net4'))">..\..\..\deps\AssemblyProcessor\net472\Stride.Core.AssemblyProcessor.exe</HintPath>
+      <HintPath Condition="$(TargetFramework.StartsWith('net5'))">..\..\..\deps\AssemblyProcessor\netstandard2.0\Stride.Core.AssemblyProcessor.dll</HintPath>
       <HintPath Condition="$(TargetFramework.StartsWith('netcoreapp'))">..\..\..\deps\AssemblyProcessor\netstandard2.0\Stride.Core.AssemblyProcessor.dll</HintPath>
     </Reference>
   </ItemGroup>

diff --git a/sources/editor/Stride.GameStudio/global.json b/sources/editor/Stride.GameStudio/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "3.1.100",
+    "version": "5.0.100",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }

diff --git a/sources/engine/Stride.Assets/StrideConfig.cs b/sources/engine/Stride.Assets/StrideConfig.cs
@@ -135,7 +135,7 @@ internal static void RegisterSolutionPlatforms()
             {
                 Name = PlatformType.Linux.ToString(),
                 IsAvailable = true,
-                TargetFramework = "netcoreapp2.1",
+                TargetFramework = "net5.0",
                 RuntimeIdentifier = "linux-x64",
                 Type = PlatformType.Linux,
             };
@@ -148,7 +148,7 @@ internal static void RegisterSolutionPlatforms()
             {
                 Name = PlatformType.macOS.ToString(),
                 IsAvailable = true,
-                TargetFramework = "netcoreapp2.1",
+                TargetFramework = "net5.0",
                 RuntimeIdentifier = "osx-x64",
                 Type = PlatformType.macOS,
             };

diff --git a/sources/engine/Stride.Games/Stride.Games.csproj b/sources/engine/Stride.Games/Stride.Games.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <StrideRuntime>true</StrideRuntime>
     <StrideRuntimeWindowsDotNet>true</StrideRuntimeWindowsDotNet>
-    <StrideRuntimeWindowsNetCoreApp3>true</StrideRuntimeWindowsNetCoreApp3>
+    <StrideRuntimeWindowsNet5>true</StrideRuntimeWindowsNet5>
     <StrideGraphicsApiDependent>true</StrideGraphicsApiDependent>
     <UseWindowsForms Condition="$(StrideUI.Contains('WINFORMS')) OR $(StrideUI.Contains('WPF'))">true</UseWindowsForms>
   </PropertyGroup>

diff --git a/sources/engine/Stride.Input/IGamePadDevice.cs b/sources/engine/Stride.Input/IGamePadDevice.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
-using Stride.Core.Collections;
+using System.Collections.Generic;
 
 namespace Stride.Input
 {
@@ -65,4 +65,4 @@ public interface IGamePadDevice : IInputDevice
         /// <remarks>Currently vibration is only supported on windows for XInput devices and UWP supported gamepads</remarks>
         void SetVibration(float smallLeft, float smallRight, float largeLeft, float largeRight);
     }
-}
+}
diff --git a/sources/engine/Stride.Input/IMouseDevice.cs b/sources/engine/Stride.Input/IMouseDevice.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Stride contributors (https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
-using Stride.Core.Collections;
+using System.Collections.Generic;
 using Stride.Core.Mathematics;
 
 namespace Stride.Input
@@ -58,4 +58,4 @@ public interface IMouseDevice : IPointerDevice
         /// <param name="normalizedPosition"></param>
         void SetPosition(Vector2 normalizedPosition);
     }
-}
+}
diff --git a/sources/engine/Stride.Input/Stride.Input.csproj b/sources/engine/Stride.Input/Stride.Input.csproj
@@ -1,8 +1,8 @@
-<Project>
+<Project>
   <PropertyGroup>
     <StrideRuntime>true</StrideRuntime>
     <StrideRuntimeWindowsDotNet>true</StrideRuntimeWindowsDotNet>
-    <StrideRuntimeWindowsNetCoreApp3>true</StrideRuntimeWindowsNetCoreApp3>
+    <StrideRuntimeWindowsNet5>true</StrideRuntimeWindowsNet5>
     <StrideGraphicsApiDependent>true</StrideGraphicsApiDependent>
   </PropertyGroup>
   <Import Project="..\..\targets\Stride.props" />

diff --git a/sources/engine/Stride.Input/VirtualButton/VirtualButton.Pointer.cs b/sources/engine/Stride.Input/VirtualButton/VirtualButton.Pointer.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Stride contributors (https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
-using Stride.Core.Collections;
+using System.Collections.Generic;
 
 namespace Stride.Input
 {

diff --git a/sources/launcher/Stride.Launcher/Launcher.cs b/sources/launcher/Stride.Launcher/Launcher.cs
@@ -65,8 +65,6 @@ internal static string GetExecutablePath()
         [NotNull]
         internal static NugetStore InitializeNugetStore()
         {
-            NugetStore.RemoveHttpTimeout();
-
             var thisExeDirectory = new UFile(Assembly.GetEntryAssembly().Location).GetFullDirectory().ToWindowsPath();
             var store = new NugetStore(thisExeDirectory);
             return store;

diff --git a/sources/launcher/Stride.Launcher/Properties/PublishProfiles/FolderProfile.pubxml b/sources/launcher/Stride.Launcher/Properties/PublishProfiles/FolderProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>bin\Release\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <PublishSingleFile>True</PublishSingleFile>

diff --git a/sources/launcher/Stride.Launcher/Services/LauncherSettings.cs b/sources/launcher/Stride.Launcher/Services/LauncherSettings.cs
@@ -15,7 +15,7 @@ public static class LauncherSettings
 
         private static readonly SettingsKey<bool> CloseLauncherAutomaticallyKey = new SettingsKey<bool>("Internal/Launcher/CloseLauncherAutomatically", SettingsContainer, false);
         private static readonly SettingsKey<string> ActiveVersionKey = new SettingsKey<string>("Internal/Launcher/ActiveVersion", SettingsContainer, "");
-        private static readonly SettingsKey<string> PreferredFrameworkKey = new SettingsKey<string>("Internal/Launcher/PreferredFramework", SettingsContainer, "netcoreapp3.1");
+        private static readonly SettingsKey<string> PreferredFrameworkKey = new SettingsKey<string>("Internal/Launcher/PreferredFramework", SettingsContainer, "net5.0");
         private static readonly SettingsKey<int> CurrentTabKey = new SettingsKey<int>("Internal/Launcher/CurrentTabSessions", SettingsContainer, 0);
         private static readonly SettingsKey<List<UDirectory>> DeveloperVersionsKey = new SettingsKey<List<UDirectory>>("Internal/Launcher/DeveloperVersions", SettingsContainer, () => new List<UDirectory>());
 

diff --git a/sources/launcher/Stride.Launcher/Stride.Launcher.csproj b/sources/launcher/Stride.Launcher/Stride.Launcher.csproj
@@ -7,7 +7,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>

diff --git a/sources/launcher/Stride.Launcher/Stride.Launcher.nuspec b/sources/launcher/Stride.Launcher/Stride.Launcher.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Stride.Launcher</id>
-    <version>5.0.3</version>
+    <version>5.0.4</version>
     <authors>Stride</authors>
     <owners>Stride</owners>
     <licenseUrl>https://stride3d.net/license.txt</licenseUrl>

diff --git a/sources/shared/Stride.NuGetResolver/NuGetAssemblyResolver.cs b/sources/shared/Stride.NuGetResolver/NuGetAssemblyResolver.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Versioning;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
@@ -128,6 +129,20 @@ internal static void SetupNuGet(string packageName, string packageVersion)
                                 .FrameworkName ?? ".NETFramework,Version=v4.7.2";
                             var nugetFramework = NuGetFramework.ParseFrameworkName(framework, DefaultFrameworkNameProvider.Instance);
 
+#if NETCOREAPP
+                            // Add TargetPlatform to net5.0 TFM (i.e. net5.0 to net5.0-windows7.0)
+                            var platform = Assembly.GetEntryAssembly()?.GetCustomAttribute<TargetPlatformAttribute>()?.PlatformName ?? string.Empty;
+                            if (framework.StartsWith(FrameworkConstants.FrameworkIdentifiers.NetCoreApp) && platform != string.Empty)
+                            {
+                                var platformParseResult = Regex.Match(platform, @"([a-zA-Z]+)(\d+.*)");
+                                if (platformParseResult.Success && Version.TryParse(platformParseResult.Groups[2].Value, out var platformVersion))
+                                {
+                                    var platformName = platformParseResult.Groups[1].Value;
+                                    nugetFramework = new NuGetFramework(nugetFramework.Framework, nugetFramework.Version, platformName, platformVersion);
+                                }
+                            }
+#endif
+
                             // Only allow this specific version
                             var versionRange = new VersionRange(new NuGetVersion(packageVersion), true, new NuGetVersion(packageVersion), true);
                             var (request, result) = RestoreHelper.Restore(logger, nugetFramework, "win", packageName, versionRange);

diff --git a/sources/shared/Stride.NuGetResolver/SplashScreenWindow.xaml.cs b/sources/shared/Stride.NuGetResolver/SplashScreenWindow.xaml.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;

diff --git a/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.projitems b/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.projitems
@@ -38,7 +38,7 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.loaderdata</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <DefineConstants Condition="'$(StrideNuGetResolverUX)' == 'true'">STRIDE_NUGET_RESOLVER_UX;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp')) Or $(TargetFramework.StartsWith('net5'))">
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.loaderdata</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);_StridePackageNuGetLoader</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>

diff --git a/sources/targets/Stride.Core.Cpp.props b/sources/targets/Stride.Core.Cpp.props
@@ -9,12 +9,12 @@
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <CLRSupport>true</CLRSupport>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('net5'))">
+    <TargetFramework>net5.0</TargetFramework>
     <TargetFrameworkVersion></TargetFrameworkVersion>
     <CLRSupport>NetCore</CLRSupport>
   </PropertyGroup>
-  <!-- Bug: Restore with StrideEditorTargetFrameworks=netcoreapp3.1 fails because Platform is set to Mixed Platforms -->
+  <!-- Bug: Restore with StrideEditorTargetFrameworks=net5.0 fails because Platform is set to Mixed Platforms -->
   <PropertyGroup Condition="'$(Platform)' == 'Mixed Platforms'">
     <OutputType>Library</OutputType>
   </PropertyGroup>