8000 [main] Source code updates from dotnet/msbuild (#1378) · dotnet/dotnet@59a54b9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 59a54b9

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/msbuild (#1378)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent eaa19c2 commit 59a54b9

File tree

6 files changed

+33
-20
lines changed
< 8000 button data-component="IconButton" type="button" data-testid="expand-file-tree-button" aria-expanded="false" aria-controls="diff_file_tree" class="prc-Button-ButtonBase-c50BI d-md-none position-relative fgColor-muted prc-Button-IconButton-szpyj" data-loading="false" data-no-visuals="true" data-size="medium" data-variant="invisible" aria-describedby=":R6iplab:-loading-announcement" aria-labelledby=":Riplab:">

6 files changed

+33
-20
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="msbuild" Sha="0785dfdb947fe301da00b7c331d6adfdeda5b283" BarId="272949" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="msbuild" Sha="2fd058a2011cf1842cb3a42531e34987e948602e" BarId="273672" />
44
<ProductDependencies>
55
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
66
<Dependency Name="Microsoft.Bcl.Cryptography" Version="9.0.0">
@@ -112,21 +112,21 @@
112112
</Dependency>
113113
</ProductDependencies>
114114
<ToolsetDependencies>
115-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25323.2">
115+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25325.4">
116116
<Uri>https://github.com/dotnet/arcade</Uri>
117-
<Sha>533b40ed3b73fcb6f4509e301db76203bd58f920</Sha>
117+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
118118
</Dependency>
119119
<Dependency Name="NuGet.Build.Tasks" Version="6.15.0-preview.1.86">
120120
<Uri>https://github.com/nuget/nuget.client</Uri>
121121
<Sha>eb38c4a6cccfce5ee9415da1a930fc6534194b2b</Sha>
122122
</Dependency>
123-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25321.2">
123+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25328.2">
124124
<Uri>https://github.com/dotnet/roslyn</Uri>
125-
<Sha>fbb35c25b4623b1d5fa7ee239f81e146ea2232b5</Sha>
125+
<Sha>a26b3057233e8d75bca43df8a5f1c938952ef05d</Sha>
126126
</Dependency>
127-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25323.2">
127+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25325.4">
128128
<Uri>https://github.com/dotnet/arcade</Uri>
129-
<Sha>533b40ed3b73fcb6f4509e301db76203bd58f920</Sha>
129+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
130130
</Dependency>
131131
</ToolsetDependencies>
132132
</Dependencies>

‎src/msbuild/eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@
8080
Otherwise, this version of dotnet will not be installed and the build will error out. -->
8181
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
8282
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
83-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25323.2</MicrosoftDotNetXUnitExtensionsVersion>
83+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25325.4</MicrosoftDotNetXUnitExtensionsVersion>
8484
<NuGetBuildTasksVersion>6.15.0-preview.1.86</NuGetBuildTasksVersion>
85-
<MicrosoftNetCompilersToolsetVersion>5.0.0-1.25321.2</MicrosoftNetCompilersToolsetVersion>
85+
<MicrosoftNetCompilersToolsetVersion>5.0.0-1.25328.2</MicrosoftNetCompilersToolsetVersion>
8686
</PropertyGroup>
8787
<PropertyGroup>
8888
<BootstrapSdkVersion>9.0.301</BootstrapSdkVersion>

‎src/msbuild/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"xcopy-msbuild": "17.12.0"
1616
},
1717
"msbuild-sdks": {
18-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25323.2"
18+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4"
1919
}
2020
}

