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

Merge branch 'release/2.1-MSRC' into merge_release_21_msrc

Browse source 
* release/2.1-MSRC:
  Update to consume aspnetcore 2.0.5-155
  Update to consume aspnetcore 2.0.5-152
  Revert "Update to consume aspnetcore 2.0.5-152"
  Update to consume aspnetcore 2.0.5-152
  Commit to trigger a rebuild of the CLI because of a build in place from the Runtime.
  Adding the 2.0.3 asp.net store to the native installer tests.
  Update to consume aspnetcore 2.0.5-147
  Update to consume aspnetcore 2.0.5-146
  Updating the runtime to 2.0.5.
  Update to consume aspnetcore 2.0.5-142
  Fixing the expected fx-version.
  Adding a separate dependency version for Microsoft.Build.Runtime.
  Updating the branding of the CLI to 2.1.4 and the runtime to 2.0.5.

 Conflicts:
  build/DependencyVersions.props
This commit is contained in:
Livar Cunha 2018-01-09 12:49:58 -08:00
commit 6f46ea928a
22 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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