Skip to content

Commit 6966ece

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0] Source code updates from dotnet/dotnet (#11611)
[release/10.0] Source code updates from dotnet/dotnet
1 parent e2d332a commit 6966ece

6 files changed

Lines changed: 80 additions & 73 deletions

File tree

‎Directory.Build.props‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@
3030
<AfterMicrosoftNETSdkTargets>$(MSBuildThisFileDirectory)eng\vs-workaround.targets</AfterMicrosoftNETSdkTargets>
3131
</PropertyGroup>
3232

33+
<!-- Add net10.0 support when using an MSBuild version that doesn't include it natively -->
34+
<ItemGroup Condition="!$([MSBuild]::VersionGreaterThanOrEquals($(MSBuildVersion), '18.0.0'))">
35+
<SupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v10.0"
36+
DisplayName=".NET 10.0"
37+
Alias="net10.0" />
38+
</ItemGroup>
39+
3340
<Import Project="$(WpfArcadeSdkProps)"
3441
Condition="Exists('$(WpfArcadeSdkProps)') And Exists('$(WpfArcadeSdkTargets)')"/>
3542

‎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-71d1809" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-71d1809a/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-dotnet-dd8ced2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-dd8ced28/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: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ 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.26217.115</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.26217.115</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.26217.115</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26217.115</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.8-servicing.26217.115</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16-
<MicrosoftNETCoreAppRefPackageVersion>10.0.8</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>10.0.8-servicing.26217.115</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>10.0.8-servicing.26217.115</MicrosoftPrivateWinformsPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26229.109</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.26229.109</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.26229.109</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26229.109</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.9-servicing.26229.109</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16+
<MicrosoftNETCoreAppRefPackageVersion>10.0.9</MicrosoftNETCoreAppRefPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>10.0.9-servicing.26229.109</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>10.0.9-servicing.26229.109</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
21-
<SystemCodeDomPackageVersion>10.0.8</SystemCodeDomPackageVersion>
22-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.8</SystemConfigurationConfigurationManagerPackageVersion>
23-
<SystemDiagnosticsEventLogPackageVersion>10.0.8</SystemDiagnosticsEventLogPackageVersion>
24-
<SystemDirectoryServicesPackageVersion>10.0.8</SystemDirectoryServicesPackageVersion>
25-
<SystemDrawingCommonPackageVersion>10.0.8</SystemDrawingCommonPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.8</SystemFormatsNrbfPackageVersion>
27-
<SystemIOPackagingPackageVersion>10.0.8</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.8-servicing.26217.115</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.8</SystemReflectionMetadataLoadContextPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>10.0.8</SystemResourcesExtensionsPackageVersion>
31-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.8</SystemRuntimeSerializationFormattersPackageVersion>
32-
<SystemSecurityCryptographyXmlPackageVersion>10.0.8</SystemSecurityCryptographyXmlPackageVersion>
33-
<SystemSecurityPermissionsPackageVersion>10.0.8</SystemSecurityPermissionsPackageVersion>
34-
<SystemWindowsExtensionsPackageVersion>10.0.8</SystemWindowsExtensionsPackageVersion>
21+
<SystemCodeDomPackageVersion>10.0.9</SystemCodeDomPackageVersion>
22+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.9</SystemConfigurationConfigurationManagerPackageVersion>
23+
<SystemDiagnosticsEventLogPackageVersion>10.0.9</SystemDiagnosticsEventLogPackageVersion>
24+
<SystemDirectoryServicesPackageVersion>10.0.9</SystemDirectoryServicesPackageVersion>
25+
<SystemDrawingCommonPackageVersion>10.0.9</SystemDrawingCommonPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>10.0.9</SystemFormatsNrbfPackageVersion>
27+
<SystemIOPackagingPackageVersion>10.0.9</SystemIOPackagingPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.9-servicing.26229.109</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.9</SystemReflectionMetadataLoadContextPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>10.0.9</SystemResourcesExtensionsPackageVersion>
31+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.9</SystemRuntimeSerializationFormattersPackageVersion>
32+
<SystemSecurityCryptographyXmlPackageVersion>10.0.9</SystemSecurityCryptographyXmlPackageVersion>
33+
<SystemSecurityPermissionsPackageVersion>10.0.9</SystemSecurityPermissionsPackageVersion>
34+
<SystemWindowsExtensionsPackageVersion>10.0.9</SystemWindowsExtensionsPackageVersion>
3535
<!-- dotnet-wpf-int dependencies -->
3636
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.5-servicing.26160.10</MicrosoftDotNetWpfDncEngPackageVersion>
3737
</PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 45 additions & 45 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="71d1809a66d8aacbe21208baeb0bbc484191b3d1" BarId="311039" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="dd8ced28bfd57694643337c5dcf1877d5159948b" BarId="312468" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.8-servicing.26217.115">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.9-servicing.26229.109">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
7+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.8-servicing.26217.115">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.9-servicing.26229.109">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
11+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.8">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.9">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
15+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.8">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.9">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
19+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.8-servicing.26217.115">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.9-servicing.26229.109">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
23+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.5-servicing.26160.10">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>206dc6cbdbcd8b52c1c516e128be08411b5cd3aa</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.8">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.9">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
31+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.8">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.9">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
35+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.8">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.9">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
39+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.8">
41+
<Dependency Name="System.CodeDom" Version="10.0.9">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
43+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.8">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.9">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
47+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.8">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.9">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
51+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.8">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.9">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
55+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.8">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.9">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
59+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.8">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.9">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
63+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.8">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.9">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
67+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.8">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.9">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
71+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.8">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.9">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
75+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</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.8-servicing.26217.115">
87+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.9-servicing.26229.109">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
89+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26217.115">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26229.109">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
93+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26217.115">
95+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26229.109">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
97+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26217.115">
99+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26229.109">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
101+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</Sha>
102102
</Dependency>
103-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.26217.115">
103+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.26229.109">
104104
<Uri>https://github.com/dotnet/dotnet</Uri>
105-
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
105+
<Sha>dd8ced28bfd57694643337c5dcf1877d5159948b</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">

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<MajorVersion>10</MajorVersion>
66
<MinorVersion>0</MinorVersion>
7-
<PatchVersion>8</PatchVersion>
7+
<PatchVersion>9</PatchVersion>
88
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
99
<PreReleaseVersionIteration></PreReleaseVersionIteration>
1010
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>

‎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.106",
3+
"version": "10.0.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.106",
13+
"dotnet": "10.0.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.26217.115",
28-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26217.115",
27+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26229.109",
28+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26229.109",
2929
"Microsoft.Build.NoTargets": "3.7.56"
3030
},
3131
"native-tools": {

0 commit comments

Comments
 (0)