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

isolate nuget-generated props files into obj dir #41

Merged
merged 3 commits into from
Sep 30, 2024
Merged

isolate nuget-generated props files into obj dir #41

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c419430
isolate nuget-generated props files into obj dir
mtfriesen Sep 30, 2024
eecc3b0
relocate below explicit platform def
mtfriesen Sep 30, 2024
f21664a
Merge branch 'main' into mtfriesen/nuget_generated_props_in_obj
mtfriesen Sep 30, 2024
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
6 changes: 4 additions & 2 deletions vs/windows.undocked.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
<UndockedBuildArm64x Condition="'$(UndockedBuildArm64x)' == '' OR $(ARM64X_DISABLED) == '1'">false</UndockedBuildArm64x>
<!-- Use the official LKG complier when available -->
<UseInternalMSUniCrtPackage>true</UseInternalMSUniCrtPackage>
<UndockedPlatConfig Condition="'$(UndockedPlatConfig)' == ''">$(Platform)_$(Configuration)</UndockedPlatConfig>
mtfriesen marked this conversation as resolved.
Show resolved Hide resolved
<_IntDir>$(UndockedOut)obj\$(UndockedPlatConfig)\$(MSBuildProjectName)\</_IntDir>
<MSBuildProjectExtensionsPath Condition="'$(MSBuildProjectExtensionsPath)' == ''">$(_IntDir)</MSBuildProjectExtensionsPath>
</PropertyGroup>
<!-- The set of supported user mode configurations (x86,x64,arm,arm64) -->
<ItemGroup Label="ProjectConfigurations" Condition="'$(UndockedType)' != 'sys'">
Expand Down Expand Up @@ -178,8 +181,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<!-- Official Windows compiler and linker settings -->
<PropertyGroup>
<UndockedPlatConfig>$(Platform)_$(Configuration)</UndockedPlatConfig>
<IntDir>$(UndockedOut)obj\$(UndockedPlatConfig)\$(ProjectName)\</IntDir>
<IntDir>$(_IntDir)</IntDir>
<OutDir>$(UndockedOut)bin\$(UndockedPlatConfig)\</OutDir>
<UseDebugLibraries Condition="'$(Configuration)'=='Debug'">true</UseDebugLibraries>
<UseDebugLibraries Condition="'$(Configuration)'=='Release'">false</UseDebugLibraries>
Expand Down