Merge branch 'net6-tmp' into net-tmp3 WIP: Stride.Core.Assets.CompilerApp.exe merge issue from [de0a0cb] .

2021-09-07 08:55:56 -07:00 · 2021-09-07 08:55:56 -07:00 · f3a376c1fc
--- a/build/Stride.Launcher.Build.props
+++ b/build/Stride.Launcher.Build.props
@ -6,6 +6,6 @@
    <!-- Defines the platform used by Stride - Values are Windows/Android/iOS...etc. -->
    <StridePlatform Condition=" '$(StridePlatform)' == '' ">Windows</StridePlatform>

-    <StrideEditorTargetFrameworks>net6.0-windows</StrideEditorTargetFrameworks>
+    <StrideEditorTargetFrameworks>net6.0-windows7.0</StrideEditorTargetFrameworks>
  </PropertyGroup>
 </Project>
--- a/samples/Audio/SimpleAudio/SimpleAudio.Windows/SimpleAudio.Windows.csproj
+++ b/samples/Audio/SimpleAudio/SimpleAudio.Windows/SimpleAudio.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>SimpleAudio</RootNamespace>
--- a/samples/Games/JumpyJet/JumpyJet.Windows/JumpyJet.Windows.csproj
+++ b/samples/Games/JumpyJet/JumpyJet.Windows/JumpyJet.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>JumpyJet</RootNamespace>
--- a/samples/Games/SpaceEscape/SpaceEscape.Windows/SpaceEscape.Windows.csproj
+++ b/samples/Games/SpaceEscape/SpaceEscape.Windows/SpaceEscape.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>SpaceEscape</RootNamespace>
--- a/samples/Graphics/AnimatedModel/AnimatedModel.Windows/AnimatedModel.Windows.csproj
+++ b/samples/Graphics/AnimatedModel/AnimatedModel.Windows/AnimatedModel.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>AnimatedModel</RootNamespace>
--- a/samples/Graphics/CustomEffect/CustomEffect.Windows/CustomEffect.Windows.csproj
+++ b/samples/Graphics/CustomEffect/CustomEffect.Windows/CustomEffect.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>CustomEffect</RootNamespace>
--- a/samples/Graphics/MaterialShader/MaterialShader.Windows/MaterialShader.Windows.csproj
+++ b/samples/Graphics/MaterialShader/MaterialShader.Windows/MaterialShader.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>MaterialShader</RootNamespace>
--- a/samples/Graphics/SpriteFonts/SpriteFonts.Windows/SpriteFonts.Windows.csproj
+++ b/samples/Graphics/SpriteFonts/SpriteFonts.Windows/SpriteFonts.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>SpriteFonts</RootNamespace>
--- a/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Windows/SpriteStudioDemo.Windows.csproj
+++ b/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Windows/SpriteStudioDemo.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>SpriteStudioDemo</RootNamespace>
--- a/samples/Input/GravitySensor/GravitySensor.Windows/GravitySensor.Windows.csproj
+++ b/samples/Input/GravitySensor/GravitySensor.Windows/GravitySensor.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>GravitySensor</RootNamespace>
--- a/samples/Input/TouchInputs/TouchInputs.Windows/TouchInputs.Windows.csproj
+++ b/samples/Input/TouchInputs/TouchInputs.Windows/TouchInputs.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>TouchInputs</RootNamespace>
--- a/samples/Particles/ParticlesSample/ParticlesSample.Windows/ParticlesSample.Windows.csproj
+++ b/samples/Particles/ParticlesSample/ParticlesSample.Windows/ParticlesSample.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>ParticlesSample</RootNamespace>
--- a/samples/Physics/PhysicsSample/PhysicsSample.Windows/PhysicsSample.Windows.csproj
+++ b/samples/Physics/PhysicsSample/PhysicsSample.Windows/PhysicsSample.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>PhysicsSample</RootNamespace>
--- a/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Windows/FirstPersonShooter.Windows.csproj
+++ b/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Windows/FirstPersonShooter.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>FirstPersonShooter</RootNamespace>
--- a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Windows/ThirdPersonPlatformer.Windows.csproj
+++ b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Windows/ThirdPersonPlatformer.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>ThirdPersonPlatformer</RootNamespace>
--- a/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Windows/TopDownRPG.Windows.csproj
+++ b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Windows/TopDownRPG.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>TopDownRPG</RootNamespace>
--- a/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Windows/VRSandbox.Windows.csproj
+++ b/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Windows/VRSandbox.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>VRSandbox</RootNamespace>
--- a/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Windows/CSharpBeginner.Windows.csproj
+++ b/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Windows/CSharpBeginner.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>CSharpBeginner.Windows</RootNamespace>
--- a/samples/UI/GameMenu/GameMenu.Windows/GameMenu.Windows.csproj
+++ b/samples/UI/GameMenu/GameMenu.Windows/GameMenu.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>GameMenu</RootNamespace>
--- a/samples/UI/UIElementLink/UIElementLink.Windows/UIElementLink.Windows.csproj
+++ b/samples/UI/UIElementLink/UIElementLink.Windows/UIElementLink.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>UIElementLink</RootNamespace>
--- a/samples/UI/UIParticles/UIParticles.Windows/UIParticles.Windows.csproj
+++ b/samples/UI/UIParticles/UIParticles.Windows/UIParticles.Windows.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <ApplicationIcon>Resources\GameIcon.ico</ApplicationIcon>
    <OutputType>WinExe</OutputType>
    <RootNamespace>UIParticles</RootNamespace>
