Merge pull request #7982 from johnbeisner/FixingPublishConditionals2.0.0

Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB'; 2.0.0
This commit is contained in:
John Beisner 2017-11-08 14:25:44 -08:00 committed by GitHub
commit 08e594b860
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -10,7 +10,7 @@
<!-- PUBLISH_TO_AZURE_BLOB env variable set by CI --> <!-- PUBLISH_TO_AZURE_BLOB env variable set by CI -->
<Target Name="Publish" <Target Name="Publish"
Condition=" '$(PUBLISH_TO_AZURE_BLOB)' != '' " Condition=" '$(PUBLISH_TO_AZURE_BLOB)' == 'true' "
DependsOnTargets="Init; DependsOnTargets="Init;
Package; Package;
EvaluateRuntimeCoherence; EvaluateRuntimeCoherence;
@ -36,11 +36,11 @@
<ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)" <ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)"
Condition=" '$(IsLinuxDistroSpecific)' != 'true' "/> Condition=" '$(IsLinuxDistroSpecific)' != 'true' "/>
<ForPublishing Include="@(NupkgsForPublishing)" <ForPublishing Include="@(NupkgsForPublishing)"
Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/> Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' == 'true' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
<ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).*.nupkg" <ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).*.nupkg"
Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' "/> Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' == 'true' AND '$(OS)' == 'Windows_NT' "/>
<ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.*.nupkg" <ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.*.nupkg"
Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/> Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' == 'true' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>