Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/llvm-project.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>2022-02-07 18:46:10 +0300
committerGitHub <noreply@github.com>2022-02-07 18:46:10 +0300
commit5b358880114238a553ea86fe087ccb80b17a0017 (patch)
tree6d4acb03d17ff5eda3cbf65f7e1fa5e61ebdea93
parent7384a32eadebf377a99fc251687285055391609e (diff)
Update dependencies from https://github.com/dotnet/arcade build 20220203.1 (#170)
[release/11.x] Update dependencies from dotnet/arcade
-rw-r--r--eng/Version.Details.xml12
-rw-r--r--eng/Versions.props2
-rw-r--r--eng/common/templates/job/job.yml1
-rw-r--r--eng/common/templates/steps/source-build.yml4
-rw-r--r--global.json4
5 files changed, 12 insertions, 11 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index aa859d332b04..9c31ca917d90 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,17 +3,17 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22080.1">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22103.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
+ <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22080.1">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22103.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
+ <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22080.1">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22103.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
+ <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 135c125bef5c..fbe4114cf657 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -6,6 +6,6 @@
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
</PropertyGroup>
<PropertyGroup>
- <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksPackagingVersion>
+ <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksPackagingVersion>
</PropertyGroup>
</Project>
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index c5c2a9915121..92e98af7ebd5 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 d85d6d07d5c7..12a8ff94d8e9 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 b77d418a338b..873a259c703d 100644
--- a/global.json
+++ b/global.json
@@ -3,8 +3,8 @@
"dotnet": "6.0.100"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22080.1",
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22103.1",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22103.1",
"Microsoft.Build.Traversal": "2.0.2"
}
}