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

Merge pull request #8261 from dotnet/merges/release/2.1-to-master-20171218-080046

Browse source 
Merge release/2.1 to master
This commit is contained in:
Livar 2017-12-18 16:12:05 -08:00 committed by GitHub
commit 72ead45476
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/DependencyVersions.props
View file

@ -57,6 +57,7 @@
<PropertyGroup>
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-25908-02</CLI_NETStandardLibraryNETFrameworkVersion>
<SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<!-- This is the version for ASP.NET packages that the CLI depends on to build, like the

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

@ -88,6 +88,7 @@ namespace Microsoft.DotNet.New.Tests
var packagesDirectory = Path.Combine(rootPath, "packages");
var projectName = "Project";
var expectedVersion = GetFrameworkPackageVersion();
var repoRootNuGetConfig = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config");
new NewCommand()