From 4048a2ca3df02c323d68242ddc9e655c49b5443b Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 24 Jan 2019 12:43:39 -0800 Subject: [PATCH 01/14] Disambiguate asset manifest path --- eng/Publishing.props | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eng/Publishing.props b/eng/Publishing.props index 7c43afbf8..ff1a990bc 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -13,6 +13,12 @@ $(DotNetPublishChecksumsBlobFeedKey) $(DotnetPublishSdkAssetsBlobFeedUrl) $(DotNetPublishSdkAssetsBlobFeedKey) + + $(OS)-$(PlatformName) + $(AssetManifestFileName)-$(Rid) + $(AssetManifestFileName).xml + $(ArtifactsLogDir)AssetManifests\$(AssetManifestFileName) false true From f6691cff13e142bf0070d0c60d5faeb548e05df3 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 24 Jan 2019 13:12:57 -0800 Subject: [PATCH 02/14] Move property group after import --- eng/Publishing.props | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index ff1a990bc..2846f7c9e 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -13,12 +13,6 @@ $(DotNetPublishChecksumsBlobFeedKey) $(DotnetPublishSdkAssetsBlobFeedUrl) $(DotNetPublishSdkAssetsBlobFeedKey) - - $(OS)-$(PlatformName) - $(AssetManifestFileName)-$(Rid) - $(AssetManifestFileName).xml - $(ArtifactsLogDir)AssetManifests\$(AssetManifestFileName) false true @@ -27,6 +21,15 @@ + + + + $(OS)-$(PlatformName) + $(AssetManifestFileName)-$(Rid) + $(AssetManifestFileName).xml + $(ArtifactsLogDir)AssetManifests\$(AssetManifestFileName) + From 443f6e0a9497f4ea686a65fc042b87177192cf65 Mon Sep 17 00:00:00 2001 From: Christopher Costa Date: Thu, 24 Jan 2019 14:00:22 -0800 Subject: [PATCH 03/14] Fix manifest publishing --- .vsts-ci.yml | 7 ------- eng/Publishing.props | 7 ++++--- eng/build.yml | 1 - 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 0b0de0314..565d59b50 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -45,21 +45,18 @@ jobs: _BuildArchitecture: x86 _DOTNET_CLI_UI_LANGUAGE: '' _DropSuffix: '' - _PublishBuildAssetManifest: true # Always run builds Build_Release_x64: _BuildConfig: Release _BuildArchitecture: x64 _DOTNET_CLI_UI_LANGUAGE: '' _DropSuffix: '' - _PublishBuildAssetManifest: true Build_Release_arm: _BuildConfig: Release _BuildArchitecture: arm _DOTNET_CLI_UI_LANGUAGE: '' _DropSuffix: '' _AdditionalBuildParameters: '/p:DisableSourceLink=true' - _PublishBuildAssetManifest: true - template: /eng/build.yml parameters: @@ -176,7 +173,6 @@ jobs: _RuntimeIdentifier: '' _BuildArchitecture: 'arm' _DropSuffix: '' - _PublishBuildAssetManifest: true Build_Arm64_Release: _BuildConfig: Release _DockerParameter: '' @@ -184,7 +180,6 @@ jobs: _RuntimeIdentifier: '' _BuildArchitecture: 'arm64' _DropSuffix: '' - _PublishBuildAssetManifest: true Build_Rhel_6_Release_x64: _BuildConfig: Release _DockerParameter: '--docker rhel.6' @@ -227,7 +222,6 @@ jobs: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' - _PublishBuildAssetManifest: true - template: /eng/build.yml parameters: @@ -239,7 +233,6 @@ jobs: matrix: Build_Release: _BuildConfig: Release - _PublishBuildAssetManifest: true # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml diff --git a/eng/Publishing.props b/eng/Publishing.props index 2846f7c9e..3119df565 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -27,8 +27,9 @@ that exists in the container. Disambiguate the manifests via RID --> $(OS)-$(PlatformName) $(AssetManifestFileName)-$(Rid) - $(AssetManifestFileName).xml - $(ArtifactsLogDir)AssetManifests\$(AssetManifestFileName) + $(AssetManifestFileName)-checksums + $(ArtifactsLogDir)AssetManifests\$(AssetManifestFileName).xml + $(ChecksumsAssetManifestFileName).xml @@ -85,7 +86,7 @@ ManifestBranch="$(BUILD_SOURCEBRANCH)" ManifestBuildId="$(BUILD_BUILDNUMBER)" ManifestCommit="$(BUILD_SOURCEVERSION)" - AssetManifestPath="$(AssetManifestFilePath)" + AssetManifestPath="$(ChecksumsAssetManifestFilePath)" PublishFlatContainer="true"/> diff --git a/eng/build.yml b/eng/build.yml index fbbebfcb2..062057af1 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -46,7 +46,6 @@ phases: /p:PB_PublishType=blob /p:DotnetPublishChecksumsBlobFeedUrl=$(_PublishChecksumsBlobFeedUrl) /p:DotNetPublishChecksumsBlobFeedKey=$(dotnetclichecksums-storage-key) - /p:AssetManifestFilePath=$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest/$(Agent.OS)_$(_BuildArchitecture).xml /p:DotNetSignType=real /p:TeamName=$(_TeamName) From 421506e7d2a3f8586a147d1cba4f70fbb172864e Mon Sep 17 00:00:00 2001 From: Christopher Costa Date: Thu, 24 Jan 2019 14:10:57 -0800 Subject: [PATCH 04/14] fix typo --- eng/Publishing.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 3119df565..f39d47bf4 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -29,7 +29,7 @@ $(AssetManifestFileName)-$(Rid) $(AssetManifestFileName)-checksums $(ArtifactsLogDir)AssetManifests\$(AssetManifestFileName).xml - $(ChecksumsAssetManifestFileName).xml + $(ChecksumsAssetManifestFileName).xml From 70b5e0eaaacc5b8d6fdbe1cf97136fcbb9a2994f Mon Sep 17 00:00:00 2001 From: Christopher Costa Date: Thu, 24 Jan 2019 14:28:52 -0800 Subject: [PATCH 05/14] Fix naming reassignment --- eng/Publishing.props | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index f39d47bf4..67e2c5567 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -28,8 +28,9 @@ $(OS)-$(PlatformName) $(AssetManifestFileName)-$(Rid) $(AssetManifestFileName)-checksums - $(ArtifactsLogDir)AssetManifests\$(AssetManifestFileName).xml - $(ChecksumsAssetManifestFileName).xml + + $(ArtifactsLogDir)AssetManifest\$(AssetManifestFileName).xml + $(ArtifactsLogDir)AssetManifest\$(ChecksumsAssetManifestFileName).xml @@ -74,7 +75,7 @@ ManifestBranch="$(BUILD_SOURCEBRANCH)" ManifestBuildId="$(BUILD_BUILDNUMBER)" ManifestCommit="$(BUILD_SOURCEVERSION)" - AssetManifestPath="$(AssetManifestFilePath)" + AssetManifestPath="$(DotNetAssetManifestFilePath)" PublishFlatContainer="true" /> Date: Thu, 24 Jan 2019 14:39:41 -0800 Subject: [PATCH 06/14] disambiguate by architecture --- eng/Publishing.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 67e2c5567..e5e80a858 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -24,9 +24,10 @@ + that exists in the container. Disambiguate the manifests via RID and architecture --> $(OS)-$(PlatformName) $(AssetManifestFileName)-$(Rid) + $(AssetManifestFileName)-$(Architecture) $(AssetManifestFileName)-checksums $(ArtifactsLogDir)AssetManifest\$(AssetManifestFileName).xml From 65ac3a997b34b98537ec00d92739f27b1be2a211 Mon Sep 17 00:00:00 2001 From: Christopher Costa Date: Thu, 24 Jan 2019 15:26:38 -0800 Subject: [PATCH 07/14] dummy commit for versioning --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 77d4454e8..0ed45f659 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Found an issue? You can consult the [Documents Index for the CLI repo](https://github.com/dotnet/cli/blob/master/Documentation/README.md) to find out current issues, see workarounds, and to see how to file new issues. This project has adopted the code of conduct defined by the [Contributor Covenant](http://contributor-covenant.org/) to clarify expected behavior in our community. For more information, see the [.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct). - + # Build status |All legs| From df6f0d65e6dea5527671d2e160f7ddf0fafed581 Mon Sep 17 00:00:00 2001 From: Christopher Costa Date: Thu, 24 Jan 2019 15:48:08 -0800 Subject: [PATCH 08/14] Change asset manifest filename to use osname --- README.md | 2 +- eng/Publishing.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0ed45f659..77d4454e8 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Found an issue? You can consult the [Documents Index for the CLI repo](https://github.com/dotnet/cli/blob/master/Documentation/README.md) to find out current issues, see workarounds, and to see how to file new issues. This project has adopted the code of conduct defined by the [Contributor Covenant](http://contributor-covenant.org/) to clarify expected behavior in our community. For more information, see the [.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct). - + # Build status |All legs| diff --git a/eng/Publishing.props b/eng/Publishing.props index e5e80a858..f84c61b59 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -25,7 +25,7 @@ - $(OS)-$(PlatformName) + $(OSName)-$(PlatformName) $(AssetManifestFileName)-$(Rid) $(AssetManifestFileName)-$(Architecture) $(AssetManifestFileName)-checksums From 5b91dfa9fbd8969c8e798df8efa1f94d2d1d15c1 Mon Sep 17 00:00:00 2001 From: Christopher Costa Date: Thu, 24 Jan 2019 16:03:59 -0800 Subject: [PATCH 09/14] Add env variables for docker --- .vsts-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 565d59b50..12fa45708 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -182,7 +182,7 @@ jobs: _DropSuffix: '' Build_Rhel_6_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker rhel.6' + _DockerParameter: '--docker rhel.6 -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id rhel.6-x64' _BuildArchitecture: 'x64' @@ -190,14 +190,14 @@ jobs: _AdditionalBuildParameters: '/p:DisableSourceLink=true' Build_Linux_musl_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker alpine.3.6' + _DockerParameter: '--docker alpine.3.6 -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-musl-x64' _BuildArchitecture: 'x64' _DropSuffix: '' Build_Linux_Portable_Deb_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker ubuntu.16.04' + _DockerParameter: '--docker ubuntu.16.04 -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' @@ -207,7 +207,7 @@ jobs: _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker rhel -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' From 5524bf3433bcd7744687b53062754df0d822ff0d Mon Sep 17 00:00:00 2001 From: Christopher Costa Date: Thu, 24 Jan 2019 16:13:25 -0800 Subject: [PATCH 10/14] move variables to dockerrun --- .vsts-ci.yml | 8 ++++---- eng/dockerrun.sh | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 12fa45708..565d59b50 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -182,7 +182,7 @@ jobs: _DropSuffix: '' Build_Rhel_6_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker rhel.6 -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION' + _DockerParameter: '--docker rhel.6' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id rhel.6-x64' _BuildArchitecture: 'x64' @@ -190,14 +190,14 @@ jobs: _AdditionalBuildParameters: '/p:DisableSourceLink=true' Build_Linux_musl_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker alpine.3.6 -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION' + _DockerParameter: '--docker alpine.3.6' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-musl-x64' _BuildArchitecture: 'x64' _DropSuffix: '' Build_Linux_Portable_Deb_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker ubuntu.16.04 -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION' + _DockerParameter: '--docker ubuntu.16.04' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' @@ -207,7 +207,7 @@ jobs: _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker rhel -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION' + _DockerParameter: '--docker rhel' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index e73d440e0..6424389e7 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -140,6 +140,13 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e PB_ASSETROOTURL \ -e PB_PACKAGEVERSIONPROPSURL \ -e PB_PUBLISHBLOBFEEDURL \ + -e _PUBLISHBLOBFEEDURL + -e _ASSETROOTURL \ + -e _PACKAGEVERSIONPROPSURL \ -e EXTERNALRESTORESOURCES \ + -e BUILD_REPOSITORY_URI \ + -e BUILD_SOURCEBRANCH \ + -e BUILD_BUILDNUMBER \ + -e BUILD_SOURCEVERSION $DOTNET_BUILD_CONTAINER_TAG \ $BUILD_COMMAND "$@" From 3e0c10bb9af9cb00e9fe34d69f1f4d243af81767 Mon Sep 17 00:00:00 2001 From: Christopher Costa Date: Thu, 24 Jan 2019 16:18:45 -0800 Subject: [PATCH 11/14] add missing slash --- eng/dockerrun.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index 6424389e7..383ae8fc2 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -147,6 +147,6 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e BUILD_REPOSITORY_URI \ -e BUILD_SOURCEBRANCH \ -e BUILD_BUILDNUMBER \ - -e BUILD_SOURCEVERSION + -e BUILD_SOURCEVERSION \ $DOTNET_BUILD_CONTAINER_TAG \ $BUILD_COMMAND "$@" From 88281a3a2908004e300e2154bf1ddb695922658b Mon Sep 17 00:00:00 2001 From: Christopher Costa Date: Thu, 24 Jan 2019 16:23:26 -0800 Subject: [PATCH 12/14] add another missing slash --- eng/dockerrun.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index 383ae8fc2..6a3634bc5 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -140,7 +140,7 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e PB_ASSETROOTURL \ -e PB_PACKAGEVERSIONPROPSURL \ -e PB_PUBLISHBLOBFEEDURL \ - -e _PUBLISHBLOBFEEDURL + -e _PUBLISHBLOBFEEDURL \ -e _ASSETROOTURL \ -e _PACKAGEVERSIONPROPSURL \ -e EXTERNALRESTORESOURCES \ From 230f7ea7cba357b07b2e4a90172b1ccd7c5c7329 Mon Sep 17 00:00:00 2001 From: Christopher Costa Date: Thu, 24 Jan 2019 16:40:12 -0800 Subject: [PATCH 13/14] Update manifest name based on osname existence --- eng/Publishing.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index f84c61b59..a9fd241cf 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -25,7 +25,8 @@ - $(OSName)-$(PlatformName) + $(OSName)-$(PlatformName) + $(OS)-$(PlatformName) $(AssetManifestFileName)-$(Rid) $(AssetManifestFileName)-$(Architecture) $(AssetManifestFileName)-checksums From 9d4acc274c54c6fff0436475ce229a9cbc9bb5f2 Mon Sep 17 00:00:00 2001 From: Christopher Costa Date: Thu, 24 Jan 2019 16:43:28 -0800 Subject: [PATCH 14/14] use agent_os --- eng/Publishing.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index a9fd241cf..12ede2957 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -25,8 +25,8 @@ - $(OSName)-$(PlatformName) - $(OS)-$(PlatformName) + $(AGENT_OS)-$(PlatformName) + $(OS)-$(PlatformName) $(AssetManifestFileName)-$(Rid) $(AssetManifestFileName)-$(Architecture) $(AssetManifestFileName)-checksums