[Build] Renamed targets to follow props/targets pattern

identy · May 28, 2020 · 8d959c2 · 8d959c2
1 parent b74e6fa
commit 8d959c2
Show file tree

Hide file tree

Showing 151 changed files with 382 additions and 564 deletions.
diff --git a/.../Stride.Android.PreSettings.Local.targets → build/Stride.Android.Build.props b/.../Stride.Android.PreSettings.Local.targets → build/Stride.Android.Build.props
diff --git a/build/Stride.Android.sln b/build/Stride.Android.sln
@@ -28,7 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Ta
 		..\sources\targets\Stride.PostSettings.targets = ..\sources\targets\Stride.PostSettings.targets
 		..\sources\targets\Stride.PostSettings.User.targets = ..\sources\targets\Stride.PostSettings.User.targets
 		..\sources\targets\Stride.PreSettings.targets = ..\sources\targets\Stride.PreSettings.targets
-		..\sources\targets\Stride.PreSettings.UnitTests.targets = ..\sources\targets\Stride.PreSettings.UnitTests.targets
+		..\sources\targets\Stride.UnitTests.props = ..\sources\targets\Stride.UnitTests.props
 		..\sources\targets\Stride.PreSettings.User.targets = ..\sources\targets\Stride.PreSettings.User.targets
 		..\sources\targets\Stride.UnitTests.DisableBuild.targets = ..\sources\targets\Stride.UnitTests.DisableBuild.targets
 		..\sources\targets\Stride.UnitTests.targets = ..\sources\targets\Stride.UnitTests.targets

diff --git a/build/Stride.PreSettings.Local.targets → build/Stride.Build.props b/build/Stride.PreSettings.Local.targets → build/Stride.Build.props
diff --git a/build/Stride.PostSettings.Local.targets → build/Stride.Build.targets b/build/Stride.PostSettings.Local.targets → build/Stride.Build.targets
diff --git a/build/Stride.Core.PreSettings.Local.targets → build/Stride.Core.Build.props b/build/Stride.Core.PreSettings.Local.targets → build/Stride.Core.Build.props
@@ -9,7 +9,6 @@
     <!-- Resolve path (remove ".." elements), for better support on Xamarin iOS -->
     <StridePackageStride>$([System.IO.Path]::GetFullPath('$(StridePackageStride)'))</StridePackageStride>
     <StridePackageStrideBin Condition="'$(StridePackageStrideBin)' == ''">$(StridePackageStride)\Bin</StridePackageStrideBin>
-    <StridePackageStrideSdkBin Condition="'$(StridePackageStrideSdkBin)' == ''">$(StridePackageStrideBin)\Windows</StridePackageStrideSdkBin>
     <StridePackageStridePlatformBin Condition="'$(StridePackageStridePlatformBin)' == ''">$(StridePackageStrideBin)\$(StridePlatformFullName)</StridePackageStridePlatformBin>
   </PropertyGroup>
 </Project>
diff --git a/build/Stride.Core.PostSettings.Local.targets → build/Stride.Core.Build.targets b/build/Stride.Core.PostSettings.Local.targets → build/Stride.Core.Build.targets
diff --git a/build/Stride.Core.GlobalSettings.Local.targets b/build/Stride.Core.GlobalSettings.Local.targets
diff --git a/...Stride.Launcher.PreSettings.Local.targets → build/Stride.Launcher.Build.props b/...Stride.Launcher.PreSettings.Local.targets → build/Stride.Launcher.Build.props
diff --git a/.../Stride.Runtime.PreSettings.Local.targets → build/Stride.Runtime.Build.props b/.../Stride.Runtime.PreSettings.Local.targets → build/Stride.Runtime.Build.props
diff --git a/build/Stride.Runtime.sln b/build/Stride.Runtime.sln
@@ -28,7 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Ta
 		..\sources\targets\Stride.PostSettings.targets = ..\sources\targets\Stride.PostSettings.targets
 		..\sources\targets\Stride.PostSettings.User.targets = ..\sources\targets\Stride.PostSettings.User.targets
 		..\sources\targets\Stride.PreSettings.targets = ..\sources\targets\Stride.PreSettings.targets
