Removed all references to $(SolutionDir) from build (#1894)

Removed all references to SolutionDir or replaced with references to $(MSBuildThisFileDirectory). Co-authored-by: Eideren <contact@eideren.com>
2023-10-16 15:27:24 -07:00 · 2023-10-16 15:27:24 -07:00 · 0bc67fc2fb
--- a/build/Stride.Android.TestApks.proj
+++ b/build/Stride.Android.TestApks.proj
@ -1,6 +1,5 @@
 <Project DefaultTargets="SignAndroidPackage" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
    <SolutionName>Stride.Android</SolutionName>
    <Platform>Android</Platform>
    <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
@ -12,8 +11,8 @@
  <Target Name="SignAndroidPackage">
    <MSBuild Projects ="@(ProjectsToBuild)" 
             Targets="SignAndroidPackage"
-             Properties="Configuration=$(Configuration);Platform=$(Platform);SolutionName=$(SolutionName);SolutionDir=$(SolutionDir);AndroidDeploymentMode=AndroidAPKDeployment">
+             Properties="Configuration=$(Configuration);Platform=$(Platform);SolutionName=$(SolutionName);AndroidDeploymentMode=AndroidAPKDeployment">
      <Output ItemName="OutputFiles" TaskParameter="TargetOutputs"/>
    </MSBuild>
  </Target>
-</Project>
+</Project>
--- a/sources/assets/Stride.Core.Assets.Quantum/Stride.Core.Assets.Quantum.csproj
+++ b/sources/assets/Stride.Core.Assets.Quantum/Stride.Core.Assets.Quantum.csproj
@ -7,7 +7,6 @@
    <TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
    <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <ItemGroup>
@ -31,4 +30,4 @@
    <ProjectReference Include="..\Stride.Core.Assets\Stride.Core.Assets.csproj" />
  </ItemGroup>
  <Import Project="$(StrideSdkTargets)" />
-</Project>
+</Project>
--- a/sources/assets/Stride.Core.Assets/Stride.Core.Assets.csproj
+++ b/sources/assets/Stride.Core.Assets/Stride.Core.Assets.csproj
@ -7,7 +7,6 @@
    <TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
    <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <ItemGroup>
--- a/sources/core/Stride.Core.AssemblyProcessor/Stride.Core.AssemblyProcessor.csproj
+++ b/sources/core/Stride.Core.AssemblyProcessor/Stride.Core.AssemblyProcessor.csproj
@ -27,7 +27,7 @@
  
  <!-- Add support for building this project from the Project Directory -->
  <PropertyGroup>
-    <SolutionDir Condition="'$(SolutionDir)' == ''">$(ProjectDir)..\..\..\build\</SolutionDir>
+    <DependencyDir>$(ProjectDir)..\..\..\..\deps</DependencyDir>
  </PropertyGroup>

  <!-- ======================================================================================== -->
@ -126,21 +126,21 @@
  <Target Name="CopyFiles" AfterTargets="PostBuildEvent">
    <Copy
      SourceFiles="@(BuiltItems)"
-      DestinationFolder="$(SolutionDir)..\deps\AssemblyProcessor\$(TargetFramework)"
+      DestinationFolder="$(DependencyDir)\AssemblyProcessor\$(TargetFramework)"
    />
  </Target>
  
  <!-- Packs the BuildItems into a single .Packed DLL and generates a .hash file from it -->
  <Target Name="GenerateHash" AfterTargets="CopyFiles">
    <!-- Repack the assemblies into a single file -->
-    <Exec Command="cd &quot;$(SolutionDir)..\deps\AssemblyProcessor\$(TargetFramework)&quot;
+    <Exec Command="cd &quot;$(DependencyDir)\AssemblyProcessor\$(TargetFramework)&quot;
    &quot;$(ILRepack)&quot; Stride.Core.AssemblyProcessor$(TargetExt) Mono.Cecil.dll Mono.Cecil.Mdb.dll Mono.Cecil.Pdb.dll Mono.Cecil.Rocks.dll Mono.Options.dll /out:Stride.Core.AssemblyProcessor.Packed$(TargetExt)"/>
    <!-- Generate the hash and then write it to disk with the .hash extension -->
-    <GetFileHash Files="$(SolutionDir)..\deps\AssemblyProcessor\$(TargetFramework)\Stride.Core.AssemblyProcessor.Packed$(TargetExt)">
+    <GetFileHash Files="$(DependencyDir)\AssemblyProcessor\$(TargetFramework)\Stride.Core.AssemblyProcessor.Packed$(TargetExt)">
      <Output
          TaskParameter="Hash"
          PropertyName="PackedAssemblyHash" />
    </GetFileHash>
-    <WriteAllText Path="$(SolutionDir)..\deps\AssemblyProcessor\$(TargetFramework)\Stride.Core.AssemblyProcessor.Packed$(TargetExt).hash" Contents="$(PackedAssemblyHash)"/>
+    <WriteAllText Path="$(DependencyDir)\AssemblyProcessor\$(TargetFramework)\Stride.Core.AssemblyProcessor.Packed$(TargetExt).hash" Contents="$(PackedAssemblyHash)"/>
  </Target>
 </Project>
--- a/sources/core/Stride.Core.Design/Stride.Core.Design.csproj
+++ b/sources/core/Stride.Core.Design/Stride.Core.Design.csproj
@ -8,7 +8,6 @@
    <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
    <TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
    <StrideBuildTags>WindowsTools</StrideBuildTags>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <ItemGroup>
@ -32,4 +31,4 @@
  
  <Import Project="$(StrideSdkTargets)" />

-</Project>
+</Project>
--- a/sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj
+++ b/sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj
@ -9,7 +9,6 @@
    <TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
    <StrideBuildTags>WindowsTools</StrideBuildTags>
    <StrideOutputPath>bin\$(Configuration)\</StrideOutputPath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <PropertyGroup>
--- a/sources/core/Stride.Core.Translation/Stride.Core.Translation.csproj
+++ b/sources/core/Stride.Core.Translation/Stride.Core.Translation.csproj
@ -8,7 +8,6 @@
    <StrideBuildTags>WindowsTools</StrideBuildTags>
    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
    <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <ItemGroup>
--- a/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj
+++ b/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj
@ -9,7 +9,6 @@
    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
    <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization --parameter-key</StrideAssemblyProcessorOptions>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <UseWPF>true</UseWPF>
    <EnableDefaultPageItems>false</EnableDefaultPageItems>
--- a/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj
+++ b/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj
@ -10,7 +10,6 @@
    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <AssemblyName>Stride.GameStudio</AssemblyName>
    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
--- a/sources/engine/Stride.Assets/Stride.Assets.csproj
+++ b/sources/engine/Stride.Assets/Stride.Assets.csproj
@ -6,7 +6,6 @@
    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
    <StrideAssemblyProcessorOptions>$(StrideAssemblyProcessorDefaultOptions)</StrideAssemblyProcessorOptions>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(TargetFramework)' == '$(StrideFramework)'">
--- a/sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Graph.csproj
+++ b/sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Graph.csproj
@ -7,7 +7,6 @@
    <TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
    <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <UseWPF>true</UseWPF>
    <EnableDefaultPageItems>false</EnableDefaultPageItems>
@ -29,4 +28,4 @@
  </ItemGroup>
  <ItemGroup />
  <Import Project="$(StrideSdkTargets)" />
-</Project>
+</Project>
--- a/sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Graph_thkfichk_wpftmp.csproj
+++ b/sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Graph_thkfichk_wpftmp.csproj
@ -14,7 +14,6 @@
    <TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
    <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <UseWPF>true</UseWPF>
    <EnableDefaultPageItems>false</EnableDefaultPageItems>
@ -260,4 +259,4 @@
  <ItemGroup>
    <Compile Include="C:\dev\stride\sources\presentation\Stride.Core.Presentation.Graph\obj\Debug\net6.0-windows7.0\GeneratedInternalTypeHelper.g.cs" />
  </ItemGroup>
-</Project>
+</Project>
--- a/sources/presentation/Stride.Core.Presentation/Stride.Core.Presentation.csproj
+++ b/sources/presentation/Stride.Core.Presentation/Stride.Core.Presentation.csproj
@ -8,7 +8,6 @@
    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
    <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
    <StrideLocalized>true</StrideLocalized>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <UseWPF>true</UseWPF>
    <EnableDefaultPageItems>false</EnableDefaultPageItems>
--- a/sources/presentation/Stride.Core.Translation.Presentation/Stride.Core.Translation.Presentation.csproj
+++ b/sources/presentation/Stride.Core.Translation.Presentation/Stride.Core.Translation.Presentation.csproj
@ -8,7 +8,6 @@
    <StrideBuildTags>WindowsTools</StrideBuildTags>
    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
    <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <UseWPF>true</UseWPF>
  </PropertyGroup>
--- a/sources/targets/Stride.Core.props
+++ b/sources/targets/Stride.Core.props
@ -2,9 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <!-- Setup this part according to your project if you want your .csproj to compile individually without going through the .sln file -->
  <PropertyGroup>
-    <SolutionDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildThisFileDirectory)..\..\build\</SolutionDir>
    <SolutionName Condition=" '$(SolutionName)' == '' ">Stride</SolutionName>
