From 4ead573f9dd297b80cae0e5815df259ebe00c2f5 Mon Sep 17 00:00:00 2001 From: Eideren Date: Sat, 13 Sep 2025 13:27:22 +0200 Subject: [PATCH 01/14] chore: Update to dotnet 10 --- README.md | 14 +- build/Stride.Launcher.Build.props | 2 +- build/Stride.sln.DotSettings | 4 + .../0.9.0-beta.23127.3/project.assets.json | 2 +- .../net10.0/Mono.Cecil.Mdb.dll | 3 + .../net10.0/Mono.Cecil.Pdb.dll | 3 + .../net10.0/Mono.Cecil.Rocks.dll | 3 + deps/AssemblyProcessor/net10.0/Mono.Cecil.dll | 3 + .../net10.0/Mono.Options.dll | 3 + .../Stride.Core.AssemblyProcessor.deps.json | 69 +++ .../net10.0/Stride.Core.AssemblyProcessor.dll | 3 + .../Stride.Core.AssemblyProcessor.dll.config | 83 ++++ .../Stride.Core.AssemblyProcessor.dll.hash | 1 + .../net10.0/Stride.Core.AssemblyProcessor.pdb | 3 + .../Stride.Core.AssemblyProcessor.deps.json | 422 +----------------- .../Stride.Core.AssemblyProcessor.dll | 2 +- .../Stride.Core.AssemblyProcessor.dll.hash | 2 +- .../Stride.Core.AssemblyProcessor.pdb | 2 +- .../SimpleAudio.Game/SimpleAudio.Game.csproj | 2 +- .../SimpleAudio.Windows.csproj | 2 +- .../JumpyJet.Game/JumpyJet.Game.csproj | 2 +- .../JumpyJet.Windows/JumpyJet.Windows.csproj | 2 +- .../SpaceEscape.Game/SpaceEscape.Game.csproj | 2 +- .../SpaceEscape.Windows.csproj | 2 +- .../AnimatedModel.Game.csproj | 2 +- .../AnimatedModel.Windows.csproj | 2 +- .../CustomEffect.Game.csproj | 2 +- .../CustomEffect.Windows.csproj | 2 +- .../MaterialShader.Game.csproj | 2 +- .../MaterialShader.Windows.csproj | 2 +- .../SpriteFonts.Game/SpriteFonts.Game.csproj | 2 +- .../SpriteFonts.Windows.csproj | 2 +- .../SpriteStudioDemo.Game.csproj | 2 +- .../SpriteStudioDemo.Windows.csproj | 2 +- .../GravitySensor.Game.csproj | 2 +- .../GravitySensor.Windows.csproj | 2 +- .../TouchInputs.Game/TouchInputs.Game.csproj | 2 +- .../TouchInputs.Windows.csproj | 2 +- .../ParticlesSample.Game.csproj | 2 +- .../ParticlesSample.Windows.csproj | 2 +- .../BepuSample.Game/BepuSample.Game.csproj | 2 +- .../BepuSample.Windows.csproj | 2 +- .../PublishProfiles/FolderProfile.pubxml | 2 +- .../PhysicsSample.Game.csproj | 2 +- .../PhysicsSample.Windows.csproj | 2 +- .../FirstPersonShooter.Game.csproj | 2 +- .../FirstPersonShooter.Windows.csproj | 2 +- .../MaterialPackage/MaterialPackage.csproj | 2 +- .../PrototypingBlocks.csproj | 2 +- .../SamplesAssetPackage.csproj | 2 +- .../Packs/VFXPackage/VFXPackage.csproj | 2 +- .../mannequinModel/mannequinModel.csproj | 2 +- .../ThirdPersonPlatformer.Game.csproj | 2 +- .../ThirdPersonPlatformer.Windows.csproj | 2 +- .../TopDownRPG.Game/TopDownRPG.Game.csproj | 2 +- .../TopDownRPG.Windows.csproj | 2 +- .../VRSandbox.Game/VRSandbox.Game.csproj | 2 +- .../VRSandbox.Windows.csproj | 2 +- .../CSharpBeginner.Game.csproj | 2 +- .../CSharpBeginner.Windows.csproj | 2 +- .../CSharpIntermediate.Game.csproj | 2 +- .../CSharpIntermediate.Windows.csproj | 2 +- .../GameMenu.Game/GameMenu.Game.csproj | 2 +- .../GameMenu.Windows/GameMenu.Windows.csproj | 2 +- .../UIElementLink.Game.csproj | 2 +- .../UIElementLink.Windows.csproj | 2 +- .../UIParticles.Game/UIParticles.Game.csproj | 2 +- .../UIParticles.Windows.csproj | 2 +- .../Stride.Core.Assets.CompilerApp.targets | 6 +- .../Yaml/CollectionWithItemIds.cs | 2 +- .../Yaml/DictionaryWithItemIds.cs | 2 +- .../assets/Stride.Core.Packages/NugetStore.cs | 2 +- ...Stride.Core.AssemblyProcessor.Tests.csproj | 2 +- .../Stride.Core.AssemblyProcessor.csproj | 2 +- .../CrashReportForm.cs | 2 + .../Stride.Editor/Engine/EmbeddedGameForm.cs | 2 + .../Stride.GameStudio.csproj | 2 +- sources/engine/Stride.Assets/StrideConfig.cs | 10 +- .../Stride.Assets/StridePackageUpgrader.cs | 23 + .../Stride.Audio.Tests.Windows.csproj | 2 +- .../Stride.BepuPhysics.Tests.csproj | 2 +- .../Colliders/ConvexHullCollider.cs | 2 +- ...tride.Engine.NoAssets.Tests.Windows.csproj | 2 +- .../Stride.Engine.Tests.Windows.csproj | 2 +- .../engine/Stride.Games/Desktop/GameForm.cs | 2 + .../Stride.Graphics.Tests.10_0.Windows.csproj | 2 +- .../Stride.Graphics.Tests.11_0.Windows.csproj | 2 +- .../Stride.Graphics.Tests.Windows.csproj | 2 +- .../Stride.Input.Tests.Windows.csproj | 2 +- .../Stride.Navigation.Tests.Windows.csproj | 2 +- .../Stride.Particles.Tests.Windows.csproj | 2 +- .../Stride.Physics.Tests.Windows.csproj | 2 +- .../Stride.UI.Tests.Windows.csproj | 2 +- .../PublishProfiles/FolderProfile.pubxml | 2 +- .../Services/LauncherSettings.cs | 2 +- .../Stride.Launcher/Stride.Launcher.csproj | 2 +- sources/localization/extract_strings.bat | 2 +- .../Irony.GrammarExplorer.csproj | 2 +- sources/shared/SharedAssemblyInfo.cs | 2 +- .../Stride.NuGetResolver.UI.csproj | 2 +- .../Stride.NuGetResolver.csproj | 2 +- .../Stride.Core.TargetFrameworks.Editor.props | 4 +- sources/targets/Stride.Core.props | 20 +- .../xunit.runner.stride.csproj | 2 +- ...de.VisualStudio.Commands.Interfaces.csproj | 2 +- .../Commands/StrideCommandsProxy.cs | 4 +- .../Stride.VisualStudio.PackageInstall.csproj | 2 +- 107 files changed, 322 insertions(+), 535 deletions(-) create mode 100644 deps/AssemblyProcessor/net10.0/Mono.Cecil.Mdb.dll create mode 100644 deps/AssemblyProcessor/net10.0/Mono.Cecil.Pdb.dll create mode 100644 deps/AssemblyProcessor/net10.0/Mono.Cecil.Rocks.dll create mode 100644 deps/AssemblyProcessor/net10.0/Mono.Cecil.dll create mode 100644 deps/AssemblyProcessor/net10.0/Mono.Options.dll create mode 100644 deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.deps.json create mode 100644 deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.dll create mode 100644 deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.dll.config create mode 100644 deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.dll.hash create mode 100644 deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.pdb diff --git a/README.md b/README.md index 58fa56d3bc..c19da5c67f 100644 --- a/README.md +++ b/README.md @@ -45,9 +45,9 @@ Our [Roadmap](https://doc.stride3d.net/latest/en/contributors/roadmap.html) comm ### Prerequisites 1. **Latest [Git](https://git-scm.com/downloads)** with **Large File Support** selected during setup. For convenience, you might also use a Git UI client like [GitExtensions](https://gitextensions.github.io/). -2. **[.NET 8.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)** +2. **[.NET 10.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)** - Run `dotnet --info` in a console or PowerShell window to see which versions you have installed. -3. **[Visual Studio 2022](https://visualstudio.microsoft.com/downloads/)** (the Community edition is free), with the following workloads. Follow this link if you would rather use [a different IDE or the command line](#build-stride-without-visual-studio). +3. **[Visual Studio 2026](https://visualstudio.microsoft.com/insiders/)** (the Community edition is free), with the following workloads. Follow this link if you would rather use [a different IDE or the command line](#build-stride-without-visual-studio). - **.NET desktop development** with **.NET Framework 4.7.2 targeting pack** *(should be enabled by default)* - **Desktop development with C++** with: - **Windows 11 SDK (10.0.22621.0)** or a later version *(should be enabled by default)* @@ -70,7 +70,7 @@ Our [Roadmap](https://doc.stride3d.net/latest/en/contributors/roadmap.html) comm git lfs clone https://github.com/stride3d/stride.git ``` 2. **Open the solution:** - - Open `\build\Stride.sln` with Visual Studio 2022. + - Open `\build\Stride.sln` with Visual Studio 2026. - Build the `Stride.GameStudio` project in the `60-Editor` solution folder (it should be the default startup project) or run it directly from Visual Studio's toolbar. - _Optionally_, open and build `Stride.Android.sln`, `Stride.iOS.sln`, etc. @@ -79,9 +79,9 @@ Our [Roadmap](https://doc.stride3d.net/latest/en/contributors/roadmap.html) comm ### Build Stride without Visual Studio -1. **Install** [Visual Studio Build Tools](https://aka.ms/vs/17/release/vs_BuildTools.exe) with the same prerequisites listed above. +1. **Install** [Visual Studio Build Tools](https://visualstudio.microsoft.com/downloads/) (Go to Tools for Visual Studio and press download next to Build Tools for Visual Studio 2026 once it is out) with the same prerequisites listed above. 2. **Add MSBuild to your system's PATH:** - - Add MSBuild's directory to your `PATH` environment variable (e.g., `C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin`). + - Add MSBuild's directory to your `PATH` environment variable (e.g., `C:\Program Files (x86)\Microsoft Visual Studio\2026\BuildTools\MSBuild\Current\Bin`). 3. **Clone the repository:** ```bash git lfs clone https://github.com/stride3d/stride.git @@ -102,9 +102,9 @@ Our [Roadmap](https://doc.stride3d.net/latest/en/contributors/roadmap.html) comm ### If Building Fails * Some errors for test projects are normal, GameStudio will start anyway. -* The Visual Studio extension might fail to build if you are missing the [Visual Studio SDK](https://learn.microsoft.com/en-us/visualstudio/extensibility/installing-the-visual-studio-sdk?view=vs-2022), but Game Studio will start anyway. +* The Visual Studio extension might fail to build if you are missing the [Visual Studio SDK](https://learn.microsoft.com/en-us/visualstudio/extensibility/installing-the-visual-studio-sdk?view=vs-2026), but Game Studio will start anyway. * If you skipped any of the **Prerequisites** thinking you already have the latest version, please update to the latest to be sure. -* Visual Studio might have issues building properly if an older version is present alongside 2022. If you want to keep those versions, ensure they are up to date and that you are building Stride using Visual Studio 2022. +* Visual Studio might have issues building properly if an older version is present alongside 2026. If you want to keep those versions, ensure they are up to date and that you are building Stride using Visual Studio 2026. * Your system's `PATH` should not contain older versions of MSBuild (e.g., `...\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin` should be removed). * Some changes might require a system reboot. Try that if you haven't yet, for example, if you see these errors: * `Could not find a compatible version of MSBuild.` diff --git a/build/Stride.Launcher.Build.props b/build/Stride.Launcher.Build.props index 7075c0439d..8eb10f038c 100644 --- a/build/Stride.Launcher.Build.props +++ b/build/Stride.Launcher.Build.props @@ -6,6 +6,6 @@ Windows - net8.0-windows + net10.0-windows diff --git a/build/Stride.sln.DotSettings b/build/Stride.sln.DotSettings index 911dc71a64..14482c75fc 100644 --- a/build/Stride.sln.DotSettings +++ b/build/Stride.sln.DotSettings @@ -23,6 +23,9 @@ Distributed under the MIT license. See the LICENSE.md file in the project root f On$event$ <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy><Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"><ElementKinds><Kind Name="FIELD" /><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="aaBb" /></Policy> + <Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"><ElementKinds><Kind Name="FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="aaBb" /></Policy> + True True True True @@ -32,6 +35,7 @@ Distributed under the MIT license. See the LICENSE.md file in the project root f True True True + True False True DarkOrange diff --git a/build/sign/.store/sign/0.9.0-beta.23127.3/project.assets.json b/build/sign/.store/sign/0.9.0-beta.23127.3/project.assets.json index b5d818293d..23954c338c 100644 --- a/build/sign/.store/sign/0.9.0-beta.23127.3/project.assets.json +++ b/build/sign/.store/sign/0.9.0-beta.23127.3/project.assets.json @@ -1,7 +1,7 @@ { "version": 3, "targets": { - "net8.0/win-x64": { + "net10.0/win-x64": { "sign/0.9.0-beta.23127.3": { "type": "package", "tools": { diff --git a/deps/AssemblyProcessor/net10.0/Mono.Cecil.Mdb.dll b/deps/AssemblyProcessor/net10.0/Mono.Cecil.Mdb.dll new file mode 100644 index 0000000000..4bb71dcb38 --- /dev/null +++ b/deps/AssemblyProcessor/net10.0/Mono.Cecil.Mdb.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bda97fc302904bf235d631e698a0c81324872dfad2a38e63ef66389155bfcf4 +size 39424 diff --git a/deps/AssemblyProcessor/net10.0/Mono.Cecil.Pdb.dll b/deps/AssemblyProcessor/net10.0/Mono.Cecil.Pdb.dll new file mode 100644 index 0000000000..b7220d43c2 --- /dev/null +++ b/deps/AssemblyProcessor/net10.0/Mono.Cecil.Pdb.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:333397769114ffd13046a25b9cfffd41c44a3450ea9ea1fd13b76eec28e1a815 +size 89600 diff --git a/deps/AssemblyProcessor/net10.0/Mono.Cecil.Rocks.dll b/deps/AssemblyProcessor/net10.0/Mono.Cecil.Rocks.dll new file mode 100644 index 0000000000..f63d67b498 --- /dev/null +++ b/deps/AssemblyProcessor/net10.0/Mono.Cecil.Rocks.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6d3e6eab8d89dbd6fcf34268a08a6544ea142b6bcc5f665bee62317786b7892 +size 26624 diff --git a/deps/AssemblyProcessor/net10.0/Mono.Cecil.dll b/deps/AssemblyProcessor/net10.0/Mono.Cecil.dll new file mode 100644 index 0000000000..e5e722ce1c --- /dev/null +++ b/deps/AssemblyProcessor/net10.0/Mono.Cecil.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c2908709da6761e9b5b9d4d46102d65851145bac987787d6c5a05ffe5689487 +size 359424 diff --git a/deps/AssemblyProcessor/net10.0/Mono.Options.dll b/deps/AssemblyProcessor/net10.0/Mono.Options.dll new file mode 100644 index 0000000000..5dc1a6abea --- /dev/null +++ b/deps/AssemblyProcessor/net10.0/Mono.Options.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2aa774b03821fae07483615b84b9eb8421d24a0bd6138f51d4669e2481490167 +size 38912 diff --git a/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.deps.json b/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.deps.json new file mode 100644 index 0000000000..d096ccff40 --- /dev/null +++ b/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.deps.json @@ -0,0 +1,69 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v10.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v10.0": { + "Stride.Core.AssemblyProcessor/1.0.0": { + "dependencies": { + "Mono.Cecil": "0.11.5", + "Mono.Options": "6.12.0.148" + }, + "runtime": { + "Stride.Core.AssemblyProcessor.dll": {} + } + }, + "Mono.Cecil/0.11.5": { + "runtime": { + "lib/netstandard2.0/Mono.Cecil.Mdb.dll": { + "assemblyVersion": "0.11.5.0", + "fileVersion": "0.11.5.0" + }, + "lib/netstandard2.0/Mono.Cecil.Pdb.dll": { + "assemblyVersion": "0.11.5.0", + "fileVersion": "0.11.5.0" + }, + "lib/netstandard2.0/Mono.Cecil.Rocks.dll": { + "assemblyVersion": "0.11.5.0", + "fileVersion": "0.11.5.0" + }, + "lib/netstandard2.0/Mono.Cecil.dll": { + "assemblyVersion": "0.11.5.0", + "fileVersion": "0.11.5.0" + } + } + }, + "Mono.Options/6.12.0.148": { + "runtime": { + "lib/netstandard2.0/Mono.Options.dll": { + "assemblyVersion": "6.0.0.0", + "fileVersion": "6.12.0.0" + } + } + } + } + }, + "libraries": { + "Stride.Core.AssemblyProcessor/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Mono.Cecil/0.11.5": { + "type": "package", + "serviceable": true, + "sha512": "sha512-fxfX+0JGTZ8YQeu1MYjbBiK2CYTSzDyEeIixt+yqKKTn7FW8rv7JMY70qevup4ZJfD7Kk/VG/jDzQQTpfch87g==", + "path": "mono.cecil/0.11.5", + "hashPath": "mono.cecil.0.11.5.nupkg.sha512" + }, + "Mono.Options/6.12.0.148": { + "type": "package", + "serviceable": true, + "sha512": "sha512-kf6bdXnP4IzqIp4bJ1YKPI3/PAcOV6qm4mznChJ3c92zHQUXTWJSp0+h+Cfcii0O6m/EgW7KA+tbCiB2al0DDA==", + "path": "mono.options/6.12.0.148", + "hashPath": "mono.options.6.12.0.148.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.dll b/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.dll new file mode 100644 index 0000000000..21aac9e253 --- /dev/null +++ b/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c76d63dbc0c7c64e52f8ac2c5f8d15645956737befdcccac5ca09c5b86240ed3 +size 150528 diff --git a/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.dll.config b/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.dll.config new file mode 100644 index 0000000000..1129f9d456 --- /dev/null +++ b/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.dll.config @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.dll.hash b/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.dll.hash new file mode 100644 index 0000000000..9832b1c9f7 --- /dev/null +++ b/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.dll.hash @@ -0,0 +1 @@ +C76D63DBC0C7C64E52F8AC2C5F8D15645956737BEFDCCCAC5CA09C5B86240ED3 \ No newline at end of file diff --git a/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.pdb b/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.pdb new file mode 100644 index 0000000000..bea31f4e1d --- /dev/null +++ b/deps/AssemblyProcessor/net10.0/Stride.Core.AssemblyProcessor.pdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d24c0c9a848e934363ba72dd325057f3f0f89737b7e0403896abaca860e1981 +size 411136 diff --git a/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.deps.json b/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.deps.json index 27c9e85141..ede343a07c 100644 --- a/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.deps.json +++ b/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.deps.json @@ -9,52 +9,13 @@ ".NETStandard,Version=v2.0/": { "Stride.Core.AssemblyProcessor/1.0.0": { "dependencies": { - "Microsoft.Build.Utilities.Core": "17.0.0", "Mono.Cecil": "0.11.5", - "Mono.Options": "6.12.0.148", - "NETStandard.Library": "2.0.3", - "PolySharp": "1.15.0" + "Mono.Options": "6.12.0.148" }, "runtime": { "Stride.Core.AssemblyProcessor.dll": {} } }, - "Microsoft.Build.Framework/17.0.0": { - "dependencies": { - "System.Security.Permissions": "4.7.0" - } - }, - "Microsoft.Build.Utilities.Core/17.0.0": { - "dependencies": { - "Microsoft.Build.Framework": "17.0.0", - "Microsoft.NET.StringTools": "1.0.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.Collections.Immutable": "5.0.0", - "System.Configuration.ConfigurationManager": "4.7.0", - "System.Security.Permissions": "4.7.0", - "System.Text.Encoding.CodePages": "4.0.1" - } - }, - "Microsoft.NET.StringTools/1.0.0": { - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "5.0.0" - } - }, - "Microsoft.NETCore.Platforms/1.1.0": {}, - "Microsoft.NETCore.Targets/1.1.0": {}, - "Microsoft.Win32.Registry/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, "Mono.Cecil/0.11.5": { "runtime": { "lib/netstandard2.0/Mono.Cecil.Mdb.dll": { @@ -82,163 +43,6 @@ "fileVersion": "6.12.0.0" } } - }, - "NETStandard.Library/2.0.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, - "PolySharp/1.15.0": {}, - "System.Buffers/4.5.1": {}, - "System.Collections/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Collections.Immutable/5.0.0": { - "dependencies": { - "System.Memory": "4.5.4" - } - }, - "System.Configuration.ConfigurationManager/4.7.0": { - "dependencies": { - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Security.Permissions": "4.7.0" - } - }, - "System.Globalization/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.IO/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Memory/4.5.4": { - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "5.0.0" - } - }, - "System.Numerics.Vectors/4.4.0": {}, - "System.Reflection/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Resources.ResourceManager/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.CompilerServices.Unsafe/5.0.0": {}, - "System.Runtime.Extensions/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Security.AccessControl/4.7.0": { - "dependencies": { - "System.Security.Principal.Windows": "4.7.0" - } - }, - "System.Security.Cryptography.ProtectedData/4.7.0": { - "dependencies": { - "System.Memory": "4.5.4" - } - }, - "System.Security.Permissions/4.7.0": { - "dependencies": { - "System.Security.AccessControl": "4.7.0" - } - }, - "System.Security.Principal.Windows/4.7.0": {}, - "System.Text.Encoding/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encoding.CodePages/4.0.1": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.0.11" - } - }, - "System.Threading/4.0.11": { - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Threading.Tasks/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } } } }, @@ -248,48 +52,6 @@ "serviceable": false, "sha512": "" }, - "Microsoft.Build.Framework/17.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-XbFA0z+6Ws2pNeRXYcDF3lKlNgRoSGMm2Q5HKzZD+EbwYMKPKrl/BJnnkMuDJHU0KravYHfhzBnLLJpPeZ3E7A==", - "path": "microsoft.build.framework/17.0.0", - "hashPath": "microsoft.build.framework.17.0.0.nupkg.sha512" - }, - "Microsoft.Build.Utilities.Core/17.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-+eqDvecetKfsZR9WqLQ96F9xhxFb3m9VOjkyzuaA/2D1cub1aW9XyegZb8+gEpBa+o7dHnIN9FskC+tRXtqLSQ==", - "path": "microsoft.build.utilities.core/17.0.0", - "hashPath": "microsoft.build.utilities.core.17.0.0.nupkg.sha512" - }, - "Microsoft.NET.StringTools/1.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ZYVcoDM0LnSyT5nWoRGfShYdOecCw2sOXWwP6j1Z0u48Xq3+BVvZ+EiPCX9/8Gz439giW+O1H1kWF9Eb/w6rVg==", - "path": "microsoft.net.stringtools/1.0.0", - "hashPath": "microsoft.net.stringtools.1.0.0.nupkg.sha512" - }, - "Microsoft.NETCore.Platforms/1.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", - "path": "microsoft.netcore.platforms/1.1.0", - "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" - }, - "Microsoft.NETCore.Targets/1.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==", - "path": "microsoft.netcore.targets/1.1.0", - "hashPath": "microsoft.netcore.targets.1.1.0.nupkg.sha512" - }, - "Microsoft.Win32.Registry/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Lw1/VwLH1yxz6SfFEjVRCN0pnflLEsWgnV4qsdJ512/HhTwnKXUG+zDQ4yTO3K/EJQemGoNaBHX5InISNKTzUQ==", - "path": "microsoft.win32.registry/4.3.0", - "hashPath": "microsoft.win32.registry.4.3.0.nupkg.sha512" - }, "Mono.Cecil/0.11.5": { "type": "package", "serviceable": true, @@ -303,188 +65,6 @@ "sha512": "sha512-kf6bdXnP4IzqIp4bJ1YKPI3/PAcOV6qm4mznChJ3c92zHQUXTWJSp0+h+Cfcii0O6m/EgW7KA+tbCiB2al0DDA==", "path": "mono.options/6.12.0.148", "hashPath": "mono.options.6.12.0.148.nupkg.sha512" - }, - "NETStandard.Library/2.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "path": "netstandard.library/2.0.3", - "hashPath": "netstandard.library.2.0.3.nupkg.sha512" - }, - "PolySharp/1.15.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-FbU0El+EEjdpuIX4iDbeS7ki1uzpJPx8vbqOzEtqnl1GZeAGJfq+jCbxeJL2y0EPnUNk8dRnnqR2xnYXg9Tf+g==", - "path": "polysharp/1.15.0", - "hashPath": "polysharp.1.15.0.nupkg.sha512" - }, - "System.Buffers/4.5.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==", - "path": "system.buffers/4.5.1", - "hashPath": "system.buffers.4.5.1.nupkg.sha512" - }, - "System.Collections/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", - "path": "system.collections/4.3.0", - "hashPath": "system.collections.4.3.0.nupkg.sha512" - }, - "System.Collections.Immutable/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==", - "path": "system.collections.immutable/5.0.0", - "hashPath": "system.collections.immutable.5.0.0.nupkg.sha512" - }, - "System.Configuration.ConfigurationManager/4.7.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", - "path": "system.configuration.configurationmanager/4.7.0", - "hashPath": "system.configuration.configurationmanager.4.7.0.nupkg.sha512" - }, - "System.Globalization/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", - "path": "system.globalization/4.3.0", - "hashPath": "system.globalization.4.3.0.nupkg.sha512" - }, - "System.IO/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "path": "system.io/4.3.0", - "hashPath": "system.io.4.3.0.nupkg.sha512" - }, - "System.Memory/4.5.4": { - "type": "package", - "serviceable": true, - "sha512": "sha512-1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", - "path": "system.memory/4.5.4", - "hashPath": "system.memory.4.5.4.nupkg.sha512" - }, - "System.Numerics.Vectors/4.4.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==", - "path": "system.numerics.vectors/4.4.0", - "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512" - }, - "System.Reflection/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "path": "system.reflection/4.3.0", - "hashPath": "system.reflection.4.3.0.nupkg.sha512" - }, - "System.Reflection.Primitives/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "path": "system.reflection.primitives/4.3.0", - "hashPath": "system.reflection.primitives.4.3.0.nupkg.sha512" - }, - "System.Resources.ResourceManager/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", - "path": "system.resources.resourcemanager/4.3.0", - "hashPath": "system.resources.resourcemanager.4.3.0.nupkg.sha512" - }, - "System.Runtime/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "path": "system.runtime/4.3.0", - "hashPath": "system.runtime.4.3.0.nupkg.sha512" - }, - "System.Runtime.CompilerServices.Unsafe/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==", - "path": "system.runtime.compilerservices.unsafe/5.0.0", - "hashPath": "system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512" - }, - "System.Runtime.Extensions/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "path": "system.runtime.extensions/4.3.0", - "hashPath": "system.runtime.extensions.4.3.0.nupkg.sha512" - }, - "System.Runtime.Handles/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "path": "system.runtime.handles/4.3.0", - "hashPath": "system.runtime.handles.4.3.0.nupkg.sha512" - }, - "System.Runtime.InteropServices/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "path": "system.runtime.interopservices/4.3.0", - "hashPath": "system.runtime.interopservices.4.3.0.nupkg.sha512" - }, - "System.Security.AccessControl/4.7.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-JECvTt5aFF3WT3gHpfofL2MNNP6v84sxtXxpqhLBCcDRzqsPBmHhQ6shv4DwwN2tRlzsUxtb3G9M3763rbXKDg==", - "path": "system.security.accesscontrol/4.7.0", - "hashPath": "system.security.accesscontrol.4.7.0.nupkg.sha512" - }, - "System.Security.Cryptography.ProtectedData/4.7.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==", - "path": "system.security.cryptography.protecteddata/4.7.0", - "hashPath": "system.security.cryptography.protecteddata.4.7.0.nupkg.sha512" - }, - "System.Security.Permissions/4.7.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-dkOV6YYVBnYRa15/yv004eCGRBVADXw8qRbbNiCn/XpdJSUXkkUeIvdvFHkvnko4CdKMqG8yRHC4ox83LSlMsQ==", - "path": "system.security.permissions/4.7.0", - "hashPath": "system.security.permissions.4.7.0.nupkg.sha512" - }, - "System.Security.Principal.Windows/4.7.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==", - "path": "system.security.principal.windows/4.7.0", - "hashPath": "system.security.principal.windows.4.7.0.nupkg.sha512" - }, - "System.Text.Encoding/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "path": "system.text.encoding/4.3.0", - "hashPath": "system.text.encoding.4.3.0.nupkg.sha512" - }, - "System.Text.Encoding.CodePages/4.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-h4z6rrA/hxWf4655D18IIZ0eaLRa3tQC/j+e26W+VinIHY0l07iEXaAvO0YSYq3MvCjMYy8Zs5AdC1sxNQOB7Q==", - "path": "system.text.encoding.codepages/4.0.1", - "hashPath": "system.text.encoding.codepages.4.0.1.nupkg.sha512" - }, - "System.Threading/4.0.11": { - "type": "package", - "serviceable": true, - "sha512": "sha512-N+3xqIcg3VDKyjwwCGaZ9HawG9aC6cSDI+s7ROma310GQo8vilFZa86hqKppwTHleR/G0sfOzhvgnUxWCR/DrQ==", - "path": "system.threading/4.0.11", - "hashPath": "system.threading.4.0.11.nupkg.sha512" - }, - "System.Threading.Tasks/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "path": "system.threading.tasks/4.3.0", - "hashPath": "system.threading.tasks.4.3.0.nupkg.sha512" } } } \ No newline at end of file diff --git a/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.dll b/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.dll index d117e4ccf5..9761425c8c 100644 --- a/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.dll +++ b/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f23f46bee31edf39e2cf2d56545ae0056335eab83b5b4cd63ecd0961423901fc +oid sha256:dd9b63a4a434e57ede5727114221868fe77d252fff4c14c3342ba4e74ad3905d size 158208 diff --git a/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.dll.hash b/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.dll.hash index 2b61922394..1f1345ecea 100644 --- a/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.dll.hash +++ b/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.dll.hash @@ -1 +1 @@ -F23F46BEE31EDF39E2CF2D56545AE0056335EAB83B5B4CD63ECD0961423901FC \ No newline at end of file +DD9B63A4A434E57EDE5727114221868FE77D252FFF4C14C3342BA4E74AD3905D \ No newline at end of file diff --git a/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.pdb b/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.pdb index 42461d7b23..7019b2d210 100644 --- a/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.pdb +++ b/deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f07db2c58dd6e9993e0b1e49188175b2c5ec8ec0ffe726f947403faa589bbf12 +oid sha256:bee19bb3a32f1397b17d0e587ec0c65d88cd9dc5ba09253220df43802a93e806 size 550400 diff --git a/samples/Audio/SimpleAudio/SimpleAudio.Game/SimpleAudio.Game.csproj b/samples/Audio/SimpleAudio/SimpleAudio.Game/SimpleAudio.Game.csproj index 42e6d37288..a4194dfd5c 100644 --- a/samples/Audio/SimpleAudio/SimpleAudio.Game/SimpleAudio.Game.csproj +++ b/samples/Audio/SimpleAudio/SimpleAudio.Game/SimpleAudio.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 SimpleAudio diff --git a/samples/Audio/SimpleAudio/SimpleAudio.Windows/SimpleAudio.Windows.csproj b/samples/Audio/SimpleAudio/SimpleAudio.Windows/SimpleAudio.Windows.csproj index 2de591ec21..08e69467b8 100644 --- a/samples/Audio/SimpleAudio/SimpleAudio.Windows/SimpleAudio.Windows.csproj +++ b/samples/Audio/SimpleAudio/SimpleAudio.Windows/SimpleAudio.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe SimpleAudio diff --git a/samples/Games/JumpyJet/JumpyJet.Game/JumpyJet.Game.csproj b/samples/Games/JumpyJet/JumpyJet.Game/JumpyJet.Game.csproj index fd5305e4b1..9b8858091b 100644 --- a/samples/Games/JumpyJet/JumpyJet.Game/JumpyJet.Game.csproj +++ b/samples/Games/JumpyJet/JumpyJet.Game/JumpyJet.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 JumpyJet diff --git a/samples/Games/JumpyJet/JumpyJet.Windows/JumpyJet.Windows.csproj b/samples/Games/JumpyJet/JumpyJet.Windows/JumpyJet.Windows.csproj index 18c5f03d97..bf2164de80 100644 --- a/samples/Games/JumpyJet/JumpyJet.Windows/JumpyJet.Windows.csproj +++ b/samples/Games/JumpyJet/JumpyJet.Windows/JumpyJet.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe JumpyJet diff --git a/samples/Games/SpaceEscape/SpaceEscape.Game/SpaceEscape.Game.csproj b/samples/Games/SpaceEscape/SpaceEscape.Game/SpaceEscape.Game.csproj index 37ced6c28c..dd33a727e8 100644 --- a/samples/Games/SpaceEscape/SpaceEscape.Game/SpaceEscape.Game.csproj +++ b/samples/Games/SpaceEscape/SpaceEscape.Game/SpaceEscape.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 SpaceEscape true diff --git a/samples/Games/SpaceEscape/SpaceEscape.Windows/SpaceEscape.Windows.csproj b/samples/Games/SpaceEscape/SpaceEscape.Windows/SpaceEscape.Windows.csproj index b9819ff48e..f6b2fd6e0d 100644 --- a/samples/Games/SpaceEscape/SpaceEscape.Windows/SpaceEscape.Windows.csproj +++ b/samples/Games/SpaceEscape/SpaceEscape.Windows/SpaceEscape.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe SpaceEscape diff --git a/samples/Graphics/AnimatedModel/AnimatedModel.Game/AnimatedModel.Game.csproj b/samples/Graphics/AnimatedModel/AnimatedModel.Game/AnimatedModel.Game.csproj index eb2fadc09f..e720605787 100644 --- a/samples/Graphics/AnimatedModel/AnimatedModel.Game/AnimatedModel.Game.csproj +++ b/samples/Graphics/AnimatedModel/AnimatedModel.Game/AnimatedModel.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 AnimatedModel diff --git a/samples/Graphics/AnimatedModel/AnimatedModel.Windows/AnimatedModel.Windows.csproj b/samples/Graphics/AnimatedModel/AnimatedModel.Windows/AnimatedModel.Windows.csproj index 895a090515..781df9b300 100644 --- a/samples/Graphics/AnimatedModel/AnimatedModel.Windows/AnimatedModel.Windows.csproj +++ b/samples/Graphics/AnimatedModel/AnimatedModel.Windows/AnimatedModel.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe AnimatedModel diff --git a/samples/Graphics/CustomEffect/CustomEffect.Game/CustomEffect.Game.csproj b/samples/Graphics/CustomEffect/CustomEffect.Game/CustomEffect.Game.csproj index 729f478520..642b3981b2 100644 --- a/samples/Graphics/CustomEffect/CustomEffect.Game/CustomEffect.Game.csproj +++ b/samples/Graphics/CustomEffect/CustomEffect.Game/CustomEffect.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 CustomEffect diff --git a/samples/Graphics/CustomEffect/CustomEffect.Windows/CustomEffect.Windows.csproj b/samples/Graphics/CustomEffect/CustomEffect.Windows/CustomEffect.Windows.csproj index 50671aea6e..26336cb4f0 100644 --- a/samples/Graphics/CustomEffect/CustomEffect.Windows/CustomEffect.Windows.csproj +++ b/samples/Graphics/CustomEffect/CustomEffect.Windows/CustomEffect.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe CustomEffect diff --git a/samples/Graphics/MaterialShader/MaterialShader.Game/MaterialShader.Game.csproj b/samples/Graphics/MaterialShader/MaterialShader.Game/MaterialShader.Game.csproj index af3e782429..1751ce416a 100644 --- a/samples/Graphics/MaterialShader/MaterialShader.Game/MaterialShader.Game.csproj +++ b/samples/Graphics/MaterialShader/MaterialShader.Game/MaterialShader.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 MaterialShader diff --git a/samples/Graphics/MaterialShader/MaterialShader.Windows/MaterialShader.Windows.csproj b/samples/Graphics/MaterialShader/MaterialShader.Windows/MaterialShader.Windows.csproj index 83b897b5fe..2a97f538b3 100644 --- a/samples/Graphics/MaterialShader/MaterialShader.Windows/MaterialShader.Windows.csproj +++ b/samples/Graphics/MaterialShader/MaterialShader.Windows/MaterialShader.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe MaterialShader diff --git a/samples/Graphics/SpriteFonts/SpriteFonts.Game/SpriteFonts.Game.csproj b/samples/Graphics/SpriteFonts/SpriteFonts.Game/SpriteFonts.Game.csproj index e48d5e46ec..24bd0b1f07 100644 --- a/samples/Graphics/SpriteFonts/SpriteFonts.Game/SpriteFonts.Game.csproj +++ b/samples/Graphics/SpriteFonts/SpriteFonts.Game/SpriteFonts.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 SpriteFonts diff --git a/samples/Graphics/SpriteFonts/SpriteFonts.Windows/SpriteFonts.Windows.csproj b/samples/Graphics/SpriteFonts/SpriteFonts.Windows/SpriteFonts.Windows.csproj index de60f19338..ab08b7d1e2 100644 --- a/samples/Graphics/SpriteFonts/SpriteFonts.Windows/SpriteFonts.Windows.csproj +++ b/samples/Graphics/SpriteFonts/SpriteFonts.Windows/SpriteFonts.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe SpriteFonts diff --git a/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Game/SpriteStudioDemo.Game.csproj b/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Game/SpriteStudioDemo.Game.csproj index 535a2278e1..a66d3dd4b0 100644 --- a/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Game/SpriteStudioDemo.Game.csproj +++ b/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Game/SpriteStudioDemo.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 SpriteStudioDemo diff --git a/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Windows/SpriteStudioDemo.Windows.csproj b/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Windows/SpriteStudioDemo.Windows.csproj index e5af06c354..e6e8f0df01 100644 --- a/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Windows/SpriteStudioDemo.Windows.csproj +++ b/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Windows/SpriteStudioDemo.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe SpriteStudioDemo diff --git a/samples/Input/GravitySensor/GravitySensor.Game/GravitySensor.Game.csproj b/samples/Input/GravitySensor/GravitySensor.Game/GravitySensor.Game.csproj index 1c01f773b6..daee4eb372 100644 --- a/samples/Input/GravitySensor/GravitySensor.Game/GravitySensor.Game.csproj +++ b/samples/Input/GravitySensor/GravitySensor.Game/GravitySensor.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 GravitySensor diff --git a/samples/Input/GravitySensor/GravitySensor.Windows/GravitySensor.Windows.csproj b/samples/Input/GravitySensor/GravitySensor.Windows/GravitySensor.Windows.csproj index af060a650b..5034f6e55d 100644 --- a/samples/Input/GravitySensor/GravitySensor.Windows/GravitySensor.Windows.csproj +++ b/samples/Input/GravitySensor/GravitySensor.Windows/GravitySensor.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe GravitySensor diff --git a/samples/Input/TouchInputs/TouchInputs.Game/TouchInputs.Game.csproj b/samples/Input/TouchInputs/TouchInputs.Game/TouchInputs.Game.csproj index e624280d81..2d568e2ccf 100644 --- a/samples/Input/TouchInputs/TouchInputs.Game/TouchInputs.Game.csproj +++ b/samples/Input/TouchInputs/TouchInputs.Game/TouchInputs.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 TouchInputs diff --git a/samples/Input/TouchInputs/TouchInputs.Windows/TouchInputs.Windows.csproj b/samples/Input/TouchInputs/TouchInputs.Windows/TouchInputs.Windows.csproj index 5e55005cfa..ddd65056c8 100644 --- a/samples/Input/TouchInputs/TouchInputs.Windows/TouchInputs.Windows.csproj +++ b/samples/Input/TouchInputs/TouchInputs.Windows/TouchInputs.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe TouchInputs diff --git a/samples/Particles/ParticlesSample/ParticlesSample.Game/ParticlesSample.Game.csproj b/samples/Particles/ParticlesSample/ParticlesSample.Game/ParticlesSample.Game.csproj index 86ec7ad24c..2b17d2d9e9 100644 --- a/samples/Particles/ParticlesSample/ParticlesSample.Game/ParticlesSample.Game.csproj +++ b/samples/Particles/ParticlesSample/ParticlesSample.Game/ParticlesSample.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 ParticlesSample true diff --git a/samples/Particles/ParticlesSample/ParticlesSample.Windows/ParticlesSample.Windows.csproj b/samples/Particles/ParticlesSample/ParticlesSample.Windows/ParticlesSample.Windows.csproj index 89bda55a5b..ac6e5d85bd 100644 --- a/samples/Particles/ParticlesSample/ParticlesSample.Windows/ParticlesSample.Windows.csproj +++ b/samples/Particles/ParticlesSample/ParticlesSample.Windows/ParticlesSample.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe ParticlesSample diff --git a/samples/Physics/BepuSample/BepuSample.Game/BepuSample.Game.csproj b/samples/Physics/BepuSample/BepuSample.Game/BepuSample.Game.csproj index fbca120a6e..0c391951c8 100644 --- a/samples/Physics/BepuSample/BepuSample.Game/BepuSample.Game.csproj +++ b/samples/Physics/BepuSample/BepuSample.Game/BepuSample.Game.csproj @@ -1,7 +1,7 @@  - net8.0-windows + net10.0-windows true diff --git a/samples/Physics/BepuSample/BepuSample.Windows/BepuSample.Windows.csproj b/samples/Physics/BepuSample/BepuSample.Windows/BepuSample.Windows.csproj index 3532a3cb15..7ff74ebe75 100644 --- a/samples/Physics/BepuSample/BepuSample.Windows/BepuSample.Windows.csproj +++ b/samples/Physics/BepuSample/BepuSample.Windows/BepuSample.Windows.csproj @@ -1,7 +1,7 @@ - net8.0-windows + net10.0-windows win-x64 Resources\Icon.ico WinExe diff --git a/samples/Physics/BepuSample/BepuSample.Windows/Properties/PublishProfiles/FolderProfile.pubxml b/samples/Physics/BepuSample/BepuSample.Windows/Properties/PublishProfiles/FolderProfile.pubxml index 02f25509d0..919f9e2d6b 100644 --- a/samples/Physics/BepuSample/BepuSample.Windows/Properties/PublishProfiles/FolderProfile.pubxml +++ b/samples/Physics/BepuSample/BepuSample.Windows/Properties/PublishProfiles/FolderProfile.pubxml @@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. ..\Bin\Windows\Release\win-x64\publish\ FileSystem <_TargetId>Folder - net8.0-windows + net10.0-windows win-x64 false false diff --git a/samples/Physics/PhysicsSample/PhysicsSample.Game/PhysicsSample.Game.csproj b/samples/Physics/PhysicsSample/PhysicsSample.Game/PhysicsSample.Game.csproj index 4b618bd3a9..3b0ab69ad6 100644 --- a/samples/Physics/PhysicsSample/PhysicsSample.Game/PhysicsSample.Game.csproj +++ b/samples/Physics/PhysicsSample/PhysicsSample.Game/PhysicsSample.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 PhysicsSample diff --git a/samples/Physics/PhysicsSample/PhysicsSample.Windows/PhysicsSample.Windows.csproj b/samples/Physics/PhysicsSample/PhysicsSample.Windows/PhysicsSample.Windows.csproj index 7905e35bd1..3522f11951 100644 --- a/samples/Physics/PhysicsSample/PhysicsSample.Windows/PhysicsSample.Windows.csproj +++ b/samples/Physics/PhysicsSample/PhysicsSample.Windows/PhysicsSample.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe PhysicsSample diff --git a/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Game/FirstPersonShooter.Game.csproj b/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Game/FirstPersonShooter.Game.csproj index 12da954070..73c854b2ac 100644 --- a/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Game/FirstPersonShooter.Game.csproj +++ b/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Game/FirstPersonShooter.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 FirstPersonShooter diff --git a/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Windows/FirstPersonShooter.Windows.csproj b/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Windows/FirstPersonShooter.Windows.csproj index 0642bec585..118fd13e94 100644 --- a/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Windows/FirstPersonShooter.Windows.csproj +++ b/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Windows/FirstPersonShooter.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe FirstPersonShooter diff --git a/samples/Templates/Packs/MaterialPackage/MaterialPackage.csproj b/samples/Templates/Packs/MaterialPackage/MaterialPackage.csproj index 75f1cfb713..cd7a62456a 100644 --- a/samples/Templates/Packs/MaterialPackage/MaterialPackage.csproj +++ b/samples/Templates/Packs/MaterialPackage/MaterialPackage.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 diff --git a/samples/Templates/Packs/PrototypingBlocks/PrototypingBlocks.csproj b/samples/Templates/Packs/PrototypingBlocks/PrototypingBlocks.csproj index 32dccb4d12..f8c8e25b45 100644 --- a/samples/Templates/Packs/PrototypingBlocks/PrototypingBlocks.csproj +++ b/samples/Templates/Packs/PrototypingBlocks/PrototypingBlocks.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 diff --git a/samples/Templates/Packs/SamplesAssetPackage/SamplesAssetPackage.csproj b/samples/Templates/Packs/SamplesAssetPackage/SamplesAssetPackage.csproj index faa88b053d..fffcd694b8 100644 --- a/samples/Templates/Packs/SamplesAssetPackage/SamplesAssetPackage.csproj +++ b/samples/Templates/Packs/SamplesAssetPackage/SamplesAssetPackage.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 diff --git a/samples/Templates/Packs/VFXPackage/VFXPackage.csproj b/samples/Templates/Packs/VFXPackage/VFXPackage.csproj index c986584a5f..a16b355331 100644 --- a/samples/Templates/Packs/VFXPackage/VFXPackage.csproj +++ b/samples/Templates/Packs/VFXPackage/VFXPackage.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 diff --git a/samples/Templates/Packs/mannequinModel/mannequinModel.csproj b/samples/Templates/Packs/mannequinModel/mannequinModel.csproj index faa88b053d..fffcd694b8 100644 --- a/samples/Templates/Packs/mannequinModel/mannequinModel.csproj +++ b/samples/Templates/Packs/mannequinModel/mannequinModel.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 diff --git a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Game/ThirdPersonPlatformer.Game.csproj b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Game/ThirdPersonPlatformer.Game.csproj index b4ffac2d1b..194aeeaf89 100644 --- a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Game/ThirdPersonPlatformer.Game.csproj +++ b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Game/ThirdPersonPlatformer.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 ThirdPersonPlatformer diff --git a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Windows/ThirdPersonPlatformer.Windows.csproj b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Windows/ThirdPersonPlatformer.Windows.csproj index 56756b3e63..8cbc5f8e6a 100644 --- a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Windows/ThirdPersonPlatformer.Windows.csproj +++ b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Windows/ThirdPersonPlatformer.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe ThirdPersonPlatformer diff --git a/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/TopDownRPG.Game.csproj b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/TopDownRPG.Game.csproj index 7ab32f4c8b..24bdb29abe 100644 --- a/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/TopDownRPG.Game.csproj +++ b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/TopDownRPG.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 TopDownRPG diff --git a/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Windows/TopDownRPG.Windows.csproj b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Windows/TopDownRPG.Windows.csproj index 9e5e9a9c6c..147c20f561 100644 --- a/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Windows/TopDownRPG.Windows.csproj +++ b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Windows/TopDownRPG.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe TopDownRPG diff --git a/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Game/VRSandbox.Game.csproj b/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Game/VRSandbox.Game.csproj index 1249353ce1..61b650ed11 100644 --- a/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Game/VRSandbox.Game.csproj +++ b/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Game/VRSandbox.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 VRSandbox diff --git a/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Windows/VRSandbox.Windows.csproj b/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Windows/VRSandbox.Windows.csproj index 8fb8d853c8..3e8b82cbbe 100644 --- a/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Windows/VRSandbox.Windows.csproj +++ b/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Windows/VRSandbox.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe VRSandbox diff --git a/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Game/CSharpBeginner.Game.csproj b/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Game/CSharpBeginner.Game.csproj index 92183ca473..90bb55de13 100644 --- a/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Game/CSharpBeginner.Game.csproj +++ b/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Game/CSharpBeginner.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 CSharpBeginner diff --git a/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Windows/CSharpBeginner.Windows.csproj b/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Windows/CSharpBeginner.Windows.csproj index 97a8a9ae63..c50f7d544d 100644 --- a/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Windows/CSharpBeginner.Windows.csproj +++ b/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Windows/CSharpBeginner.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe CSharpBeginner.Windows diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/CSharpIntermediate.Game.csproj b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/CSharpIntermediate.Game.csproj index a0511108d5..67a42bd935 100644 --- a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/CSharpIntermediate.Game.csproj +++ b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/CSharpIntermediate.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 CSharpIntermediate diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Windows/CSharpIntermediate.Windows.csproj b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Windows/CSharpIntermediate.Windows.csproj index 48455dd4ab..567d4cfabd 100644 --- a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Windows/CSharpIntermediate.Windows.csproj +++ b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Windows/CSharpIntermediate.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe CSharpIntermediate.Windows diff --git a/samples/UI/GameMenu/GameMenu.Game/GameMenu.Game.csproj b/samples/UI/GameMenu/GameMenu.Game/GameMenu.Game.csproj index 35f897a5db..9f36822812 100644 --- a/samples/UI/GameMenu/GameMenu.Game/GameMenu.Game.csproj +++ b/samples/UI/GameMenu/GameMenu.Game/GameMenu.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 GameMenu diff --git a/samples/UI/GameMenu/GameMenu.Windows/GameMenu.Windows.csproj b/samples/UI/GameMenu/GameMenu.Windows/GameMenu.Windows.csproj index 772e08830a..6f6ca346ba 100644 --- a/samples/UI/GameMenu/GameMenu.Windows/GameMenu.Windows.csproj +++ b/samples/UI/GameMenu/GameMenu.Windows/GameMenu.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe GameMenu diff --git a/samples/UI/UIElementLink/UIElementLink.Game/UIElementLink.Game.csproj b/samples/UI/UIElementLink/UIElementLink.Game/UIElementLink.Game.csproj index c8c6d1f422..1beaa615b2 100644 --- a/samples/UI/UIElementLink/UIElementLink.Game/UIElementLink.Game.csproj +++ b/samples/UI/UIElementLink/UIElementLink.Game/UIElementLink.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 UIElementLink diff --git a/samples/UI/UIElementLink/UIElementLink.Windows/UIElementLink.Windows.csproj b/samples/UI/UIElementLink/UIElementLink.Windows/UIElementLink.Windows.csproj index f36a7c5c80..ec4e544f52 100644 --- a/samples/UI/UIElementLink/UIElementLink.Windows/UIElementLink.Windows.csproj +++ b/samples/UI/UIElementLink/UIElementLink.Windows/UIElementLink.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe UIElementLink diff --git a/samples/UI/UIParticles/UIParticles.Game/UIParticles.Game.csproj b/samples/UI/UIParticles/UIParticles.Game/UIParticles.Game.csproj index d5b3c303b4..89793048b2 100644 --- a/samples/UI/UIParticles/UIParticles.Game/UIParticles.Game.csproj +++ b/samples/UI/UIParticles/UIParticles.Game/UIParticles.Game.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 UIParticles diff --git a/samples/UI/UIParticles/UIParticles.Windows/UIParticles.Windows.csproj b/samples/UI/UIParticles/UIParticles.Windows/UIParticles.Windows.csproj index 91a2b30ac9..fccd042bdb 100644 --- a/samples/UI/UIParticles/UIParticles.Windows/UIParticles.Windows.csproj +++ b/samples/UI/UIParticles/UIParticles.Windows/UIParticles.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net10.0-windows Resources\GameIcon.ico WinExe UIParticles 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 index f228eee8dc..178d0aede5 100644 --- 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 @@ -125,9 +125,9 @@ - $(MSBuildThisFileDirectory)..\lib\net8.0-windows7.0\Stride.Core.Assets.CompilerApp.dll - $(MSBuildThisFileDirectory)..\lib\net8.0\Stride.Core.Assets.CompilerApp.dll - $(MSBuildThisFileDirectory)..\bin\$(Configuration)\net8.0\Stride.Core.Assets.CompilerApp.dll + $(MSBuildThisFileDirectory)..\lib\net10.0-windows7.0\Stride.Core.Assets.CompilerApp.dll + $(MSBuildThisFileDirectory)..\lib\net10.0\Stride.Core.Assets.CompilerApp.dll + $(MSBuildThisFileDirectory)..\bin\$(Configuration)\net10.0\Stride.Core.Assets.CompilerApp.dll diff --git a/sources/assets/Stride.Core.Assets/Yaml/CollectionWithItemIds.cs b/sources/assets/Stride.Core.Assets/Yaml/CollectionWithItemIds.cs index c83776da47..297bde7e6a 100644 --- a/sources/assets/Stride.Core.Assets/Yaml/CollectionWithItemIds.cs +++ b/sources/assets/Stride.Core.Assets/Yaml/CollectionWithItemIds.cs @@ -11,6 +11,6 @@ namespace Stride.Core.Yaml; /// /// The type of item contained in the collection. [DataContract] -public class CollectionWithItemIds : OrderedDictionary +public class CollectionWithItemIds : Serialization.OrderedDictionary { } diff --git a/sources/assets/Stride.Core.Assets/Yaml/DictionaryWithItemIds.cs b/sources/assets/Stride.Core.Assets/Yaml/DictionaryWithItemIds.cs index f0ca11794c..1c73636c13 100644 --- a/sources/assets/Stride.Core.Assets/Yaml/DictionaryWithItemIds.cs +++ b/sources/assets/Stride.Core.Assets/Yaml/DictionaryWithItemIds.cs @@ -11,4 +11,4 @@ namespace Stride.Core.Yaml; /// The type of key contained in the dictionary. /// The type of value contained in the dictionary. [DataContract] -public class DictionaryWithItemIds : OrderedDictionary, TValue>; +public class DictionaryWithItemIds : Serialization.OrderedDictionary, TValue>; diff --git a/sources/assets/Stride.Core.Packages/NugetStore.cs b/sources/assets/Stride.Core.Packages/NugetStore.cs index 38e245cce1..8f2d03a70f 100644 --- a/sources/assets/Stride.Core.Packages/NugetStore.cs +++ b/sources/assets/Stride.Core.Packages/NugetStore.cs @@ -330,7 +330,7 @@ public static string GetPackageVersionVariable(string packageId, string packageV // In case it's a package without any TFM (i.e. Visual Studio plugin), we still need to specify one if (!targetFrameworks.Any()) - targetFrameworks = ["net8.0"]; + targetFrameworks = ["net10.0"]; // Old version expects to be installed in GamePackages if (packageId == "Xenko" && version < new PackageVersion(3, 0, 0, 0) && oldRootDirectory != null) diff --git a/sources/core/Stride.Core.AssemblyProcessor.Tests/Stride.Core.AssemblyProcessor.Tests.csproj b/sources/core/Stride.Core.AssemblyProcessor.Tests/Stride.Core.AssemblyProcessor.Tests.csproj index 945853d0f0..56b90e46e3 100644 --- a/sources/core/Stride.Core.AssemblyProcessor.Tests/Stride.Core.AssemblyProcessor.Tests.csproj +++ b/sources/core/Stride.Core.AssemblyProcessor.Tests/Stride.Core.AssemblyProcessor.Tests.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 win-x64 true true diff --git a/sources/core/Stride.Core.AssemblyProcessor/Stride.Core.AssemblyProcessor.csproj b/sources/core/Stride.Core.AssemblyProcessor/Stride.Core.AssemblyProcessor.csproj index 6e88702d48..7312f40373 100644 --- a/sources/core/Stride.Core.AssemblyProcessor/Stride.Core.AssemblyProcessor.csproj +++ b/sources/core/Stride.Core.AssemblyProcessor/Stride.Core.AssemblyProcessor.csproj @@ -1,7 +1,7 @@ Library - netstandard2.0;net8.0 + netstandard2.0;net10.0 true true enable diff --git a/sources/editor/Stride.Editor.CrashReport/CrashReportForm.cs b/sources/editor/Stride.Editor.CrashReport/CrashReportForm.cs index ca38256581..eb6fbcc17f 100644 --- a/sources/editor/Stride.Editor.CrashReport/CrashReportForm.cs +++ b/sources/editor/Stride.Editor.CrashReport/CrashReportForm.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Stride.CrashReport; +using System.ComponentModel; namespace Stride.Editor.CrashReport { @@ -39,6 +40,7 @@ public CrashReportForm(CrashReportData crashReport, ICrashEmailSetting storeCras } } + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public bool Expanded { get { return expanded; } set { expanded = value; RefreshSize(); } } private void RefreshSize() diff --git a/sources/editor/Stride.Editor/Engine/EmbeddedGameForm.cs b/sources/editor/Stride.Editor/Engine/EmbeddedGameForm.cs index 7142a0c62d..383dedeb19 100644 --- a/sources/editor/Stride.Editor/Engine/EmbeddedGameForm.cs +++ b/sources/editor/Stride.Editor/Engine/EmbeddedGameForm.cs @@ -3,6 +3,7 @@ using Stride.Core.Presentation.Controls; using Stride.Core.Presentation.Interop; using Stride.Games; +using System.ComponentModel; namespace Stride.Editor.Engine { @@ -20,6 +21,7 @@ public EmbeddedGameForm() /// /// Gets or sets the associated to this form. /// + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public GameEngineHost Host { get; set; } /// diff --git a/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj b/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj index 696e374ade..7410306020 100644 --- a/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj +++ b/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj @@ -36,7 +36,7 @@ - ..\..\..\deps\AssemblyProcessor\netstandard2.0\Stride.Core.AssemblyProcessor.dll + ..\..\..\deps\AssemblyProcessor\netstandard2.0\Stride.Core.AssemblyProcessor.dll diff --git a/sources/engine/Stride.Assets/StrideConfig.cs b/sources/engine/Stride.Assets/StrideConfig.cs index d80a171202..3dab2730a6 100644 --- a/sources/engine/Stride.Assets/StrideConfig.cs +++ b/sources/engine/Stride.Assets/StrideConfig.cs @@ -62,7 +62,7 @@ internal static void RegisterSolutionPlatforms() { Name = PlatformType.Windows.ToString(), IsAvailable = true, - TargetFramework = "net8.0-windows", + TargetFramework = "net10.0-windows", RuntimeIdentifier = "win-x64", Type = PlatformType.Windows }; @@ -120,7 +120,7 @@ internal static void RegisterSolutionPlatforms() { Name = PlatformType.Linux.ToString(), IsAvailable = true, - TargetFramework = "net8.0", + TargetFramework = "net10.0", RuntimeIdentifier = "linux-x64", Type = PlatformType.Linux, }; @@ -131,7 +131,7 @@ internal static void RegisterSolutionPlatforms() { Name = PlatformType.macOS.ToString(), IsAvailable = true, - TargetFramework = "net8.0", + TargetFramework = "net10.0", RuntimeIdentifier = "osx-x64", Type = PlatformType.macOS, }; @@ -142,7 +142,7 @@ internal static void RegisterSolutionPlatforms() { Name = PlatformType.Android.ToString(), Type = PlatformType.Android, - TargetFramework = "net8.0-android", + TargetFramework = "net10.0-android", IsAvailable = IsVSComponentAvailableAnyVersion(XamarinAndroidComponents) }; androidPlatform.DefineConstants.Add("STRIDE_PLATFORM_MONO_MOBILE"); @@ -169,7 +169,7 @@ internal static void RegisterSolutionPlatforms() Name = PlatformType.iOS.ToString(), SolutionName = "iPhone", // For iOS, we need to use iPhone as a solution name Type = PlatformType.iOS, - TargetFramework = "net8.0-ios", + TargetFramework = "net10.0-ios", IsAvailable = IsVSComponentAvailableAnyVersion(XamariniOSComponents) }; iphonePlatform.PlatformsPart.Add(new SolutionPlatformPart("iPhoneSimulator")); diff --git a/sources/engine/Stride.Assets/StridePackageUpgrader.cs b/sources/engine/Stride.Assets/StridePackageUpgrader.cs index c2660ed642..a29087dd3d 100644 --- a/sources/engine/Stride.Assets/StridePackageUpgrader.cs +++ b/sources/engine/Stride.Assets/StridePackageUpgrader.cs @@ -282,6 +282,29 @@ public override bool UpgradeBeforeAssembliesLoaded(PackageLoadParameters loadPar } } + if (dependency.Version.MinVersion < new PackageVersion("4.3.0.0") && solutionProject != null) + { + var tfm = project.GetProperty("TargetFramework") + ?? project.GetProperty("TargetFrameworks"); + if (tfm != null) + { + // Library + if (tfm.EvaluatedValue.StartsWith("net8", StringComparison.Ordinal) && solutionProject.Type == ProjectType.Library) + { + // In case it's a single TargetFramework, add the "s" at the end + tfm.Xml.Name = "TargetFrameworks"; + tfm.Xml.Value = "net10.0"; + isProjectDirty = true; + } + // Executable + else if ((tfm.EvaluatedValue.StartsWith("net8", StringComparison.Ordinal)) && solutionProject.Type == ProjectType.Executable) + { + tfm.Xml.Value = solutionProject.Platform == PlatformType.Windows ? "net10.0-windows" : "net10.0"; + isProjectDirty = true; + } + } + } + if (isProjectDirty) project.Save(); diff --git a/sources/engine/Stride.Audio.Tests/Stride.Audio.Tests.Windows.csproj b/sources/engine/Stride.Audio.Tests/Stride.Audio.Tests.Windows.csproj index d84b254fa9..28ab790cf3 100644 --- a/sources/engine/Stride.Audio.Tests/Stride.Audio.Tests.Windows.csproj +++ b/sources/engine/Stride.Audio.Tests/Stride.Audio.Tests.Windows.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 win-x64 Stride.Audio.Tests Stride.Audio.Tests diff --git a/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics.Tests/Stride.BepuPhysics.Tests.csproj b/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics.Tests/Stride.BepuPhysics.Tests.csproj index bb8b02b238..fdd3066a4b 100644 --- a/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics.Tests/Stride.BepuPhysics.Tests.csproj +++ b/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics.Tests/Stride.BepuPhysics.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 win-x64 Stride.BepuPhysics.Tests Stride.BepuPhysics.Tests diff --git a/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics/Definitions/Colliders/ConvexHullCollider.cs b/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics/Definitions/Colliders/ConvexHullCollider.cs index 9fcca7758f..2b6042f15a 100644 --- a/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics/Definitions/Colliders/ConvexHullCollider.cs +++ b/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics/Definitions/Colliders/ConvexHullCollider.cs @@ -51,7 +51,7 @@ internal override void AddToCompoundBuilder(ShapeCacheSystem shape, BufferPool p // Multiple convex hulls may be set up to create a concave shape, do not merge them foreach (var hull in mesh.Hulls) { - var points = MemoryMarshal.Cast(hull.InternalPoints); + var points = MemoryMarshal.Cast(hull.InternalPoints.AsSpan()); var convex = new ConvexHull(points, _sharedPool, out var center); hulls.Add((convex, center)); } diff --git a/sources/engine/Stride.Engine.NoAssets.Tests/Stride.Engine.NoAssets.Tests.Windows.csproj b/sources/engine/Stride.Engine.NoAssets.Tests/Stride.Engine.NoAssets.Tests.Windows.csproj index b6d648c515..1466f0167a 100644 --- a/sources/engine/Stride.Engine.NoAssets.Tests/Stride.Engine.NoAssets.Tests.Windows.csproj +++ b/sources/engine/Stride.Engine.NoAssets.Tests/Stride.Engine.NoAssets.Tests.Windows.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 win-x64 Stride.Engine.NoAssets.Tests Stride.Engine.Tests diff --git a/sources/engine/Stride.Engine.Tests/Stride.Engine.Tests.Windows.csproj b/sources/engine/Stride.Engine.Tests/Stride.Engine.Tests.Windows.csproj index 719491d14a..411735d0c2 100644 --- a/sources/engine/Stride.Engine.Tests/Stride.Engine.Tests.Windows.csproj +++ b/sources/engine/Stride.Engine.Tests/Stride.Engine.Tests.Windows.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 win-x64 Stride.Engine.Tests Stride.Engine.Tests diff --git a/sources/engine/Stride.Games/Desktop/GameForm.cs b/sources/engine/Stride.Games/Desktop/GameForm.cs index 6a267af2ff..08c25cdfe7 100644 --- a/sources/engine/Stride.Games/Desktop/GameForm.cs +++ b/sources/engine/Stride.Games/Desktop/GameForm.cs @@ -165,8 +165,10 @@ public GameForm() /// Gets or sets a value indicating whether this instance is processing keys. By default is false /// /// true if this instance is processing keys; otherwise, false. + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public bool IsProcessingKeys { get; set; } + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] internal bool IsFullScreen { get; set; } /// diff --git a/sources/engine/Stride.Graphics.Tests.10_0/Stride.Graphics.Tests.10_0.Windows.csproj b/sources/engine/Stride.Graphics.Tests.10_0/Stride.Graphics.Tests.10_0.Windows.csproj index fcd85c0bd2..e5d21a9ec6 100644 --- a/sources/engine/Stride.Graphics.Tests.10_0/Stride.Graphics.Tests.10_0.Windows.csproj +++ b/sources/engine/Stride.Graphics.Tests.10_0/Stride.Graphics.Tests.10_0.Windows.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 win-x64 Stride.Graphics.Tests.10_0 Stride.Graphics.Tests diff --git a/sources/engine/Stride.Graphics.Tests.11_0/Stride.Graphics.Tests.11_0.Windows.csproj b/sources/engine/Stride.Graphics.Tests.11_0/Stride.Graphics.Tests.11_0.Windows.csproj index 54d304d66b..0d544d37eb 100644 --- a/sources/engine/Stride.Graphics.Tests.11_0/Stride.Graphics.Tests.11_0.Windows.csproj +++ b/sources/engine/Stride.Graphics.Tests.11_0/Stride.Graphics.Tests.11_0.Windows.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 win-x64 Stride.Graphics.Tests.11_0 Stride.Graphics.Tests diff --git a/sources/engine/Stride.Graphics.Tests/Stride.Graphics.Tests.Windows.csproj b/sources/engine/Stride.Graphics.Tests/Stride.Graphics.Tests.Windows.csproj index c50975e950..d6f0c41830 100644 --- a/sources/engine/Stride.Graphics.Tests/Stride.Graphics.Tests.Windows.csproj +++ b/sources/engine/Stride.Graphics.Tests/Stride.Graphics.Tests.Windows.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 win-x64 Stride.Graphics.Tests Stride.Graphics.Tests diff --git a/sources/engine/Stride.Input.Tests/Stride.Input.Tests.Windows.csproj b/sources/engine/Stride.Input.Tests/Stride.Input.Tests.Windows.csproj index 1390f79f0b..f79d95eb03 100644 --- a/sources/engine/Stride.Input.Tests/Stride.Input.Tests.Windows.csproj +++ b/sources/engine/Stride.Input.Tests/Stride.Input.Tests.Windows.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 win-x64 Stride.Input.Tests Stride.Input.Tests diff --git a/sources/engine/Stride.Navigation.Tests/Stride.Navigation.Tests.Windows.csproj b/sources/engine/Stride.Navigation.Tests/Stride.Navigation.Tests.Windows.csproj index f669f11b83..9754e2c9c5 100644 --- a/sources/engine/Stride.Navigation.Tests/Stride.Navigation.Tests.Windows.csproj +++ b/sources/engine/Stride.Navigation.Tests/Stride.Navigation.Tests.Windows.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 win-x64 Stride.Navigation.Tests Stride.Navigation.Tests diff --git a/sources/engine/Stride.Particles.Tests/Stride.Particles.Tests.Windows.csproj b/sources/engine/Stride.Particles.Tests/Stride.Particles.Tests.Windows.csproj index c7b72af819..038c5fdb72 100644 --- a/sources/engine/Stride.Particles.Tests/Stride.Particles.Tests.Windows.csproj +++ b/sources/engine/Stride.Particles.Tests/Stride.Particles.Tests.Windows.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 win-x64 Stride.Particles.Tests Stride.Particles.Tests diff --git a/sources/engine/Stride.Physics.Tests/Stride.Physics.Tests.Windows.csproj b/sources/engine/Stride.Physics.Tests/Stride.Physics.Tests.Windows.csproj index 005af98d89..2b3fbea4d2 100644 --- a/sources/engine/Stride.Physics.Tests/Stride.Physics.Tests.Windows.csproj +++ b/sources/engine/Stride.Physics.Tests/Stride.Physics.Tests.Windows.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 win-x64 Stride.Physics.Tests Stride.Physics.Tests diff --git a/sources/engine/Stride.UI.Tests/Stride.UI.Tests.Windows.csproj b/sources/engine/Stride.UI.Tests/Stride.UI.Tests.Windows.csproj index 92b9980c82..1649f67075 100644 --- a/sources/engine/Stride.UI.Tests/Stride.UI.Tests.Windows.csproj +++ b/sources/engine/Stride.UI.Tests/Stride.UI.Tests.Windows.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 win-x64 Stride.UI.Tests Stride.UI.Tests diff --git a/sources/launcher/Stride.Launcher/Properties/PublishProfiles/FolderProfile.pubxml b/sources/launcher/Stride.Launcher/Properties/PublishProfiles/FolderProfile.pubxml index 051fca4180..19b6fe681a 100644 --- 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. Any CPU bin\Release\publish\ FileSystem - net8.0-windows + net10.0-windows true win-x64 true diff --git a/sources/launcher/Stride.Launcher/Services/LauncherSettings.cs b/sources/launcher/Stride.Launcher/Services/LauncherSettings.cs index 5681887078..62ecdd313f 100644 --- 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 CloseLauncherAutomaticallyKey = new SettingsKey("Internal/Launcher/CloseLauncherAutomatically", SettingsContainer, false); private static readonly SettingsKey ActiveVersionKey = new SettingsKey("Internal/Launcher/ActiveVersion", SettingsContainer, ""); - private static readonly SettingsKey PreferredFrameworkKey = new SettingsKey("Internal/Launcher/PreferredFramework", SettingsContainer, "net8.0"); + private static readonly SettingsKey PreferredFrameworkKey = new SettingsKey("Internal/Launcher/PreferredFramework", SettingsContainer, "net10.0"); private static readonly SettingsKey CurrentTabKey = new SettingsKey("Internal/Launcher/CurrentTabSessions", SettingsContainer, 0); private static readonly SettingsKey> DeveloperVersionsKey = new SettingsKey>("Internal/Launcher/DeveloperVersions", SettingsContainer, () => new List()); diff --git a/sources/launcher/Stride.Launcher/Stride.Launcher.csproj b/sources/launcher/Stride.Launcher/Stride.Launcher.csproj index dff48c6006..6acdc430b5 100644 --- a/sources/launcher/Stride.Launcher/Stride.Launcher.csproj +++ b/sources/launcher/Stride.Launcher/Stride.Launcher.csproj @@ -1,7 +1,7 @@ WinExe - net8.0-windows + net10.0-windows win-x64 false false diff --git a/sources/localization/extract_strings.bat b/sources/localization/extract_strings.bat index b23e7e4e88..968659898a 100644 --- a/sources/localization/extract_strings.bat +++ b/sources/localization/extract_strings.bat @@ -1,7 +1,7 @@ @set SOURCES_DIR=%~dp0.. @set MSGMERGE=%~dp0..\..\deps\gettext\msgmerge @set OUTPUT_DIR=%SOURCES_DIR%\localization -@set TOOL_DIR=%SOURCES_DIR%\tools\Stride.Core.Translation.Extractor\bin\Debug\net8.0-windows +@set TOOL_DIR=%SOURCES_DIR%\tools\Stride.Core.Translation.Extractor\bin\Debug\net10.0-windows @cd %OUTPUT_DIR% diff --git a/sources/shaders/Irony.GrammarExplorer/Irony.GrammarExplorer.csproj b/sources/shaders/Irony.GrammarExplorer/Irony.GrammarExplorer.csproj index 2019e96df6..eba71c608f 100644 --- a/sources/shaders/Irony.GrammarExplorer/Irony.GrammarExplorer.csproj +++ b/sources/shaders/Irony.GrammarExplorer/Irony.GrammarExplorer.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows + net10.0-windows True diff --git a/sources/shared/SharedAssemblyInfo.cs b/sources/shared/SharedAssemblyInfo.cs index f1a976f73c..a4f578c2e8 100644 --- a/sources/shared/SharedAssemblyInfo.cs +++ b/sources/shared/SharedAssemblyInfo.cs @@ -25,7 +25,7 @@ internal class StrideVersion /// /// The version used by editor for display purpose. The 4th digit will automatically be replaced by the git height when building packages with Stride.Build. /// - public const string PublicVersion = "4.2.1.1"; + public const string PublicVersion = "4.3.0.1"; /// /// The current assembly version as text, currently same as . diff --git a/sources/shared/Stride.NuGetResolver.UI/Stride.NuGetResolver.UI.csproj b/sources/shared/Stride.NuGetResolver.UI/Stride.NuGetResolver.UI.csproj index dbba7955c8..74f91d1750 100644 --- a/sources/shared/Stride.NuGetResolver.UI/Stride.NuGetResolver.UI.csproj +++ b/sources/shared/Stride.NuGetResolver.UI/Stride.NuGetResolver.UI.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable WindowsTools diff --git a/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.csproj b/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.csproj index 8221be94d8..9208dd29ee 100644 --- a/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.csproj +++ b/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable latest enable diff --git a/sources/targets/Stride.Core.TargetFrameworks.Editor.props b/sources/targets/Stride.Core.TargetFrameworks.Editor.props index da2045cb04..5830d10521 100644 --- a/sources/targets/Stride.Core.TargetFrameworks.Editor.props +++ b/sources/targets/Stride.Core.TargetFrameworks.Editor.props @@ -2,8 +2,8 @@ - net8.0-windows - net8.0 + net10.0-windows + net10.0 true diff --git a/sources/targets/Stride.Core.props b/sources/targets/Stride.Core.props index 686a4e2e26..cee4ddad19 100644 --- a/sources/targets/Stride.Core.props +++ b/sources/targets/Stride.Core.props @@ -7,10 +7,10 @@ - net8.0 - net8.0-windows - net8.0-android - net8.0-ios + net10.0 + net10.0-windows + net10.0-android + net10.0-ios uap10.0.16299 @@ -57,12 +57,12 @@ true - - net8.0 - $(StrideRuntimeTargetFrameworks);net8.0-windows + + net10.0 + $(StrideRuntimeTargetFrameworks);net10.0-windows $(StrideRuntimeTargetFrameworks);uap10.0.16299 - $(StrideRuntimeTargetFrameworks);net8.0-android - $(StrideRuntimeTargetFrameworks);net8.0-ios + $(StrideRuntimeTargetFrameworks);net10.0-android + $(StrideRuntimeTargetFrameworks);net10.0-ios $([MSBuild]::Unescape($(StrideRuntimeTargetFrameworks.Trim(';')))) @@ -210,7 +210,7 @@ - + STRIDE_RUNTIME_CORECLR diff --git a/sources/tests/xunit.runner.stride/xunit.runner.stride.csproj b/sources/tests/xunit.runner.stride/xunit.runner.stride.csproj index f08ee56f4c..08cceb8e08 100644 --- a/sources/tests/xunit.runner.stride/xunit.runner.stride.csproj +++ b/sources/tests/xunit.runner.stride/xunit.runner.stride.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 enable latest enable diff --git a/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj b/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj index 7c4b632bda..cb9bb86415 100644 --- a/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj +++ b/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj @@ -2,7 +2,7 @@ - net8.0-windows;net472 + net10.0-windows;net472 Stride.VisualStudio.Commands diff --git a/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs b/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs index 5ce4fbfea1..3f8e61c91a 100644 --- a/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs +++ b/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs @@ -176,9 +176,9 @@ internal static async Task FindStrideSdkDir(string solution, string // Try to find the package with the expected version if (packageInfo.ExpectedVersion != null && packageInfo.ExpectedVersion >= MinimumVersion) { - // Try both net8.0 and net472 + // Try both net10.0 and net472 var success = false; - foreach (var folder in new[] { "net8.0-windows", "net472" }) + foreach (var folder in new[] { "net10.0-windows", "net472" }) { var logger = new Logger(); var solutionRoot = Path.GetDirectoryName(solution); diff --git a/sources/tools/Stride.VisualStudio.PackageInstall/Stride.VisualStudio.PackageInstall.csproj b/sources/tools/Stride.VisualStudio.PackageInstall/Stride.VisualStudio.PackageInstall.csproj index 1914187a9d..b596253442 100644 --- a/sources/tools/Stride.VisualStudio.PackageInstall/Stride.VisualStudio.PackageInstall.csproj +++ b/sources/tools/Stride.VisualStudio.PackageInstall/Stride.VisualStudio.PackageInstall.csproj @@ -1,7 +1,7 @@ Exe - net8.0 + net10.0 false true true From 5df3988abe526d35e5660e71939b6148459b8650 Mon Sep 17 00:00:00 2001 From: Eideren Date: Sat, 13 Sep 2025 19:24:16 +0200 Subject: [PATCH 02/14] fix PackageUpgrader's TargetFramework changes --- sources/Directory.Packages.props | 12 +++--- .../Stride.Assets/StridePackageUpgrader.cs | 40 ++++++++++--------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/sources/Directory.Packages.props b/sources/Directory.Packages.props index 28607e25a4..59ede55aed 100644 --- a/sources/Directory.Packages.props +++ b/sources/Directory.Packages.props @@ -56,11 +56,11 @@ - - - - - + + + + + @@ -144,4 +144,4 @@ - + \ No newline at end of file diff --git a/sources/engine/Stride.Assets/StridePackageUpgrader.cs b/sources/engine/Stride.Assets/StridePackageUpgrader.cs index a29087dd3d..24e6de0159 100644 --- a/sources/engine/Stride.Assets/StridePackageUpgrader.cs +++ b/sources/engine/Stride.Assets/StridePackageUpgrader.cs @@ -22,6 +22,8 @@ using Stride.Assets.Templates; using Stride.Graphics; using System.Text; +using Microsoft.Build.Evaluation; +using Stride.Core.Annotations; namespace Stride.Assets { @@ -243,16 +245,14 @@ public override bool UpgradeBeforeAssembliesLoaded(PackageLoadParameters loadPar if (tfm.EvaluatedValue == "netstandard2.0" || (tfm.EvaluatedValue.StartsWith("net4", StringComparison.Ordinal) && solutionProject.Type == ProjectType.Library)) { - // In case it's a single TargetFramework, add the "s" at the end - tfm.Xml.Name = "TargetFrameworks"; - tfm.Xml.Value = "net6.0"; + tfm.UnevaluatedValue = "net6.0"; isProjectDirty = true; project.ReevaluateIfNecessary(); } // Executable else if ((tfm.EvaluatedValue.StartsWith("net4", StringComparison.Ordinal) || tfm.EvaluatedValue.StartsWith("net5", StringComparison.Ordinal)) && solutionProject.Type == ProjectType.Executable) { - tfm.Xml.Value = solutionProject.Platform == PlatformType.Windows ? "net6.0-windows" : "net6.0"; + tfm.UnevaluatedValue = solutionProject.Platform == PlatformType.Windows ? "net6.0-windows" : "net6.0"; isProjectDirty = true; project.ReevaluateIfNecessary(); } @@ -261,45 +261,39 @@ public override bool UpgradeBeforeAssembliesLoaded(PackageLoadParameters loadPar if (dependency.Version.MinVersion < new PackageVersion("4.2.0.0") && solutionProject != null) { - var tfm = project.GetProperty("TargetFramework") - ?? project.GetProperty("TargetFrameworks"); - if (tfm != null) + if (GetTargetFramework(project) is { } tfm) { // Library if (tfm.EvaluatedValue.StartsWith("net6", StringComparison.Ordinal) && solutionProject.Type == ProjectType.Library) { - // In case it's a single TargetFramework, add the "s" at the end - tfm.Xml.Name = "TargetFrameworks"; - tfm.Xml.Value = "net8.0"; + tfm.UnevaluatedValue = "net8.0"; isProjectDirty = true; + project.ReevaluateIfNecessary(); } // Executable else if ((tfm.EvaluatedValue.StartsWith("net6", StringComparison.Ordinal)) && solutionProject.Type == ProjectType.Executable) { - tfm.Xml.Value = solutionProject.Platform == PlatformType.Windows ? "net8.0-windows" : "net8.0"; + tfm.UnevaluatedValue = solutionProject.Platform == PlatformType.Windows ? "net8.0-windows" : "net8.0"; isProjectDirty = true; + project.ReevaluateIfNecessary(); } } } if (dependency.Version.MinVersion < new PackageVersion("4.3.0.0") && solutionProject != null) { - var tfm = project.GetProperty("TargetFramework") - ?? project.GetProperty("TargetFrameworks"); - if (tfm != null) + if (GetTargetFramework(project) is { } tfm) { // Library if (tfm.EvaluatedValue.StartsWith("net8", StringComparison.Ordinal) && solutionProject.Type == ProjectType.Library) { - // In case it's a single TargetFramework, add the "s" at the end - tfm.Xml.Name = "TargetFrameworks"; - tfm.Xml.Value = "net10.0"; + tfm.UnevaluatedValue = "net10.0"; isProjectDirty = true; } // Executable else if ((tfm.EvaluatedValue.StartsWith("net8", StringComparison.Ordinal)) && solutionProject.Type == ProjectType.Executable) { - tfm.Xml.Value = solutionProject.Platform == PlatformType.Windows ? "net10.0-windows" : "net10.0"; + tfm.UnevaluatedValue = solutionProject.Platform == PlatformType.Windows ? "net10.0-windows" : "net10.0"; isProjectDirty = true; } } @@ -319,5 +313,15 @@ public override bool UpgradeBeforeAssembliesLoaded(PackageLoadParameters loadPar return true; } + + [CanBeNull] + private static ProjectProperty GetTargetFramework(Project project) + { + var tfm = project.GetProperty("TargetFramework"); + if (tfm is null || tfm.IsGlobalProperty) + tfm = project.GetProperty("TargetFrameworks"); + + return tfm.IsGlobalProperty ? null : tfm; + } } } From 6e52c0a28678b903372c947dbf04229a04f8bb46 Mon Sep 17 00:00:00 2001 From: Eideren Date: Wed, 17 Sep 2025 23:45:05 +0200 Subject: [PATCH 03/14] Fix required components --- build/.vsconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/.vsconfig b/build/.vsconfig index a474f2c8f0..6c97b7d753 100644 --- a/build/.vsconfig +++ b/build/.vsconfig @@ -17,7 +17,7 @@ "Microsoft.VisualStudio.Component.SQL.CLR", "Microsoft.Component.ClickOnce", "Microsoft.VisualStudio.Component.ManagedDesktop.Core", - "Microsoft.NetCore.Component.Runtime.6.0", + "Microsoft.NetCore.Component.Runtime.10.0", "Microsoft.NetCore.Component.SDK", "Microsoft.VisualStudio.Component.FSharp", "Microsoft.ComponentGroup.ClickOnce.Publish", From 1b186653845bb77af89b4ff137b565de4223e7a9 Mon Sep 17 00:00:00 2001 From: Eideren Date: Thu, 18 Sep 2025 11:33:03 +0200 Subject: [PATCH 04/14] Visual Studio 2026 Extension support --- sources/assets/Stride.Core.Packages/NugetStore.cs | 10 +++++++--- .../ViewModels/LauncherViewModel.cs | 14 ++++++++++++++ .../ViewModels/VsixVersionViewModel.cs | 7 +++++-- .../Stride.Launcher/Views/LauncherWindow.xaml | 1 + .../Stride.VisualStudio.Package.csproj | 2 +- .../Stride.VisualStudio.Package.nuspec | 2 +- .../source.extension.vsixmanifest | 8 ++++---- .../Stride.VisualStudio.PackageInstall/Program.cs | 4 ++-- 8 files changed, 35 insertions(+), 13 deletions(-) diff --git a/sources/assets/Stride.Core.Packages/NugetStore.cs b/sources/assets/Stride.Core.Packages/NugetStore.cs index 8f2d03a70f..6e7c693191 100644 --- a/sources/assets/Stride.Core.Packages/NugetStore.cs +++ b/sources/assets/Stride.Core.Packages/NugetStore.cs @@ -156,7 +156,8 @@ public static void UpdatePackageSource(ISettings settings, string name, string u public enum VsixSupportedVsVersion { VS2019, - VS2022 + VS2022, + VS2026, } /// @@ -166,10 +167,13 @@ public enum VsixSupportedVsVersion public IReadOnlyDictionary VsixVersionToStrideRelease { get; } = new Dictionary { // The VSIX for VS2019 is avaliable in Stride packages of version 4.0.x - {VsixSupportedVsVersion.VS2019, (new PackageVersion("4.0"), new PackageVersion("4.1")) }, + { VsixSupportedVsVersion.VS2019, (new PackageVersion("4.0"), new PackageVersion("4.1")) }, // The VSIX for VS2022 is available in Stride packages of version 4.1.x and later. - {VsixSupportedVsVersion.VS2022, (new PackageVersion("4.1"), new PackageVersion(int.MaxValue,0,0,0)) }, + { VsixSupportedVsVersion.VS2022, (new PackageVersion("4.1"), new PackageVersion("4.3")) }, + + // The VSIX for VS2026 is available in Stride packages of version 4.3.x and later. + { VsixSupportedVsVersion.VS2026, (new PackageVersion("4.3"), new PackageVersion(int.MaxValue, 0, 0, 0)) }, }; /// diff --git a/sources/launcher/Stride.Launcher/ViewModels/LauncherViewModel.cs b/sources/launcher/Stride.Launcher/ViewModels/LauncherViewModel.cs index aa8d2246a8..da62263a10 100644 --- a/sources/launcher/Stride.Launcher/ViewModels/LauncherViewModel.cs +++ b/sources/launcher/Stride.Launcher/ViewModels/LauncherViewModel.cs @@ -57,6 +57,7 @@ internal LauncherViewModel(IViewModelServiceProvider serviceProvider, NugetStore VsixPackage2019 = new VsixVersionViewModel(this, store, store.VsixPackageId, NugetStore.VsixSupportedVsVersion.VS2019); VsixPackage2022 = new VsixVersionViewModel(this, store, store.VsixPackageId, NugetStore.VsixSupportedVsVersion.VS2022); + VsixPackage2026 = new VsixVersionViewModel(this, store, store.VsixPackageId, NugetStore.VsixSupportedVsVersion.VS2026); // Commands InstallLatestVersionCommand = new AnonymousTaskCommand(ServiceProvider, InstallLatestVersion) { IsEnabled = false }; OpenUrlCommand = new AnonymousTaskCommand(ServiceProvider, OpenUrl); @@ -110,6 +111,8 @@ public void Dispose() public VsixVersionViewModel VsixPackage2022 { get; } + public VsixVersionViewModel VsixPackage2026 { get; } + public StrideVersionViewModel ActiveVersion { get { return activeVersion; } set { SetValue(ref activeVersion, value); Dispatcher.InvokeAsync(() => StartStudioCommand.IsEnabled = (value != null) && value.CanStart); } } public ObservableList RecentProjects { get; } = new ObservableList(); @@ -195,6 +198,7 @@ await RunLockTask(async () => await RetrieveServerStrideVersions(); await VsixPackage2019.UpdateFromStore(); await VsixPackage2022.UpdateFromStore(); + await VsixPackage2026.UpdateFromStore(); await CheckForFirstInstall(); await newsTask; @@ -511,6 +515,16 @@ await Dispatcher.InvokeTask(async () => var versionToInstall = StrideVersions.First(x => x.CanBeDownloaded); await versionToInstall.Download(true); + // if VS2026 is installed (version 18.x) + if (!VsixPackage2026.IsLatestVersionInstalled && VsixPackage2026.CanBeDownloaded && VisualStudioVersions.AvailableInstances.Any(ide => ide.InstallationVersion.Major == 18)) + { + result = await ServiceProvider.Get().MessageBoxAsync(string.Format(Strings.AskInstallVSIX, "2026"), MessageBoxButton.YesNo, MessageBoxImage.Question); + if (result == MessageBoxResult.Yes) + { + await VsixPackage2026.ExecuteAction(); + } + } + // if VS2022 is installed (version 17.x) if (!VsixPackage2022.IsLatestVersionInstalled && VsixPackage2022.CanBeDownloaded && VisualStudioVersions.AvailableInstances.Any(ide => ide.InstallationVersion.Major == 17)) { diff --git a/sources/launcher/Stride.Launcher/ViewModels/VsixVersionViewModel.cs b/sources/launcher/Stride.Launcher/ViewModels/VsixVersionViewModel.cs index 9736ef4e87..a96a60ec09 100644 --- a/sources/launcher/Stride.Launcher/ViewModels/VsixVersionViewModel.cs +++ b/sources/launcher/Stride.Launcher/ViewModels/VsixVersionViewModel.cs @@ -85,10 +85,13 @@ private string FormatStatus(string status) switch (vsixSupportedVsVersion) { case NugetStore.VsixSupportedVsVersion.VS2019: - vsixTarget = string.Format(vsixTarget,"2019"); + vsixTarget = string.Format(vsixTarget, "2019"); break; case NugetStore.VsixSupportedVsVersion.VS2022: - vsixTarget = string.Format(vsixTarget, "2022"); ; + vsixTarget = string.Format(vsixTarget, "2022"); + break; + case NugetStore.VsixSupportedVsVersion.VS2026: + vsixTarget = string.Format(vsixTarget, "2026"); break; } return $"{vsixTarget}: {status}"; diff --git a/sources/launcher/Stride.Launcher/Views/LauncherWindow.xaml b/sources/launcher/Stride.Launcher/Views/LauncherWindow.xaml index 3fe2ff3f03..74b62d2689 100644 --- a/sources/launcher/Stride.Launcher/Views/LauncherWindow.xaml +++ b/sources/launcher/Stride.Launcher/Views/LauncherWindow.xaml @@ -508,6 +508,7 @@ + diff --git a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj index 3af3a4a1aa..ca2e123ef7 100644 --- a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj +++ b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj @@ -1,6 +1,6 @@ - 17.0 + 18.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) true diff --git a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.nuspec b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.nuspec index 8eb8eab5ab..f7c98e9c06 100644 --- a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.nuspec +++ b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.nuspec @@ -2,7 +2,7 @@ Stride.VisualStudio.Package - 4.2.0 + 4.3.0 Stride Stride MIT diff --git a/sources/tools/Stride.VisualStudio.Package/source.extension.vsixmanifest b/sources/tools/Stride.VisualStudio.Package/source.extension.vsixmanifest index 897a0c1ea7..7cc50e063b 100644 --- a/sources/tools/Stride.VisualStudio.Package/source.extension.vsixmanifest +++ b/sources/tools/Stride.VisualStudio.Package/source.extension.vsixmanifest @@ -1,13 +1,13 @@ - + Stride Tools - Stride Tools for VS2022 + Stride Tools for VS2026 Resources\VSPackage.ico - + amd64 @@ -20,6 +20,6 @@ - + diff --git a/sources/tools/Stride.VisualStudio.PackageInstall/Program.cs b/sources/tools/Stride.VisualStudio.PackageInstall/Program.cs index 878eaf25bb..350dc042d8 100644 --- a/sources/tools/Stride.VisualStudio.PackageInstall/Program.cs +++ b/sources/tools/Stride.VisualStudio.PackageInstall/Program.cs @@ -42,7 +42,7 @@ static int Main(string[] args) case "/uninstall": { // Note: we allow uninstall to fail (i.e. VSIX was not installed for that specific Visual Studio version) - RunVsixInstaller(ideInfo.VsixInstallerPath, "/uninstall:Stride.VisualStudio.Package.2022 /quiet"); + RunVsixInstaller(ideInfo.VsixInstallerPath, "/uninstall:Stride.VisualStudio.Package.2026 /quiet"); break; } } @@ -72,4 +72,4 @@ private static int RunVsixInstaller(string pathToVsixInstaller, string arguments process.WaitForExit(); return process.ExitCode; } -} +} \ No newline at end of file From dbf21d2f3a74d7ef42de064cb31ff2446f6acf1f Mon Sep 17 00:00:00 2001 From: Eideren Date: Mon, 29 Sep 2025 13:09:05 +0200 Subject: [PATCH 05/14] Specify Pre-release VS for MSBuild --- .github/workflows/build-android.yml | 2 ++ .github/workflows/build-ios.yml | 2 ++ .github/workflows/build-launcher.yml | 2 ++ .github/workflows/build-linux-runtime.yml | 2 ++ .github/workflows/build-vs-package.yml | 2 ++ .github/workflows/build-windows-full.yml | 2 ++ .github/workflows/build-windows-runtime.yml | 2 ++ .github/workflows/test-windows.yml | 2 ++ 8 files changed, 16 insertions(+) diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index b5ee97f403..e36a3f72e4 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -53,6 +53,8 @@ jobs: with: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 + with: + vs-prerelease: true - name: Build run: | msbuild build\Stride.Android.sln ` diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 34714023a5..d7e760ee43 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -53,6 +53,8 @@ jobs: with: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 + with: + vs-prerelease: true - name: Build run: | msbuild build\Stride.iOS.sln ` diff --git a/.github/workflows/build-launcher.yml b/.github/workflows/build-launcher.yml index 3395e9b103..e5fc5163ee 100644 --- a/.github/workflows/build-launcher.yml +++ b/.github/workflows/build-launcher.yml @@ -51,6 +51,8 @@ jobs: with: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 + with: + vs-prerelease: true - name: Build run: | msbuild build\Stride.Launcher.sln ` diff --git a/.github/workflows/build-linux-runtime.yml b/.github/workflows/build-linux-runtime.yml index 74bfaac72f..b391e763aa 100644 --- a/.github/workflows/build-linux-runtime.yml +++ b/.github/workflows/build-linux-runtime.yml @@ -63,6 +63,8 @@ jobs: with: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 + with: + vs-prerelease: true - name: Build run: | msbuild build\Stride.Runtime.sln ` diff --git a/.github/workflows/build-vs-package.yml b/.github/workflows/build-vs-package.yml index d6b78114d5..76825224b6 100644 --- a/.github/workflows/build-vs-package.yml +++ b/.github/workflows/build-vs-package.yml @@ -48,6 +48,8 @@ jobs: with: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 + with: + vs-prerelease: true - name: Build run: | msbuild build\Stride.VisualStudio.sln ` diff --git a/.github/workflows/build-windows-full.yml b/.github/workflows/build-windows-full.yml index 9b2b7f08f6..657622093e 100644 --- a/.github/workflows/build-windows-full.yml +++ b/.github/workflows/build-windows-full.yml @@ -48,6 +48,8 @@ jobs: with: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 + with: + vs-prerelease: true - name: Build run: | msbuild build\Stride.sln ` diff --git a/.github/workflows/build-windows-runtime.yml b/.github/workflows/build-windows-runtime.yml index d66b9acdca..b799dd47b3 100644 --- a/.github/workflows/build-windows-runtime.yml +++ b/.github/workflows/build-windows-runtime.yml @@ -66,6 +66,8 @@ jobs: with: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 + with: + vs-prerelease: true - name: Build run: | msbuild build\Stride.Runtime.sln ` diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index c01db5a7ea..7a670062f0 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -59,6 +59,8 @@ jobs: with: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 + with: + vs-prerelease: true - name: Build run: | msbuild build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf ` From 9715074c43cbd1469d6870dfd69c9a26c641f048 Mon Sep 17 00:00:00 2001 From: Eideren Date: Mon, 29 Sep 2025 13:22:56 +0200 Subject: [PATCH 06/14] Specify VS version for MSBuild instead ? --- .github/workflows/build-android.yml | 2 +- .github/workflows/build-ios.yml | 2 +- .github/workflows/build-launcher.yml | 2 +- .github/workflows/build-linux-runtime.yml | 2 +- .github/workflows/build-vs-package.yml | 2 +- .github/workflows/build-windows-full.yml | 2 +- .github/workflows/build-windows-runtime.yml | 2 +- .github/workflows/test-windows.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index e36a3f72e4..f69a51e4b7 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -54,7 +54,7 @@ jobs: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 with: - vs-prerelease: true + vs-version: '[18.0,19.0)' - name: Build run: | msbuild build\Stride.Android.sln ` diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index d7e760ee43..1d856a95af 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -54,7 +54,7 @@ jobs: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 with: - vs-prerelease: true + vs-version: '[18.0,19.0)' - name: Build run: | msbuild build\Stride.iOS.sln ` diff --git a/.github/workflows/build-launcher.yml b/.github/workflows/build-launcher.yml index e5fc5163ee..690c9528bd 100644 --- a/.github/workflows/build-launcher.yml +++ b/.github/workflows/build-launcher.yml @@ -52,7 +52,7 @@ jobs: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 with: - vs-prerelease: true + vs-version: '[18.0,19.0)' - name: Build run: | msbuild build\Stride.Launcher.sln ` diff --git a/.github/workflows/build-linux-runtime.yml b/.github/workflows/build-linux-runtime.yml index b391e763aa..23ac782d3c 100644 --- a/.github/workflows/build-linux-runtime.yml +++ b/.github/workflows/build-linux-runtime.yml @@ -64,7 +64,7 @@ jobs: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 with: - vs-prerelease: true + vs-version: '[18.0,19.0)' - name: Build run: | msbuild build\Stride.Runtime.sln ` diff --git a/.github/workflows/build-vs-package.yml b/.github/workflows/build-vs-package.yml index 76825224b6..99c6654a37 100644 --- a/.github/workflows/build-vs-package.yml +++ b/.github/workflows/build-vs-package.yml @@ -49,7 +49,7 @@ jobs: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 with: - vs-prerelease: true + vs-version: '[18.0,19.0)' - name: Build run: | msbuild build\Stride.VisualStudio.sln ` diff --git a/.github/workflows/build-windows-full.yml b/.github/workflows/build-windows-full.yml index 657622093e..fe3934eee1 100644 --- a/.github/workflows/build-windows-full.yml +++ b/.github/workflows/build-windows-full.yml @@ -49,7 +49,7 @@ jobs: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 with: - vs-prerelease: true + vs-version: '[18.0,19.0)' - name: Build run: | msbuild build\Stride.sln ` diff --git a/.github/workflows/build-windows-runtime.yml b/.github/workflows/build-windows-runtime.yml index b799dd47b3..cd5fd4a1d6 100644 --- a/.github/workflows/build-windows-runtime.yml +++ b/.github/workflows/build-windows-runtime.yml @@ -67,7 +67,7 @@ jobs: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 with: - vs-prerelease: true + vs-version: '[18.0,19.0)' - name: Build run: | msbuild build\Stride.Runtime.sln ` diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 7a670062f0..06131b39d1 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -60,7 +60,7 @@ jobs: dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 with: - vs-prerelease: true + vs-version: '[18.0,19.0)' - name: Build run: | msbuild build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf ` From f930ef86366dfa0d1c6ef7f6fe518edc083b5218 Mon Sep 17 00:00:00 2001 From: Eideren Date: Mon, 29 Sep 2025 13:49:56 +0200 Subject: [PATCH 07/14] Use dotnet msbuild instead --- .github/workflows/build-android.yml | 5 +---- .github/workflows/build-ios.yml | 5 +---- .github/workflows/build-launcher.yml | 5 +---- .github/workflows/build-linux-runtime.yml | 5 +---- .github/workflows/build-vs-package.yml | 5 +---- .github/workflows/build-windows-full.yml | 5 +---- .github/workflows/build-windows-runtime.yml | 5 +---- .github/workflows/test-windows.yml | 5 +---- 8 files changed, 8 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index f69a51e4b7..0be1a4607d 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -52,12 +52,9 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' - - uses: microsoft/setup-msbuild@v2 - with: - vs-version: '[18.0,19.0)' - name: Build run: | - msbuild build\Stride.Android.sln ` + dotnet msbuild build\Stride.Android.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 1d856a95af..13af3b0005 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -52,12 +52,9 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' - - uses: microsoft/setup-msbuild@v2 - with: - vs-version: '[18.0,19.0)' - name: Build run: | - msbuild build\Stride.iOS.sln ` + dotnet msbuild build\Stride.iOS.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/build-launcher.yml b/.github/workflows/build-launcher.yml index 690c9528bd..a1e0fa8f10 100644 --- a/.github/workflows/build-launcher.yml +++ b/.github/workflows/build-launcher.yml @@ -50,12 +50,9 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' - - uses: microsoft/setup-msbuild@v2 - with: - vs-version: '[18.0,19.0)' - name: Build run: | - msbuild build\Stride.Launcher.sln ` + dotnet msbuild build\Stride.Launcher.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/build-linux-runtime.yml b/.github/workflows/build-linux-runtime.yml index 23ac782d3c..d6648dca48 100644 --- a/.github/workflows/build-linux-runtime.yml +++ b/.github/workflows/build-linux-runtime.yml @@ -62,12 +62,9 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' - - uses: microsoft/setup-msbuild@v2 - with: - vs-version: '[18.0,19.0)' - name: Build run: | - msbuild build\Stride.Runtime.sln ` + dotnet msbuild build\Stride.Runtime.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/build-vs-package.yml b/.github/workflows/build-vs-package.yml index 99c6654a37..a5638eac1e 100644 --- a/.github/workflows/build-vs-package.yml +++ b/.github/workflows/build-vs-package.yml @@ -47,12 +47,9 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' - - uses: microsoft/setup-msbuild@v2 - with: - vs-version: '[18.0,19.0)' - name: Build run: | - msbuild build\Stride.VisualStudio.sln ` + dotnet msbuild build\Stride.VisualStudio.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/build-windows-full.yml b/.github/workflows/build-windows-full.yml index fe3934eee1..84362acd8c 100644 --- a/.github/workflows/build-windows-full.yml +++ b/.github/workflows/build-windows-full.yml @@ -47,12 +47,9 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' - - uses: microsoft/setup-msbuild@v2 - with: - vs-version: '[18.0,19.0)' - name: Build run: | - msbuild build\Stride.sln ` + dotnet msbuild build\Stride.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/build-windows-runtime.yml b/.github/workflows/build-windows-runtime.yml index cd5fd4a1d6..6af605b1f8 100644 --- a/.github/workflows/build-windows-runtime.yml +++ b/.github/workflows/build-windows-runtime.yml @@ -65,12 +65,9 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' - - uses: microsoft/setup-msbuild@v2 - with: - vs-version: '[18.0,19.0)' - name: Build run: | - msbuild build\Stride.Runtime.sln ` + dotnet msbuild build\Stride.Runtime.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 06131b39d1..fb48acfd54 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -58,12 +58,9 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' - - uses: microsoft/setup-msbuild@v2 - with: - vs-version: '[18.0,19.0)' - name: Build run: | - msbuild build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf ` + dotnet msbuild build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` From e09d790aa7a3fe7d2c32a768f20be189e1693581 Mon Sep 17 00:00:00 2001 From: Vaclav Elias <4528464+VaclavElias@users.noreply.github.com> Date: Mon, 13 Oct 2025 12:43:34 +0100 Subject: [PATCH 08/14] chore: GitHub Actions Upgrade to .NET 10 (#10) * ci: Replace dotnet CLI with msbuild in workflows - Added `global.json` to specify .NET SDK version `10.0.100` with `rollForward` set to `latestMinor` for compatibility and flexibility. * fix: .NET SDK version updated * fix: ios workload added * fix: android workflow added * feat: Setup Android NDK added and NDK enviroment configuration * test: GitHub actions updated for Android * fix: android-sdk path explicitly added * test: Remove NDK 26.3 * test: Reversing the change * refactor: Simplifying workflow * test: Disabling android workload, probaly it isn't needed * fix: android workflow re-enabled * ci: Improve Linux compatibility in build and test scripts - Updated `dotnet build` and `dotnet test` commands to use forward slashes (`/`) instead of backslashes (`\`) for file paths and line continuations, ensuring compatibility with Linux systems. * feat: Install Build Dependencies step added * fix: Make strlcat_chk and strlcpy_chk non-fatal on Linux * feat: llvm added * feat: lld added * feat: Create NuGet.config added * test: Testing another approach * fix: Action updated * fix: Updates reversed * test: Path test added * test: Configure NuGet Sources added * fix: Semicolon replaced * fix: Paths corrected * test: Additinal updates * fix: Action updated * text: Projects from editor folder removed * test: Custom source disabled * test: Removing Windows specific tests * ci: Clean up * ci: Removig a comment * fix: Reversing the changes back --- .github/workflows/build-android.yml | 40 ++++++++++++++++- .github/workflows/build-ios.yml | 5 ++- .github/workflows/build-launcher.yml | 3 +- .github/workflows/build-linux-runtime.yml | 3 +- .github/workflows/build-vs-package.yml | 3 +- .github/workflows/build-windows-full.yml | 3 +- .github/workflows/build-windows-runtime.yml | 3 +- .github/workflows/test-linux.yml | 49 +++++++++++++++++---- .github/workflows/test-windows.yml | 3 +- build/global.json | 6 +++ 10 files changed, 101 insertions(+), 17 deletions(-) create mode 100644 build/global.json diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 0be1a4607d..7d2c877687 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -52,12 +52,48 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' + - name: Install Android Workload + run: dotnet workload install android + - name: Remove Conflicting NDK + shell: pwsh + run: | + $conflictingNdk = "C:\Android\android-sdk\ndk\26.3.11579264" + if (Test-Path $conflictingNdk) { + Write-Host "Removing conflicting NDK 26.3.11579264" + Remove-Item -Path $conflictingNdk -Recurse -Force + } + - name: Setup Android + uses: android-actions/setup-android@v3 + with: + cmdline-tools-version: 12266719 + accept-android-sdk-licenses: true + log-accepted-android-sdk-licenses: true + packages: tools platform-tools ndk;21.4.7075529 + - name: Configure NDK Environment + shell: pwsh + run: | + $ndkPath = "$env:ANDROID_SDK_ROOT\ndk\21.4.7075529" + echo "ANDROID_NDK_ROOT=$ndkPath" >> $env:GITHUB_ENV + echo "ANDROID_NDK_HOME=$ndkPath" >> $env:GITHUB_ENV + echo "Using NDK at: $ndkPath" + - uses: microsoft/setup-msbuild@v2 + - name: Debug NDK Configuration + shell: pwsh + run: | + Write-Host "ANDROID_SDK_ROOT: $env:ANDROID_SDK_ROOT" + Write-Host "ANDROID_NDK_ROOT: $env:ANDROID_NDK_ROOT" + Write-Host "ANDROID_NDK_HOME: $env:ANDROID_NDK_HOME" + Write-Host "NDK Path exists: $(Test-Path $env:ANDROID_NDK_ROOT)" + if (Test-Path "$env:ANDROID_NDK_ROOT\source.properties") { + Get-Content "$env:ANDROID_NDK_ROOT\source.properties" + } - name: Build run: | - dotnet msbuild build\Stride.Android.sln ` + msbuild build\Stride.Android.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` -p:StridePlatforms=Android ` -p:StrideSkipUnitTests=true ` - -p:StrideSkipAutoPack=true + -p:StrideSkipAutoPack=true ` + -p:_AndroidNdkDirectory="$env:ANDROID_NDK_ROOT" diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 13af3b0005..91aa4773a4 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -52,9 +52,12 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' + - name: Install .NET iOS Workload + run: dotnet workload install ios + - uses: microsoft/setup-msbuild@v2 - name: Build run: | - dotnet msbuild build\Stride.iOS.sln ` + msbuild build\Stride.iOS.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/build-launcher.yml b/.github/workflows/build-launcher.yml index a1e0fa8f10..3395e9b103 100644 --- a/.github/workflows/build-launcher.yml +++ b/.github/workflows/build-launcher.yml @@ -50,9 +50,10 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' + - uses: microsoft/setup-msbuild@v2 - name: Build run: | - dotnet msbuild build\Stride.Launcher.sln ` + msbuild build\Stride.Launcher.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/build-linux-runtime.yml b/.github/workflows/build-linux-runtime.yml index d6648dca48..74bfaac72f 100644 --- a/.github/workflows/build-linux-runtime.yml +++ b/.github/workflows/build-linux-runtime.yml @@ -62,9 +62,10 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' + - uses: microsoft/setup-msbuild@v2 - name: Build run: | - dotnet msbuild build\Stride.Runtime.sln ` + msbuild build\Stride.Runtime.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/build-vs-package.yml b/.github/workflows/build-vs-package.yml index a5638eac1e..d6b78114d5 100644 --- a/.github/workflows/build-vs-package.yml +++ b/.github/workflows/build-vs-package.yml @@ -47,9 +47,10 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' + - uses: microsoft/setup-msbuild@v2 - name: Build run: | - dotnet msbuild build\Stride.VisualStudio.sln ` + msbuild build\Stride.VisualStudio.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/build-windows-full.yml b/.github/workflows/build-windows-full.yml index 84362acd8c..9b2b7f08f6 100644 --- a/.github/workflows/build-windows-full.yml +++ b/.github/workflows/build-windows-full.yml @@ -47,9 +47,10 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' + - uses: microsoft/setup-msbuild@v2 - name: Build run: | - dotnet msbuild build\Stride.sln ` + msbuild build\Stride.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/build-windows-runtime.yml b/.github/workflows/build-windows-runtime.yml index 6af605b1f8..d66b9acdca 100644 --- a/.github/workflows/build-windows-runtime.yml +++ b/.github/workflows/build-windows-runtime.yml @@ -65,9 +65,10 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' + - uses: microsoft/setup-msbuild@v2 - name: Build run: | - dotnet msbuild build\Stride.Runtime.sln ` + msbuild build\Stride.Runtime.sln ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 430e168c85..190ff5c720 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -45,16 +45,49 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' + - name: Install Build Dependencies + run: | + sudo apt-get update + sudo apt-get install -y libbsd-dev clang llvm lld + - name: Patch NativePath for Linux + run: | + # Make strlcat_chk and strlcpy_chk non-fatal on Linux + sed -i 's/#if !__has_builtin(__builtin___strlcat_chk)/#if !__has_builtin(__builtin___strlcat_chk) \&\& !defined(__linux__)/' deps/NativePath/NativePath.h + sed -i 's/#if !__has_builtin(__builtin___strlcpy_chk)/#if !__has_builtin(__builtin___strlcpy_chk) \&\& !defined(__linux__)/' deps/NativePath/NativePath.h + # This step isn't needed, it adds another NuGet soruce + # - name: Configure NuGet Sources + # run: | + # # Get absolute path to local packages + # LOCAL_PACKAGES_PATH="$(pwd)/bin/packages" + + # # Only add the local source (not the non-existent global one) + # dotnet nuget add source "$LOCAL_PACKAGES_PATH" --name "StrideDev Local" + + # # List configured sources + # echo "==== Configured NuGet Sources ====" + # dotnet nuget list source - name: Build run: | - dotnet build build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf ` - -restore -m:1 -nr:false ` - -v:m -p:WarningLevel=0 ` - -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type }} ` - -p:StridePlatforms=Linux ` - -p:StrideGraphicsApis=OpenGL + dotnet build build/Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf \ + -restore -m:1 -nr:false \ + -v:m -p:WarningLevel=0 \ + -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type }} \ + -p:StridePlatforms=Linux \ + -p:StrideGraphicsApis=OpenGL \ + # This step isn't needed, it lists the NuGet sources again + # - name: Inspect NuGet Local Sources (always) + # if: always() + # run: | + # echo "==== NuGet Sources (dotnet) ====" + # dotnet nuget list source || true + # echo + # echo "==== Working Directory ====" + # pwd + # echo + # echo "==== StrideDev Local ./bin/packages ====" + # if [ -d ./bin/packages ]; then find ./bin/packages -maxdepth 2 -type f -printf '%P\n' | head -200; else echo "Directory not found"; fi - name: Test run: | - dotnet test build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf ` - --no-build ` + dotnet test build/Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf \ + --no-build \ -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type }} diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index fb48acfd54..c01db5a7ea 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -58,9 +58,10 @@ jobs: - uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' + - uses: microsoft/setup-msbuild@v2 - name: Build run: | - dotnet msbuild build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf ` + msbuild build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf ` -restore -m:1 -nr:false ` -v:m -p:WarningLevel=0 ` -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} ` diff --git a/build/global.json b/build/global.json new file mode 100644 index 0000000000..6025460c5d --- /dev/null +++ b/build/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "10.0.100-rc.1.25451.107", + "rollForward": "latestMinor" + } +} From 44db3e861c371768a5824e0290cd46b4635ee16e Mon Sep 17 00:00:00 2001 From: Nicolas Musset Date: Sat, 18 Oct 2025 21:57:05 +0200 Subject: [PATCH 09/14] chore: update SDK to .NET 10 in GitHub actions --- .github/workflows/build-assembly-processor.yml | 2 +- .github/workflows/build-launcher.yml | 2 +- .github/workflows/build-linux-runtime.yml | 2 +- .github/workflows/build-vs-package.yml | 2 +- .github/workflows/build-windows-full.yml | 2 +- .github/workflows/build-windows-runtime.yml | 2 +- .github/workflows/test-windows.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-assembly-processor.yml b/.github/workflows/build-assembly-processor.yml index 6eda02accf..43a604a27d 100644 --- a/.github/workflows/build-assembly-processor.yml +++ b/.github/workflows/build-assembly-processor.yml @@ -47,7 +47,7 @@ jobs: lfs: true - uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - name: Build run: | dotnet build build\Stride.AssemblyProcessor.sln ` diff --git a/.github/workflows/build-launcher.yml b/.github/workflows/build-launcher.yml index 11258e4aa2..52341dded9 100644 --- a/.github/workflows/build-launcher.yml +++ b/.github/workflows/build-launcher.yml @@ -49,7 +49,7 @@ jobs: lfs: true - uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 - name: Build run: | diff --git a/.github/workflows/build-linux-runtime.yml b/.github/workflows/build-linux-runtime.yml index baea1644d8..e55299ddff 100644 --- a/.github/workflows/build-linux-runtime.yml +++ b/.github/workflows/build-linux-runtime.yml @@ -61,7 +61,7 @@ jobs: lfs: true - uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 - name: Build run: | diff --git a/.github/workflows/build-vs-package.yml b/.github/workflows/build-vs-package.yml index 03427c189f..fbc919bc96 100644 --- a/.github/workflows/build-vs-package.yml +++ b/.github/workflows/build-vs-package.yml @@ -46,7 +46,7 @@ jobs: lfs: true - uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 - name: Build run: | diff --git a/.github/workflows/build-windows-full.yml b/.github/workflows/build-windows-full.yml index d18fc15037..cb4de54006 100644 --- a/.github/workflows/build-windows-full.yml +++ b/.github/workflows/build-windows-full.yml @@ -46,7 +46,7 @@ jobs: lfs: true - uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 - name: Build run: | diff --git a/.github/workflows/build-windows-runtime.yml b/.github/workflows/build-windows-runtime.yml index 60008aef7f..00fcdb8ed0 100644 --- a/.github/workflows/build-windows-runtime.yml +++ b/.github/workflows/build-windows-runtime.yml @@ -64,7 +64,7 @@ jobs: lfs: true - uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 - name: Build run: | diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 8d6136c078..4d8455aacb 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -57,7 +57,7 @@ jobs: lfs: true - uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - uses: microsoft/setup-msbuild@v2 - name: Build run: | From e9c6ae663a7b9d9bf2ee218b70f65d25083337b7 Mon Sep 17 00:00:00 2001 From: Eideren Date: Sun, 19 Oct 2025 03:24:49 +0200 Subject: [PATCH 10/14] Move global.json --- {build => sources}/global.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {build => sources}/global.json (100%) diff --git a/build/global.json b/sources/global.json similarity index 100% rename from build/global.json rename to sources/global.json From 7bf49b2ca46cec3aff7c9b27ab82be5018b18258 Mon Sep 17 00:00:00 2001 From: Eideren Date: Sun, 19 Oct 2025 03:24:55 +0200 Subject: [PATCH 11/14] Update .vsconfig --- build/.vsconfig | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/build/.vsconfig b/build/.vsconfig index 6c97b7d753..5dfbfa418a 100644 --- a/build/.vsconfig +++ b/build/.vsconfig @@ -6,9 +6,7 @@ "Microsoft.Net.Component.4.8.SDK", "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites", - "Microsoft.VisualStudio.Component.TypeScript.TSServer", "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions", - "Microsoft.VisualStudio.Component.JavaScript.TypeScript", "Microsoft.VisualStudio.Component.Roslyn.Compiler", "Microsoft.Component.MSBuild", "Microsoft.VisualStudio.Component.Roslyn.LanguageServices", @@ -24,35 +22,26 @@ "Microsoft.NetCore.Component.DevelopmentTools", "Microsoft.Net.Component.4.8.TargetingPack", "Microsoft.Net.ComponentGroup.4.8.DeveloperTools", - "Microsoft.VisualStudio.Component.DiagnosticTools", - "Microsoft.VisualStudio.Component.EntityFramework", - "Microsoft.VisualStudio.Component.Debugger.JustInTime", - "Component.Microsoft.VisualStudio.LiveShare.2022", "Microsoft.VisualStudio.Component.IntelliCode", "Microsoft.VisualStudio.Component.VC.CoreIde", - "Microsoft.VisualStudio.Component.Windows10SDK", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.Graphics.Tools", "Microsoft.VisualStudio.Component.VC.DiagnosticTools", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.26100", "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites", "Microsoft.ComponentGroup.Blend", - "Microsoft.VisualStudio.Component.DotNetModelBuilder", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Component.VC.Redist.14.Latest", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", + "Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit", + "Microsoft.VisualStudio.Component.CppBuildInsights", "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake", - "Microsoft.VisualStudio.Component.VC.CMake.Project", - "Microsoft.VisualStudio.Component.VC.ATL", - "Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest", - "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest", + "Microsoft.VisualStudio.Component.Vcpkg", "Microsoft.VisualStudio.Component.VC.CLI.Support", - "Microsoft.VisualStudio.Component.VC.ASAN", - "Microsoft.VisualStudio.Component.Windows10SDK.18362", - "Microsoft.VisualStudio.Component.VC.CoreBuildTools", "Microsoft.VisualStudio.Workload.NativeDesktop", - "Microsoft.VisualStudio.Component.NuGet.BuildTools", - "Microsoft.Net.Component.4.6.TargetingPack", - "Microsoft.Net.Component.4.6.1.TargetingPack" - ] + "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.NuGet.BuildTools" + ], + "extensions": [] } \ No newline at end of file From b022f4e55cc5e3a159ed1e5f069334bbd6b8de59 Mon Sep 17 00:00:00 2001 From: Eideren Date: Sun, 19 Oct 2025 03:26:16 +0200 Subject: [PATCH 12/14] Newline for Directory.Packages.props --- sources/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/Directory.Packages.props b/sources/Directory.Packages.props index 59ede55aed..6903634b2b 100644 --- a/sources/Directory.Packages.props +++ b/sources/Directory.Packages.props @@ -144,4 +144,4 @@ - \ No newline at end of file + From 6f1f3eaee92aee2a24a58f8f40d939159de95f5f Mon Sep 17 00:00:00 2001 From: Eideren Date: Sun, 19 Oct 2025 03:28:07 +0200 Subject: [PATCH 13/14] Rollback empty line --- sources/tools/Stride.VisualStudio.PackageInstall/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/tools/Stride.VisualStudio.PackageInstall/Program.cs b/sources/tools/Stride.VisualStudio.PackageInstall/Program.cs index 350dc042d8..8d0a481bc2 100644 --- a/sources/tools/Stride.VisualStudio.PackageInstall/Program.cs +++ b/sources/tools/Stride.VisualStudio.PackageInstall/Program.cs @@ -72,4 +72,4 @@ private static int RunVsixInstaller(string pathToVsixInstaller, string arguments process.WaitForExit(); return process.ExitCode; } -} \ No newline at end of file +} From cac9c04bb07c8db396233eda487d61d57df9fa90 Mon Sep 17 00:00:00 2001 From: Eideren Date: Sun, 19 Oct 2025 17:13:23 +0200 Subject: [PATCH 14/14] Move global.json to root --- sources/global.json => global.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sources/global.json => global.json (100%) diff --git a/sources/global.json b/global.json similarity index 100% rename from sources/global.json rename to global.json