-		..\sources\targets\Stride.PreSettings.UnitTests.targets = ..\sources\targets\Stride.PreSettings.UnitTests.targets
+		..\sources\targets\Stride.UnitTests.props = ..\sources\targets\Stride.UnitTests.props
 		..\sources\targets\Stride.PreSettings.User.targets = ..\sources\targets\Stride.PreSettings.User.targets
 		..\sources\targets\Stride.UnitTests.DisableBuild.targets = ..\sources\targets\Stride.UnitTests.DisableBuild.targets
 		..\sources\targets\Stride.UnitTests.targets = ..\sources\targets\Stride.UnitTests.targets

diff --git a/build/Stride.iOS.PreSettings.Local.targets → build/Stride.iOS.Build.props b/build/Stride.iOS.PreSettings.Local.targets → build/Stride.iOS.Build.props
diff --git a/build/Stride.iOS.sln b/build/Stride.iOS.sln
@@ -29,7 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Ta
 		..\sources\targets\Stride.PostSettings.targets = ..\sources\targets\Stride.PostSettings.targets
 		..\sources\targets\Stride.PostSettings.User.targets = ..\sources\targets\Stride.PostSettings.User.targets
 		..\sources\targets\Stride.PreSettings.targets = ..\sources\targets\Stride.PreSettings.targets
-		..\sources\targets\Stride.PreSettings.UnitTests.targets = ..\sources\targets\Stride.PreSettings.UnitTests.targets
+		..\sources\targets\Stride.UnitTests.props = ..\sources\targets\Stride.UnitTests.props
 		..\sources\targets\Stride.PreSettings.User.targets = ..\sources\targets\Stride.PreSettings.User.targets
 		..\sources\targets\Stride.UnitTests.DisableBuild.targets = ..\sources\targets\Stride.UnitTests.DisableBuild.targets
 		..\sources\targets\Stride.UnitTests.targets = ..\sources\targets\Stride.UnitTests.targets

diff --git a/build/Stride.props b/build/Stride.props
diff --git a/build/Stride.sln b/build/Stride.sln
@@ -11,29 +11,20 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Targets.Private", "{97978864-95DD-43A6-9159-AA1C881BE99F}"
 	ProjectSection(SolutionItems) = preProject
 		..\store.config = ..\store.config
-		..\sources\targets\Stride.Core.Android.CSharp.targets = ..\sources\targets\Stride.Core.Android.CSharp.targets
-		..\sources\targets\Stride.Core.CoreCLR.Cpp.targets = ..\sources\targets\Stride.Core.CoreCLR.Cpp.targets
-		..\sources\targets\Stride.Core.CoreCLR.CSharp.targets = ..\sources\targets\Stride.Core.CoreCLR.CSharp.targets
+		..\sources\targets\Stride.Core.Cpp.props = ..\sources\targets\Stride.Core.Cpp.props
 		..\sources\targets\Stride.Core.Cpp.targets = ..\sources\targets\Stride.Core.Cpp.targets
-		..\sources\targets\Stride.Core.CSharp.targets = ..\sources\targets\Stride.Core.CSharp.targets
-		..\sources\targets\Stride.Core.GlobalSettings.targets = ..\sources\targets\Stride.Core.GlobalSettings.targets
-		..\sources\targets\Stride.Core.iOS.CSharp.targets = ..\sources\targets\Stride.Core.iOS.CSharp.targets
 		..\sources\targets\Stride.Core.PostSettings.Dependencies.targets = ..\sources\targets\Stride.Core.PostSettings.Dependencies.targets
-		..\sources\targets\Stride.Core.PostSettings.targets = ..\sources\targets\Stride.Core.PostSettings.targets
-		..\sources\targets\Stride.Core.PreSettings.targets = ..\sources\targets\Stride.Core.PreSettings.targets
+		..\sources\targets\Stride.Core.props = ..\sources\targets\Stride.Core.props
+		..\sources\targets\Stride.Core.RuntimeIdentifier.ProjectReference.targets = ..\sources\targets\Stride.Core.RuntimeIdentifier.ProjectReference.targets
 		..\sources\targets\Stride.Core.Sign.targets = ..\sources\targets\Stride.Core.Sign.targets
