Skip to content

Commit 0a14832

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#13822)
[main] Source code updates from dotnet/dotnet
1 parent 8818780 commit 0a14832

File tree

5 files changed

+85
-79
lines changed

5 files changed

+85
-79
lines changed

‎eng/Version.Details.props‎

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

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

‎eng/common/sdk-task.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ Param(
77
[switch] $restore,
88
[switch] $prepareMachine,
99
[switch][Alias('nobl')]$excludeCIBinaryLog,
10+
[switch]$noWarnAsError,
1011
[switch] $help,
1112
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
1213
)
1314

1415
$ci = $true
1516
$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
16-
$warnAsError = $true
17+
$warnAsError = if ($noWarnAsError) { $false } else { $true }
1718

1819
. $PSScriptRoot\tools.ps1
1920

‎eng/common/sdk-task.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ show_usage() {
1010

1111
echo "Advanced settings:"
1212
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
13+
echo " --noWarnAsError Do not warn as error
1314
echo ""
1415
echo "Command line arguments not listed above are passed thru to msbuild."
1516
}
@@ -52,6 +53,7 @@ exclude_ci_binary_log=false
5253
restore=false
5354
help=false
5455
properties=''
56+
warnAsError=true
5557
5658
while (($# > 0)); do
5759
lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
@@ -73,6 +75,10 @@ while (($# > 0)); do
7375
exclude_ci_binary_log=true
7476
shift 1
7577
;;
78+
--noWarnAsError)
79+
warnAsError=false
80+
shift 1
81+
;;
7682
--help)
7783
help=true
7884
shift 1
@@ -85,7 +91,6 @@ while (($# > 0)); do
8591
done
8692
8793
ci=true
88-
warnAsError=true
8994
9095
if $help; then
9196
show_usage

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25418.105",
25-
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25418.105",
26-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25418.105",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25419.104",
25+
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25419.104",
26+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25419.104",
2727
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
28-
"Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25418.105"
28+
"Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25419.104"
2929
},
3030
"native-tools": {
3131
"cmake": "latest"

0 commit comments

Comments
 (0)