mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove double publish in stable builds (#8553)

Browse source 
https://github.com/dotnet/arcade/pull/6051 fixed the issue where the install
scripts require matching names of files to directories. Remove the double
publish change introduced in 3.0

Co-authored-by: dotnet-bot <dotnet-bot@dotnetfoundation.org>
This commit is contained in:
Matt Mitchell 2020-09-18 13:38:18 -07:00 • committed by GitHub
parent 9897429616
commit 03b7ec459d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
eng/Publishing.props
View file

@ -103,30 +103,6 @@
PropertyName="FullNugetVersion"/> PropertyName="FullNugetVersion"/>
</ReadLinesFromFile> </ReadLinesFromFile>
<!-- If the sdk version is stabilized, then we should double publish the binaries to suffixed file names.
To do this, create new copies of the blobs, replacing the SdkVersion string in the file name with the
FullNugetVersion, except if the FullNuGetVersion is already in the file name (which would end up
publishing the same exact file name twice). -->
<ItemGroup Condition="'$(DotNetFinalVersionKind)'== 'release'">
<SdkAssetsToCopyWithSuffix Include="@(SdkAssetsToPublish)" Condition="'$([System.String]::Copy(`%(Filename)`).Contains(`$(Version)`))' == 'true'">
<SuffixedPath>$(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)'))</SuffixedPath>
</SdkAssetsToCopyWithSuffix>
<CheckSumsToCopyWithSuffix Include="@(CheckSumsToPublish)" Condition="'$([System.String]::Copy(`%(Filename)`).Contains(`$(Version)`))' == 'true'">
<SuffixedPath>$(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)'))</SuffixedPath>
</CheckSumsToCopyWithSuffix>
</ItemGroup>
<Copy
SourceFiles="@(SdkAssetsToCopyWithSuffix -> '%(Identity)')"
DestinationFiles="@(SdkAssetsToCopyWithSuffix -> '%(SuffixedPath)')">
<Output TaskParameter="CopiedFiles" ItemName="SdkAssetsToPublishWithSuffix" />
</Copy>
<Copy
SourceFiles="@(CheckSumsToCopyWithSuffix -> '%(Identity)')"
DestinationFiles="@(CheckSumsToCopyWithSuffix -> '%(SuffixedPath)')">
<Output TaskParameter="CopiedFiles" ItemName="CheckSumsToPublishWithSuffix" />
</Copy>
<ItemGroup> <ItemGroup>
<!-- Always publish blobs to a suffixed directory. --> <!-- Always publish blobs to a suffixed directory. -->
<SdkAssetsToPushToBlobFeed Include="@(SdkAssetsToPublish)"> <SdkAssetsToPushToBlobFeed Include="@(SdkAssetsToPublish)">
@ -141,20 +117,10 @@
<ChecksumsToPushToBlobFeed Include="@(CheckSumsToPublish)"> <ChecksumsToPushToBlobFeed Include="@(CheckSumsToPublish)">
<RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath> <RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
</ChecksumsToPushToBlobFeed> </ChecksumsToPushToBlobFeed>
<SdkAssetsWithSuffixToPushToBlobFeed Include="@(SdkAssetsToPublishWithSuffix)">
<RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
<ManifestArtifactData>NonShipping=true</ManifestArtifactData>
</SdkAssetsWithSuffixToPushToBlobFeed>
<ChecksumsWithSuffixToPushToBlobFeed Include="@(CheckSumsToPublishWithSuffix)" Condition="'$(DotNetFinalVersionKind)'== 'release'">
<RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
<ManifestArtifactData>NonShipping=true</ManifestArtifactData>
</ChecksumsWithSuffixToPushToBlobFeed>
</ItemGroup> </ItemGroup>
<PushToAzureDevOpsArtifacts <PushToAzureDevOpsArtifacts
ItemsToPush="@(SdkAssetsToPushToBlobFeed);@(SdkAssetsWithSuffixToPushToBlobFeed)" ItemsToPush="@(SdkAssetsToPushToBlobFeed)"
ManifestBuildData="@(ManifestBuildData)" ManifestBuildData="@(ManifestBuildData)"
ManifestRepoUri="$(BUILD_REPOSITORY_NAME)" ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
ManifestBranch="$(BUILD_SOURCEBRANCH)" ManifestBranch="$(BUILD_SOURCEBRANCH)"
@ -165,7 +131,7 @@
PublishingVersion="3"/> PublishingVersion="3"/>
<PushToAzureDevOpsArtifacts <PushToAzureDevOpsArtifacts
ItemsToPush="@(ChecksumsToPushToBlobFeed);@(ChecksumsWithSuffixToPushToBlobFeed)" ItemsToPush="@(ChecksumsToPushToBlobFeed)"
ManifestBuildData="@(ManifestBuildData)" ManifestBuildData="@(ManifestBuildData)"
ManifestRepoUri="$(BUILD_REPOSITORY_NAME)" ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
ManifestBranch="$(BUILD_SOURCEBRANCH)" ManifestBranch="$(BUILD_SOURCEBRANCH)"