Skip to content

Commit d707b37

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20220203.1 (llvm#169)
[objwriter/12.x] Update dependencies from dotnet/arcade
1 parent 19d9d88 commit d707b37

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22080.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22103.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
8+
<Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22080.1">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22103.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
12+
<Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22080.1">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22103.1">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
16+
<Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
</Project>

eng/common/templates/job/job.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ jobs:
140140

141141
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
142142
- task: ComponentGovernanceComponentDetection@0
143+
continueOnError: true
143144

144145
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
145146
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

eng/common/templates/steps/source-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ steps:
4343
# In that case, add variables to allow the download of internal runtimes if the specified versions are not found
4444
# in the default public locations.
4545
internalRuntimeDownloadArgs=
46-
if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
47-
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)'
46+
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
47+
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)'
4848
fi
4949
5050
buildConfig=Release

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"dotnet": "6.0.100"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1",
7-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22080.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22103.1",
7+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22103.1",
88
"Microsoft.Build.Traversal": "2.0.2"
99
}
1010
}

0 commit comments

Comments
 (0)