mirror of
https://github.com/aphrody-labs/NuGet.Client.git
synced 2026-10-14 05:19:04 +00:00
dotnet-maestro[bot]
5314ef624e
[dev] Source code updates from dotnet/dotnet - [nuget-client] Source update 50dbab4 → 50dbab4 Diff: https://github.com/dotnet/dotnet/compare/50dbab4de210e882172b07934e9666313b7065f1..50dbab4de210e882172b07934e9666313b7065f1 From: https://github.com/dotnet/dotnet/commit/50dbab4de210e882172b07934e9666313b7065f1 To: https://github.com/dotnet/dotnet/commit/50dbab4de210e882172b07934e9666313b7065f1 The following files had conflicts that were resolved by a user: - build/common.project.props - trying to fix code flow issues - source build should use newer sdk
23 lines
1.3 KiB
XML
23 lines
1.3 KiB
XML
<Project>
|
|
<!-- Temporarily detect that common props haven't been imported since not every project is using this new logic yet. -->
|
|
<PropertyGroup Condition="'$(_WasCommonPropsImported)' != 'true'">
|
|
<CustomBeforeMicrosoftCSharpTargets>$(CustomBeforeMicrosoftCSharpTargets);$(MSBuildThisFileDirectory)build\common.targets</CustomBeforeMicrosoftCSharpTargets>
|
|
</PropertyGroup>
|
|
<ImportGroup Condition="'$(_WasCommonPropsImported)' != 'true'">
|
|
<Import Project="build\config.props" />
|
|
<Import Project="build\common.project.props" />
|
|
</ImportGroup>
|
|
<PropertyGroup Condition="'$(_WasCommonPropsImported)' != 'true'">
|
|
<!-- Some legacy projects reference assemblies in GAC;AssemblyFolders. -->
|
|
<!-- Reset AssemblySearchPaths to empty to let Microsoft.Common.targets pick the legacy defaults -->
|
|
<AssemblySearchPaths Condition="'$(UsingMicrosoftNETSdk)' != 'true'" />
|
|
</PropertyGroup>
|
|
|
|
<PropertyGroup>
|
|
<UsingToolXliff>true</UsingToolXliff>
|
|
<UpdateXlfOnBuild Condition="'$(CI)' != 'true'">true</UpdateXlfOnBuild>
|
|
<CustomBeforeMicrosoftCommonTargets Condition="'$(DotNetBuild)' == 'true'">$(CustomBeforeMicrosoftCommonTargets);$(MSBuildThisFileDirectory)eng\dotnet-build\TargetingPacks.BeforeCommonTargets.targets</CustomBeforeMicrosoftCommonTargets>
|
|
</PropertyGroup>
|
|
|
|
</Project>
|