--- a/sources/engine/Stride.Games/Stride.Games.csproj
+++ b/sources/engine/Stride.Games/Stride.Games.csproj
@ -9,8 +9,8 @@
  <PropertyGroup>
    <ProductVersion>8.0.30703</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <UseWPF Condition="$(TargetFramework.EndsWith('-windows'))">true</UseWPF>
-    <UseWindowsForms Condition="$(TargetFramework.EndsWith('-windows'))">true</UseWindowsForms>
+    <UseWPF Condition="$(TargetFramework.Contains('-windows'))">true</UseWPF>
+    <UseWindowsForms Condition="$(TargetFramework.Contains('-windows'))">true</UseWindowsForms>
    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
    <StrideAssemblyProcessorOptions>--auto-module-initializer</StrideAssemblyProcessorOptions>
    <StridePlatformDependent>true</StridePlatformDependent>
--- a/sources/engine/Stride.Input/Stride.Input.csproj
+++ b/sources/engine/Stride.Input/Stride.Input.csproj
@ -6,8 +6,8 @@
  </PropertyGroup>
  <Import Project="..\..\targets\Stride.props" />
  <PropertyGroup>
-    <UseWPF Condition="$(TargetFramework.EndsWith('-windows'))">true</UseWPF>
-    <UseWindowsForms Condition="$(TargetFramework.EndsWith('-windows'))">true</UseWindowsForms>
+    <UseWPF Condition="$(TargetFramework.Contains('-windows'))">true</UseWPF>
+    <UseWindowsForms Condition="$(TargetFramework.Contains('-windows'))">true</UseWindowsForms>
    <StridePlatformDependent>true</StridePlatformDependent>
    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
    <StrideBuildTags>*</StrideBuildTags>
@ -23,8 +23,8 @@
  <ItemGroup>
    <ProjectReference Include="..\Stride.Games\Stride.Games.csproj" />
    <PackageReference Include="SharpDX.RawInput" Version="4.2.0" Condition="$(TargetFramework.StartsWith('net4'))" />
-    <PackageReference Include="SharpDX.DirectInput" Version="4.2.0" Condition="$(TargetFramework.EndsWith('-windows'))" />
-    <PackageReference Include="SharpDX.XInput" Version="4.2.0" Condition="$(TargetFramework.EndsWith('-windows'))" />
+    <PackageReference Include="SharpDX.DirectInput" Version="4.2.0" Condition="$(TargetFramework.Contains('-windows'))" />
+    <PackageReference Include="SharpDX.XInput" Version="4.2.0" Condition="$(TargetFramework.Contains('-windows'))" />
  </ItemGroup>
  <Import Project="$(StrideSdkTargets)" />
 </Project>