-		..\sources\targets\Stride.Core.UWP.Cpp.targets = ..\sources\targets\Stride.Core.UWP.Cpp.targets
-		..\sources\targets\Stride.Core.UWP.CSharp.targets = ..\sources\targets\Stride.Core.UWP.CSharp.targets
-		..\sources\targets\Stride.GlobalSettings.targets = ..\sources\targets\Stride.GlobalSettings.targets
-		..\sources\targets\Stride.Graphics.targets = ..\sources\targets\Stride.Graphics.targets
+		..\sources\targets\Stride.Core.targets = ..\sources\targets\Stride.Core.targets
+		..\sources\targets\Stride.GraphicsApi.Dev.targets = ..\sources\targets\Stride.GraphicsApi.Dev.targets
+		..\sources\targets\Stride.GraphicsApi.PackageReference.targets = ..\sources\targets\Stride.GraphicsApi.PackageReference.targets
 		..\sources\native\Stride.Native.targets = ..\sources\native\Stride.Native.targets
-		..\sources\targets\Stride.PostSettings.References.targets = ..\sources\targets\Stride.PostSettings.References.targets
-		..\sources\targets\Stride.PostSettings.targets = ..\sources\targets\Stride.PostSettings.targets
-		..\sources\targets\Stride.PostSettings.User.targets = ..\sources\targets\Stride.PostSettings.User.targets
-		..\sources\targets\Stride.PreSettings.targets = ..\sources\targets\Stride.PreSettings.targets
-		..\sources\targets\Stride.PreSettings.UnitTests.targets = ..\sources\targets\Stride.PreSettings.UnitTests.targets
-		..\sources\targets\Stride.PreSettings.User.targets = ..\sources\targets\Stride.PreSettings.User.targets
+		..\sources\targets\Stride.props = ..\sources\targets\Stride.props
+		..\sources\targets\Stride.targets = ..\sources\targets\Stride.targets
 		..\sources\targets\Stride.UnitTests.DisableBuild.targets = ..\sources\targets\Stride.UnitTests.DisableBuild.targets
+		..\sources\targets\Stride.UnitTests.props = ..\sources\targets\Stride.UnitTests.props
 		..\sources\targets\Stride.UnitTests.targets = ..\sources\targets\Stride.UnitTests.targets
 	EndProjectSection
 EndProject
@@ -77,10 +68,10 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Build", "00-Targets.Build", "{0B81090E-4066-4723-A658-8AEDBEADE619}"
 	ProjectSection(SolutionItems) = preProject
 		Stride.build = Stride.build
-		Stride.Core.GlobalSettings.Local.targets = Stride.Core.GlobalSettings.Local.targets
-		Stride.Core.PostSettings.Local.targets = Stride.Core.PostSettings.Local.targets
-		Stride.Core.PreSettings.Local.targets = Stride.Core.PreSettings.Local.targets
-		Stride.PreSettings.Local.targets = Stride.PreSettings.Local.targets
+		Stride.Build.props = Stride.Build.props
+		Stride.Build.targets = Stride.Build.targets
+		Stride.Core.Build.props = Stride.Core.Build.props
+		Stride.Core.Build.targets = Stride.Core.Build.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "30-CoreDesign", "30-CoreDesign", "{25F10A0B-7259-404C-86BE-FD2363C92F72}"

diff --git a/build/Stride.targets b/build/Stride.targets
diff --git a/samples/Tests/Stride.Samples.Tests.csproj b/samples/Tests/Stride.Samples.Tests.csproj
@@ -1,7 +1,7 @@
 <Project>
   <!-- NuGet resolved needed for StrideDefaultAssetsPlugin.LoadDefaultTemplates() -->
   <Import Project="..\..\sources\shared\Stride.NuGetResolver\Stride.NuGetResolver.projitems" Label="Shared" />
-  <Import Project="..\..\sources\targets\Stride.PreSettings.UnitTests.targets" />
+  <Import Project="..\..\sources\targets\Stride.UnitTests.props" />
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <StrideAssemblyProcessor>true</StrideAssemblyProcessor>

diff --git a/sources/assets/Stride.Core.Assets.CompilerApp/Stride.Core.Assets.CompilerApp.csproj b/sources/assets/Stride.Core.Assets.CompilerApp/Stride.Core.Assets.CompilerApp.csproj
@@ -8,7 +8,7 @@
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <Import Project="..\..\targets\Stride.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.props" />
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -41,7 +41,7 @@
   </ItemGroup>
   <Import Project="..\..\tools\Stride.Core.VisualStudio\Stride.Core.VisualStudio.projitems" Label="Shared" />
   <Import Project="..\..\shared\Stride.NuGetResolver\Stride.NuGetResolver.projitems" Label="Shared" />
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
 
   <PropertyGroup>

