Orchestrated final publish; CLI:master (#8504)

* Orchestrated final publish: https://github.com/dotnet/core-eng/issues/2407

* Changes per code review...
This commit is contained in:
John Beisner 2018-01-30 15:22:32 -08:00 committed by GitHub
parent a8a0657ce8
commit 8649a5c6c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 3 deletions

View file

@ -1,9 +1,10 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Product>Sdk</Product>
<IsNotOrchestratedPublish>true</IsNotOrchestratedPublish> <IsNotOrchestratedPublish>true</IsNotOrchestratedPublish>
<IsNotOrchestratedPublish Condition="'$(PB_PublishBlobFeedUrl)' != ''">false</IsNotOrchestratedPublish> <IsNotOrchestratedPublish Condition="'$(PB_PublishBlobFeedUrl)' != ''">false</IsNotOrchestratedPublish>
<BlobStoragePartialRelativePath>Sdk</BlobStoragePartialRelativePath> <BlobStoragePartialRelativePath>$(Product)</BlobStoragePartialRelativePath>
<BlobStoragePartialRelativePath Condition="'$(IsNotOrchestratedPublish)' == 'false'">assets/$(BlobStoragePartialRelativePath)</BlobStoragePartialRelativePath> <BlobStoragePartialRelativePath Condition="'$(IsNotOrchestratedPublish)' == 'false'">assets/$(Product)</BlobStoragePartialRelativePath>
<!-- Values related to the download of assets from blob storage --> <!-- Values related to the download of assets from blob storage -->
<DefaultCoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</DefaultCoreSetupBlobRootUrl> <DefaultCoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</DefaultCoreSetupBlobRootUrl>

View file

@ -68,7 +68,7 @@
<PropertyGroup> <PropertyGroup>
<VersionToolsVersion>2.1.0-prerelease-02430-04</VersionToolsVersion> <VersionToolsVersion>2.1.0-prerelease-02430-04</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion> <DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion>
<BuildTasksFeedToolVersion>2.1.0-prerelease-02411-04</BuildTasksFeedToolVersion> <BuildTasksFeedToolVersion>2.1.0-prerelease-02430-04</BuildTasksFeedToolVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

View file

@ -84,6 +84,7 @@
ManifestBuildId="$(FullNugetVersion)" ManifestBuildId="$(FullNugetVersion)"
ManifestCommit="$(CommitHash)" ManifestCommit="$(CommitHash)"
ManifestName="$(BuildName)" ManifestName="$(BuildName)"
ManifestBuildData="ProductVersion=$(FullNugetVersion)"
Overwrite="false" Overwrite="false"
PublishFlatContainer="true" PublishFlatContainer="true"
SkipCreateManifest="$(IsNotOrchestratedPublish)" /> SkipCreateManifest="$(IsNotOrchestratedPublish)" />

View file

@ -33,6 +33,7 @@
ManifestBuildId="$(FullNugetVersion)" ManifestBuildId="$(FullNugetVersion)"
ManifestCommit="$(CommitHash)" ManifestCommit="$(CommitHash)"
ManifestName="$(BuildName)" ManifestName="$(BuildName)"
ManifestBuildData="ProductVersion=$(FullNugetVersion)"
Overwrite="$(OverwriteOnPublish)" Overwrite="$(OverwriteOnPublish)"
PublishFlatContainer="true" PublishFlatContainer="true"
SkipCreateManifest="$(IsNotOrchestratedPublish)" /> SkipCreateManifest="$(IsNotOrchestratedPublish)" />
@ -51,6 +52,7 @@
ManifestBuildId="$(FullNugetVersion)" ManifestBuildId="$(FullNugetVersion)"
ManifestCommit="$(CommitHash)" ManifestCommit="$(CommitHash)"
ManifestName="$(BuildName)" ManifestName="$(BuildName)"
ManifestBuildData="ProductVersion=$(FullNugetVersion)"
Overwrite="$(OverwriteOnPublish)" Overwrite="$(OverwriteOnPublish)"
PublishFlatContainer="true" PublishFlatContainer="true"
SkipCreateManifest="$(IsNotOrchestratedPublish)" /> SkipCreateManifest="$(IsNotOrchestratedPublish)" />

View file

@ -17,6 +17,7 @@
ManifestBuildId="$(FullNugetVersion)" ManifestBuildId="$(FullNugetVersion)"
ManifestCommit="$(CommitHash)" ManifestCommit="$(CommitHash)"
ManifestName="$(BuildName)" ManifestName="$(BuildName)"
ManifestBuildData="ProductVersion=$(FullNugetVersion)"
Overwrite="true" Overwrite="true"
PublishFlatContainer="false" PublishFlatContainer="false"
SkipCreateManifest="$(IsNotOrchestratedPublish)" /> SkipCreateManifest="$(IsNotOrchestratedPublish)" />