Skip to content

Commit ceec5ac

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Merge release/10.0 into darc-release/10.0-fe58326f-c95e-400c-a941-7a86a0845954
2 parents 72ca82c + 220d249 commit ceec5ac

File tree

4 files changed

+44
-44
lines changed

4 files changed

+44
-44
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-dotnet -->
8-
<add key="darc-pub-dotnet-dotnet-79c85d9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-79c85d96/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-dotnet-50d7970" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-50d79701/nuget/v3/index.json" />
99
<!-- End: Package sources from dotnet-dotnet -->
1010
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1111
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

‎eng/Version.Details.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props
88
<!-- dotnet/dotnet dependencies -->
99
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
1010
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rtm.25515.111</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25520.117</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25520.117</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25520.117</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25520.117</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rtm.25520.117</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
1616
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25515.111</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rtm.25515.111</MicrosoftPrivateWinformsPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25520.117</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rtm.25520.117</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
2121
<SystemCodeDomPackageVersion>10.0.0</SystemCodeDomPackageVersion>
@@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props
2525
<SystemDrawingCommonPackageVersion>10.0.0</SystemDrawingCommonPackageVersion>
2626
<SystemFormatsNrbfPackageVersion>10.0.0</SystemFormatsNrbfPackageVersion>
2727
<SystemIOPackagingPackageVersion>10.0.0</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rtm.25515.111</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rtm.25520.117</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
2929
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0</SystemReflectionMetadataLoadContextPackageVersion>
3030
<SystemResourcesExtensionsPackageVersion>10.0.0</SystemResourcesExtensionsPackageVersion>
3131
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0</SystemRuntimeSerializationFormattersPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="79c85d969a02abd06c2202949318fd4c21e5e7a0" BarId="287426" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="50d79701f2d748e965fefb4ba42580368598b9cc" BarId="287966" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rtm.25515.111">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rtm.25520.117">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
7+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rtm.25515.111">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rtm.25520.117">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
11+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
1212
</Dependency>
1313
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
15+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
1616
</Dependency>
1717
<Dependency Name="System.Windows.Extensions" Version="10.0.0">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
19+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25515.111">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25520.117">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
23+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rtm.25513.4">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>bbb14872ef0b8cdc8c2ebcd4f19f78024d5f560c</Sha>
2828
</Dependency>
2929
<Dependency Name="System.Resources.Extensions" Version="10.0.0">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
31+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
3232
</Dependency>
3333
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
35+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
3636
</Dependency>
3737
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
39+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
4040
</Dependency>
4141
<Dependency Name="System.CodeDom" Version="10.0.0">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
43+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
4444
</Dependency>
4545
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
47+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
4848
</Dependency>
4949
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
51+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
5252
</Dependency>
5353
<Dependency Name="System.DirectoryServices" Version="10.0.0">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
55+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
5656
</Dependency>
5757
<Dependency Name="System.Formats.Nrbf" Version="10.0.0">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
59+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
6060
</Dependency>
6161
<Dependency Name="System.IO.Packaging" Version="10.0.0">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
63+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
6464
</Dependency>
6565
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
67+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
6868
</Dependency>
6969
<Dependency Name="System.Security.Permissions" Version="10.0.0">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
71+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
7272
</Dependency>
7373
<Dependency Name="System.Drawing.Common" Version="10.0.0">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
75+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -84,25 +84,25 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rtm.25515.111">
87+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rtm.25520.117">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
89+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25515.111">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25520.117">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
93+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25515.111">
95+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25520.117">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
97+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25515.111">
99+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25520.117">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
101+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
102102
</Dependency>
103-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25515.111">
103+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25520.117">
104104
<Uri>https://github.com/dotnet/dotnet</Uri>
105-
<Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
105+
<Sha>50d79701f2d748e965fefb4ba42580368598b9cc</Sha>
106106
</Dependency>
107107
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
108108
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">

‎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.25451.107",
3+
"version": "10.0.100-rc.2.25502.107",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature",
66
"paths": [
@@ -10,7 +10,7 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1111
},
1212
"tools": {
13-
"dotnet": "10.0.100-rc.1.25451.107",
13+
"dotnet": "10.0.100-rc.2.25502.107",
1414
"runtimes": {
1515
"dotnet/x64": [
1616
"$(MicrosoftNETCorePlatformsVersion)"
@@ -24,8 +24,8 @@
2424
}
2525
},
2626
"msbuild-sdks": {
27-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.111",
28-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.111",
27+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25520.117",
28+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25520.117",
2929
"Microsoft.Build.NoTargets": "3.7.56"
3030
},
3131
"native-tools": {

0 commit comments

Comments
 (0)