From 0c4bcdcc559e338f978acb624037d9142761c204 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 16 Oct 2017 14:33:50 -0700 Subject: [PATCH 1/7] Enabling the publish of CLI NuPkg to the unified Transport feed. --- build/AzureInfo.props | 7 +++++ build/Microsoft.DotNet.Cli.tasks | 1 + build/Publish.targets | 4 ++- .../PublishNupkgToTransportFeed.targets | 27 +++++++++++++++++++ .../dotnet-cli-build/dotnet-cli-build.csproj | 1 + dir.props | 1 + 6 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 build/publish/PublishNupkgToTransportFeed.targets diff --git a/build/AzureInfo.props b/build/AzureInfo.props index 0e8cf5104..9f323b42b 100644 --- a/build/AzureInfo.props +++ b/build/AzureInfo.props @@ -8,7 +8,14 @@ dotnetcli https://$(ArtifactCloudDropAccountName).blob.core.windows.net/$(ArtifactContainerName) $(CHECKSUM_STORAGE_CONTAINER) + dotnet $(CHECKSUM_STORAGE_KEY) $(CHECKSUM_STORAGE_ACCOUNT) + dotnetclichecksums + $(TRANSPORTFEED_STORAGE_CONTAINER) + dotnet-core + $(TRANSPORTFEED_STORAGE_KEY) + $(TRANSPORTFEED_STORAGE_ACCOUNT) + dotnetfeed diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks index 901a48f84..1c4bbac75 100644 --- a/build/Microsoft.DotNet.Cli.tasks +++ b/build/Microsoft.DotNet.Cli.tasks @@ -24,6 +24,7 @@ + diff --git a/build/Publish.targets b/build/Publish.targets index bc9a387b6..99e64e520 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -3,6 +3,7 @@ + @@ -24,6 +25,7 @@ GenerateChecksums; UploadArtifactsToAzure; UploadChecksumsToAzure; + PublishNupkgToTransportFeed; PublishDebFilesToDebianRepo; PublishCliVersionBadge" /> @@ -33,7 +35,7 @@ Condition=" '$(IslinuxPortable)' != 'true' "/> - diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets new file mode 100644 index 000000000..a59c5e5a3 --- /dev/null +++ b/build/publish/PublishNupkgToTransportFeed.targets @@ -0,0 +1,27 @@ + + + + + + + + packages + + + + + + + + + + + + diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 872cae995..89dc0f323 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -29,5 +29,6 @@ + diff --git a/dir.props b/dir.props index 756fccc32..7133cb74f 100644 --- a/dir.props +++ b/dir.props @@ -7,6 +7,7 @@ $(RepoRoot)/.nuget/packages $(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll + $(RepoRoot)/build_projects/dotnet-cli-build/bin/Microsoft.DotNet.Build.Tasks.Feed.dll true true From f33310fefcfc14dbda39a334cf38b5774a825220 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 17 Oct 2017 09:08:35 -0700 Subject: [PATCH 2/7] Make the uploads to blob storage more exacting. --- build/Publish.targets | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index 99e64e520..2842c40ee 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -37,9 +37,11 @@ Condition=" '$(IsLinuxDistroSpecific)' != 'true' "/> - + - From 9bd54acabe64acb8bd6a1ad9d787f0f768286123 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 20 Oct 2017 11:55:14 -0700 Subject: [PATCH 3/7] Adding the second CLI NuPkg --- build/publish/PublishNupkgToTransportFeed.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets index a59c5e5a3..b45bb43f6 100644 --- a/build/publish/PublishNupkgToTransportFeed.targets +++ b/build/publish/PublishNupkgToTransportFeed.targets @@ -2,6 +2,7 @@ + From f26e651c6abcd43071bbe1ad10990c047fc8960f Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 20 Oct 2017 14:02:41 -0700 Subject: [PATCH 4/7] Defining the published Nupkgs in one place. --- build/Publish.targets | 4 +--- build/publish/PublishNupkgToTransportFeed.targets | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index 2842c40ee..efe45cd91 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -35,9 +35,7 @@ Condition=" '$(IslinuxPortable)' != 'true' "/> - - diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets index b45bb43f6..2f41acfd1 100644 --- a/build/publish/PublishNupkgToTransportFeed.targets +++ b/build/publish/PublishNupkgToTransportFeed.targets @@ -1,8 +1,8 @@ - - + + @@ -19,7 +19,7 @@ AccountName="$(TransportFeedCloudDropAccountName)" ContainerName="$(TransportFeedContainerName)" IndexDirectory="$(IndexDirectory)" - ItemsToPush="@(ItemsToPush)" + ItemsToPush="@(NupkgsForPublishing)" Overwrite="false" PublishFlatContainer="false" RelativePath="$(RelativePath)" /> From f81c0fc1d758a3a958581dbe64b187560c307020 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Mon, 23 Oct 2017 14:59:24 -0700 Subject: [PATCH 5/7] MSBuild 15.5.165 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cff56573d..e4ddf2ecf 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.0.0 - 15.5.0-preview-000160-1065475 + 15.5.0-preview-000165-1081473 2.6.0-beta2-62210-01 1.6.0-beta2-25304 4.2.0-rtm-170926-0 From 12461752407155db4eba73236b02f302333d9774 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 25 Oct 2017 10:47:33 -0700 Subject: [PATCH 6/7] Adding the Microsoft.DotNet.Build.Tasks.Feed tasks --- Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Build.props b/Directory.Build.props index f2622914b..a75ddc89a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -24,6 +24,7 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj build_projects/dotnet-cli-build/bin dotnet-cli-build.dll $(RepoRoot)/$(RelativeCLIBuildBinaries)/$(RelativeCLIBuildDllName) + $(RepoRoot)/build_projects/dotnet-cli-build/bin/Microsoft.DotNet.Build.Tasks.Feed.dll true true From 8797fecdbcc88cf06c54619b8d5eae2bd7c11f5d Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 30 Oct 2017 10:16:35 -0700 Subject: [PATCH 7/7] Updating the transport feed DLL to 1.0.0-prerelease-02130-01 --- build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 8e156bfc6..8288487bc 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -29,7 +29,7 @@ - +