Skip to content
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

Jump to bottom

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

Merged
merged 3 commits into from Oct 16, 2023
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7ae591
Removed all references to $(SolutionDir) from build
JeromyWalsh Oct 4, 2023
a4ae7f4
Merge branch 'stride3d:master' into build-cleanup
JeromyWalsh Oct 9, 2023
310ec17
Merge branch 'master' into build-cleanup
Eideren Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions build/Stride.Android.TestApks.proj
View file
Open in desktop
@@ -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>
Expand All @@ -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>
3 changes: 1 addition & 2 deletions sources/assets/Stride.Core.Assets.Quantum/Stride.Core.Assets.Quantum.csproj
View file
Open in desktop
Expand Up @@ -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>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
Expand All @@ -33,4 +32,4 @@
<ProjectReference Include="..\Stride.Core.Assets\Stride.Core.Assets.csproj" />
</ItemGroup>
<Import Project="$(StrideSdkTargets)" />
</Project>
</Project>
1 change: 0 additions & 1 deletion sources/assets/Stride.Core.Assets/Stride.Core.Assets.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions sources/core/Stride.Core.AssemblyProcessor/Stride.Core.AssemblyProcessor.csproj
View file
Open in desktop
Expand Up @@ -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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a little nitpick:
Shouldn't it be DependenciesDir instead? It's the directory where all Stride dependencies are located.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @Ethereal77, grammatically speaking you're not wrong, and if people have a strong preference it's an easy change to make.

That being said, historically the preference has been for readability/laziness rather than grammatical accuracy. ;-) As examples, there used to be the "src" and "source", folders. Still remaining are the "bin", and "obj" folders. In our own project hierarchy there's the "build" folder, though technically it's the "builds" folder. Those are all cases where the folder name acted as a sort/filter rather than as a description of the contents, ie. "this is where a source file goes," or "this is where a build file goes."

I also just found DependecyDir easier to read and say than DependenciesDir. But again, that's likely just a dialectical preference or laziness. If people prefer the latter, I'm happy to change it. Thoughts?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a strong preference. I'm not a native english speaker, so it doesn't matter much to me. Anyway I agree with you on the simplicity point.
Readability > all else 😁

</PropertyGroup>

<!-- ======================================================================================== -->
Expand Down Expand Up @@ -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 $(SolutionDir)..\deps\AssemblyProcessor\$(TargetFramework)
<Exec Command="cd $(DependencyDir)\AssemblyProcessor\$(TargetFramework)
$(ILRepack) 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>
3 changes: 1 addition & 2 deletions sources/core/Stride.Core.Design/Stride.Core.Design.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand All @@ -32,4 +31,4 @@

<Import Project="$(StrideSdkTargets)" />

</Project>
</Project>
1 change: 0 additions & 1 deletion sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sources/core/Stride.Core.Translation/Stride.Core.Translation.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sources/editor/Stride.GameStudio/Stride.GameStudio.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sources/engine/Stride.Assets/Stride.Assets.csproj
View file
Open in desktop
Expand Up @@ -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)'">
Expand Down
3 changes: 1 addition & 2 deletions sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Graph.csproj
View file
Open in desktop
Expand Up @@ -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>
<UseWPF>true</UseWPF>
<EnableDefaultPageItems>false</EnableDefaultPageItems>
Expand All @@ -29,4 +28,4 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(StrideSdkTargets)" />
</Project>
</Project>
3 changes: 1 addition & 2 deletions ...tion/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Graph_thkfichk_wpftmp.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
1 change: 0 additions & 1 deletion sources/presentation/Stride.Core.Presentation/Stride.Core.Presentation.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion ...entation/Stride.Core.Translation.Presentation/Stride.Core.Translation.Presentation.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down
7 changes: 2 additions & 5 deletions sources/targets/Stride.Core.props
View file
Open in desktop
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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" />

<!--
Expand Down
19 changes: 11 additions & 8 deletions sources/targets/Stride.Core.targets
View file
Open in desktop
Expand Up @@ -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">
Expand All @@ -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>
Expand Down Expand Up @@ -190,7 +193,7 @@
</_StrideTraductions>
</ItemGroup>
<Message Importance="High" Text="Generating traduction for %(_StrideTraductions.Identity) %(_StrideTraductions.SourceFolder)"/>
<Exec Condition="Exists('$(SolutionDir)..\sources\localization\%(_StrideTraductions.Source)\$(TargetName).%(_StrideTraductions.Source).po')" Command="$(SolutionDir)..\deps\Gettext.Net\GNU.Gettext.Msgfmt.exe -r $(TargetName) -d $(TargetDir) -l %(_StrideTraductions.Identity) -L $(SolutionDir)..\deps\Gettext.Net\ $(MSBuildThisFileDirectory)..\localization\%(_StrideTraductions.Source)\$(TargetName).%(_StrideTraductions.Source).po" />
<Exec Condition="Exists('$(SourceDir)\localization\%(_StrideTraductions.Source)\$(TargetName).%(_StrideTraductions.Source).po')" Command="$(DependencyDir)\Gettext.Net\GNU.Gettext.Msgfmt.exe -r $(TargetName) -d $(TargetDir) -l %(_StrideTraductions.Identity) -L $(DependencyDir)\Gettext.Net\ $(MSBuildThisFileDirectory)..\localization\%(_StrideTraductions.Source)\$(TargetName).%(_StrideTraductions.Source).po" />
<ItemGroup>
<SatelliteDllsProjectOutputGroupOutputIntermediate Include="$(OutDir)%(_StrideTraductions.Identity)\$(TargetName).Messages.resources.dll" Condition="Exists('$(OutDir)%(_StrideTraductions.Identity)\$(TargetName).Messages.resources.dll')">
<TargetPath>%(_StrideTraductions.Identity)\$(TargetName).Messages.resources.dll</TargetPath>
Expand Down
9 changes: 4 additions & 5 deletions sources/targets/Stride.UnitTests.props
View file
Open in desktop
@@ -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 Local Pre Settings for the solution being loaded -->
<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>
Expand Down
7 changes: 1 addition & 6 deletions sources/targets/Stride.UnitTests.targets
View file
Open in desktop
@@ -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>
Expand Down Expand Up @@ -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>

Expand Down
1 change: 0 additions & 1 deletion sources/tools/Stride.Core.Translation.Extractor/Stride.Core.Translation.Extractor.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions sources/tools/Stride.TextureConverter.Wrappers/DxtWrapper/DxtWrapper.vcxproj
View file
Open in desktop
Expand Up @@ -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'">
Expand Down Expand Up @@ -171,4 +171,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>