From e3be52153fdda2f8473ca3c41b71cf0229fde983 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Jan 2020 13:02:02 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/arcade build 20200103.2 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20053.2 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20053.2 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20053.2 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20053.2 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20053.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1dbf01ccf0b..33a87f2934b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,25 +67,25 @@ Note: if the Uri is a new place, you will need to add a subscription from that p 5596 - + https://github.com/dotnet/arcade - 98cc270f5e08096729fc7d54ffafa9e3c6576316 + b49ab5e13eb7c5678d6720ef041dc675cf8e9307 - + https://github.com/dotnet/arcade - 98cc270f5e08096729fc7d54ffafa9e3c6576316 + b49ab5e13eb7c5678d6720ef041dc675cf8e9307 - + https://github.com/dotnet/arcade - 98cc270f5e08096729fc7d54ffafa9e3c6576316 + b49ab5e13eb7c5678d6720ef041dc675cf8e9307 - + https://github.com/dotnet/arcade - 98cc270f5e08096729fc7d54ffafa9e3c6576316 + b49ab5e13eb7c5678d6720ef041dc675cf8e9307 - + https://github.com/dotnet/arcade - 98cc270f5e08096729fc7d54ffafa9e3c6576316 + b49ab5e13eb7c5678d6720ef041dc675cf8e9307 diff --git a/eng/Versions.props b/eng/Versions.props index 0bf1a287130..47b4b428dcc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,9 +32,9 @@ - 5.0.0-beta.20052.1 - 5.0.0-beta.20052.1 - 5.0.0-beta.20052.1 + 5.0.0-beta.20053.2 + 5.0.0-beta.20053.2 + 5.0.0-beta.20053.2 diff --git a/global.json b/global.json index ff7b00c282f..2fbdc37f958 100644 --- a/global.json +++ b/global.json @@ -15,8 +15,8 @@ "version": "5.0.100-alpha1-015536" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20052.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20052.1", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20053.2", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20053.2", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19513.3" }, From 94a4f4dd515a5d05d5efbbce53c0ad659ed66d82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 Jan 2020 13:01:46 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/arcade build 20200104.1 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20054.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20054.1 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20054.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20054.1 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20054.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33a87f2934b..7b78a97c2f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,25 +67,25 @@ Note: if the Uri is a new place, you will need to add a subscription from that p 5596 - + https://github.com/dotnet/arcade - b49ab5e13eb7c5678d6720ef041dc675cf8e9307 + 96ab522b32ff4d0f7bfc18074fd5ae3673c59d0a - + https://github.com/dotnet/arcade - b49ab5e13eb7c5678d6720ef041dc675cf8e9307 + 96ab522b32ff4d0f7bfc18074fd5ae3673c59d0a - + https://github.com/dotnet/arcade - b49ab5e13eb7c5678d6720ef041dc675cf8e9307 + 96ab522b32ff4d0f7bfc18074fd5ae3673c59d0a - + https://github.com/dotnet/arcade - b49ab5e13eb7c5678d6720ef041dc675cf8e9307 + 96ab522b32ff4d0f7bfc18074fd5ae3673c59d0a - + https://github.com/dotnet/arcade - b49ab5e13eb7c5678d6720ef041dc675cf8e9307 + 96ab522b32ff4d0f7bfc18074fd5ae3673c59d0a diff --git a/eng/Versions.props b/eng/Versions.props index 47b4b428dcc..debc6272435 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,9 +32,9 @@ - 5.0.0-beta.20053.2 - 5.0.0-beta.20053.2 - 5.0.0-beta.20053.2 + 5.0.0-beta.20054.1 + 5.0.0-beta.20054.1 + 5.0.0-beta.20054.1 diff --git a/global.json b/global.json index 2fbdc37f958..e3095bf3701 100644 --- a/global.json +++ b/global.json @@ -15,8 +15,8 @@ "version": "5.0.100-alpha1-015536" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20053.2", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20053.2", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20054.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20054.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19513.3" }, From 96c3b2c5a045da51d757c1d2e14cbc4c3eef64ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Jan 2020 13:01:59 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/arcade build 20200105.1 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20055.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20055.1 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20055.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20055.1 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20055.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b78a97c2f8..e27c44e71c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,25 +67,25 @@ Note: if the Uri is a new place, you will need to add a subscription from that p 5596 - + https://github.com/dotnet/arcade - 96ab522b32ff4d0f7bfc18074fd5ae3673c59d0a + 111d78c79ac38f596688af152779d7a39e4bf973 - + https://github.com/dotnet/arcade - 96ab522b32ff4d0f7bfc18074fd5ae3673c59d0a + 111d78c79ac38f596688af152779d7a39e4bf973 - + https://github.com/dotnet/arcade - 96ab522b32ff4d0f7bfc18074fd5ae3673c59d0a + 111d78c79ac38f596688af152779d7a39e4bf973 - + https://github.com/dotnet/arcade - 96ab522b32ff4d0f7bfc18074fd5ae3673c59d0a + 111d78c79ac38f596688af152779d7a39e4bf973 - + https://github.com/dotnet/arcade - 96ab522b32ff4d0f7bfc18074fd5ae3673c59d0a + 111d78c79ac38f596688af152779d7a39e4bf973 diff --git a/eng/Versions.props b/eng/Versions.props index debc6272435..54e696f4d35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,9 +32,9 @@ - 5.0.0-beta.20054.1 - 5.0.0-beta.20054.1 - 5.0.0-beta.20054.1 + 5.0.0-beta.20055.1 + 5.0.0-beta.20055.1 + 5.0.0-beta.20055.1 diff --git a/global.json b/global.json index e3095bf3701..c837f303ba0 100644 --- a/global.json +++ b/global.json @@ -15,8 +15,8 @@ "version": "5.0.100-alpha1-015536" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20054.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20054.1", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20055.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20055.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19513.3" }, From 409596bba62d3862944ac1f15ac3f290fc992b83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Jan 2020 13:02:04 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/arcade build 20200106.6 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20056.6 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20056.6 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20056.6 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20056.6 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20056.6 --- eng/Version.Details.xml | 20 +++++----- eng/Versions.props | 6 +-- .../channels/generic-internal-channel.yml | 38 +++++++----------- .../channels/generic-public-channel.yml | 39 +++++++------------ global.json | 4 +- 5 files changed, 45 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e27c44e71c5..59ecc09ec30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,25 +67,25 @@ Note: if the Uri is a new place, you will need to add a subscription from that p 5596 - + https://github.com/dotnet/arcade - 111d78c79ac38f596688af152779d7a39e4bf973 + 5cbca575e9002cc2d9814c3471d38882df2fcc8e - + https://github.com/dotnet/arcade - 111d78c79ac38f596688af152779d7a39e4bf973 + 5cbca575e9002cc2d9814c3471d38882df2fcc8e - + https://github.com/dotnet/arcade - 111d78c79ac38f596688af152779d7a39e4bf973 + 5cbca575e9002cc2d9814c3471d38882df2fcc8e - + https://github.com/dotnet/arcade - 111d78c79ac38f596688af152779d7a39e4bf973 + 5cbca575e9002cc2d9814c3471d38882df2fcc8e - + https://github.com/dotnet/arcade - 111d78c79ac38f596688af152779d7a39e4bf973 + 5cbca575e9002cc2d9814c3471d38882df2fcc8e diff --git a/eng/Versions.props b/eng/Versions.props index 54e696f4d35..0a191a0a929 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,9 +32,9 @@ - 5.0.0-beta.20055.1 - 5.0.0-beta.20055.1 - 5.0.0-beta.20055.1 + 5.0.0-beta.20056.6 + 5.0.0-beta.20056.6 + 5.0.0-beta.20056.6 diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 3a8755fbbb7..700211049b5 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -30,16 +30,15 @@ stages: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' + displayName: Download Build Assets continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts inputs: - artifactName: 'PDBArtifacts' - continueOnError: true + buildType: 'current' + downloadType: 'specific' + itemPattern: | + PDBArtifacts/** + BlobArtifacts/** + downloadPath: '$(Build.ArtifactStagingDirectory)' # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here @@ -85,23 +84,16 @@ stages: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts + displayName: Download Build Assets continueOnError: true - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests inputs: - buildType: current - artifactName: AssetManifests + buildType: 'current' + downloadType: 'specific' + itemPattern: | + PackageArtifacts/** + BlobArtifacts/** + AssetManifests/** + downloadPath: '$(Build.ArtifactStagingDirectory)' - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml index 3f572f8b12f..fbb5a19b677 100644 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -30,16 +30,15 @@ stages: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' + displayName: Download Build Assets continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts inputs: - artifactName: 'PDBArtifacts' - continueOnError: true + buildType: 'current' + downloadType: 'specific' + itemPattern: | + PDBArtifacts/** + BlobArtifacts/** + downloadPath: '$(Build.ArtifactStagingDirectory)' # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here @@ -84,24 +83,16 @@ stages: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts + displayName: Download Build Assets continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests inputs: - buildType: current - artifactName: AssetManifests + buildType: 'current' + downloadType: 'specific' + itemPattern: | + PackageArtifacts/** + BlobArtifacts/** + AssetManifests/** + downloadPath: '$(Build.ArtifactStagingDirectory)' - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' diff --git a/global.json b/global.json index c837f303ba0..dfd4b045d3b 100644 --- a/global.json +++ b/global.json @@ -15,8 +15,8 @@ "version": "5.0.100-alpha1-015536" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20055.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20055.1", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20056.6", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20056.6", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19513.3" }, From d764e86f128cfec8d9aedf68f607dbe6a8c851f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Jan 2020 13:01:54 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/arcade build 20200107.5 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20057.5 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20057.5 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20057.5 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20057.5 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20057.5 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59ecc09ec30..498f11df758 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,25 +67,25 @@ Note: if the Uri is a new place, you will need to add a subscription from that p 5596 - + https://github.com/dotnet/arcade - 5cbca575e9002cc2d9814c3471d38882df2fcc8e + d0833c8e5e58cfc507ce3c8da364e55931190263 - + https://github.com/dotnet/arcade - 5cbca575e9002cc2d9814c3471d38882df2fcc8e + d0833c8e5e58cfc507ce3c8da364e55931190263 - + https://github.com/dotnet/arcade - 5cbca575e9002cc2d9814c3471d38882df2fcc8e + d0833c8e5e58cfc507ce3c8da364e55931190263 - + https://github.com/dotnet/arcade - 5cbca575e9002cc2d9814c3471d38882df2fcc8e + d0833c8e5e58cfc507ce3c8da364e55931190263 - + https://github.com/dotnet/arcade - 5cbca575e9002cc2d9814c3471d38882df2fcc8e + d0833c8e5e58cfc507ce3c8da364e55931190263 diff --git a/eng/Versions.props b/eng/Versions.props index 0a191a0a929..cd48d0400d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,9 +32,9 @@ - 5.0.0-beta.20056.6 - 5.0.0-beta.20056.6 - 5.0.0-beta.20056.6 + 5.0.0-beta.20057.5 + 5.0.0-beta.20057.5 + 5.0.0-beta.20057.5 diff --git a/global.json b/global.json index dfd4b045d3b..7310586d9be 100644 --- a/global.json +++ b/global.json @@ -15,8 +15,8 @@ "version": "5.0.100-alpha1-015536" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20056.6", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20056.6", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20057.5", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20057.5", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19513.3" },