8000 [main] Source code updates from dotnet/winforms (#606) · dotnet/dotnet@15902c3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 15902c3

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/winforms (#606)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 5552336 commit 15902c3

File tree

9 files changed

+88
-90
lines changed

9 files changed

+88
-90
lines changed

‎prereqs/git-info/winforms.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<GitCommitHash>05a904f4c1419562b2ae01bad597f9cd3bad5872</GitCommitHash>
5-
<OfficialBuildId>20250515.1</OfficialBuildId>
6-
<OutputPackageVersion>10.0.0-preview.5.25265.1</OutputPackageVersion>
4+
<GitCommitHash>716bc129a4679a98394b2e2d24d1d1d3d4f54ddb</GitCommitHash>
5+
<OfficialBuildId>20250517.1</OfficialBuildId>
6+
<OutputPackageVersion>10.0.0-preview.5.25267.1</OutputPackageVersion>
77
</PropertyGroup>
88
</Project>

‎src/source-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@
176176
"commitSha": "b9faa7e590d3e5acc87d0600072167d140b811f1"
177177
},
178178
{
179-
"packageVersion": "10.0.0-preview.5.25265.1",
180-
"barId": 268429,
179+
"packageVersion": "10.0.0-preview.5.25267.1",
180+
"barId": 268741,
181181
"path": "winforms",
182182
"remoteUri": "https://github.com/dotnet/winforms",
183-
"commitSha": "05a904f4c1419562b2ae01bad597f9cd3bad5872"
183+
"commitSha": "716bc129a4679a98394b2e2d24d1d1d3d4f54ddb"
184184
},
185185
{
186186
"packageVersion": "10.0.0-preview.5.25265.3",

‎src/winforms/eng/Version.Details.xml

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,106 +6,106 @@ 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="362a4227bd38985f75f6a6d7f6733c7d62414569" BarId="268099" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="170498a9429a5553fe7ac0ec2341d19bbb97cbe8" BarId="268722" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25263.108">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25267.102">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
13+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
1414
</Dependency>
15-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.5.25263.108">
15+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.5.25267.102">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
17+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25263.108">
19+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25267.102">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
21+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.5.25263.108">
23+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.5.25267.102">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
25+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25263.108">
27+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25267.102">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
29+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25263.108">
31+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25267.102">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
33+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25263.108">
35+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25267.102">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
37+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
3838
</Dependency>
39-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25263.108">
39+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25267.102">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
41+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.5.25263.108">
43+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.5.25267.102">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
45+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
4646
</Dependency>
47-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.5.25263.108">
47+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.5.25267.102">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
49+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.5.25263.108">
51+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.5.25267.102">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
53+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25263.108">
55+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25267.102">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
57+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
5858
</Dependency>
59-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25263.108">
59+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25267.102">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
61+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.5.25263.108">
63+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.5.25267.102">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
65+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
6666
</Dependency>
67-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25263.108">
67+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25267.102">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
69+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
7070
</Dependency>
71-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25263.108">
71+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25267.102">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
73+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
7474
</Dependency>
75-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25263.108">
75+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25267.102">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
77+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
7878
</Dependency>
79-
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.5.25263.108">
79+
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.5.25267.102">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
81+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25263.108">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25267.102">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
88+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25263.108">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25267.102">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
92+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25263.108">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25267.102">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
96+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25263.108">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25267.102">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
100+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25263.108">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25267.102">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
104+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25263.108">
106+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25267.102">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
108+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
109109
</Dependency>
110110
</ToolsetDependencies>
111111
</Dependencies>

‎src/winforms/eng/Versions.props

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@
1010
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1111
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1212
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
13-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.5.25263.108</SystemReflectionMetadataLoadContextVersion>
14-
<SystemTextEncodingsWebVersion>10.0.0-preview.5.25263.108</SystemTextEncodingsWebVersion>
13+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.5.25267.102</SystemReflectionMetadataLoadContextVersion>
14+
<SystemTextEncodingsWebVersion>10.0.0-preview.5.25267.102</SystemTextEncodingsWebVersion>
1515
</PropertyGroup>
1616
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
1717
<PropertyGroup>
18-
<SystemFormatsNrbfPackageVersion>10.0.0-preview.5.25263.108</SystemFormatsNrbfPackageVersion>
19-
<SystemIOHashingPackageVersion>10.0.0-preview.5.25263.108</SystemIOHashingPackageVersion>
18+
<SystemFormatsNrbfPackageVersion>10.0.0-preview.5.25267.102</SystemFormatsNrbfPackageVersion>
19+
<SystemIOHashingPackageVersion>10.0.0-preview.5.25267.102</SystemIOHashingPackageVersion>
2020
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
21-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.5.25263.108</MicrosoftNETCoreILDAsmPackageVersion>
21+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.5.25267.102</MicrosoftNETCoreILDAsmPackageVersion>
2222
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.0-preview.1.24511.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
23-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25263.108</SystemRuntimeSerializationFormattersPackageVersion>
24-
<SystemTextJsonPackageVersion>10.0.0-preview.5.25263.108</SystemTextJsonPackageVersion>
25-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25263.108</MicrosoftNETCoreAppRefPackageVersion>
26-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.5.25263.108</MicrosoftNETCorePlatformsPackageVersion>
27-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.5.25263.108</MicrosoftWin32SystemEventsPackageVersion>
28-
<SystemCodeDomPackageVersion>10.0.0-preview.5.25263.108</SystemCodeDomPackageVersion>
29-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.5.25263.108</SystemConfigurationConfigurationManagerPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.5.25263.108</SystemResourcesExtensionsPackageVersion>
23+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25267.102</SystemRuntimeSerializationFormattersPackageVersion>
24+
<SystemTextJsonPackageVersion>10.0.0-preview.5.25267.102</SystemTextJsonPackageVersion>
25+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25267.102</MicrosoftNETCoreAppRefPackageVersion>
26+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.5.25267.102</MicrosoftNETCorePlatformsPackageVersion>
27+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.5.25267.102</MicrosoftWin32SystemEventsPackageVersion>
28+
<SystemCodeDomPackageVersion>10.0.0-preview.5.25267.102</SystemCodeDomPackageVersion>
29+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.5.25267.102</SystemConfigurationConfigurationManagerPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.5.25267.102</SystemResourcesExtensionsPackageVersion>
3131
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25227.101</SystemSecurityPermissionsPackageVersion>
32-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.5.25263.108</SystemWindowsExtensionsPackageVersion>
33-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25263.108</MicrosoftNETCoreILAsmPackageVersion>
34-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25263.108</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
35-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25263.108</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
36-
<MicrosoftNETSdkILVersion>10.0.0-preview.5.25263.108</MicrosoftNETSdkILVersion>
32+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.5.25267.102</SystemWindowsExtensionsPackageVersion>
33+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25267.102</MicrosoftNETCoreILAsmPackageVersion>
34+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25267.102</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
35+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25267.102</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
36+
<MicrosoftNETSdkILVersion>10.0.0-preview.5.25267.102</MicrosoftNETSdkILVersion>
3737
<!--
3838
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
3939
-->
@@ -46,9 +46,9 @@
4646
</PropertyGroup>
4747
<!-- Arcade -->
4848
<PropertyGroup>
49-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25263.108</MicrosoftDotNetGenFacadesPackageVersion>
50-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25263.108</MicrosoftDotNetRemoteExecutorVersion>
51-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25263.108</MicrosoftDotNetXUnitExtensionsPackageVersion>
49+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25267.102</MicrosoftDotNetGenFacadesPackageVersion>
50+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25267.102</MicrosoftDotNetRemoteExecutorVersion>
51+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25267.102</MicrosoftDotNetXUnitExtensionsPackageVersion>
5252
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
5353
</PropertyGroup>
5454
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

‎src/winforms/eng/common/build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function Build {
127127
/p:Deploy=$deploy `
128128
/p:Test=$test `
129129
/p:Pack=$pack `
130-
/p:DotNetBuildRepo=$productBuild `
130+
/p:DotNetBuild=$productBuild `
131131
/p:IntegrationTest=$integrationTest `
132132
/p:PerformanceTest=$performanceTest `
133133
/p:Sign=$sign `

‎src/winforms/eng/common/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ while [[ $# > 0 ]]; do
129129
-pack)
130130
pack=true
131131
;;
132-
-sourcebuild|-sb)
132+
-sourcebuild|-source-build|-sb)
133133
build=true
134134
source_build=true
135135
product_build=true
136136
restore=true
137137
pack=true
138138
;;
139-
-productbuild|-pb)
139+
-productbuild|-product-build|-pb)
140140
build=true
141141
product_build=true
142142
restore=true
@@ -241,7 +241,7 @@ function Build {
241241
/p:RepoRoot="$repo_root" \
242242
/p:Restore=$restore \
243243
/p:Build=$build \
244-
/p:DotNetBuildRepo=$product_build \
244+
/p:DotNetBuild=$product_build \
245245
/p:DotNetBuildSourceOnly=$source_build \
246246
/p:Rebuild=$rebuild \
247247
/p:Test=$test \

‎src/winforms/eng/common/tools.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ $ErrorActionPreference = 'Stop'
6868
# True if the build is a product build
6969
[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }
7070

71-
[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() }
72-
7371
function Create-Directory ([string[]] $path) {
7472
New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
7573
}
@@ -853,7 +851,7 @@ function MSBuild-Core() {
853851

854852
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
855853
# Skip this when the build is a child of the VMR orchestrator build.
856-
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) {
854+
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) {
857855
Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
858856
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
859857
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

‎src/winforms/eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ function MSBuil 10000 d-Core {
507507

508508
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
509509
# Skip this when the build is a child of the VMR orchestrator build.
510-
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then
510+
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then
511511
Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
512512
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
513513
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

‎src/winforms/global.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-preview.3.25201.16",
3+
"dotnet": "10.0.100-preview.5.25265.106",
44
"runtimes": {
55
"dotnet/x64": [
66
"$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -11,14 +11,14 @@
1111
}
1212
},
1313
"sdk": {
14-
"version": "10.0.100-preview.3.25201.16"
14+
"version": "10.0.100-preview.5.25265.106"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.108",
18-
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25263.108",
19-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25263.108",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25267.102",
18+
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25267.102",
19+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25267.102",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
21-
"Microsoft.NET.Sdk.IL": "10.0.0-preview.5.25263.108"
21+
"Microsoft.NET.Sdk.IL": "10.0.0-preview.5.25267.102"
2222
},
2323
"native-tools": {
2424
"cmake": "latest"

0 commit comments

Comments
 (0)
0