Skip to content

Net6+VS2022 support #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Nov 10, 2021
Merged

Net6+VS2022 support #1126

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
015dcaf
basic VS2022 support: update vcxproj to use tools v143
jasonswearingen Aug 21, 2021
94d8169
WIP: move to net6
jasonswearingen Aug 21, 2021
f59a355
net6 + vs2022 working build/run of gamestudio
jasonswearingen Aug 22, 2021
b80d398
WIP: fixing Nuget References. Remove reference to Stride.NuGet.Packa…
jasonswearingen Aug 23, 2021
f068d4a
update old Nuget reference to Microsoft.Extensions.DependencyModel to…
jasonswearingen Aug 23, 2021
e7cc699
Delete settings.json
jasonswearingen Aug 24, 2021
88f6252
update comment for lang 10.0
jasonswearingen Aug 24, 2021
b41c9fe
remove unneeded ref
jasonswearingen Aug 24, 2021
79b89c1
remove Resharper autoplaced config value
jasonswearingen Aug 25, 2021
d2752cd
change version suffix from "-beta" to "-net6" to represent runtime ch…
jasonswearingen Aug 27, 2021
1f70809
personalizations for my net6 R&D environment
jasonswearingen Aug 27, 2021
acd969a
[build] update msbuild to 16.11.0 from 16.0.461
jasonswearingen Sep 2, 2021
26ce828
[IL Injection] update Stride.Core.AssemblyProcessor to latest depende…
jasonswearingen Sep 2, 2021
b7971bd
Merge branch 'net6-unnecessary-build-updates' into jason-scratch
jasonswearingen Sep 2, 2021
f05c90b
Merge branch 'master' into vs2022-net6
jasonswearingen Sep 2, 2021
f5827af
minor path fix for merge from master
jasonswearingen Sep 2, 2021
5e82e0c
[AssemblyProcessor] Fixed UpdateEngine to works with .NET 6 (fixes #1…
xen2 Sep 6, 2021
1a3545d
WIP: Stride.Core.Assets.CompilerApp.exe merge issue from [de0a0cb] . …
jasonswearingen Sep 7, 2021
82161cc
Merge commit 'a0fdc3d7cc0c3c9cc7576ba66c9c11c00d0e4150' into net-tmp3
jasonswearingen Sep 7, 2021
f3a376c
Merge branch 'net6-tmp' into net-tmp3 WIP: Stride.Core.Assets.Compil…
jasonswearingen Sep 7, 2021
9df8150
partial checkin of CompilerApp work. this includes the files but doe…
jasonswearingen Sep 7, 2021
6c9c45e
finish merge of CompilerApp work. (broken)
jasonswearingen Sep 7, 2021
e44a7ca
bugfix CompilerApp checkin
jasonswearingen Sep 7, 2021
64c242f
Merge remote-tracking branch 'xen2/vs2022-net6' into net-tmp3
jasonswearingen Sep 7, 2021
291464d
Merge branch 'stride3d:master' into vs2022-net6
jasonswearingen Sep 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/Stride.Launcher.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<!-- Defines the platform used by Stride - Values are Windows/Android/iOS...etc. -->
<StridePlatform Condition=" '$(StridePlatform)' == '' ">Windows</StridePlatform>

<StrideEditorTargetFrameworks>net5.0-windows</StrideEditorTargetFrameworks>
<StrideEditorTargetFrameworks>net6.0-windows</StrideEditorTargetFrameworks>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions build/Stride.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Distributed under the MIT license. See the LICENSE.md file in the project root f
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
Expand Down
2 changes: 1 addition & 1 deletion samples/Audio/SimpleAudio/SimpleAudio.Game/SimpleAudio.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>SimpleAudio</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Audio/SimpleAudio/SimpleAudio.Windows/SimpleAudio.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>SimpleAudio</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Games/JumpyJet/JumpyJet.Game/JumpyJet.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>JumpyJet</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Games/JumpyJet/JumpyJet.Windows/JumpyJet.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>JumpyJet</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Games/SpaceEscape/SpaceEscape.Game/SpaceEscape.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>SpaceEscape</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Games/SpaceEscape/SpaceEscape.Windows/SpaceEscape.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>SpaceEscape</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Graphics/AnimatedModel/AnimatedModel.Game/AnimatedModel.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>AnimatedModel</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Graphics/AnimatedModel/AnimatedModel.Windows/AnimatedModel.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>AnimatedModel</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Graphics/CustomEffect/CustomEffect.Game/CustomEffect.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>CustomEffect</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Graphics/CustomEffect/CustomEffect.Windows/CustomEffect.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>CustomEffect</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Graphics/MaterialShader/MaterialShader.Game/MaterialShader.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>MaterialShader</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Graphics/MaterialShader/MaterialShader.Windows/MaterialShader.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>MaterialShader</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Graphics/SpriteFonts/SpriteFonts.Game/SpriteFonts.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>SpriteFonts</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Graphics/SpriteFonts/SpriteFonts.Windows/SpriteFonts.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>SpriteFonts</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Game/SpriteStudioDemo.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>SpriteStudioDemo</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Windows/SpriteStudioDemo.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>SpriteStudioDemo</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Input/GravitySensor/GravitySensor.Game/GravitySensor.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>GravitySensor</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Input/GravitySensor/GravitySensor.Windows/GravitySensor.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>GravitySensor</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Input/TouchInputs/TouchInputs.Game/TouchInputs.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>TouchInputs</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Input/TouchInputs/TouchInputs.Windows/TouchInputs.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>TouchInputs</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Particles/ParticlesSample/ParticlesSample.Game/ParticlesSample.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>ParticlesSample</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Particles/ParticlesSample/ParticlesSample.Windows/ParticlesSample.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>ParticlesSample</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Physics/PhysicsSample/PhysicsSample.Game/PhysicsSample.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>PhysicsSample</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Physics/PhysicsSample/PhysicsSample.Windows/PhysicsSample.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>PhysicsSample</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion ...stPersonShooter/FirstPersonShooter/FirstPersonShooter.Game/FirstPersonShooter.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>FirstPersonShooter</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...onShooter/FirstPersonShooter/FirstPersonShooter.Windows/FirstPersonShooter.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>FirstPersonShooter</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Templates/Packs/MaterialPackage/MaterialPackage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Stride.Core" Version="4.1.0.1-beta" PrivateAssets="contentfiles;analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Templates/Packs/PrototypingBlocks/PrototypingBlocks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Stride.Core" Version="4.1.0.1-beta" PrivateAssets="contentfiles;analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Templates/Packs/SamplesAssetPackage/SamplesAssetPackage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Stride.Core" Version="4.1.0.1-beta" PrivateAssets="contentfiles;analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Templates/Packs/VFXPackage/VFXPackage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Stride.Core" Version="4.1.0.1-beta" PrivateAssets="contentfiles;analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Templates/Packs/mannequinModel/mannequinModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Stride.Core" Version="4.1.0.1-beta" PrivateAssets="contentfiles;analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion ...former/ThirdPersonPlatformer/ThirdPersonPlatformer.Game/ThirdPersonPlatformer.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>ThirdPersonPlatformer</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion .../ThirdPersonPlatformer/ThirdPersonPlatformer.Windows/ThirdPersonPlatformer.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>ThirdPersonPlatformer</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/TopDownRPG.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>TopDownRPG</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Windows/TopDownRPG.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>TopDownRPG</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/Templates/VRSandbox/VRSandbox/VRSandbox.Game/VRSandbox.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>VRSandbox</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Templates/VRSandbox/VRSandbox/VRSandbox.Windows/VRSandbox.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>VRSandbox</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion ...es/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Game/CSharpBeginner.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>CSharpBeginner</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...orials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Windows/CSharpBeginner.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>CSharpBeginner.Windows</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/UI/GameMenu/GameMenu.Game/GameMenu.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>GameMenu</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/UI/GameMenu/GameMenu.Windows/GameMenu.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>GameMenu</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/UI/UIElementLink/UIElementLink.Game/UIElementLink.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>UIElementLink</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/UI/UIElementLink/UIElementLink.Windows/UIElementLink.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>UIElementLink</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion samples/UI/UIParticles/UIParticles.Game/UIParticles.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>UIParticles</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/UI/UIParticles/UIParticles.Windows/UIParticles.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>UIParticles</RootNamespace>
Expand Down
1 change: 1 addition & 0 deletions sources/assets/Stride.Core.Assets.CompilerApp/Tasks/PackAssets.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using Stride.Core.IO;
using Stride.Core.Yaml;
using Stride.Core.Yaml.Events;
using Task = Microsoft.Build.Utilities.Task;

namespace Stride.Core.Assets.CompilerApp.Tasks
{
Expand Down
4 changes: 2 additions & 2 deletions sources/assets/Stride.Core.Assets.CompilerApp/build/Stride.Core.Assets.CompilerApp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@
<Target Name="_StridePrepareAssetCompiler">
<PropertyGroup>
<!-- First try NuGet layout, then git checkout -->
<StrideCompileAssetCommand Condition="'$(StrideCompileAssetCommand)' == '' And Exists('$(MSBuildThisFileDirectory)..\lib\net5.0-windows7.0\')">$(MSBuildThisFileDirectory)..\lib\net5.0-windows7.0\Stride.Core.Assets.CompilerApp.exe</StrideCompileAssetCommand>
<StrideCompileAssetCommand Condition="'$(StrideCompileAssetCommand)' == '' And Exists('$(MSBuildThisFileDirectory)..\Stride.Core.Assets.CompilerApp.csproj')">$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net5.0-windows\Stride.Core.Assets.CompilerApp.exe</StrideCompileAssetCommand>
<StrideCompileAssetCommand Condition="'$(StrideCompileAssetCommand)' == '' And Exists('$(MSBuildThisFileDirectory)..\lib\net6.0-windows7.0\')">$(MSBuildThisFileDirectory)..\lib\net6.0-windows7.0\Stride.Core.Assets.CompilerApp.exe</StrideCompileAssetCommand>
<StrideCompileAssetCommand Condition="'$(StrideCompileAssetCommand)' == '' And Exists('$(MSBuildThisFileDirectory)..\Stride.Core.Assets.CompilerApp.csproj')">$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net6.0-windows\Stride.Core.Assets.CompilerApp.exe</StrideCompileAssetCommand>
</PropertyGroup>

<Error Condition="!Exists('$(StrideCompileAssetCommand)')" Text="Stride AssetCompiler could not be found (Command: &quot;$(StrideCompileAssetCommand)&quot;)"/>
Expand Down
Loading