Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Need to re-default output properties after writing $(OutputPath). #2091

Merged
merged 1 commit into from
Jul 10, 2018
Merged

Need to re-default output properties after writing $(OutputPath). #2091

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions src/Microsoft.DotNet.Build.Tasks/PackageFiles/ReferenceAssemblies.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@
<NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
</PropertyGroup>

<PropertyGroup Condition="'$(IsReferenceAssembly)'=='true' AND '$(UsingMicrosoftNETSdk)'=='true'">
<!-- When not using Sdk-style projects, Microsoft.Common.CurrentVersion.targets,

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

(which defaults the below properties) is imported after this file, so these properties
are getting set correctly.
When using Sdk-style projects, Microsoft.Common.CurrentVersion.targets gets imported before
this file, so we are overwriting OutputPath too late and we need to re-default these properties. -->

<OutDir>$(OutputPath)</OutDir>
<TargetDir>$([MSBuild]::Escape($([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildProjectDirectory)`, `$(OutDir)`))`))))</TargetDir>
<TargetPath>$(TargetDir)$(TargetFileName)</TargetPath>
</PropertyGroup>

<ItemGroup Condition="'$(IsReferenceAssembly)'=='true'">
<!-- All reference assemblies should have the 0x70 flag which prevents them from loading
and the ReferenceAssemblyAttribute. -->
Expand Down