-    <SolutionPath Condition=" '$(SolutionPath)' == '' ">$(SolutionDir)$(SolutionName).sln</SolutionPath>
  </PropertyGroup>

  <!-- Setup StridePlatform according to current TargetFramework -->
@ -35,9 +33,8 @@
  </PropertyGroup>

  <!--Import Local Pre Settings for the solution being loaded -->
-  <Import Project="$(SolutionDir)$(SolutionName).Build.props" Condition="Exists('$(SolutionDir)$(SolutionName).Build.props')" />
-  <Import Project="$(SolutionDir)Stride.Core.Build.props" Condition="Exists('$(SolutionDir)Stride.Core.Build.props')" />
-
+  <Import Project="$(MSBuildThisFileDirectory)..\..\build\$(SolutionName).Build.props" Condition="Exists('$(MSBuildThisFileDirectory)..\..\build\$(SolutionName).Build.props')" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\build\Stride.Core.Build.props" Condition="Exists('$(MSBuildThisFileDirectory)..\..\build\Stride.Core.Build.props')" />
  <Import Project="$(MSBuildThisFileDirectory)Stride.Core.TargetFrameworks.Editor.props" />
  
  <!-- 
--- a/sources/targets/Stride.Core.targets
+++ b/sources/targets/Stride.Core.targets
@ -10,9 +10,17 @@
  <Target Name="GetNativeManifest"/>
  <Target Name="GetPackagingOutputs"/>

