Skip to content

Commit 3f7425b

Browse files
[main] Source code updates from dotnet/dotnet (#11404)
* Backflow from https://github.com/dotnet/dotnet / 159b6d6 build 299369 [[ commit created by automation ]] * Update dependencies * Update dependencies --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 447de4b commit 3f7425b

File tree

4 files changed

+72
-72
lines changed

4 files changed

+72
-72
lines changed

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>11.0.0-beta.26078.110</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.26078.110</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26078.110</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26078.110</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>11.0.0-preview.1.26078.110</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16-
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.1.26078.110</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.1.26078.110</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>11.0.0-preview.1.26078.110</MicrosoftPrivateWinformsPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26080.101</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.26080.101</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26080.101</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26080.101</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>11.0.0-preview.2.26080.101</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.2.26080.101</MicrosoftNETCoreAppRefPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.2.26080.101</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>11.0.0-preview.2.26080.101</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
21-
<SystemCodeDomPackageVersion>11.0.0-preview.1.26078.110</SystemCodeDomPackageVersion>
22-
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.1.26078.110</SystemConfigurationConfigurationManagerPackageVersion>
23-
<SystemDiagnosticsEventLogPackageVersion>11.0.0-preview.1.26078.110</SystemDiagnosticsEventLogPackageVersion>
24-
<SystemDirectoryServicesPackageVersion>11.0.0-preview.1.26078.110</SystemDirectoryServicesPackageVersion>
25-
<SystemDrawingCommonPackageVersion>11.0.0-preview.1.26078.110</SystemDrawingCommonPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>11.0.0-preview.1.26078.110</SystemFormatsNrbfPackageVersion>
27-
<SystemIOPackagingPackageVersion>11.0.0-preview.1.26078.110</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>11.0.0-preview.1.26078.110</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29-
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.1.26078.110</SystemReflectionMetadataLoadContextPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.1.26078.110</SystemResourcesExtensionsPackageVersion>
31-
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.1.26078.110</SystemRuntimeSerializationFormattersPackageVersion>
32-
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-preview.1.26078.110</SystemSecurityCryptographyXmlPackageVersion>
33-
<SystemSecurityPermissionsPackageVersion>11.0.0-preview.1.26078.110</SystemSecurityPermissionsPackageVersion>
34-
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.1.26078.110</SystemWindowsExtensionsPackageVersion>
21+
<SystemCodeDomPackageVersion>11.0.0-preview.2.26080.101</SystemCodeDomPackageVersion>
22+
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.2.26080.101</SystemConfigurationConfigurationManagerPackageVersion>
23+
<SystemDiagnosticsEventLogPackageVersion>11.0.0-preview.2.26080.101</SystemDiagnosticsEventLogPackageVersion>
24+
<SystemDirectoryServicesPackageVersion>11.0.0-preview.2.26080.101</SystemDirectoryServicesPackageVersion>
25+
<SystemDrawingCommonPackageVersion>11.0.0-preview.2.26080.101</SystemDrawingCommonPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>11.0.0-preview.2.26080.101</SystemFormatsNrbfPackageVersion>
27+
<SystemIOPackagingPackageVersion>11.0.0-preview.2.26080.101</SystemIOPackagingPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>11.0.0-preview.2.26080.101</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29+
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.2.26080.101</SystemReflectionMetadataLoadContextPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.2.26080.101</SystemResourcesExtensionsPackageVersion>
31+
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.2.26080.101</SystemRuntimeSerializationFormattersPackageVersion>
32+
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-preview.2.26080.101</SystemSecurityCryptographyXmlPackageVersion>
33+
<SystemSecurityPermissionsPackageVersion>11.0.0-preview.2.26080.101</SystemSecurityPermissionsPackageVersion>
34+
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.2.26080.101</SystemWindowsExtensionsPackageVersion>
3535
<!-- _git/dotnet-wpf-int dependencies -->
3636
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.2.26078.2</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="549d1068506d4cf35fcc1f21f6a3014cd43bf3c9" BarId="299216" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="fd46c9c9899610c1d999268dfb0382aa229222e1" BarId="299501" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="11.0.0-preview.1.26078.110">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="11.0.0-preview.2.26080.101">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
7+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="11.0.0-preview.1.26078.110">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="11.0.0-preview.2.26080.101">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
11+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.1.26078.110">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.2.26080.101">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
15+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.1.26078.110">
17+
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.2.26080.101">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
19+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.1.26078.110">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.2.26080.101">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
23+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.2.26078.2">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>2cf3c828019cfdc1544699673e916ec3a5688422</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.1.26078.110">
29+
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.2.26080.101">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
31+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.1.26078.110">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.2.26080.101">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
35+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.1.26078.110">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.2.26080.101">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
39+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="11.0.0-preview.1.26078.110">
41+
<Dependency Name="System.CodeDom" Version="11.0.0-preview.2.26080.101">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
43+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.1.26078.110">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.2.26080.101">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
47+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="11.0.0-preview.1.26078.110">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="11.0.0-preview.2.26080.101">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
51+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="11.0.0-preview.1.26078.110">
53+
<Dependency Name="System.DirectoryServices" Version="11.0.0-preview.2.26080.101">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
55+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.1.26078.110">
57+
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.2.26080.101">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
59+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="11.0.0-preview.1.26078.110">
61+
<Dependency Name="System.IO.Packaging" Version="11.0.0-preview.2.26080.101">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
63+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-preview.1.26078.110">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-preview.2.26080.101">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
67+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="11.0.0-preview.1.26078.110">
69+
<Dependency Name="System.Security.Permissions" Version="11.0.0-preview.2.26080.101">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
71+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="11.0.0-preview.1.26078.110">
73+
<Dependency Name="System.Drawing.Common" Version="11.0.0-preview.2.26080.101">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
75+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -84,21 +84,21 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26078.110">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26080.101">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
89+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.26078.110">
91+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.26080.101">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
93+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26078.110">
95+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26080.101">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
97+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26078.110">
99+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26080.101">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
101+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
102102
</Dependency>
103103
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
104104
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
@@ -109,9 +109,9 @@
109109
<Uri>https://github.com/dotnet/dotnet</Uri>
110110
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
111111
</Dependency>
112-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="11.0.0-preview.1.26078.110">
112+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="11.0.0-preview.2.26080.101">
113113
<Uri>https://github.com/dotnet/dotnet</Uri>
114-
<Sha>549d1068506d4cf35fcc1f21f6a3014cd43bf3c9</Sha>
114+
<Sha>fd46c9c9899610c1d999268dfb0382aa229222e1</Sha>
115115
</Dependency>
116116
</ToolsetDependencies>
117117
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<MinorVersion>0</MinorVersion>
88
<PatchVersion>0</PatchVersion>
99
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
10-
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
10+
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
1111
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1212
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
1313
<DotNetFinalVersionKind></DotNetFinalVersionKind>

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": "11.0.100-alpha.1.26064.118",
3+
"version": "11.0.100-preview.1.26078.121",
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": "11.0.100-alpha.1.26064.118",
13+
"dotnet": "11.0.100-preview.1.26078.121",
1414
"runtimes": {
1515
"dotnet/x64": [
1616
"$(MicrosoftNETCorePlatformsVersion)"
@@ -27,8 +27,8 @@
2727
"runner": "Microsoft.Testing.Platform"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26078.110",
31-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26078.110",
30+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26080.101",
31+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26080.101",
3232
"Microsoft.Build.NoTargets": "3.7.56"
3333
},
3434
"native-tools": {

0 commit comments

Comments
 (0)