Merge pull request #9421 from johnbeisner/FixProdConIssues

Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests

Author: Livar

build/DependencyVersions.props

@@ -9,7 +9,7 @@
     <DotnetSqlCachePackageVersion>2.1.0</DotnetSqlCachePackageVersion>
     <DotnetUserSecretsPackageVersion>2.1.0</DotnetUserSecretsPackageVersion>
     <DotnetWatchPackageVersion>2.1.0</DotnetWatchPackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>2.1.0</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>2.1.1-rtm-26531-02</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
     <MicrosoftBuildPackageVersion>15.7.179</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>

build/Test.targets

@@ -89,7 +89,7 @@
   </Target>
 
   <Target Name="TestsForBuildItself">
-    <DotNetMSBuild Arguments="/v:diag $(RepoRoot)/test/MsBuildScript.Tests/runtests.target"
+    <DotNetMSBuild Arguments="/v:diag $(RepoRoot)/test/MsBuildScript.Tests/runtests.target /p:PB_AssetRootUrl=$(PB_AssetRootUrl)"
                    ToolPath="$(PreviousStageDirectory)" />
   </Target>
 

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

@@ -304,7 +304,7 @@ public void ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile()
 
             result.Should().NotBeNull();
 
-            result.Args.Should().Contain("--fx-version 2.1.0");
+            result.Args.Should().Contain("--fx-version 2.1.1");
         }
 
         [Fact]

test/dotnet-new.Tests/GivenThatIWantANewApp.cs

@@ -75,8 +75,7 @@ private void CreateAndRestoreNewProject(
         }
 
         [Theory]
-        [InlineData("console", "microsoft.netcore.app")]
-        // re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574
+        // [InlineData("console", "microsoft.netcore.app")] re-enable when this issue is resolved: "https://github.com/dotnet/cli/issues/9420"
         [InlineData("classlib", "netstandard.library")]
         public void NewProjectRestoresCorrectPackageVersion(string type, string packageName)
         {
@@ -107,7 +106,7 @@ string GetFrameworkPackageVersion()
                 var sharedFxDir = dotnetDir
                     .GetDirectory("shared", "Microsoft.NETCore.App")
                     .EnumerateDirectories()
-                    .Single(d => d.Name.StartsWith("2.1.0"));
+                    .Single(d => d.Name.StartsWith("2.1.1"));
 
                 if (packageName == "microsoft.netcore.app")
                 {