‎src/msbuild/src/Framework/EnvironmentVariableReadEventArgs.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ public EnvironmentVariableReadEventArgs(
4040
/// Initializes an instance of the EnvironmentVariableReadEventArgs class.
4141
/// </summary>
4242
/// <param name="environmentVarName">The name of the environment variable that was read.</param>
43-
/// <param name="environmentVarValue">The value of the environment variable that was read.</param>
44-
/// <param name="file">file associated with the event</param>
45-
/// <param name="line">line number (0 if not applicable)</param>
46-
/// <param name="column">column number (0 if not applicable)</param>
43+
/// <param name="message">Message for the log.</param>
44+
/// <param name="file">file associated with the event.</param>
45+
/// <param name="line">line number (0 if not applicable).</param>
46+
/// <param name="column">column number (0 if not applicable).</param>
4747
public EnvironmentVariableReadEventArgs(
4848
string environmentVarName,
49-
string environmentVarValue,
49+
string message,
5050
string file,
5151
int line,
5252
int column)
53-
: base(environmentVarValue, file, line, column, MessageImportance.Low) => EnvironmentVariableName = environmentVarName;
53+
: base(message, file, line, column, MessageImportance.Low) => EnvironmentVariableName = environmentVarName;
5454

5555
/// <summary>
5656
/// The name of the environment variable that was read.

‎src/msbuild/src/Tasks.UnitTests/ResolveAssemblyReference_CustomCultureTests.cs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
< A3E2 button class="Button Button--iconOnly Button--invisible ExpandableHunkHeaderDiffLine-module__expand-button-line--wZKjF ExpandableHunkHeaderDiffLine-module__expand-button-unified--Eae6C" aria-label="Expand file up from line 7" data-direction="up" aria-hidden="true" tabindex="-1">
@@ -7,6 +7,7 @@
77
using Microsoft.Build.UnitTests.Shared;
88
using Shouldly;
99
using Xunit;
10+
using Xunit.Abstractions;
1011

1112
namespace Microsoft.Build.Tasks.UnitTests
1213
{
@@ -15,6 +16,13 @@ namespace Microsoft.Build.Tasks.UnitTests
1516
/// </summary>
1617
public class ResolveAssemblyReference_CustomCultureTests
1718
{
19+
private readonly ITestOutputHelper _output;
20+
21+
public ResolveAssemblyReference_CustomCultureTests(ITestOutputHelper output)
22+
{
23+
_output = output;
24+
}
25+
1826
private static string TestAssetsRootPath { get; } = Path.Combine(
1927
Path.GetDirectoryName(typeof(AddToWin32Manifest_Tests).Assembly.Location) ?? AppContext.BaseDirectory,
2028
"TestResources",
@@ -30,7 +38,7 @@ public class ResolveAssemblyReference_CustomCultureTests
3038
[InlineData(true, "euy;yue")]
3139
public void E2EScenarioTests(bool enableCustomCulture, string customCultureExclusions = "", bool isYueCultureExpected = false, bool isEuyCultureExpected = false)
3240
{
33-
using (TestEnvironment env = TestEnvironment.Create())
41+
using (TestEnvironment env = TestEnvironment.Create(_output))
34< FB68 code>42
{
3543
// Set up project paths
3644
var testAssetsPath = TestAssetsRootPath;
@@ -57,7 +65,12 @@ public void E2EScenarioTests(bool enableCustomCulture, string customCultureExclu
5765
env.SetCurrentDirectory(projectBFolder);
5866
var output = RunnerUtilities.ExecBootstrapedMSBuild("-restore", out bool buildSucceeded);
5967

60-
buildSucceeded.ShouldBeTrue($"MSBuild should complete successfully. Build output: {output}");
68+
if (!buildSucceeded)
69+
{
70+
_output.WriteLine(output);
71+
}
72+
73+
buildSucceeded.ShouldBeTrue("MSBuild should complete successfully.");
6174

6275
var yueCultureResourceDll = Path.Combine(projBOutputPath, "yue", "ProjectA.resources.dll");
6376
AssertCustomCulture(isYueCultureExpected, "yue", yueCultureResourceDll);

‎src/source-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
"commitSha": "7346d84a24dd15155d74f8179788a423cbdd962a"
6262
},
6363
{
64-
"barId": 273615,
64+
"barId": 273725,
6565
"path": "msbuild",
6666
"remoteUri": "https://github.com/dotnet/msbuild",
67-
"commitSha": "0e2431add8a483acfd985c6fdd352ebfcade6755"
67+
"commitSha": "0122ba37ede14177fc0d5da0f9e3d9e283c354e8"
6868
},
6969
{
7070
"barId": 271771,

0 commit comments

Comments
 (0)
0