diff options
| author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2022-03-21 15:29:16 +0300 |
|---|---|---|
| committer | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2022-03-21 15:29:16 +0300 |
| commit | a36ef9928e114ccd96d9a418fa20c9b2d725910e (patch) | |
| tree | 3fd44b6d10af11535ab603957213ce2198689e67 | |
| parent | fccdef045c2e982dd2e2465585cd9f405cf85757 (diff) | |
Update dependencies from https://github.com/dotnet/arcade build 20220316.2darc-release/6.0-a2ade6e2-0160-4993-b296-8944ba516283
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat
From Version 6.0.0-beta.22102.3 -> To Version 6.0.0-beta.22166.2
| -rw-r--r-- | eng/Version.Details.xml | 8 | ||||
| -rw-r--r-- | eng/Versions.props | 2 | ||||
| -rw-r--r-- | eng/common/templates/steps/source-build.yml | 4 | ||||
| -rw-r--r-- | global.json | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2024f4e84..dc0cce65b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,14 +3,14 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22161.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22166.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha> + <Sha>3c5f86af982adcb2bbd3932b54cd61f5e5888edc</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22161.1"> + <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22166.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha> + <Sha>3c5f86af982adcb2bbd3932b54cd61f5e5888edc</Sha> </Dependency> <Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-rc.1.21415.6"> <Uri>https://github.com/dotnet/runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 9d9918d62..1cce64d76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion> <MicrosoftBuildFrameworkVersion>17.0.0-preview-21267-01</MicrosoftBuildFrameworkVersion> <MicrosoftBuildUtilitiesCoreVersion>17.0.0-preview-21267-01</MicrosoftBuildUtilitiesCoreVersion> - <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22161.1</MicrosoftDotNetApiCompatVersion> + <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22166.2</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21271.1</MicrosoftDotNetCodeAnalysisVersion> <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion> <MicrosoftCodeAnalysisVersion>3.10.0-2.final</MicrosoftCodeAnalysisVersion> diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f..abb1b2bcd 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 7f39871a4..3ea7c8a43 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22166.2", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" } |