diff --git a/sources/assets/Stride.Core.Assets.Quantum.Tests/Stride.Core.Assets.Quantum.Tests.csproj b/sources/assets/Stride.Core.Assets.Quantum.Tests/Stride.Core.Assets.Quantum.Tests.csproj
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\targets\Stride.PreSettings.UnitTests.targets" />
+  <Import Project="..\..\targets\Stride.UnitTests.props" />
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <StrideBuildTags>WindowsTools</StrideBuildTags>

diff --git a/sources/assets/Stride.Core.Assets.Quantum/Stride.Core.Assets.Quantum.csproj b/sources/assets/Stride.Core.Assets.Quantum/Stride.Core.Assets.Quantum.csproj
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\targets\Stride.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.props" />
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -33,6 +33,6 @@
     <ProjectReference Include="..\..\presentation\Stride.Core.Quantum\Stride.Core.Quantum.csproj" />
     <ProjectReference Include="..\Stride.Core.Assets\Stride.Core.Assets.csproj" />
   </ItemGroup>
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
 </Project>
diff --git a/sources/assets/Stride.Core.Assets.Tests/Stride.Core.Assets.Tests.csproj b/sources/assets/Stride.Core.Assets.Tests/Stride.Core.Assets.Tests.csproj
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\targets\Stride.PreSettings.UnitTests.targets" />
+  <Import Project="..\..\targets\Stride.UnitTests.props" />
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <StrideAssemblyProcessor>true</StrideAssemblyProcessor>

diff --git a/sources/assets/Stride.Core.Assets/Stride.Core.Assets.csproj b/sources/assets/Stride.Core.Assets/Stride.Core.Assets.csproj
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\targets\Stride.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.props" />
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -48,6 +48,6 @@
   </ItemGroup>
   <Import Project="..\..\shared\Stride.Core.ShellHelper\Stride.Core.ShellHelper.projitems" Label="Shared" />
   <Import Project="..\Stride.Core.Assets.Yaml\Stride.Core.Assets.Yaml.projitems" Label="Shared" />
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
 </Project>
diff --git a/sources/assets/Stride.Core.Packages/Stride.Core.Packages.csproj b/sources/assets/Stride.Core.Packages/Stride.Core.Packages.csproj
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\targets\Stride.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.props" />
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -34,6 +34,6 @@
       <LastGenOutput>TargetGenerator.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
 </Project>
diff --git a/sources/buildengine/Stride.Core.BuildEngine.Common/Stride.Core.BuildEngine.Common.csproj b/sources/buildengine/Stride.Core.BuildEngine.Common/Stride.Core.BuildEngine.Common.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Project="..\..\targets\Stride.Core.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.Core.props" />
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -24,6 +24,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\core\Stride.Core.Design\Stride.Core.Design.csproj" />
   </ItemGroup>
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
 </Project>
diff --git a/sources/buildengine/Stride.Core.BuildEngine.Tests/Stride.Core.BuildEngine.Tests.csproj b/sources/buildengine/Stride.Core.BuildEngine.Tests/Stride.Core.BuildEngine.Tests.csproj
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\targets\Stride.PreSettings.UnitTests.targets" />
+  <Import Project="..\..\targets\Stride.UnitTests.props" />
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>

diff --git a/sources/buildengine/Stride.Core.BuildEngine/Stride.Core.BuildEngine.csproj b/sources/buildengine/Stride.Core.BuildEngine/Stride.Core.BuildEngine.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <StridePlatform>Windows</StridePlatform>
   </PropertyGroup>
-  <Import Project="..\..\targets\Stride.Core.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.Core.props" />
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -26,6 +26,6 @@
     <ProjectReference Include="..\..\core\Stride.Core.Serialization\Stride.Core.Serialization.csproj" />
     <ProjectReference Include="..\Stride.Core.BuildEngine.Common\Stride.Core.BuildEngine.Common.csproj" />
   </ItemGroup>
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
 </Project>
