Skip to content

Commit 6cf9752

Browse files
authored
Update branding to 6.0.129 (#39219)
2 parents a1b47e3 + 2d90b14 commit 6cf9752

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111
<!-- Repo Version Information -->
1212
<PropertyGroup>
13-
<VersionPrefix>6.0.128</VersionPrefix>
13+
<VersionPrefix>6.0.129</VersionPrefix>
1414
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1515
</PropertyGroup>
1616
<!-- Production Dependencies -->

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithGlobalJson.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ public void It_fails_build_on_failed_sdk_resolution(bool runningInVS)
4545
var result = buildCommand.Execute($"/p:BuildingInsideVisualStudio={runningInVS}", $"/bl:binlog{runningInVS}.binlog")
4646
.Should()
4747
.Fail();
48-
var warningString = "warning : Unable to locate the .NET SDK as specified by global.json, please check that the specified version is installed.";
49-
var errorString = "Unable to locate the .NET SDK. Check that it is installed and that the version specified in global.json (if any) matches the installed version.";
50-
if (runningInVS)
48+
var warningString = "warning : Unable to locate the .NET SDK version";
49+
var errorString = "Unable to locate the .NET SDK. Check that it is installed, your PATH is configured for the correct architecture, and that the version specified in global.json (if any) matches the installed version."; if (runningInVS)
5150
{
5251
result.And
5352
.HaveStdOutContaining(warningString)

src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void It_should_create_suggested_workload_items()
9595
.BeEquivalentTo(("microsoft-net-sdk-missingtestworkload", "microsoft.net.sdk.missingtestworkload"));
9696
}
9797

98-
[Fact]
98+
[CoreMSBuildOnlyFact]
9999
public void It_should_fail_to_restore_without_workload_when_multitargeted()
100100
{
101101
var testProject = new TestProject()

0 commit comments

Comments
 (0)