Skip to content

Commit 707393e

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0] Source code updates from dotnet/dotnet (#36774)
* Update dependencies from https://github.com/dotnet/dotnet build 282973 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25460.104 -> 10.0.0-beta.25462.101) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.2.25460.104 -> 10.0.0-rc.2.25462.101) * Update dependencies from https://github.com/dotnet/dotnet build 283077 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25462.101 -> 10.0.0-beta.25462.117) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.2.25462.101 -> 10.0.0-rc.2.25462.117) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent a419d5d commit 707393e

File tree

5 files changed

+61
-61
lines changed

5 files changed

+61
-61
lines changed

‎eng/Version.Details.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25460.104</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25460.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25460.104</MicrosoftDotNetHelixSdkPackageVersion>
12-
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.2.25460.104</MicrosoftExtensionsCachingMemoryPackageVersion>
13-
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.2.25460.104</MicrosoftExtensionsConfigurationPackageVersion>
14-
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.2.25460.104</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
15-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.2.25460.104</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
16-
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.2.25460.104</MicrosoftExtensionsConfigurationJsonPackageVersion>
17-
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.2.25460.104</MicrosoftExtensionsDependencyInjectionPackageVersion>
18-
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.2.25460.104</MicrosoftExtensionsDependencyModelPackageVersion>
19-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.2.25460.104</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
20-
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.2.25460.104</MicrosoftExtensionsLoggingPackageVersion>
21-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25460.104</MicrosoftNETCoreAppRefPackageVersion>
22-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25460.104</MicrosoftNETCorePlatformsPackageVersion>
23-
<SystemFormatsAsn1PackageVersion>10.0.0-rc.2.25460.104</SystemFormatsAsn1PackageVersion>
24-
<SystemRuntimeCachingPackageVersion>10.0.0-rc.2.25460.104</SystemRuntimeCachingPackageVersion>
25-
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.2.25460.104</SystemTextEncodingsWebPackageVersion>
26-
<SystemTextJsonPackageVersion>10.0.0-rc.2.25460.104</SystemTextJsonPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25462.117</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25462.117</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25462.117</MicrosoftDotNetHelixSdkPackageVersion>
12+
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.2.25462.117</MicrosoftExtensionsCachingMemoryPackageVersion>
13+
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.2.25462.117</MicrosoftExtensionsConfigurationPackageVersion>
14+
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.2.25462.117</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
15+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.2.25462.117</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
16+
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.2.25462.117</MicrosoftExtensionsConfigurationJsonPackageVersion>
17+
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.2.25462.117</MicrosoftExtensionsDependencyInjectionPackageVersion>
18+
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.2.25462.117</MicrosoftExtensionsDependencyModelPackageVersion>
19+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.2.25462.117</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
20+
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.2.25462.117</MicrosoftExtensionsLoggingPackageVersion>
21+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25462.117</MicrosoftNETCoreAppRefPackageVersion>
22+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25462.117</MicrosoftNETCorePlatformsPackageVersion>
23+
<SystemFormatsAsn1PackageVersion>10.0.0-rc.2.25462.117</SystemFormatsAsn1PackageVersion>
24+
<SystemRuntimeCachingPackageVersion>10.0.0-rc.2.25462.117</SystemRuntimeCachingPackageVersion>
25+
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.2.25462.117</SystemTextEncodingsWebPackageVersion>
26+
<SystemTextJsonPackageVersion>10.0.0-rc.2.25462.117</SystemTextJsonPackageVersion>
2727
</PropertyGroup>
2828
<!--Property group for alternate package version names-->
2929
<PropertyGroup>

‎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="eac14590f69f6876d418cef9e8fdd3f44f6ef0b2" BarId="282708" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="ee760c42a6df115208fe2262d358be6d4003e55f" BarId="283077" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.2.25460.104">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.2.25462.117">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
7+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.2.25460.104">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.2.25462.117">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
11+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.2.25460.104">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.2.25462.117">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
15+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.2.25460.104">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.2.25462.117">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
19+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.2.25460.104">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.2.25462.117">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
23+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25460.104">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25462.117">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
27+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.2.25460.104">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.2.25462.117">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
31+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.2.25460.104">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.2.25462.117">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
35+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.2.25460.104">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.2.25462.117">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
39+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25460.104">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25462.117">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
43+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25460.104">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25462.117">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
47+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Json" Version="10.0.0-rc.2.25460.104">
49+
<Dependency Name="System.Text.Json" Version="10.0.0-rc.2.25462.117">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
51+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.2.25460.104">
53+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.2.25462.117">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
55+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.2.25460.104">
57+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.2.25462.117">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
59+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.2.25460.104">
61+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.2.25462.117">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
63+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25460.104">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25462.117">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
69+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25460.104">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25462.117">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
73+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25460.104">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25462.117">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
77+
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
157157
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
158158
}
159159

160-
$dotnetVersions = @('5','6','7','8','9')
160+
$dotnetVersions = @('5','6','7','8','9','10')
161161

162162
foreach ($dotnetVersion in $dotnetVersions) {
163163
$feedPrefix = "dotnet" + $dotnetVersion;

‎eng/common/SetupNugetSources.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
9999
PackageSources+=('dotnet3.1-internal-transport')
100100
fi
101101

102-
DotNetVersions=('5' '6' '7' '8' '9')
102+
DotNetVersions=('5' '6' '7' '8' '9' '10')
103103

104104
for DotNetVersion in ${DotNetVersions[@]} ; do
105105
FeedPrefix="dotnet${DotNetVersion}";

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.1.25420.111",
3+
"version": "10.0.100-rc.1.25451.107",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor",
66
"paths": [
@@ -10,15 +10,15 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./restore.sh or .\\restore.cmd to install it."
1111
},
1212
"tools": {
13-
"dotnet": "10.0.100-rc.1.25420.111",
13+
"dotnet": "10.0.100-rc.1.25451.107",
1414
"runtimes": {
1515
"dotnet": [
1616
"$(MicrosoftNETCorePlatformsVersion)"
1717
]
1818
}
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25460.104",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25460.104"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25462.117",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25462.117"
2323
}
2424
}

0 commit comments

Comments
 (0)