Skip to content

Commit a1e1d46

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0] Source code updates from dotnet/dotnet (#36588)
* Update dependencies from https://github.com/dotnet/dotnet build 279432 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25414.103 -> 10.0.0-beta.25414.111) 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.1.25414.103 -> 10.0.0-rc.1.25414.111) * Backflow from https://github.com/dotnet/dotnet / a01724d build 279606 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 279606 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25414.111 -> 10.0.0-beta.25416.105) 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.1.25414.111 -> 10.0.0-rc.2.25416.105) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 5f505fd commit a1e1d46

File tree

5 files changed

+59
-60
lines changed

5 files changed

+59
-60
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<configuration>
43
<packageSources>
54
<clear />
@@ -28,4 +27,4 @@
2827
<!-- End: Package sources from dotnet-runtime -->
2928
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3029
</disabledPackageSources>
31-
</configuration>
30+
</configuration>

‎eng/Version.Details.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ This file should be imported by eng/Versions.props
77
<Project>
88
<PropertyGroup>
99
<!-- dotnet/dotnet dependencies -->
10-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25414.103</MicrosoftDotNetArcadeSdkPackageVersion>
11-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25414.103</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
12-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25414.103</MicrosoftDotNetHelixSdkPackageVersion>
13-
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25414.103</MicrosoftExtensionsCachingMemoryPackageVersion>
14-
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25414.103</MicrosoftExtensionsConfigurationPackageVersion>
15-
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25414.103</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
16-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25414.103</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
17-
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25414.103</MicrosoftExtensionsConfigurationJsonPackageVersion>
18-
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25414.103</MicrosoftExtensionsDependencyInjectionPackageVersion>
19-
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25414.103</MicrosoftExtensionsDependencyModelPackageVersion>
20-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25414.103</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
21-
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25414.103</MicrosoftExtensionsLoggingPackageVersion>
22-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25414.103</MicrosoftNETCoreAppRefPackageVersion>
23-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25414.103</MicrosoftNETCorePlatformsPackageVersion>
24-
<SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25414.103</SystemFormatsAsn1PackageVersion>
25-
<SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25414.103</SystemRuntimeCachingPackageVersion>
26-
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25414.103</SystemTextEncodingsWebPackageVersion>
27-
<SystemTextJsonPackageVersion>10.0.0-rc.1.25414.103</SystemTextJsonPackageVersion>
10+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25416.105</MicrosoftDotNetArcadeSdkPackageVersion>
11+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25416.105</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
12+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25416.105</MicrosoftDotNetHelixSdkPackageVersion>
13+
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsCachingMemoryPackageVersion>
14+
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsConfigurationPackageVersion>
15+
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
16+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
17+
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsConfigurationJsonPackageVersion>
18+
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsDependencyInjectionPackageVersion>
19+
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsDependencyModelPackageVersion>
20+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
21+
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsLoggingPackageVersion>
22+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25416.105</MicrosoftNETCoreAppRefPackageVersion>
23+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25416.105</MicrosoftNETCorePlatformsPackageVersion>
24+
<SystemFormatsAsn1PackageVersion>10.0.0-rc.2.25416.105</SystemFormatsAsn1PackageVersion>
25+
<SystemRuntimeCachingPackageVersion>10.0.0-rc.2.25416.105</SystemRuntimeCachingPackageVersion>
26+
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.2.25416.105</SystemTextEncodingsWebPackageVersion>
27+
<SystemTextJsonPackageVersion>10.0.0-rc.2.25416.105</SystemTextJsonPackageVersion>
2828
</PropertyGroup>
2929
<!--Property group for alternate package version names-->
3030
<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="5088919af0e4a144ce5b294542f472bf668c9cc8" BarId="279336" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="a01724db6d16445177cb31c6f300d38b0af06290" BarId="279606" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25414.103">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.2.25416.105">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
7+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25414.103">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.2.25416.105">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
11+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25414.103">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.2.25416.105">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
15+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25414.103">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.2.25416.105">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
19+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25414.103">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.2.25416.105">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
23+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25414.103">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25416.105">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
27+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25414.103">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.2.25416.105">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
31+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25414.103">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.2.25416.105">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
35+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25414.103">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.2.25416.105">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
39+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25414.103">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25416.105">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
43+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25414.103">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25416.105">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
47+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25414.103">
49+
<Dependency Name="System.Text.Json" Version="10.0.0-rc.2.25416.105">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
51+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25414.103">
53+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.2.25416.105">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
55+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25414.103">
57+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.2.25416.105">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
59+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25414.103">
61+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.2.25416.105">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
63+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25414.103">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25416.105">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
69+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25414.103">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25416.105">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
73+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25414.103">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25416.105">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>
77+
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup Label="Version settings">
44
<VersionPrefix>10.0.0</VersionPrefix>
55
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
6-
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
6+
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
77
<IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
88
<IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>
99
<!--

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

0 commit comments

Comments
 (0)