Skip to content

Commit 12b8d44

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0] Source code updates from dotnet/dotnet (dotnet#37002)
* Backflow from https://github.com/dotnet/dotnet / d499f9c build 287756 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 287756 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25515.107 -> 10.0.0-beta.25519.102) 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.Logging, Microsoft.NETCore.App.Ref, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0 -> 10.0.0) Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.NETCore.Platforms (Version 10.0.0-rtm.25515.107 -> 10.0.0-rtm.25519.102) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 456f972 commit 12b8d44

File tree

6 files changed

+36
-36
lines changed

6 files changed

+36
-36
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
3232

3333
<!-- build dependencies-->
34-
<PackageVersion Include="Microsoft.Build.Locator" Version="1.9.1" />
34+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.10.2" />
3535
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
3636
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
3737
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-03ebd38" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-03ebd38e/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-d499f9c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-d499f9cd/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!-- Begin: Package sources from dotnet-runtime -->
1010
<!-- End: Package sources from dotnet-runtime -->

‎eng/Version.Details.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetHelixSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25519.102</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25519.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25519.102</MicrosoftDotNetHelixSdkPackageVersion>
1212
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0</MicrosoftExtensionsCachingMemoryPackageVersion>
1313
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0</MicrosoftExtensionsConfigurationPackageVersion>
1414
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
1515
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
1616
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0</MicrosoftExtensionsConfigurationJsonPackageVersion>
1717
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
1818
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
19-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rtm.25515.107</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
19+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rtm.25519.102</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
2020
<MicrosoftExtensionsLoggingPackageVersion>10.0.0</MicrosoftExtensionsLoggingPackageVersion>
2121
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
22-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25515.107</MicrosoftNETCorePlatformsPackageVersion>
22+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25519.102</MicrosoftNETCorePlatformsPackageVersion>
2323
<SystemFormatsAsn1PackageVersion>10.0.0</SystemFormatsAsn1PackageVersion>
2424
<SystemRuntimeCachingPackageVersion>10.0.0</SystemRuntimeCachingPackageVersion>
2525
<SystemTextEncodingsWebPackageVersion>10.0.0</SystemTextEncodingsWebPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 24 additions & 24 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="03ebd38e3fd6b1068f44b5e4c560ad891c2b412e" BarId="287340" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="d499f9cdfd5b7b7bb291f95a3c14417d5edc969f" BarId="287756" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
7+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
88
</Dependency>
99
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
11+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
15+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
1616
</Dependency>
1717
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
19+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
2020
</Dependency>
2121
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
23+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
27+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
2828
</Dependency>
2929
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
31+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rtm.25515.107">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rtm.25519.102">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
35+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
3636
</Dependency>
3737
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
39+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
4040
</Dependency>
4141
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
43+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25515.107">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25519.102">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
47+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
4848
</Dependency>
4949
<Dependency Name="System.Text.Json" Version="10.0.0">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
51+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
5252
</Dependency>
5353
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
55+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
5656
</Dependency>
5757
<Dependency Name="System.Formats.Asn1" Version="10.0.0">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
59+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
6060
</Dependency>
6161
<Dependency Name="System.Runtime.Caching" Version="10.0.0">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
63+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25515.107">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25519.102">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
69+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25515.107">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25519.102">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
73+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25515.107">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25519.102">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
77+
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
</PropertyGroup>
1919
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(IsServicingBuild)' != 'true'">
2020
<!-- For MSBuild and Roslyn packages use the previous stable version until the current stable build is released. -->
21-
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>
22-
<MicrosoftBuildUtilitiesCoreVersion>17.14.8</MicrosoftBuildUtilitiesCoreVersion>
23-
<MicrosoftBuildTasksCoreVersion>17.14.8</MicrosoftBuildTasksCoreVersion>
21+
<MicrosoftBuildFrameworkVersion>17.14.28</MicrosoftBuildFrameworkVersion>
22+
<MicrosoftBuildUtilitiesCoreVersion>17.14.28</MicrosoftBuildUtilitiesCoreVersion>
23+
<MicrosoftBuildTasksCoreVersion>17.14.28</MicrosoftBuildTasksCoreVersion>
2424
<MicrosoftCodeAnalysisCSharpVersion>4.14.0</MicrosoftCodeAnalysisCSharpVersion>
2525
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.14.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
2626
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>4.14.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>

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

0 commit comments

Comments
 (0)