Skip to content

Commit 1a4d14a

Browse files
dotnet-maestro[bot]GangWang01JanKrivanek
authored
[vs17.12] Update dependencies from dotnet/arcade (#11034)
* Update dependencies from https://github.com/dotnet/arcade build 20241122.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24562.13 -> To Version 9.0.0-beta.24572.2 * Update version prefix to 17.12.14 * Update BootstrapSdkVersion * Decreasing severity of IDE0306 * Decrease IDE0303 severity * Update cibuild_bootstrapped_msbuild.ps1 * Update cibuild_bootstrapped_msbuild.sh --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]> Co-authored-by: Jan Krivanek <[email protected]>
1 parent ed8c6ae commit 1a4d14a

File tree

9 files changed

+25
-19
lines changed

9 files changed

+25
-19
lines changed

.editorconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,10 @@ dotnet_diagnostic.IDE0290.severity = suggestion
410410

411411
# Collection initialization can be simplified
412412
dotnet_diagnostic.IDE0300.severity = suggestion
413+
dotnet_diagnostic.IDE0303.severity = suggestion
413414
dotnet_diagnostic.IDE0301.severity = suggestion
414415
dotnet_diagnostic.IDE0305.severity = suggestion
416+
dotnet_diagnostic.IDE0306.severity = suggestion
415417

416418
# Temporarily disable SA1010 "Opening square brackets should not be preceded by a space" until https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3687 is fixed
417419
dotnet_diagnostic.SA1010.severity = none
@@ -445,4 +447,4 @@ dotnet_diagnostic.xUnit1031.severity = none
445447
# However to fix the warning for collections with 1 elements we should use Assert.Single() instead of Assert.Equal(1, collection.Count)
446448
# The latter brings incosistency in the codebase and some times in one test case.
447449
# So we are disabling this rule with respect to the above mentioned reasons.
448-
dotnet_diagnostic.xUnit2013.severity = none
450+
dotnet_diagnostic.xUnit2013.severity = none

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,19 @@
7171
</Dependency>
7272
</ProductDependencies>
7373
<ToolsetDependencies>
74-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24562.13">
74+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24572.2">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>1c7e09a8d9c9c9b15ba574cd6a496553505559de</Sha>
76+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
7777
</Dependency>
7878
<!-- Intermediate is necessary for source build. -->
79-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24562.13">
79+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24572.2">
8080
<Uri>https://github.com/dotnet/arcade</Uri>
81-
<Sha>1c7e09a8d9c9c9b15ba574cd6a496553505559de</Sha>
81+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
8282
<SourceBuild RepoName="arcade" ManagedOnly="true" />
8383
</Dependency>
84-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24562.13">
84+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24572.2">
8585
<Uri>https://github.com/dotnet/arcade</Uri>
86-
<Sha>1c7e09a8d9c9c9b15ba574cd6a496553505559de</Sha>
86+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
8787
</Dependency>
8888
<Dependency Name="NuGet.Build.Tasks" Version="6.12.0-rc.106">
8989
<Uri>https://github.com/nuget/nuget.client</Uri>
@@ -98,9 +98,9 @@
9898
<Sha>df4ae6b81013ac45367372176b9c3135a35a7e3c</Sha>
9999
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24562.13">
101+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24572.2">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>1c7e09a8d9c9c9b15ba574cd6a496553505559de</Sha>
103+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
104104
</Dependency>
105105
</ToolsetDependencies>
106106
</Dependencies>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
44
<PropertyGroup>
5-
<VersionPrefix>17.12.18</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
5+
<VersionPrefix>17.12.19</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
66
<PackageValidationBaselineVersion>17.11.4</PackageValidationBaselineVersion>
77
<AssemblyVersion>15.1.0.0</AssemblyVersion>
88
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
@@ -49,15 +49,15 @@
4949
Otherwise, this version of dotnet will not be installed and the build will error out. -->
5050
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
5151
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
52-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24562.13</MicrosoftDotNetXUnitExtensionsVersion>
52+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24572.2</MicrosoftDotNetXUnitExtensionsVersion>
5353
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
5454
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
5555
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.24463.9</MicrosoftNetCompilersToolsetVersion>
5656
<NuGetBuildTasksVersion>6.12.0-rc.106</NuGetBuildTasksVersion>
5757
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
5858
</PropertyGroup>
5959
<PropertyGroup Condition="!$(TargetFramework.StartsWith('net4'))">
60-
<BootstrapSdkVersion>9.0.100-rc.2.24474.11</BootstrapSdkVersion>
60+
<BootstrapSdkVersion>9.0.100</BootstrapSdkVersion>
6161
</PropertyGroup>
6262
<Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">
6363
<!-- See https://github.com/dotnet/arcade/issues/3386

eng/cibuild_bootstrapped_msbuild.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ try {
8686
{
8787
$buildToolPath = Join-Path $bootstrapRoot "core\dotnet.exe"
8888
# The version must be consistent with BootstrapSdkVersion
89-
$buildToolCommand = Join-Path $bootstrapRoot "core\sdk\9.0.100-rc.2.24474.11\MSBuild.dll"
89+
$buildToolCommand = Join-Path $bootstrapRoot "core\sdk\9.0.100\MSBuild.dll"
9090
$buildToolFramework = "net9.0"
9191
}
9292

eng/cibuild_bootstrapped_msbuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if [ $host_type = "core" ]
6060
then
6161
_InitializeBuildTool="$bootstrapRoot/core/dotnet"
6262
# The version must be consistent with BootstrapSdkVersion
63-
_InitializeBuildToolCommand="$bootstrapRoot/core/sdk/9.0.100-rc.2.24474.11/MSBuild.dll"
63+
_InitializeBuildToolCommand="$bootstrapRoot/core/sdk/9.0.100/MSBuild.dll"
6464
_InitializeBuildToolFramework="net9.0"
6565
else
6666
echo "Unsupported hostType ($host_type)"

eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"allowPrerelease": true
44
},
55
"tools": {
6-
"dotnet": "9.0.100-rc.2.24474.11",
6+
"dotnet": "9.0.100",
77
"vs": {
88
"version": "17.10.0"
99
},
1010
"xcopy-msbuild": "17.10.0-pre.4.0"
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13"
13+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2"
1414
}
1515
}

src/MSBuild.Bootstrap.Utils/Tasks/InstallDotNetCoreTask.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ public override bool Execute()
8181

8282
protected override string GenerateFullPathToTool() => ToolName;
8383

84+
// Do not use the normal parse-for-canonical-errors mechanism since install-scripts can emit nonfatal curl errors that match that pattern.
85+
// Instead, log everything as a message and rely on the final success/failure return.
86+
protected override void LogEventsFromTextOutput(string singleLine, MessageImportance messageImportance) => Log.LogMessage(messageImportance, singleLine);
87+
8488
/// <summary>
8589
/// Downloads the .NET Core installation script asynchronously from the specified URL.
8690
/// </summary>

0 commit comments

Comments
 (0)