+  <!-- OS Compatibility Properties -->
+  <PropertyGroup>
+    <TEMP>$([System.IO.Path]::GetTempPath())</TEMP>
+    <DependencyDir>$(MSBuildThisFileDirectory)../../deps</DependencyDir>
+    <BuildDir>$(MSBuildThisFileDirectory)../../build/</BuildDir>
+    <SourceDir>$(MSBuildThisFileDirectory)../../sources</SourceDir>
+  </PropertyGroup>
+
  <!--Import Local Post Settings for the solution being loaded -->
-  <Import Project="$(SolutionDir)$(SolutionName).Build.targets" Condition="Exists('$(SolutionDir)$(SolutionName).Build.targets')" />
-  <Import Project="$(SolutionDir)Stride.Core.Build.targets" Condition="Exists('$(SolutionDir)Stride.Core.Build.targets')" />
+  <Import Project="$(BuildDir)/$(SolutionName).Build.targets" Condition="Exists('$(BuildDir)/$(SolutionName).Build.targets')" />
+  <Import Project="$(BuildDir)/Stride.Core.Build.targets" Condition="Exists('$(BuildDir)/Stride.Core.Build.targets')" />

  <!-- Workaround: GetPackagingOutputs from UWP (uap) try to build ProjectReference with current TFM, and that's the only way I could find to skip it -->
  <Target Name="_StrideRemoveTargetFrameworkBeforeGetPackagingOutputs" BeforeTargets="GetPackagingOutputs">
@ -23,11 +31,6 @@
    </ItemGroup>
  </Target>

-  <!-- Linux Compatibility Properties -->
-  <PropertyGroup>
-    <TEMP>$([System.IO.Path]::GetTempPath())</TEMP>
-  </PropertyGroup>
-
  <!-- Code Analysis -->
  <PropertyGroup Condition="'$(StrideCodeAnalysis)' == 'true'">
    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Stride.ruleset</CodeAnalysisRuleSet>
