Skip to content

Commit bd1e532

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#36425)
[main] Source code updates from dotnet/dotnet
1 parent c23462b commit bd1e532

File tree

5 files changed

+90
-62
lines changed

5 files changed

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

‎eng/common/core-templates/job/job.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ parameters:
2020
artifacts: ''
2121
enableMicrobuild: false
2222
enableMicrobuildForMacAndLinux: false
23+
microbuildUseESRP: true
2324
enablePublishBuildArtifacts: false
2425
enablePublishBuildAssets: false
2526
enablePublishTestResults: false
@@ -128,6 +129,7 @@ jobs:
128129
parameters:
129130
enableMicrobuild: ${{ parameters.enableMicrobuild }}
130131
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
132+
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
131133
continueOnError: ${{ parameters.continueOnError }}
132134

133135
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:

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

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@ parameters:
44
# Enable install tasks for MicroBuild on Mac and Linux
55
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
66
enableMicrobuildForMacAndLinux: false
7+
# Determines whether the ESRP service connection information should be passed to the signing plugin.
8+
# This overlaps with _SignType to some degree. We only need the service connection for real signing.
9+
# It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place.
10+
# Doing so will cause the service connection to be authorized for the pipeline, which isn't allowed and won't work for non-prod.
11+
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
12+
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
13+
microbuildUseESRP: true
714
# Location of the MicroBuild output folder
815
microBuildOutputFolder: '$(Build.SourcesDirectory)'
16+
917
continueOnError: false
1018

1119
steps:
@@ -21,19 +29,37 @@ steps:
2129
workingDirectory: ${{ parameters.microBuildOutputFolder }}
2230
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
2331

32+
- script: |
33+
REM Check if ESRP is disabled while SignType is real
34+
if /I "${{ parameters.microbuildUseESRP }}"=="false" if /I "$(_SignType)"=="real" (
35+
echo Error: ESRP must be enabled when SignType is real.
36+
exit /b 1
37+
)
38+
displayName: 'Validate ESRP usage (Windows)'
39+
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'))
40+
- script: |
41+
# Check if ESRP is disabled while SignType is real
42+
if [ "${{ parameters.microbuildUseESRP }}" = "false" ] && [ "$(_SignType)" = "real" ]; then
43+
echo "Error: ESRP must be enabled when SignType is real."
44+
exit 1
45+
fi
46+
displayName: 'Validate ESRP usage (Non-Windows)'
47+
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
48+
2449
- task: MicroBuildSigningPlugin@4
2550
displayName: Install MicroBuild plugin
2651
inputs:
2752
signType: $(_SignType)
2853
zipSources: false
2954
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
30-
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
31-
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
32-
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
55+
${{ if eq(parameters.microbuildUseESRP, true) }}:
56+
${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
57+
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
58+
useEsrpCli: true
59+
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
60+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
61+
${{ else }}:
62+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
3763
env:
3864
TeamName: $(_TeamName)
3965
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}

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

0 commit comments

Comments
 (0)