diff --git a/sources/core/Stride.Core.Design.Tests/Stride.Core.Design.Tests.csproj b/sources/core/Stride.Core.Design.Tests/Stride.Core.Design.Tests.csproj
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\targets\Stride.PreSettings.UnitTests.targets" />
+  <Import Project="..\..\targets\Stride.UnitTests.props" />
   <PropertyGroup>
     <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
     <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>

diff --git a/sources/core/Stride.Core.Design/Stride.Core.Design.csproj b/sources/core/Stride.Core.Design/Stride.Core.Design.csproj
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\targets\Stride.Core.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.Core.props" />
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -35,7 +35,7 @@
     <PackageReference Include="System.Management" Version="4.7.0" />
   </ItemGroup>
 
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
 
 </Project>
diff --git a/sources/core/Stride.Core.IO/Stride.Core.IO.csproj b/sources/core/Stride.Core.IO/Stride.Core.IO.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <StrideRuntime>true</StrideRuntime>
   </PropertyGroup>
-  <Import Project="..\..\targets\Stride.Core.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.Core.props" />
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
 
   <PropertyGroup>
@@ -32,7 +32,7 @@
     <PackageReference Include="SharpDX" Version="4.2.0" Condition="'$(StridePlatform)' == 'UWP'" />
   </ItemGroup>
 
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
 
 </Project>
diff --git a/sources/core/Stride.Core.Mathematics.Tests/Stride.Core.Mathematics.Tests.csproj b/sources/core/Stride.Core.Mathematics.Tests/Stride.Core.Mathematics.Tests.csproj
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\targets\Stride.PreSettings.UnitTests.targets" />
+  <Import Project="..\..\targets\Stride.UnitTests.props" />
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <StrideAssemblyProcessor>true</StrideAssemblyProcessor>

diff --git a/sources/core/Stride.Core.Mathematics/Stride.Core.Mathematics.csproj b/sources/core/Stride.Core.Mathematics/Stride.Core.Mathematics.csproj
@@ -3,7 +3,7 @@
     <StrideRuntime>true</StrideRuntime>
     <StrideRuntimeNetStandard>true</StrideRuntimeNetStandard>
   </PropertyGroup>
-  <Import Project="..\..\targets\Stride.Core.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.Core.props" />
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -23,6 +23,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Stride.Core\Stride.Core.csproj" />
   </ItemGroup>
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/sources/core/Stride.Core.MicroThreading/Stride.Core.MicroThreading.csproj b/sources/core/Stride.Core.MicroThreading/Stride.Core.MicroThreading.csproj
@@ -3,7 +3,7 @@
     <StrideRuntime>true</StrideRuntime>
     <StrideRuntimeNetStandard>true</StrideRuntimeNetStandard>
   </PropertyGroup>
-  <Import Project="..\..\targets\Stride.Core.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.Core.props" />
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -22,6 +22,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Stride.Core\Stride.Core.csproj" />
   </ItemGroup>
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/sources/core/Stride.Core.Reflection/Stride.Core.Reflection.csproj b/sources/core/Stride.Core.Reflection/Stride.Core.Reflection.csproj
@@ -3,7 +3,7 @@
     <StrideRuntime>true</StrideRuntime>
     <StrideRuntimeNetStandard>true</StrideRuntimeNetStandard>
   </PropertyGroup>
-  <Import Project="..\..\targets\Stride.Core.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.Core.props" />
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -34,6 +34,6 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/sources/core/Stride.Core.Serialization/Stride.Core.Serialization.csproj b/sources/core/Stride.Core.Serialization/Stride.Core.Serialization.csproj
@@ -3,7 +3,7 @@
     <StrideRuntime>true</StrideRuntime>
     <StrideRuntimeNetStandard>true</StrideRuntimeNetStandard>
   </PropertyGroup>
-  <Import Project="..\..\targets\Stride.Core.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.Core.props" />
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -29,6 +29,6 @@
   <ItemGroup>
     <Folder Include="Reflection\" />
   </ItemGroup>
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj b/sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\targets\Stride.Core.PreSettings.targets" />
+  <Import Project="..\..\targets\Stride.Core.props" />
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -49,6 +49,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\assets\Stride.Core.Assets\Stride.Core.Assets.csproj" />
   </ItemGroup>
-  <Import Project="$(StridePostSettingsTargets)" />
+  <Import Project="$(StrideSdkTargets)" />
   <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.87" />
 </Project>