Skip to content

Commit e7d3e82

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0] Source code updates from dotnet/dotnet (#11369)
* Backflow from https://github.com/dotnet/dotnet / 99f9e99 build 297507 [[ commit created by automation ]] * Update dependencies --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 110f792 commit e7d3e82

File tree

8 files changed

+56
-49
lines changed

8 files changed

+56
-49
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-3d691b2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-3d691b2b/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-dotnet-99f9e99" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-99f9e99f/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.25622.101</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25622.101</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25622.101</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25622.101</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.3-servicing.25622.101</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26065.102</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.26065.102</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.26065.102</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26065.102</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.3-servicing.26065.102</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
1616
<MicrosoftNETCoreAppRefPackageVersion>10.0.3</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>10.0.3-servicing.25622.101</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>10.0.3-servicing.25622.101</MicrosoftPrivateWinformsPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>10.0.3-servicing.26065.102</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>10.0.3-servicing.26065.102</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
2121
<SystemCodeDomPackageVersion>10.0.3</SystemCodeDomPackageVersion>
@@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props
2525
<SystemDrawingCommonPackageVersion>10.0.3</SystemDrawingCommonPackageVersion>
2626
<SystemFormatsNrbfPackageVersion>10.0.3</SystemFormatsNrbfPackageVersion>
2727
<SystemIOPackagingPackageVersion>10.0.3</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.3-servicing.25622.101</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.3-servicing.26065.102</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
2929
<SystemReflectionMetadataLoadContextPackageVersion>10.0.3</SystemReflectionMetadataLoadContextPackageVersion>
3030
<SystemResourcesExtensionsPackageVersion>10.0.3</SystemResourcesExtensionsPackageVersion>
3131
<SystemRuntimeSerializationFormattersPackageVersion>10.0.3</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="3d691b2b683b3106c96294965b337acc9d8ca8f7" BarId="295531" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="99f9e99f92d73ade5453ba8edba5d72247f3cd11" BarId="297507" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.3-servicing.25622.101">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.3-servicing.26065.102">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
7+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.3-servicing.25622.101">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.3-servicing.26065.102">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
11+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
1212
</Dependency>
1313
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.3">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
15+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
1616
</Dependency>
1717
<Dependency Name="System.Windows.Extensions" Version="10.0.3">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
19+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.3-servicing.25622.101">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.3-servicing.26065.102">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
23+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.3-servicing.26068.3">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>bcaefe6ad3a21cc8c2ff31aed7092d07a1aae59c</Sha>
2828
</Dependency>
2929
<Dependency Name="System.Resources.Extensions" Version="10.0.3">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
31+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
3232
</Dependency>
3333
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.3">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
35+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
3636
</Dependency>
3737
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.3">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
39+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
4040
</Dependency>
4141
<Dependency Name="System.CodeDom" Version="10.0.3">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
43+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
4444
</Dependency>
4545
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.3">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
47+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
4848
</Dependency>
4949
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.3">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
51+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
5252
</Dependency>
5353
<Dependency Name="System.DirectoryServices" Version="10.0.3">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
55+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
5656
</Dependency>
5757
<Dependency Name="System.Formats.Nrbf" Version="10.0.3">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
59+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
6060
</Dependency>
6161
<Dependency Name="System.IO.Packaging" Version="10.0.3">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
63+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
6464
</Dependency>
6565
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.3">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
67+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
6868
</Dependency>
6969
<Dependency Name="System.Security.Permissions" Version="10.0.3">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
71+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
7272
</Dependency>
7373
<Dependency Name="System.Drawing.Common" Version="10.0.3">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
75+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</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.3-servicing.25622.101">
87+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.3-servicing.26065.102">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
89+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25622.101">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26065.102">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
93+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25622.101">
95+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26065.102">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
97+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25622.101">
99+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26065.102">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
101+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
102102
</Dependency>
103-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25622.101">
103+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.26065.102">
104104
<Uri>https://github.com/dotnet/dotnet</Uri>
105-
<Sha>3d691b2b683b3106c96294965b337acc9d8ca8f7</Sha>
105+
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</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/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# If it's not devdiv, it's dnceng
8181
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
8282
name: NetCore1ESPool-Publishing-Internal
83-
image: windows.vs2019.amd64
83+
image: windows.vs2022.amd64
8484
os: windows
8585
steps:
8686
- ${{ if eq(parameters.is1ESPipeline, '') }}:

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,11 @@ stages:
293293
${{ else }}:
294294
${{ if eq(parameters.is1ESPipeline, true) }}:
295295
name: NetCore1ESPool-Publishing-Internal
296-
image: windows.vs2019.amd64
296+
image: windows.vs2022.amd64
297297
os: windows
298298
${{ else }}:
299299
name: NetCore1ESPool-Publishing-Internal
300-
demands: ImageOverride -equals windows.vs2019.amd64
300+
demands: ImageOverride -equals windows.vs2022.amd64
301301
steps:
302302
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
303303
parameters:

‎eng/common/templates/variables/pool-providers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# demands: ImageOverride -equals windows.vs2019.amd64
26+
# demands: ImageOverride -equals windows.vs2022.amd64
2727
variables:
2828
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
2929
- template: /eng/common/templates-official/variables/pool-providers.yml

‎eng/common/tools.ps1‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,19 +560,26 @@ function LocateVisualStudio([object]$vsRequirements = $null){
560560
})
561561
}
562562

563-
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
563+
if (!$vsRequirements) {
564+
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
565+
$vsRequirements = $GlobalJson.tools.vs
566+
} else {
567+
$vsRequirements = $null
568+
}
569+
}
570+
564571
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
565572

566573
if (!$excludePrereleaseVS) {
567574
$args += '-prerelease'
568575
}
569576

570-
if (Get-Member -InputObject $vsRequirements -Name 'version') {
577+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
571578
$args += '-version'
572579
$args += $vsRequirements.version
573580
}
574581

575-
if (Get-Member -InputObject $vsRequirements -Name 'components') {
582+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
576583
foreach ($component in $vsRequirements.components) {
577584
$args += '-requires'
578585
$args += $component

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
}
2525
},
2626
"msbuild-sdks": {
27-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25622.101",
28-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25622.101",
27+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26065.102",
28+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26065.102",
2929
"Microsoft.Build.NoTargets": "3.7.56"
3030
},
3131
"native-tools": {

0 commit comments

Comments
 (0)