Skip to content

Commit 8fdfbad

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 270450 (#36182)
[main] Source code updates from dotnet/dotnet
1 parent 3f1063e commit 8fdfbad

File tree

7 files changed

+105
-67
lines changed

7 files changed

+105
-67
lines changed

‎eng/Version.Details.xml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7" BarId="270315" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="ac2aaf24d127067df385f2aa5ab35bb9b96d5f74" BarId="270450" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.6.25302.103">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.6.25303.102">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
7+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.6.25302.103">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.6.25303.102">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
11+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.6.25302.103">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.6.25303.102">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
15+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.6.25302.103">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.6.25303.102">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
19+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.6.25302.103">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.6.25303.102">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
23+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.6.25302.103">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.6.25303.102">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
27+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.6.25302.103">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.6.25303.102">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
31+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.6.25302.103">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.6.25303.102">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
35+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.6.25302.103">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.6.25303.102">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
39+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25302.103">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25303.102">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
43+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25302.103">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25303.102">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
47+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25302.103">
49+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25303.102">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
51+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25302.103">
53+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25303.102">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
55+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.6.25302.103">
57+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.6.25303.102">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
59+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.6.25302.103">
61+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.6.25303.102">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
63+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25302.103">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25303.102">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
69+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25302.103">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25303.102">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
73+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25302.103">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25303.102">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
77+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
<UsingToolXliff>False</UsingToolXliff>
1717
</PropertyGroup>
1818
<PropertyGroup Label="Dependencies from dotnet/runtime">
19-
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.6.25302.103</MicrosoftExtensionsCachingMemoryVersion>
20-
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.6.25302.103</MicrosoftExtensionsConfigurationVersion>
21-
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.6.25302.103</MicrosoftExtensionsConfigurationAbstractionsVersion>
22-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.6.25302.103</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23-
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.6.25302.103</MicrosoftExtensionsConfigurationJsonVersion>
24-
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.6.25302.103</MicrosoftExtensionsDependencyInjectionVersion>
25-
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.6.25302.103</MicrosoftExtensionsDependencyModelVersion>
26-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.6.25302.103</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27-
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.6.25302.103</MicrosoftExtensionsLoggingVersion>
28-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25302.103</MicrosoftNETCoreAppRefVersion>
29-
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25302.103</MicrosoftNETCorePlatformsVersion>
30-
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25302.103</SystemTextEncodingsWebVersion>
31-
<SystemTextJsonVersion>10.0.0-preview.6.25302.103</SystemTextJsonVersion>
32-
<SystemFormatsAsn1Version>10.0.0-preview.6.25302.103</SystemFormatsAsn1Version>
33-
<SystemRuntimeCachingVersion>10.0.0-preview.6.25302.103</SystemRuntimeCachingVersion>
19+
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.6.25303.102</MicrosoftExtensionsCachingMemoryVersion>
20+
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.6.25303.102</MicrosoftExtensionsConfigurationVersion>
21+
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.6.25303.102</MicrosoftExtensionsConfigurationAbstractionsVersion>
22+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.6.25303.102</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23+
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.6.25303.102</MicrosoftExtensionsConfigurationJsonVersion>
24+
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.6.25303.102</MicrosoftExtensionsDependencyInjectionVersion>
25+
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.6.25303.102</MicrosoftExtensionsDependencyModelVersion>
26+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.6.25303.102</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.6.25303.102</MicrosoftExtensionsLoggingVersion>
28+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25303.102</MicrosoftNETCoreAppRefVersion>
29+
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25303.102</MicrosoftNETCorePlatformsVersion>
30+
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25303.102</SystemTextEncodingsWebVersion>
31+
<SystemTextJsonVersion>10.0.0-preview.6.25303.102</SystemTextJsonVersion>
32+
<SystemFormatsAsn1Version>10.0.0-preview.6.25303.102</SystemFormatsAsn1Version>
33+
<SystemRuntimeCachingVersion>10.0.0-preview.6.25303.102</SystemRuntimeCachingVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
36-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25302.103</MicrosoftDotNetBuildTasksTemplatingVersion>
36+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25303.102</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
3939
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>

‎eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ parameters:
3232
# Optional: 🌤️ or not the build has assets it wants to publish to BAR
3333
isAssetlessBuild: false
3434

35+
# Optional, publishing version
36+
publishingVersion: 3
37+
38+
# Optional: A minimatch pattern for the asset manifests to publish to BAR
39+
assetManifestsPattern: '*/manifests/**/*.xml'
40+
3541
jobs:
3642
- job: Asset_Registry_Publish
3743

@@ -77,13 +83,31 @@ jobs:
7783
clean: true
7884

7985
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
80-
- task: DownloadPipelineArtifact@2
81-
displayName: Download Asset Manifests
82-
inputs:
83-
artifactName: AssetManifests
84-
targetPath: '$(Build.StagingDirectory)/AssetManifests'
85-
condition: ${{ parameters.condition }}
86-
continueOnError: ${{ parameters.continueOnError }}
86+
- ${{ if eq(parameters.publishingVersion, 3) }}:
87+
- task: DownloadPipelineArtifact@2
88+
displayName: Download Asset Manifests
89+
inputs:
90+
artifactName: AssetManifests
91+
targetPath: '$(Build.StagingDirectory)/AssetManifests'
92+
condition: ${{ parameters.condition }}
93+
continueOnError: ${{ parameters.continueOnError }}
94+
- ${{ if eq(parameters.publishingVersion, 4) }}:
95+
- task: DownloadPipelineArtifact@2
96+
displayName: Download V4 asset manifests
97+
inputs:
98+
itemPattern: '*/manifests/**/*.xml'
99+
targetPath: '$(Build.StagingDirectory)/AllAssetManifests'
100+
condition: ${{ parameters.condition }}
101+
continueOnError: ${{ parameters.continueOnError }}
102+
- task: CopyFiles@2
103+
displayName: Copy V4 asset manifests to AssetManifests
104+
inputs:
105+
SourceFolder: '$(Build.StagingDirectory)/AllAssetManifests'
106+
Contents: ${{ parameters.assetManifestsPattern }}
107+
TargetFolder: '$(Build.StagingDirectory)/AssetManifests'
108+
flattenFolders: true
109+
condition: ${{ parameters.condition }}
110+
continueOnError: ${{ parameters.continueOnError }}
87111

88112
- task: NuGetAuthenticate@1
89113

@@ -120,6 +144,17 @@ jobs:
120144
Copy-Item -Path $symbolExclusionfile -Destination "$(Build.StagingDirectory)/ReleaseConfigs"
121145
}
122146
147+
- ${{ if eq(parameters.publishingVersion, 4) }}:
148+
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
149+
parameters:
150+
is1ESPipeline: ${{ parameters.is1ESPipeline }}
151+
args:
152+
targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml'
153+
artifactName: AssetManifests
154+
displayName: 'Publish Merged Manifest'
155+
retryCountOnTaskFailure: 10 # for any logs being locked
156+
sbomEnabled: false # we don't need SBOM for logs
157+
123158
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
124159
parameters:
125160
is1ESPipeline: ${{ parameters.is1ESPipeline }}