@ -194,12 +197,11 @@
        <Source Condition="%(StrideTranslations.Source) == ''">%(StrideTranslations.Identity)</Source>
      </_StrideTranslations>
    </ItemGroup>
-
    <Message Importance="High" Text="Generating translation for %(_StrideTranslations.Identity) %(_StrideTranslations.SourceFolder)"/>

-    <Exec Condition="Exists('$(SolutionDir)..\sources\localization\%(_StrideTranslations.Source)\$(TargetName).%(_StrideTranslations.Source).po')"
-          Command="&quot;$(SolutionDir)..\deps\Gettext.Net\GNU.Gettext.Msgfmt.exe&quot; -r $(TargetName) -d &quot;$(TargetDir)\&quot; -l %(_StrideTranslations.Identity) -L &quot;$(SolutionDir)..\deps\Gettext.Net&quot; &quot;$(MSBuildThisFileDirectory)..\localization\%(_StrideTranslations.Source)\$(TargetName).%(_StrideTranslations.Source).po&quot;" />
-    
+    <Exec Condition="Exists('$(SourceDir)\localization\%(_StrideTranslations.Source)\$(TargetName).%(_StrideTranslations.Source).po')"
+          Command="&quot;$(DependencyDir)\Gettext.Net\GNU.Gettext.Msgfmt.exe&quot; -r $(TargetName) -d &quot;$(TargetDir)\&quot; -l %(_StrideTranslations.Identity) -L &quot;$(DependencyDir)\deps\Gettext.Net&quot; &quot;$(MSBuildThisFileDirectory)..\localization\%(_StrideTranslations.Source)\$(TargetName).%(_StrideTranslations.Source).po&quot;" />
+
    <ItemGroup>
      <SatelliteDllsProjectOutputGroupOutputIntermediate Include="$(OutDir)%(_StrideTranslations.Identity)\$(TargetName).Messages.resources.dll" Condition="Exists('$(OutDir)%(_StrideTranslations.Identity)\$(TargetName).Messages.resources.dll')">
        <TargetPath>%(_StrideTranslations.Identity)\$(TargetName).Messages.resources.dll</TargetPath>
--- a/sources/targets/Stride.UnitTests.props
+++ b/sources/targets/Stride.UnitTests.props
@ -1,11 +1,10 @@
 <!-- Build file pre-included by all Stride projects -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
  <!--Import Local Pre Settings for the solution being loaded -->
-  <Import Project="$(SolutionDir)$(SolutionName).Build.props" Condition="Exists('$(SolutionDir)$(SolutionName).Build.props')" />
-  <Import Project="$(SolutionDir)Stride.Core.Build.props" Condition="Exists('$(SolutionDir)Stride.Core.Build.props')" />
-
-  <Import Project="$(MSBuildThisDirectory)..\..\sources\core\Stride.Core\build\Stride.Core.props"/>
-
+  <Import Project="$(MSBuildThisFileDirectory)..\..\build\$(SolutionName).Build.props" Condition="Exists('$(MSBuildThisFileDirectory)..\..\build\$(SolutionName).Build.props')" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\build\Stride.Core.Build.props" Condition="Exists('$(MSBuildThisFileDirectory)..\..\build\Stride.Core.Build.props')" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\sources\core\Stride.Core\build\Stride.Core.props"/>
  <Import Project="$(MSBuildThisFileDirectory)Stride.Core.TargetFrameworks.Editor.props" />

  <PropertyGroup>
--- a/sources/targets/Stride.UnitTests.targets
+++ b/sources/targets/Stride.UnitTests.targets
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="StrideGraphicsApis">
  <!--Import Unit Tests Local Settings for the solution being loaded -->
-  <Import Project="$(SolutionDir)$(SolutionName).UnitTests.Build.targets" Condition="Exists('$(SolutionDir)$(SolutionName).UnitTests.Build.targets')" />
+  <Import Project="$(MSBuildThisFileDirectory)../../build/$(SolutionName).UnitTests.Build.targets" Condition="Exists('$(MSBuildThisFileDirectory)../../build/$(SolutionName).UnitTests.Build.targets')" />

  <!-- Setup GraphicsApi (we do it even if StrideGraphicsApiDependent is not set to true, so that ProjectReference works) -->
  <PropertyGroup>
