mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merged PR 126473: Port Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests #9421

Browse source 
Porting Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests #9421 from GitHub
This commit is contained in:
Matt Mitchell 2018-06-06 00:35:05 +00:00
commit 27ae13af80
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/DependencyVersions.props
View file

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

2
build/Test.targets
View file

@ -89,7 +89,7 @@
</Target> </Target>
<Target Name="TestsForBuildItself"> <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)" /> ToolPath="$(PreviousStageDirectory)" />
</Target> </Target>

2
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
View file

@ -304,7 +304,7 @@ namespace Microsoft.DotNet.Tests
result.Should().NotBeNull(); result.Should().NotBeNull();
result.Args.Should().Contain("--fx-version 2.1.0"); result.Args.Should().Contain("--fx-version 2.1.2");
} }
[Fact] [Fact]

5
test/dotnet-new.Tests/GivenThatIWantANewApp.cs
View file

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