--- a/sources/launcher/Stride.Launcher/Stride.Launcher.csproj
+++ b/sources/launcher/Stride.Launcher/Stride.Launcher.csproj
@ -7,7 +7,7 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
--- a/sources/targets/Stride.Core.TargetFrameworks.Editor.props
+++ b/sources/targets/Stride.Core.TargetFrameworks.Editor.props
@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <PropertyGroup>
-    <StrideEditorTargetFramework>net6.0-windows</StrideEditorTargetFramework>
+    <StrideEditorTargetFramework>net6.0-windows7.0</StrideEditorTargetFramework>
  </PropertyGroup>

 </Project>
--- a/sources/targets/Stride.Core.props
+++ b/sources/targets/Stride.Core.props
@ -59,7 +59,7 @@
  <PropertyGroup Condition=" '$(StrideRuntime)' == 'true' ">
    <!-- Add net6.0 no matter what (needed for references) -->
    <StrideRuntimeTargetFrameworks>net6.0</StrideRuntimeTargetFrameworks>
-    <StrideRuntimeTargetFrameworks Condition="$(_StridePlatforms.Contains(';Windows;')) And '$(StrideRuntimeWindowsNet6)' == 'true'">$(StrideRuntimeTargetFrameworks);net6.0-windows</StrideRuntimeTargetFrameworks>
+    <StrideRuntimeTargetFrameworks Condition="$(_StridePlatforms.Contains(';Windows;')) And '$(StrideRuntimeWindowsNet6)' == 'true'">$(StrideRuntimeTargetFrameworks);net6.0-windows7.0</StrideRuntimeTargetFrameworks>
    <StrideRuntimeTargetFrameworks Condition="$(_StridePlatforms.Contains(';UWP;'))">$(StrideRuntimeTargetFrameworks);uap10.0.16299</StrideRuntimeTargetFrameworks>
    <StrideRuntimeTargetFrameworks Condition="$(_StridePlatforms.Contains(';Android;'))">$(StrideRuntimeTargetFrameworks);monoandroid81</StrideRuntimeTargetFrameworks>
    <StrideRuntimeTargetFrameworks Condition="$(_StridePlatforms.Contains(';iOS;'))">$(StrideRuntimeTargetFrameworks);xamarinios10</StrideRuntimeTargetFrameworks>
--- a/sources/targets/Stride.props
+++ b/sources/targets/Stride.props
@ -82,7 +82,7 @@
  <PropertyGroup>
    <StrideUI Condition="'$(StridePlatform)' == 'Windows' Or '$(StridePlatform)' == 'Linux' Or '$(StridePlatform)' == 'macOS'">SDL</StrideUI>
    <StrideUI Condition="'$(StrideGraphicsApi)' == 'OpenGL'">$(StrideUI);OPENTK</StrideUI>
-    <StrideUI Condition="$(TargetFramework.EndsWith('-windows')) AND ('$(StrideGraphicsApi)' == 'Direct3D11' Or '$(StrideGraphicsApi)' == 'Direct3D12')">$(StrideUI);WINFORMS;WPF</StrideUI>
+    <StrideUI Condition="$(TargetFramework.Contains('-windows')) AND ('$(StrideGraphicsApi)' == 'Direct3D11' Or '$(StrideGraphicsApi)' == 'Direct3D12')">$(StrideUI);WINFORMS;WPF</StrideUI>

    <DefineConstants Condition="$(StrideUI.Contains('SDL'))">$(DefineConstants);STRIDE_UI_SDL</DefineConstants>
    <DefineConstants Condition="$(StrideUI.Contains('OPENTK'))">$(DefineConstants);STRIDE_UI_OPENTK</DefineConstants>
--- a/sources/tools/Stride.NuGetLoader/Stride.NuGetLoader.csproj
+++ b/sources/tools/Stride.NuGetLoader/Stride.NuGetLoader.csproj
@ -4,7 +4,7 @@

  <PropertyGroup>
    <OutputType Condition="'$(OutputType)' == ''">Exe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
    <UseWpf>true</UseWpf>
    <UseWindowsForms>true</UseWindowsForms>
    <IntermediateOutputPath>obj\$(Configuration)\$(StrideApplicationName)</IntermediateOutputPath>