Skip to content

Commit 9b45365

Browse files
authored
Merge branch 'release/8.0.1xx' into fix-local-fullframework
2 parents a082087 + 0535724 commit 9b45365

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212
<!-- Repo Version Information -->
1313
<PropertyGroup>
14-
<VersionPrefix>8.0.106</VersionPrefix>
14+
<VersionPrefix>8.0.107</VersionPrefix>
1515
<!-- Enable to remove prerelease label. -->
1616
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@ public void It_fails_build_on_failed_sdk_resolution(bool runningInVS)
3535
var result = buildCommand.Execute($"/p:BuildingInsideVisualStudio={runningInVS}", $"/bl:binlog{runningInVS}.binlog")
3636
.Should()
3737
.Fail();
38-
var warningString = runningInVS
39-
? "warning : Unable to locate the .NET SDK version '9.9.999' as specified by global.json, please check that the specified version is installed."
40-
: "warning : Unable to locate the .NET SDK as specified by global.json, please check that the specified version is installed.";
41-
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.";
38+
var warningString = "warning : Unable to locate the .NET SDK";
39+
var errorString = "Unable to locate the .NET SDK. Check that it is installed";
4240
if (runningInVS)
4341
{
4442
result.And

0 commit comments

Comments
 (0)