Skip to content

Commit 3daa2ad

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0] Source code updates from dotnet/dotnet (#11219)
[release/10.0] Source code updates from dotnet/dotnet
1 parent a25aa3a commit 3daa2ad

File tree

5 files changed

+49
-50
lines changed

5 files changed

+49
-50
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-bbafab7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-bbafab7b/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-dotnet-ba86126" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-ba861262/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.25528.106</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rtm.25528.106</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rtm.25531.102</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
1616
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25528.106</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rtm.25528.106</MicrosoftPrivateWinformsPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25531.102</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rtm.25531.102</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.25528.106</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rtm.25531.102</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="bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05" BarId="288919" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="ba86126261026d26f7c30cd3434680d3965a88cf" BarId="289152" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rtm.25528.106">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rtm.25531.102">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
7+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rtm.25528.106">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rtm.25531.102">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
11+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
1212
</Dependency>
1313
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
15+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
1616
</Dependency>
1717
<Dependency Name="System.Windows.Extensions" Version="10.0.0">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
19+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25528.106">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25531.102">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
23+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</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>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
31+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
3232
</Dependency>
3333
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
35+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
3636
</Dependency>
3737
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
39+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
4040
</Dependency>
4141
<Dependency Name="System.CodeDom" Version="10.0.0">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
43+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
4444
</Dependency>
4545
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
47+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
4848
</Dependency>
4949
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
51+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
5252
</Dependency>
5353
<Dependency Name="System.DirectoryServices" Version="10.0.0">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
55+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
5656
</Dependency>
5757
<Dependency Name="System.Formats.Nrbf" Version="10.0.0">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
59+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
6060
</Dependency>
6161
<Dependency Name="System.IO.Packaging" Version="10.0.0">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
63+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
6464
</Dependency>
6565
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
67+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
6868
</Dependency>
6969
<Dependency Name="System.Security.Permissions" Version="10.0.0">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
71+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
7272
</Dependency>
7373
<Dependency Name="System.Drawing.Common" Version="10.0.0">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
75+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</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.25528.106">
87+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rtm.25531.102">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
89+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25528.106">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25531.102">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
93+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25528.106">
95+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25531.102">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
97+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25528.106">
99+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25531.102">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
101+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
102102
</Dependency>
103-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25528.106">
103+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25531.102">
104104
<Uri>https://github.com/dotnet/dotnet</Uri>
105-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
105+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</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/steps/install-microbuild.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,22 @@ parameters:
1111
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
1212
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
1313
microbuildUseESRP: true
14-
# Location of the MicroBuild output folder
15-
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
16-
microBuildOutputFolder: '$(Build.SourcesDirectory)'
1714

1815
continueOnError: false
1916

2017
steps:
2118
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
2219
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
23-
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
20+
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
2421
- task: UseDotNet@2
2522
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
2623
inputs:
2724
packageType: sdk
2825
version: 8.0.x
29-
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
30-
workingDirectory: ${{ parameters.microBuildOutputFolder }}
26+
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
27+
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
28+
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
29+
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
3130
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
3231

3332
- script: |
@@ -65,7 +64,7 @@ steps:
6564
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
6665
env:
6766
TeamName: $(_TeamName)
68-
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
67+
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
6968
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
7069
continueOnError: ${{ parameters.continueOnError }}
7170
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
@@ -85,7 +84,7 @@ steps:
8584
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
8685
env:
8786
TeamName: $(_TeamName)
88-
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
87+
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
8988
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
9089
continueOnError: ${{ parameters.continueOnError }}
9190
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))

‎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.25528.106",
28-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25528.106",
27+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25531.102",
28+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25531.102",
2929
"Microsoft.Build.NoTargets": "3.7.56"
3030
},
3131
"native-tools": {

0 commit comments

Comments
 (0)