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

Simplify eng\publishing.props (#6491)

Browse source 
* Simplify eng\publishing.props

With newer versions of Tasks.Feed and Arcade.SDK you don't need these lines.

* Let Arcade.SDK dictate the version of Tasks.Feed
This commit is contained in:
Divino César 2020-02-20 14:12:24 -08:00 • committed by GitHub
parent 2805fe968a
commit 2b2cae502b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
eng/Publishing.props
View file

@ -14,8 +14,6 @@
<PublishBinariesAndBadge Condition=" '$(PublishBinariesAndBadge)' == '' ">true</PublishBinariesAndBadge> <PublishBinariesAndBadge Condition=" '$(PublishBinariesAndBadge)' == '' ">true</PublishBinariesAndBadge>
</PropertyGroup> </PropertyGroup>
<Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" Condition=" '$(PublishSdkAssetsAndChecksumsToBlob)' == 'true' " />
<PropertyGroup> <PropertyGroup>
<!-- Because we may be building in a container, we should use an asset manifest file path <!-- Because we may be building in a container, we should use an asset manifest file path
that exists in the container. Disambiguate the manifests via available properties. that exists in the container. Disambiguate the manifests via available properties.
@ -111,9 +109,6 @@
</ChecksumsWithSuffixToPushToBlobFeed> </ChecksumsWithSuffixToPushToBlobFeed>
</ItemGroup> </ItemGroup>
<MakeDir Directories="$(DotnetTempWorkingDirectory)"/>
<MakeDir Directories="$(ChecksumTempWorkingDirectory)"/>
<PushToAzureDevOpsArtifacts <PushToAzureDevOpsArtifacts
ItemsToPush="@(SdkAssetsToPushToBlobFeed);@(SdkAssetsWithSuffixToPushToBlobFeed)" ItemsToPush="@(SdkAssetsToPushToBlobFeed);@(SdkAssetsWithSuffixToPushToBlobFeed)"
ManifestBuildData="Location=$(SdkAssetsFeedUrl)" ManifestBuildData="Location=$(SdkAssetsFeedUrl)"
@ -122,8 +117,7 @@
ManifestBuildId="$(BUILD_BUILDNUMBER)" ManifestBuildId="$(BUILD_BUILDNUMBER)"
ManifestCommit="$(BUILD_SOURCEVERSION)" ManifestCommit="$(BUILD_SOURCEVERSION)"
AssetManifestPath="$(DotNetAssetManifestFilePath)" AssetManifestPath="$(DotNetAssetManifestFilePath)"
PublishFlatContainer="true" PublishFlatContainer="true" />
AssetsTemporaryDirectory="$(DotnetTempWorkingDirectory)" />
<PushToAzureDevOpsArtifacts <PushToAzureDevOpsArtifacts
ItemsToPush="@(ChecksumsToPushToBlobFeed);@(ChecksumsWithSuffixToPushToBlobFeed)" ItemsToPush="@(ChecksumsToPushToBlobFeed);@(ChecksumsWithSuffixToPushToBlobFeed)"
@ -133,23 +127,6 @@
ManifestBuildId="$(BUILD_BUILDNUMBER)" ManifestBuildId="$(BUILD_BUILDNUMBER)"
ManifestCommit="$(BUILD_SOURCEVERSION)" ManifestCommit="$(BUILD_SOURCEVERSION)"
AssetManifestPath="$(ChecksumsAssetManifestFilePath)" AssetManifestPath="$(ChecksumsAssetManifestFilePath)"
PublishFlatContainer="true" PublishFlatContainer="true" />
AssetsTemporaryDirectory="$(ChecksumTempWorkingDirectory)" />
<Copy
SourceFiles="$(DotNetAssetManifestFilePath)"
DestinationFolder="$(DotnetTempWorkingDirectory)\$(AssetManifestFileName)" />
<Copy
SourceFiles="$(ChecksumsAssetManifestFilePath)"
DestinationFolder="$(ChecksumTempWorkingDirectory)\$(ChecksumsAssetManifestFileName)" />
<Message
Text="##vso[artifact.upload containerfolder=AssetManifests;artifactname=AssetManifests]$(DotnetTempWorkingDirectory)/$(AssetManifestFileName)"
Importance="high" />
<Message
Text="##vso[artifact.upload containerfolder=AssetManifests;artifactname=AssetManifests]$(ChecksumTempWorkingDirectory)/$(ChecksumsAssetManifestFileName)"
Importance="high" />
</Target> </Target>
</Project> </Project>

3
eng/Versions.props
View file

@ -122,8 +122,7 @@
</PropertyGroup> </PropertyGroup>
<!-- infrastructure and test only dependencies --> <!-- infrastructure and test only dependencies -->
<PropertyGroup> <PropertyGroup>
<BuildTasksFeedToolVersion>2.2.0-beta.19072.10</BuildTasksFeedToolVersion> <VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<VersionToolsVersion>$(BuildTasksFeedToolVersion)</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion> <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>15.8.0</MicrosoftNETTestSdkVersion> <MicrosoftNETTestSdkVersion>15.8.0</MicrosoftNETTestSdkVersion>
</PropertyGroup> </PropertyGroup>