Skip to content

Commit e47e93a

Browse files
cincuranetcincuranet
authored
Merge pull request #36810 from dotnet/darc-main-952a83ff-691b-460d-8aa3-b5fe88cc67d5
[main] Source code updates from dotnet/dotnet
2 parents 877f2da + 8386db3 commit e47e93a

File tree

5 files changed

+84
-75
lines changed

5 files changed

+84
-75
lines changed

‎eng/Version.Details.props‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,30 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftBuildFrameworkPackageVersion>17.15.0-preview-25465-103</MicrosoftBuildFrameworkPackageVersion>
10-
<MicrosoftBuildTasksCorePackageVersion>17.15.0-preview-25465-103</MicrosoftBuildTasksCorePackageVersion>
11-
<MicrosoftBuildUtilitiesCorePackageVersion>17.15.0-preview-25465-103</MicrosoftBuildUtilitiesCorePackageVersion>
12-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25465.103</MicrosoftCodeAnalysisCSharpPackageVersion>
13-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-2.25465.103</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
14-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-2.25465.103</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
15-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25465.103</MicrosoftDotNetArcadeSdkPackageVersion>
16-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25465.103</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
17-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25465.103</MicrosoftDotNetHelixSdkPackageVersion>
18-
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25465.103</MicrosoftExtensionsCachingMemoryPackageVersion>
19-
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25465.103</MicrosoftExtensionsConfigurationPackageVersion>
20-
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25465.103</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
21-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25465.103</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
22-
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25465.103</MicrosoftExtensionsConfigurationJsonPackageVersion>
23-
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25465.103</MicrosoftExtensionsDependencyInjectionPackageVersion>
24-
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25465.103</MicrosoftExtensionsDependencyModelPackageVersion>
25-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25465.103</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
26-
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25465.103</MicrosoftExtensionsLoggingPackageVersion>
27-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25465.103</MicrosoftNETCoreAppRefPackageVersion>
28-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25465.103</MicrosoftNETCorePlatformsPackageVersion>
29-
<SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25465.103</SystemFormatsAsn1PackageVersion>
30-
<SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25465.103</SystemRuntimeCachingPackageVersion>
31-
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25465.103</SystemTextEncodingsWebPackageVersion>
32-
<SystemTextJsonPackageVersion>10.0.0-rc.1.25465.103</SystemTextJsonPackageVersion>
9+
<MicrosoftBuildFrameworkPackageVersion>18.0.0-preview-25466-104</MicrosoftBuildFrameworkPackageVersion>
10+
<MicrosoftBuildTasksCorePackageVersion>18.0.0-preview-25466-104</MicrosoftBuildTasksCorePackageVersion>
11+
<MicrosoftBuildUtilitiesCorePackageVersion>18.0.0-preview-25466-104</MicrosoftBuildUtilitiesCorePackageVersion>
12+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25466.104</MicrosoftCodeAnalysisCSharpPackageVersion>
13+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-2.25466.104</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
14+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-2.25466.104</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
15+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25466.104</MicrosoftDotNetArcadeSdkPackageVersion>
16+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25466.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
17+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25466.104</MicrosoftDotNetHelixSdkPackageVersion>
18+
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25466.104</MicrosoftExtensionsCachingMemoryPackageVersion>
19+
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25466.104</MicrosoftExtensionsConfigurationPackageVersion>
20+
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25466.104</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
21+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25466.104</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
22+
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25466.104</MicrosoftExtensionsConfigurationJsonPackageVersion>
23+
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25466.104</MicrosoftExtensionsDependencyInjectionPackageVersion>
24+
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25466.104</MicrosoftExtensionsDependencyModelPackageVersion>
25+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25466.104</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
26+
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25466.104</MicrosoftExtensionsLoggingPackageVersion>
27+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25466.104</MicrosoftNETCoreAppRefPackageVersion>
28+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25466.104</MicrosoftNETCorePlatformsPackageVersion>
29+
<SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25466.104</SystemFormatsAsn1PackageVersion>
30+
<SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25466.104</SystemRuntimeCachingPackageVersion>
31+
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25466.104</SystemTextEncodingsWebPackageVersion>
32+
<SystemTextJsonPackageVersion>10.0.0-rc.1.25466.104</SystemTextJsonPackageVersion>
3333
</PropertyGroup>
3434
<!--Property group for alternate package version names-->
3535
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,104 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="7e80b42a4e753d4d2c1779edea60140a887b36ed" BarId="283253" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="c0d13804f97528f7b3750ca31846f83c4617a451" BarId="283489" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25465.103">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25466.104">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
7+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25465.103">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25466.104">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
11+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25465.103">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25466.104">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
15+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25465.103">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25466.104">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
19+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25465.103">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25466.104">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
23+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25465.103">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25466.104">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
27+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25465.103">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25466.104">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
31+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25465.103">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25466.104">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
35+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25465.103">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25466.104">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
39+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25465.103">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25466.104">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
43+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25465.103">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25466.104">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
47+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25465.103">
49+
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25466.104">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
51+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25465.103">
53+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25466.104">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
55+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25465.103">
57+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25466.104">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
59+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25465.103">
61+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25466.104">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
63+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25465-103">
65+
<Dependency Name="Microsoft.Build.Framework" Version="18.0.0-preview-25466-104">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
67+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25465-103">
69+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.0.0-preview-25466-104">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
71+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25465-103">
73+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.0.0-preview-25466-104">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
75+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25465.103">
77+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25466.104">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
79-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
79+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-2.25465.103">
81+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-2.25466.104">
8282
<Uri>https://github.com/dotnet/dotnet</Uri>
83-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
83+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-2.25465.103">
85+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-2.25466.104">
8686
<Uri>https://github.com/dotnet/dotnet</Uri>
87-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
87+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
8888
</Dependency>
8989
</ProductDependencies>
9090
<ToolsetDependencies>
91-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25465.103">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25466.104">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
93+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25465.103">
95+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25466.104">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
97+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25465.103">
99+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25466.104">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>7e80b42a4e753d4d2c1779edea60140a887b36ed</Sha>
101+
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
102102
</Dependency>
103103
</ToolsetDependencies>
104104
</Dependencies>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ parameters:
4040

4141
repositoryAlias: self
4242

43+
officialBuildId: ''
44+
4345
jobs:
4446
- job: Asset_Registry_Publish
4547

@@ -62,6 +64,11 @@ jobs:
6264
value: false
6365
# unconditional - needed for logs publishing (redactor tool version)
6466
- template: /eng/common/core-templates/post-build/common-variables.yml
67+
- name: OfficialBuildId
68+
${{ if ne(parameters.officialBuildId, '') }}:
69+
value: ${{ parameters.officialBuildId }}
70+
${{ else }}:
71+
value: $(Build.BuildNumber)
6572

6673
pool:
6774
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ parameters:
4444
artifacts: {}
4545
is1ESPipeline: ''
4646
repositoryAlias: self
47+
officialBuildId: ''
4748

4849
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4950
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -116,3 +117,4 @@ jobs:
116117
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
117118
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
118119
repositoryAlias: ${{ parameters.repositoryAlias }}
120+
officialBuildId: ${{ parameters.officialBuildId }}

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

0 commit comments

Comments
 (0)