Skip to content

Commit 8e560d0

Browse files
Shyam-GuptaShyam-Gupta
authored
[main] Source code updates from dotnet/dotnet (#14334)
> [!NOTE] > This is a codeflow update. It may contain both source code changes from > [the VMR](https://github.com/dotnet/dotnet) > as well as dependency updates. Learn more [here](https://github.com/dotnet/dotnet/tree/main/docs/Codeflow-PRs.md). This pull request brings the following source code changes [marker]: <> (Begin:81d064a4-929c-4152-b746-ee3acc24b4ed) ## From https://github.com/dotnet/dotnet - **Subscription**: [81d064a4-929c-4152-b746-ee3acc24b4ed](https://maestro.dot.net/subscriptions?search=81d064a4-929c-4152-b746-ee3acc24b4ed) - **Build**: [20260224.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2911474) ([303174](https://maestro.dot.net/channel/8298/github:dotnet:dotnet/build/303174)) - **Date Produced**: February 24, 2026 2:34:05 PM UTC - **Commit**: [36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9](dotnet/dotnet@36ea4de) - **Commit Diff**: [c4217ee...36ea4de](dotnet/dotnet@c4217ee...36ea4de) - **Branch**: [main](https://github.com/dotnet/dotnet/tree/main) **Updated Dependencies** - From [11.0.0-beta.26111.109 to 11.0.0-beta.26124.102][1] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.Build.Tasks.Templating - Microsoft.DotNet.CMake.Sdk - Microsoft.DotNet.GenFacades - Microsoft.DotNet.Helix.Sdk - Microsoft.DotNet.RemoteExecutor - Microsoft.DotNet.XUnitV3Extensions - From [11.0.0-preview.2.26111.109 to 11.0.0-preview.3.26124.102][1] - Microsoft.NET.Sdk.IL - Microsoft.NETCore.App.Ref - Microsoft.NETCore.ILAsm - Microsoft.NETCore.ILDAsm - Microsoft.NETCore.Platforms - Microsoft.Win32.SystemEvents - runtime.win-x64.Microsoft.NETCore.ILAsm - runtime.win-x86.Microsoft.NETCore.ILAsm - System.CodeDom - System.Configuration.ConfigurationManager - System.Formats.Nrbf - System.IO.Hashing - System.Reflection.MetadataLoadContext - System.Resources.Extensions - System.Runtime.Serialization.Formatters - System.Text.Encodings.Web - System.Text.Json - System.Windows.Extensions [marker]: <> (End:81d064a4-929c-4152-b746-ee3acc24b4ed) [1]: dotnet/dotnet@c4217ee...36ea4de [marker]: <> (Start:Footer:CodeFlow PR) ## Associated changes in source repos - dotnet/arcade@ab22aee...88c8808 - dotnet/aspnetcore@339f512...6bf45a7 - dotnet/command-line-api@702b2bb...a3bae7d - dotnet/efcore@d46ce64...fb11d70 - dotnet/fsharp@63f3734...5fd82bc - dotnet/msbuild@ee7b4d3...81815e5 - NuGet/NuGet.Client@dba621c...a60358c - dotnet/razor@a5a7620...a1bd540 - dotnet/roslyn@da86ec6...24ed5cb - dotnet/runtime@0b91113...f8ac08f - dotnet/sdk@f44050f...e90c441 - dotnet/source-build-assets@061555a...d492faa - dotnet/sourcelink@abbd07d...6ea6adb - dotnet/symreader@2255aa6...df88239 - microsoft/vstest@d9ab5ad...42e97b7 - 298ae19...fdb43c8 <details> <summary>Diff the source with this PR branch</summary> ```bash darc vmr diff --name-only https://github.com/dotnet/dotnet:36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9..https://github.com/dotnet/winforms:darc-main-37fd120c-5353-4ab1-91ab-8e30eb3093dd ``` </details> [marker]: <> (End:Footer:CodeFlow PR) ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/dotnet/winforms/pull/14334)
2 parents 2846f02 + 3d190f7 commit 8e560d0

12 files changed

Lines changed: 160 additions & 117 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
1414
<PackageVersion Include="System.ComponentModel.TypeConverter.TestData" Version="$(SystemComponentModelTypeConverterTestDataVersion)" />
1515
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
16-
<PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
16+
<PackageVersion Include="System.Data.SqlClient" Version="4.9.1" />
1717
<PackageVersion Include="System.Drawing.Common.TestData" Version="$(SystemDrawingCommonTestDataVersion)" />
1818
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1PackageVersion)" />
1919
<PackageVersion Include="System.Formats.Nrbf" Version="$(SystemFormatsNrbfPackageVersion)" />

‎eng/Version.Details.props‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26111.109</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26111.109</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.26111.109</MicrosoftDotNetCMakeSdkPackageVersion>
12-
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26111.109</MicrosoftDotNetGenFacadesPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26111.109</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26111.109</MicrosoftDotNetRemoteExecutorPackageVersion>
15-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26111.109</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16-
<MicrosoftNETSdkILPackageVersion>11.0.0-preview.2.26111.109</MicrosoftNETSdkILPackageVersion>
17-
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.2.26111.109</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.2.26111.109</MicrosoftNETCoreILAsmPackageVersion>
19-
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-preview.2.26111.109</MicrosoftNETCoreILDAsmPackageVersion>
20-
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.2.26111.109</MicrosoftNETCorePlatformsPackageVersion>
21-
<MicrosoftWin32SystemEventsPackageVersion>11.0.0-preview.2.26111.109</MicrosoftWin32SystemEventsPackageVersion>
22-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.2.26111.109</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
23-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.2.26111.109</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
24-
<SystemCodeDomPackageVersion>11.0.0-preview.2.26111.109</SystemCodeDomPackageVersion>
25-
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.2.26111.109</SystemConfigurationConfigurationManagerPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>11.0.0-preview.2.26111.109</SystemFormatsNrbfPackageVersion>
27-
<SystemIOHashingPackageVersion>11.0.0-preview.2.26111.109</SystemIOHashingPackageVersion>
28-
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.2.26111.109</SystemReflectionMetadataLoadContextPackageVersion>
29-
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.2.26111.109</SystemResourcesExtensionsPackageVersion>
30-
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.2.26111.109</SystemRuntimeSerializationFormattersPackageVersion>
31-
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.2.26111.109</SystemTextEncodingsWebPackageVersion>
32-
<SystemTextJsonPackageVersion>11.0.0-preview.2.26111.109</SystemTextJsonPackageVersion>
33-
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.2.26111.109</SystemWindowsExtensionsPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26124.102</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26124.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.26124.102</MicrosoftDotNetCMakeSdkPackageVersion>
12+
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26124.102</MicrosoftDotNetGenFacadesPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26124.102</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26124.102</MicrosoftDotNetRemoteExecutorPackageVersion>
15+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26124.102</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16+
<MicrosoftNETSdkILPackageVersion>11.0.0-preview.3.26124.102</MicrosoftNETSdkILPackageVersion>
17+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.3.26124.102</MicrosoftNETCoreAppRefPackageVersion>
18+
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.3.26124.102</MicrosoftNETCoreILAsmPackageVersion>
19+
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-preview.3.26124.102</MicrosoftNETCoreILDAsmPackageVersion>
20+
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.3.26124.102</MicrosoftNETCorePlatformsPackageVersion>
21+
<MicrosoftWin32SystemEventsPackageVersion>11.0.0-preview.3.26124.102</MicrosoftWin32SystemEventsPackageVersion>
22+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.3.26124.102</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
23+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.3.26124.102</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
24+
<SystemCodeDomPackageVersion>11.0.0-preview.3.26124.102</SystemCodeDomPackageVersion>
25+
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.3.26124.102</SystemConfigurationConfigurationManagerPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>11.0.0-preview.3.26124.102</SystemFormatsNrbfPackageVersion>
27+
<SystemIOHashingPackageVersion>11.0.0-preview.3.26124.102</SystemIOHashingPackageVersion>
28+
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.3.26124.102</SystemReflectionMetadataLoadContextPackageVersion>
29+
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.3.26124.102</SystemResourcesExtensionsPackageVersion>
30+
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.3.26124.102</SystemRuntimeSerializationFormattersPackageVersion>
31+
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.3.26124.102</SystemTextEncodingsWebPackageVersion>
32+
<SystemTextJsonPackageVersion>11.0.0-preview.3.26124.102</SystemTextJsonPackageVersion>
33+
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.3.26124.102</SystemWindowsExtensionsPackageVersion>
3434
</PropertyGroup>
3535
<!--Property group for alternate package version names-->
3636
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="c4217eea0ad09ef217a7eeef066831806e936e55" BarId="301350" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9" BarId="303174" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.2.26111.109">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.3.26124.102">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
13+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
1414
</Dependency>
15-
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.2.26111.109">
15+
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.3.26124.102">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
17+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.2.26111.109">
19+
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.3.26124.102">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
21+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="11.0.0-preview.2.26111.109">
23+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="11.0.0-preview.3.26124.102">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
25+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-preview.2.26111.109">
27+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-preview.3.26124.102">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
29+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.2.26111.109">
31+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.3.26124.102">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
33+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.2.26111.109">
35+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.3.26124.102">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
37+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
3838
</Dependency>
39-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.2.26111.109">
39+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.3.26124.102">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
41+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-preview.2.26111.109">
43+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-preview.3.26124.102">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
45+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
4646
</Dependency>
47-
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.2.26111.109">
47+
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.3.26124.102">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
49+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Json" Version="11.0.0-preview.2.26111.109">
51+
<Dependency Name="System.Text.Json" Version="11.0.0-preview.3.26124.102">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
53+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.2.26111.109">
55+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.3.26124.102">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
57+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
5858
</Dependency>
59-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.2.26111.109">
59+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.3.26124.102">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
61+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="11.0.0-preview.2.26111.109">
63+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="11.0.0-preview.3.26124.102">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
65+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
6666
</Dependency>
67-
<Dependency Name="System.CodeDom" Version="11.0.0-preview.2.26111.109">
67+
<Dependency Name="System.CodeDom" Version="11.0.0-preview.3.26124.102">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
69+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
7070
</Dependency>
71-
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.2.26111.109">
71+
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.3.26124.102">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
73+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
7474
</Dependency>
75-
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.2.26111.109">
75+
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.3.26124.102">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
77+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
7878
</Dependency>
79-
<Dependency Name="System.IO.Hashing" Version="11.0.0-preview.2.26111.109">
79+
<Dependency Name="System.IO.Hashing" Version="11.0.0-preview.3.26124.102">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
81+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26111.109">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26124.102">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
88+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26111.109">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26124.102">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
92+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.26111.109">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.26124.102">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
96+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26111.109">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26124.102">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
100+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26111.109">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26124.102">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
104+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26111.109">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26124.102">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
108+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26111.109">
110+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26124.102">
111111
<Uri>https://github.com/dotnet/dotnet</Uri>
112-
<Sha>c4217eea0ad09ef217a7eeef066831806e936e55</Sha>
112+
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
113113
</Dependency>
114114
</ToolsetDependencies>
115115
</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>2</PreReleaseVersionIteration>
10+
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>
1111
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1212
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
1313
<DotNetFinalVersionKind></DotNetFinalVersionKind>

‎eng/common/templates/steps/vmr-sync.yml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,6 @@ steps:
3838
displayName: Label PR commit
3939
workingDirectory: $(Agent.BuildDirectory)/repo
4040

41-
- script: |
42-
vmr_sha=$(grep -oP '(?<=Sha=")[^"]*' $(Agent.BuildDirectory)/repo/eng/Version.Details.xml)
43-
echo "##vso[task.setvariable variable=vmr_sha]$vmr_sha"
44-
displayName: Obtain the vmr sha from Version.Details.xml (Unix)
45-
condition: ne(variables['Agent.OS'], 'Windows_NT')
46-
workingDirectory: $(Agent.BuildDirectory)/repo
47-
48-
- powershell: |
49-
[xml]$xml = Get-Content -Path $(Agent.BuildDirectory)/repo/eng/Version.Details.xml
50-
$vmr_sha = $xml.SelectSingleNode("//Source").Sha
51-
Write-Output "##vso[task.setvariable variable=vmr_sha]$vmr_sha"
52-
displayName: Obtain the vmr sha from Version.Details.xml (Windows)
53-
condition: eq(variables['Agent.OS'], 'Windows_NT')
54-
workingDirectory: $(Agent.BuildDirectory)/repo
55-
56-
- script: |
57-
git fetch --all
58-
git checkout $(vmr_sha)
59-
displayName: Checkout VMR at correct sha for repo flow
60-
workingDirectory: ${{ parameters.vmrPath }}
61-
6241
- script: |
6342
git config --global user.name "dotnet-maestro[bot]"
6443
git config --global user.email "dotnet-maestro[bot]@users.noreply.github.com"

‎eng/common/templates/vmr-build-pr.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ resources:
3434
type: github
3535
name: dotnet/dotnet
3636
endpoint: dotnet
37+
ref: refs/heads/main # Set to whatever VMR branch the PR build should insert into
3738

3839
stages:
3940
- template: /eng/pipelines/templates/stages/vmr-build.yml@vmr

‎eng/common/tools.ps1‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,11 @@ function LocateVisualStudio([object]$vsRequirements = $null){
588588
return $null
589589
}
590590

591+
if ($null -eq $vsInfo -or $vsInfo.Count -eq 0) {
592+
throw "No instance of Visual Studio meeting the requirements specified was found. Requirements: $($args -join ' ')"
593+
return $null
594+
}
595+
591596
# use first matching instance
592597
return $vsInfo[0]
593598
}
@@ -820,6 +825,11 @@ function MSBuild-Core() {
820825

821826
$cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
822827

828+
# Add -mt flag for MSBuild multithreaded mode if enabled via environment variable
829+
if ($env:MSBUILD_MT_ENABLED -eq "1") {
830+
$cmdArgs += ' -mt'
831+
}
832+
823833
if ($warnAsError) {
824834
$cmdArgs += ' /warnaserror /p:TreatWarningsAsErrors=true'
825835
}

‎eng/common/tools.sh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,13 @@ function MSBuild-Core {
522522
}
523523
}
524524

525-
RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
525+
# Add -mt flag for MSBuild multithreaded mode if enabled via environment variable
526+
local mt_switch=""
527+
if [[ "${MSBUILD_MT_ENABLED:-}" == "1" ]]; then
528+
mt_switch="-mt"
529+
fi
530+
531+
RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
526532
}
527533

528534
function GetDarc {

0 commit comments

Comments
 (0)