From: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 14:22:26 +0000 (+0000) Subject: Update dependencies from https://github.com/dotnet/arcade build 20220203.1 (#2848) X-Git-Tag: accepted/tizen/unified/20221103.165810~28^2^2~92 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e7a0fdb961ab925d1b5cf6e868419c1a7029b4f;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git Update dependencies from https://github.com/dotnet/arcade build 20220203.1 (#2848) [main] Update dependencies from dotnet/arcade --- diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1c2cf482..49eddcf01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,14 +19,14 @@ - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 https://github.com/dotnet/installer diff --git a/eng/Versions.props b/eng/Versions.props index 75f534ca6..31b81dcee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,7 +56,7 @@ 4.7.2 4.7.1 2.0.3 - 7.0.0-beta.22080.1 + 7.0.0-beta.22103.1 10.0.18362 12.0.2 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index c5c2a9915..92e98af7e 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -140,6 +140,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - task: ComponentGovernanceComponentDetection@0 + continueOnError: true - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index d85d6d07d..12a8ff94d 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -43,8 +43,8 @@ steps: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index ebc310803..66c87e61a 100644 --- a/global.json +++ b/global.json @@ -16,6 +16,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "2.0.1", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22103.1" } }