@ -37,11 +37,6 @@

    <!-- Unit tests are executables (execute asset compiler, embed native libraries, etc... -->
    <StrideIsExecutable>true</StrideIsExecutable>
-
-    <!-- Setup Asset Compiler MSBuild SolutionDir and SolutionName to point to Stride Windows
-         Also disable BuildProjectReferences, otherwise it would try to recompile assemblies currently locked by the CompilerApp itself.
-         However, that means that Tests dependencies must be compiled properly on Windows (should be the case usually).
-    -->
    <StrideCompileAssetOptions>--compile-property:BuildProjectReferences=false</StrideCompileAssetOptions>
  </PropertyGroup>

--- a/sources/tools/Stride.Core.Translation.Extractor/Stride.Core.Translation.Extractor.csproj
+++ b/sources/tools/Stride.Core.Translation.Extractor/Stride.Core.Translation.Extractor.csproj
@ -9,7 +9,6 @@
    <StrideBuildTags>WindowsTools</StrideBuildTags>
    <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
    <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <UseWPF>true</UseWPF>
  </PropertyGroup>
--- a/sources/tools/Stride.TextureConverter.Wrappers/DxtWrapper/DxtWrapper.vcxproj
+++ b/sources/tools/Stride.TextureConverter.Wrappers/DxtWrapper/DxtWrapper.vcxproj
@ -68,22 +68,22 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)</OutDir>
+    <OutDir>$(MSBuildThisFileDirectory)..\..\..\..\build\$(Configuration)\$(Platform)</OutDir>
    <IntDir>$(Configuration)\$(Platform)</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)</OutDir>
+    <OutDir>$(MSBuildThisFileDirectory)..\..\..\..\build\$(Configuration)\$(Platform)</OutDir>
    <IntDir>$(Configuration)\$(Platform)</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)</OutDir>
+    <OutDir>$(MSBuildThisFileDirectory)..\..\..\..\build\$(Configuration)\$(Platform)</OutDir>
    <IntDir>$(Configuration)\$(Platform)</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)</OutDir>
+    <OutDir>$(MSBuildThisFileDirectory)..\..\..\..\build\$(Configuration)\$(Platform)</OutDir>
    <IntDir>$(Configuration)\$(Platform)</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -171,4 +171,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/sources/tools/Stride.TextureConverter.Wrappers/PvrttWrapperC++/PvrttWrapperC++.vcxproj
+++ b/sources/tools/Stride.TextureConverter.Wrappers/PvrttWrapperC++/PvrttWrapperC++.vcxproj
@ -69,22 +69,22 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)</OutDir>
+    <OutDir>$(MSBuildThisFileDirectory)..\..\..\..\build\$(Configuration)\$(Platform)</OutDir>
    <IntDir>$(Configuration)\$(Platform)</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)</OutDir>
+    <OutDir>$(MSBuildThisFileDirectory)..\..\..\..\build\$(Configuration)\$(Platform)</OutDir>
    <IntDir>$(Configuration)\$(Platform)</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)</OutDir>
+    <OutDir>$(MSBuildThisFileDirectory)..\..\..\..\build\$(Configuration)\$(Platform)</OutDir>
    <IntDir>$(Configuration)\$(Platform)</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)</OutDir>
+    <OutDir>$(MSBuildThisFileDirectory)..\..\..\..\build\$(Configuration)\$(Platform)</OutDir>
    <IntDir>$(Configuration)\$(Platform)</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -170,4 +170,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj
+++ b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj
@ -2,7 +2,6 @@
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">17.0</VisualStudioVersion>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <Import Project="..\..\targets\Stride.props" />
--- a/sources/tools/Stride.VisualStudio.PackageInstall/Stride.VisualStudio.PackageInstall.csproj
+++ b/sources/tools/Stride.VisualStudio.PackageInstall/Stride.VisualStudio.PackageInstall.csproj
@ -4,7 +4,6 @@
    <TargetFramework>net461</TargetFramework>
    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <AssemblyName>packageinstall</AssemblyName>
  </PropertyGroup>
@ -32,4 +31,4 @@
  <ItemGroup>
    <None Include="App.config" />
  </ItemGroup>
-</Project>
+</Project>