Skip to content

Commit 6c8a83b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 280037 (#11061)
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25418.105 -> 10.0.0-beta.25419.104) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25418.105 -> 10.0.0-rc.1.25419.104) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 046b4d4 commit 6c8a83b

File tree

5 files changed

+77
-71
lines changed

5 files changed

+77
-71
lines changed

‎eng/Version.Details.props

Lines changed: 22 additions & 22 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-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25418.105</MicrosoftDotNetCodeAnalysisPackageVersion>
12-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25418.105</MicrosoftDotNetGenAPIPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25418.105</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25418.105</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
15-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25418.105</MicrosoftNETCoreAppRefPackageVersion>
16-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25418.105</MicrosoftNETCorePlatformsPackageVersion>
17-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25418.105</MicrosoftPrivateWinformsPackageVersion>
10+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25419.104</MicrosoftDotNetArcadeSdkPackageVersion>
11+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25419.104</MicrosoftDotNetCodeAnalysisPackageVersion>
12+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25419.104</MicrosoftDotNetGenAPIPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25419.104</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25419.104</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
15+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25419.104</MicrosoftNETCoreAppRefPackageVersion>
16+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25419.104</MicrosoftNETCorePlatformsPackageVersion>
17+
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25419.104</MicrosoftPrivateWinformsPackageVersion>
1818
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
1919
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
20-
<SystemCodeDomPackageVersion>10.0.0-rc.1.25418.105</SystemCodeDomPackageVersion>
21-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25418.105</SystemConfigurationConfigurationManagerPackageVersion>
22-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25418.105</SystemDiagnosticsEventLogPackageVersion>
23-
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25418.105</SystemDirectoryServicesPackageVersion>
24-
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25418.105</SystemDrawingCommonPackageVersion>
25-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25418.105</SystemFormatsNrbfPackageVersion>
26-
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25418.105</SystemIOPackagingPackageVersion>
27-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25418.105</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
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-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25418.105</SystemSecurityCryptographyXmlPackageVersion>
32-
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25418.105</SystemSecurityPermissionsPackageVersion>
33-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25418.105</SystemWindowsExtensionsPackageVersion>
20+
<SystemCodeDomPackageVersion>10.0.0-rc.1.25419.104</SystemCodeDomPackageVersion>
21+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25419.104</SystemConfigurationConfigurationManagerPackageVersion>
22+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25419.104</SystemDiagnosticsEventLogPackageVersion>
23+
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25419.104</SystemDirectoryServicesPackageVersion>
24+
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25419.104</SystemDrawingCommonPackageVersion>
25+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25419.104</SystemFormatsNrbfPackageVersion>
26+
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25419.104</SystemIOPackagingPackageVersion>
27+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25419.104</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
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+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25419.104</SystemSecurityCryptographyXmlPackageVersion>
32+
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25419.104</SystemSecurityPermissionsPackageVersion>
33+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25419.104</SystemWindowsExtensionsPackageVersion>
3434
<!-- _git/dotnet-wpf-int dependencies -->
3535
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-preview.7.25317.2</MicrosoftDotNetWpfDncEngPackageVersion>
3636
</PropertyGroup>

‎eng/Version.Details.xml

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,96 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="5c3434d8b831745673c31e186906f463e1036301" BarId="279843" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="04752cb2abae96e13adee371bf45a334fc7a32d2" BarId="280037" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25418.105">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25419.104">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
7+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25418.105">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25419.104">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
11+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25418.105">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25419.104">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
15+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25418.105">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25419.104">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
19+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25418.105">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25419.104">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
23+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.7.25317.2">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>8a6c1d81657ef04c040f598cafacf8f5a33abda2</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25418.105">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25419.104">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
31+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25418.105">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25419.104">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
35+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25418.105">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25419.104">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
39+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25418.105">
41+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25419.104">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
43+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25418.105">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25419.104">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
47+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25418.105">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25419.104">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
51+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25418.105">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25419.104">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
55+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25418.105">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25419.104">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
59+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25418.105">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25419.104">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
63+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25418.105">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25419.104">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
67+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25418.105">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25419.104">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
71+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25418.105">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25419.104">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
75+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25418.105">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25419.104">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
81+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
8282
</Dependency>
83-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25418.105">
83+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25419.104">
8484
<Uri>https://github.com/dotnet/dotnet</Uri>
85-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
85+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
8686
</Dependency>
87-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25418.105">
87+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25419.104">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
89+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25418.105">
91+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25419.104">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
93+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
9494
</Dependency>
9595
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
9696
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
@@ -101,9 +101,9 @@
101101
<Uri>https://github.com/dotnet/dotnet</Uri>
102102
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
103103
</Dependency>
104-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25418.105">
104+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25419.104">
105105
<Uri>https://github.com/dotnet/dotnet</Uri>
106-
<Sha>5c3434d8b831745673c31e186906f463e1036301</Sha>
106+
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
107107
</Dependency>
108108
</ToolsetDependencies>
109109
</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: 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.25418.105",
28-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25418.105",
27+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25419.104",
28+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25419.104",
2929
"Microsoft.Build.NoTargets": "3.7.56"
3030
},
3131
"native-tools": {

0 commit comments

Comments
 (0)