Skip to content

Commit a81cc59

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from build 307198 (#37968)
[main] Source code updates from dotnet/dotnet
1 parent aeda6f5 commit a81cc59

31 files changed

Lines changed: 537 additions & 822 deletions

‎eng/Version.Details.props‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ This file should be imported by eng/Versions.props
55
-->
66
<Project>
77
<PropertyGroup>
8-
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26151.104</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26151.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26151.104</MicrosoftDotNetHelixSdkPackageVersion>
12-
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-preview.3.26151.104</MicrosoftExtensionsCachingMemoryPackageVersion>
13-
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-preview.3.26151.104</MicrosoftExtensionsConfigurationPackageVersion>
14-
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>11.0.0-preview.3.26151.104</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
15-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-preview.3.26151.104</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
16-
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-preview.3.26151.104</MicrosoftExtensionsConfigurationJsonPackageVersion>
17-
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-preview.3.26151.104</MicrosoftExtensionsDependencyInjectionPackageVersion>
18-
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-preview.3.26151.104</MicrosoftExtensionsDependencyModelPackageVersion>
19-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-preview.3.26151.104</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
20-
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.3.26151.104</MicrosoftExtensionsLoggingPackageVersion>
21-
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.3.26151.104</MicrosoftNETCoreAppRefPackageVersion>
22-
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.3.26151.104</MicrosoftNETCorePlatformsPackageVersion>
23-
<SystemFormatsAsn1PackageVersion>11.0.0-preview.3.26151.104</SystemFormatsAsn1PackageVersion>
24-
<SystemRuntimeCachingPackageVersion>11.0.0-preview.3.26151.104</SystemRuntimeCachingPackageVersion>
25-
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.3.26151.104</SystemTextEncodingsWebPackageVersion>
26-
<SystemTextJsonPackageVersion>11.0.0-preview.3.26151.104</SystemTextJsonPackageVersion>
8+
<!-- dotnet-dotnet dependencies -->
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26171.106</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26171.106</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26171.106</MicrosoftDotNetHelixSdkPackageVersion>
12+
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-preview.3.26171.106</MicrosoftExtensionsCachingMemoryPackageVersion>
13+
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-preview.3.26171.106</MicrosoftExtensionsConfigurationPackageVersion>
14+
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>11.0.0-preview.3.26171.106</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
15+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-preview.3.26171.106</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
16+
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-preview.3.26171.106</MicrosoftExtensionsConfigurationJsonPackageVersion>
17+
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-preview.3.26171.106</MicrosoftExtensionsDependencyInjectionPackageVersion>
18+
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-preview.3.26171.106</MicrosoftExtensionsDependencyModelPackageVersion>
19+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-preview.3.26171.106</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
20+
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.3.26171.106</MicrosoftExtensionsLoggingPackageVersion>
21+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.3.26171.106</MicrosoftNETCoreAppRefPackageVersion>
22+
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.3.26171.106</MicrosoftNETCorePlatformsPackageVersion>
23+
<SystemFormatsAsn1PackageVersion>11.0.0-preview.3.26171.106</SystemFormatsAsn1PackageVersion>
24+
<SystemRuntimeCachingPackageVersion>11.0.0-preview.3.26171.106</SystemRuntimeCachingPackageVersion>
25+
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.3.26171.106</SystemTextEncodingsWebPackageVersion>
26+
<SystemTextJsonPackageVersion>11.0.0-preview.3.26171.106</SystemTextJsonPackageVersion>
2727
</PropertyGroup>
2828
<!--Property group for alternate package version names-->
2929
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="a66d14e1fcfc6474837f9c951759d049c380bc59" BarId="303883" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="840ea139a6e8aebe487f7041190f3865a74378d9" BarId="307198" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-preview.3.26151.104">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-preview.3.26171.106">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
7+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-preview.3.26151.104">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-preview.3.26171.106">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
11+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="11.0.0-preview.3.26151.104">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="11.0.0-preview.3.26171.106">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
15+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-preview.3.26151.104">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-preview.3.26171.106">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
19+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-preview.3.26151.104">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-preview.3.26171.106">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
23+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.3.26151.104">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.3.26171.106">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
27+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-preview.3.26151.104">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-preview.3.26171.106">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
31+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-preview.3.26151.104">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-preview.3.26171.106">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
35+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.3.26151.104">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.3.26171.106">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
39+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.3.26151.104">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.3.26171.106">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
43+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.3.26151.104">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.3.26171.106">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
47+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Json" Version="11.0.0-preview.3.26151.104">
49+
<Dependency Name="System.Text.Json" Version="11.0.0-preview.3.26171.106">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
51+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.3.26151.104">
53+
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.3.26171.106">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
55+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Asn1" Version="11.0.0-preview.3.26151.104">
57+
<Dependency Name="System.Formats.Asn1" Version="11.0.0-preview.3.26171.106">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
59+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Runtime.Caching" Version="11.0.0-preview.3.26151.104">
61+
<Dependency Name="System.Runtime.Caching" Version="11.0.0-preview.3.26171.106">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
63+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26151.104">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26171.106">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
69+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26151.104">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26171.106">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
73+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26151.104">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26171.106">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
77+
<Sha>840ea139a6e8aebe487f7041190f3865a74378d9</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

‎eng/common/build.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Param(
66
[string][Alias('v')]$verbosity = "minimal",
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
9+
[string] $warnNotAsError = '',
910
[bool] $nodeReuse = $true,
1011
[switch] $buildCheck = $false,
1112
[switch][Alias('r')]$restore,
@@ -70,6 +71,7 @@ function Print-Usage() {
7071
Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)"
7172
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
7273
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
74+
Write-Host " -warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
7375
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
7476
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
7577
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"

‎eng/common/build.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ usage()
4242
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
4343
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
4444
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
45+
echo " --warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
4546
echo " --buildCheck <value> Sets /check msbuild parameter"
4647
echo " --fromVMR Set when building from within the VMR"
4748
echo ""
@@ -78,6 +79,7 @@ ci=false
7879
clean=false
7980

8081
warn_as_error=true
82+
warn_not_as_error=''
8183
node_reuse=true
8284
build_check=false
8385
binary_log=false
@@ -176,6 +178,10 @@ while [[ $# -gt 0 ]]; do
176178
warn_as_error=$2
177179
shift
178180
;;
181+
-warnnotaserror)
182+
warn_not_as_error=$2
183+
shift
184+
;;
179185
-nodereuse)
180186
node_reuse=$2
181187
shift

0 commit comments

Comments
 (0)