huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge in 'release/5.0' changes

This commit is contained in:
dotnet-bot 2021-02-12 00:27:43 +00:00
parent 1ff21d0691 3aad49b708
commit 61fc832b61
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eng/Publishing.props
View File

@ -8,7 +8,9 @@
<_UploadPathRoot>aspnetcore</_UploadPathRoot> <_UploadPathRoot>aspnetcore</_UploadPathRoot>
<ProductVersionFileName>productVersion.txt</ProductVersionFileName> <ProductVersionFileName>productVersion.txt</ProductVersionFileName>
<RepoProductVersionFileName>$(_UploadPathRoot)-$(ProductVersionFileName)</RepoProductVersionFileName>
<ProductVersionFileLocation>$(ArtifactsShippingPackagesDir)$(ProductVersionFileName)</ProductVersionFileLocation> <ProductVersionFileLocation>$(ArtifactsShippingPackagesDir)$(ProductVersionFileName)</ProductVersionFileLocation>
<RepoProductVersionFileLocation>$(ArtifactsShippingPackagesDir)$(RepoProductVersionFileName)</RepoProductVersionFileLocation>
</PropertyGroup> </PropertyGroup>
<!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. --> <!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. -->
@ -33,7 +35,7 @@
<_ChecksumsToPublish Include="$(ArtifactsDir)**\*.sha512" /> <_ChecksumsToPublish Include="$(ArtifactsDir)**\*.sha512" />
</ItemGroup> </ItemGroup>
<Target <Target
Name="_PublishInstallersAndChecksumsAndProductVersion" Name="_PublishInstallersAndChecksumsAndProductVersion"
DependsOnTargets="_WriteProductVersionFile"> DependsOnTargets="_WriteProductVersionFile">
<!-- <!--
@ -78,10 +80,15 @@
<PublishFlatContainer>true</PublishFlatContainer> <PublishFlatContainer>true</PublishFlatContainer>
<RelativeBlobPath>$(_UploadPathRoot)/Runtime/$(_PackageVersion)/$(ProductVersionFileName)</RelativeBlobPath> <RelativeBlobPath>$(_UploadPathRoot)/Runtime/$(_PackageVersion)/$(ProductVersionFileName)</RelativeBlobPath>
</ItemsToPushToBlobFeed> </ItemsToPushToBlobFeed>
<ItemsToPushToBlobFeed Include="$(RepoProductVersionFileLocation)" Condition=" '$(PublishInstallerBaseVersion)' == 'true'">
<PublishFlatContainer>true</PublishFlatContainer>
<RelativeBlobPath>$(_UploadPathRoot)/Runtime/$(_PackageVersion)/$(RepoProductVersionFileName)</RelativeBlobPath>
</ItemsToPushToBlobFeed>
</ItemGroup> </ItemGroup>
</Target> </Target>
<Target <Target
Name="_WriteProductVersionFile" Name="_WriteProductVersionFile"
Condition=" '$(PublishInstallerBaseVersion)' == 'true'"> Condition=" '$(PublishInstallerBaseVersion)' == 'true'">
<!-- <!--
@ -106,5 +113,10 @@
Lines="$(_ProductVersion)" Lines="$(_ProductVersion)"
Overwrite="true" Overwrite="true"
Encoding="ASCII" /> Encoding="ASCII" />
<WriteLinesToFile
File="$(RepoProductVersionFileLocation)"
Lines="$(_ProductVersion)"
Overwrite="true"
Encoding="ASCII" />
</Target> </Target>
</Project> </Project>