Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 5952487

Browse files
author
Livar
authored
Merge pull request #9421 from johnbeisner/FixProdConIssues
Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests
2 parents 05348ce + 79b4809 commit 5952487

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

build/DependencyVersions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<DotnetSqlCachePackageVersion>2.1.0</DotnetSqlCachePackageVersion>
1010
<DotnetUserSecretsPackageVersion>2.1.0</DotnetUserSecretsPackageVersion>
1111
<DotnetWatchPackageVersion>2.1.0</DotnetWatchPackageVersion>
12-
<MicrosoftNETCoreAppPackageVersion>2.1.0</MicrosoftNETCoreAppPackageVersion>
12+
<MicrosoftNETCoreAppPackageVersion>2.1.1-rtm-26531-02</MicrosoftNETCoreAppPackageVersion>
1313
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
1414
<MicrosoftBuildPackageVersion>15.7.179</MicrosoftBuildPackageVersion>
1515
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>

build/Test.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
</Target>
9090

9191
<Target Name="TestsForBuildItself">
92-
<DotNetMSBuild Arguments="/v:diag $(RepoRoot)/test/MsBuildScript.Tests/runtests.target"
92+
<DotNetMSBuild Arguments="/v:diag $(RepoRoot)/test/MsBuildScript.Tests/runtests.target /p:PB_AssetRootUrl=$(PB_AssetRootUrl)"
9393
ToolPath="$(PreviousStageDirectory)" />
9494
</Target>
9595

test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public void ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile()
304304

305305
result.Should().NotBeNull();
306306

307-
result.Args.Should().Contain("--fx-version 2.1.0");
307+
result.Args.Should().Contain("--fx-version 2.1.1");
308308
}
309309

310310
[Fact]

test/dotnet-new.Tests/GivenThatIWantANewApp.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ private void CreateAndRestoreNewProject(
7575
}
7676

7777
[Theory]
78-
[InlineData("console", "microsoft.netcore.app")]
79-
// re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574
78+
// [InlineData("console", "microsoft.netcore.app")] re-enable when this issue is resolved: "https://github.com/dotnet/cli/issues/9420"
8079
[InlineData("classlib", "netstandard.library")]
8180
public void NewProjectRestoresCorrectPackageVersion(string type, string packageName)
8281
{
@@ -107,7 +106,7 @@ string GetFrameworkPackageVersion()
107106
var sharedFxDir = dotnetDir
108107
.GetDirectory("shared", "Microsoft.NETCore.App")
109108
.EnumerateDirectories()
110-
.Single(d => d.Name.StartsWith("2.1.0"));
109+
.Single(d => d.Name.StartsWith("2.1.1"));
111110

112111
if (packageName == "microsoft.netcore.app")
113112
{

0 commit comments

Comments
 (0)