‎eng/common/tools.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,7 @@ function GetDarc {
528528
fi
529529

530530
"$eng_root/common/darc-init.sh" --toolpath "$darc_path" $version
531+
darc_tool="$darc_path/darc"
531532
}
532533

533534
# Returns a full path to an Arcade SDK task project file.

‎eng/common/vmr-sync.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ Set-StrictMode -Version Latest
103103
Highlight 'Installing .NET, preparing the tooling..'
104104
. .\eng\common\tools.ps1
105105
$dotnetRoot = InitializeDotNetCli -install:$true
106+
$darc = Get-Darc
106107
$dotnet = "$dotnetRoot\dotnet.exe"
107-
& "$dotnet" tool restore
108108

109109
Highlight "Starting the synchronization of VMR.."
110110

111111
# Synchronize the VMR
112112
$darcArgs = (
113-
"darc", "vmr", "forwardflow",
113+
"vmr", "forwardflow",
114114
"--tmp", $tmpDir,
115115
"--$verbosity",
116116
$vmrDir
@@ -124,7 +124,7 @@ if ($azdevPat) {
124124
$darcArgs += ("--azdev-pat", $azdevPat)
125125
}
126126

127-
& "$dotnet" $darcArgs
127+
& "$darc" $darcArgs
128128

129129
if ($LASTEXITCODE -eq 0) {
130130
Highlight "Synchronization succeeded"

‎eng/common/vmr-sync.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ set -e
164164
highlight 'Installing .NET, preparing the tooling..'
165165
source "./eng/common/tools.sh"
166166
InitializeDotNetCli true
167+
GetDarc
167168
dotnetDir=$( cd ./.dotnet/; pwd -P )
168169
dotnet=$dotnetDir/dotnet
169-
"$dotnet" tool restore
170170

171171
highlight "Starting the synchronization of VMR.."
172172
set +e
@@ -186,7 +186,9 @@ fi
186186

187187
# Synchronize the VMR
188188

189-
"$dotnet" darc vmr forwardflow \
189+
export DOTNET_ROOT="$dotnetDir"
190+
191+
"$darc_tool" vmr forwardflow \
190192
--tmp "$tmp_dir" \
191193
$azdev_pat \
192194
--$verbosity \

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25302.103",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25302.103"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25303.102",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25303.102"
2323
}
2424
}

0 commit comments

Comments
 (0)