Skip to content

Commit 0e9f58b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 272780 (#36284)
[main] Source code updates from dotnet/dotnet
1 parent 35cd115 commit 0e9f58b

File tree

5 files changed

+77
-55
lines changed

5 files changed

+77
-55
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="67889d9d2f21a890ac29bcd175c0d1937a401781" BarId="272656" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="0b99617c5b5a95c9da470ab9cd38f4a39753bf41" BarId="272780" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25320.118">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25323.102">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
7+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25320.118">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25323.102">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
11+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25320.118">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25323.102">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
15+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25320.118">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25323.102">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
19+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25320.118">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25323.102">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
23+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25320.118">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25323.102">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
27+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25320.118">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25323.102">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
31+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25320.118">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25323.102">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
35+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25320.118">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25323.102">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
39+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25320.118">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25323.102">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
43+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25320.118">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25323.102">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
47+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25320.118">
49+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25323.102">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
51+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25320.118">
53+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25323.102">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
55+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25320.118">
57+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25323.102">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
59+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25320.118">
61+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25323.102">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
63+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25320.118">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25323.102">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
69+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25320.118">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25323.102">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
73+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25320.118">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25323.102">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
77+
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</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.7.25320.118</MicrosoftExtensionsCachingMemoryVersion>
20-
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25320.118</MicrosoftExtensionsConfigurationVersion>
21-
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25320.118</MicrosoftExtensionsConfigurationAbstractionsVersion>
22-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25320.118</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23-
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25320.118</MicrosoftExtensionsConfigurationJsonVersion>
24-
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25320.118</MicrosoftExtensionsDependencyInjectionVersion>
25-
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25320.118</MicrosoftExtensionsDependencyModelVersion>
26-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25320.118</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27-
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25320.118</MicrosoftExtensionsLoggingVersion>
28-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25320.118</MicrosoftNETCoreAppRefVersion>
29-
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25320.118</MicrosoftNETCorePlatformsVersion>
30-
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25320.118</SystemTextEncodingsWebVersion>
31-
<SystemTextJsonVersion>10.0.0-preview.7.25320.118</SystemTextJsonVersion>
32-
<SystemFormatsAsn1Version>10.0.0-preview.7.25320.118</SystemFormatsAsn1Version>
33-
<SystemRuntimeCachingVersion>10.0.0-preview.7.25320.118</SystemRuntimeCachingVersion>
19+
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.7.25323.102</MicrosoftExtensionsCachingMemoryVersion>
20+
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25323.102</MicrosoftExtensionsConfigurationVersion>
21+
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25323.102</MicrosoftExtensionsConfigurationAbstractionsVersion>
22+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25323.102</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23+
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25323.102</MicrosoftExtensionsConfigurationJsonVersion>
24+
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25323.102</MicrosoftExtensionsDependencyInjectionVersion>
25+
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25323.102</MicrosoftExtensionsDependencyModelVersion>
26+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25323.102</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25323.102</MicrosoftExtensionsLoggingVersion>
28+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25323.102</MicrosoftNETCoreAppRefVersion>
29+
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25323.102</MicrosoftNETCorePlatformsVersion>
30+
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25323.102</SystemTextEncodingsWebVersion>
31+
<SystemTextJsonVersion>10.0.0-preview.7.25323.102</SystemTextJsonVersion>
32+
<SystemFormatsAsn1Version>10.0.0-preview.7.25323.102</SystemFormatsAsn1Version>
33+
<SystemRuntimeCachingVersion>10.0.0-preview.7.25323.102</SystemRuntimeCachingVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
36-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25320.118</MicrosoftDotNetBuildTasksTemplatingVersion>
36+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25323.102</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
3939
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>

‎eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ steps:
3030
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
3131
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
3232
useEsrpCli: true
33+
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
34+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
35+
${{ else }}:
36+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
3337
env:
3438
TeamName: $(_TeamName)
3539
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}

‎eng/common/templates/vmr-build-pr.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# This pipeline is used for running the VMR verification of the PR changes in repo-level PRs.
2+
#
3+
# It will run a full set of verification jobs defined in:
4+
# https://github.com/dotnet/dotnet/blob/10060d128e3f470e77265f8490f5e4f72dae738e/eng/pipelines/templates/stages/vmr-build.yml#L27-L38
5+
#
6+
# For repos that do not need to run the full set, you would do the following:
7+
#
8+
# 1. Copy this YML file to a repo-specific location, i.e. outside of eng/common.
9+
#
10+
# 2. Add `verifications` parameter to VMR template reference
11+
#
12+
# Examples:
13+
# - For source-build stage 1 verification, add the following:
14+
# verifications: [ "source-build-stage1" ]
15+
#
16+
# - For Windows only verifications, add the following:
17+
# verifications: [ "unified-build-windows-x64", "unified-build-windows-x86" ]
18+
119
trigger: none
220
pr: none
321

‎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.25320.118",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25320.118"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25323.102",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25323.102"
2323
}
2424
}

0 commit comments

Comments
 (0)