Skip to content

Commit 7540feb

Browse files
[main] Update dependencies from dotnet/arcade (#9661)
[main] Update dependencies from dotnet/arcade
1 parent fd04307 commit 7540feb

File tree

4 files changed

+27
-18
lines changed

4 files changed

+27
-18
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
179179
</ProductDependencies>
180180
<ToolsetDependencies>
181181
<!-- Arcade -->
182-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23402.2">
182+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23403.7">
183183
<Uri>https://github.com/dotnet/arcade</Uri>
184-
<Sha>3addc5d978d01e864792d2c6bce0b50ec105f857</Sha>
184+
<Sha>bbafffba44a4dcfce6eee08bdd59db29b919f306</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23402.2">
186+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23403.7">
187187
<Uri>https://github.com/dotnet/arcade</Uri>
188-
<Sha>3addc5d978d01e864792d2c6bce0b50ec105f857</Sha>
188+
<Sha>bbafffba44a4dcfce6eee08bdd59db29b919f306</Sha>
189189
</Dependency>
190-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23402.2">
190+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23403.7">
191191
<Uri>https://github.com/dotnet/arcade</Uri>
192-
<Sha>3addc5d978d01e864792d2c6bce0b50ec105f857</Sha>
192+
<Sha>bbafffba44a4dcfce6eee08bdd59db29b919f306</Sha>
193193
</Dependency>
194-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23402.2">
194+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23403.7">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>3addc5d978d01e864792d2c6bce0b50ec105f857</Sha>
196+
<Sha>bbafffba44a4dcfce6eee08bdd59db29b919f306</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23402.2">
198+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23403.7">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>3addc5d978d01e864792d2c6bce0b50ec105f857</Sha>
200+
<Sha>bbafffba44a4dcfce6eee08bdd59db29b919f306</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23402.2">
202+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23403.7">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>3addc5d978d01e864792d2c6bce0b50ec105f857</Sha>
204+
<Sha>bbafffba44a4dcfce6eee08bdd59db29b919f306</Sha>
205205
</Dependency>
206206
</ToolsetDependencies>
207207
</Dependencies>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
</PropertyGroup>
5353
<!-- Arcade -->
5454
<PropertyGroup>
55-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23402.2</MicrosoftDotNetGenFacadesPackageVersion>
56-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23402.2</MicrosoftDotNetRemoteExecutorVersion>
57-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23402.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
55+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23403.7</MicrosoftDotNetGenFacadesPackageVersion>
56+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23403.7</MicrosoftDotNetRemoteExecutorVersion>
57+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23403.7</MicrosoftDotNetXUnitExtensionsPackageVersion>
5858
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
5959
</PropertyGroup>
6060
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,12 @@ steps:
118118
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
119119
continueOnError: true
120120
condition: succeededOrFailed()
121+
122+
# Manually inject component detection so that we can ignore the source build upstream cache, which contains
123+
# a nupkg cache of input packages (a local feed).
124+
# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir'
125+
# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets
126+
- task: ComponentGovernanceComponentDetection@0
127+
displayName: Component Detection (Exclude upstream cache)
128+
inputs:
129+
ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"version": "8.0.100-preview.6.23330.14"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23402.2",
18-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23402.2",
19-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23402.2",
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23403.7",
18+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23403.7",
19+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23403.7",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23402.13"
2222
},

0 commit comments

Comments
 (0)