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

Merge pull request #7608 from dotnet/merges/release/2.0.0-to-master-20170907-070027

Browse source 
Merge release/2.0.0 to master
This commit is contained in:
Livar 2017-09-07 11:52:46 -07:00 • committed by GitHub
commit 80c6635fdb
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build/Signing.proj
View file

@ -40,14 +40,23 @@
<!-- Built binaries -->
<FilesToSign Include="$(OutputDirectory)/sdk/**/csc.exe;
$(OutputDirectory)/sdk/**/csc.dll;
$(OutputDirectory)/sdk/**/vbc.exe;
$(OutputDirectory)/sdk/**/vbc.dll;
$(OutputDirectory)/sdk/**/fsc.exe;
$(OutputDirectory)/sdk/**/fsi.exe;
$(OutputDirectory)/sdk/**/FSharp.*.dll;
$(OutputDirectory)/sdk/**/dotnet.dll;
$(OutputDirectory)/sdk/**/dotnet.resources.dll;
$(OutputDirectory)/sdk/**/System.*.dll;
$(OutputDirectory)/sdk/**/Microsoft.*.dll;
$(OutputDirectory)/sdk/**/NuGet*.dll;
$(OutputDirectory)/sdk/**/datacollector.dll;
$(OutputDirectory)/sdk/**/datacollector.exe;
$(OutputDirectory)/sdk/**/MSBuild.dll;
$(OutputDirectory)/sdk/**/MSBuild.resources.dll;
$(OutputDirectory)/sdk/**/testhost.dll;
$(OutputDirectory)/sdk/**/testhost.exe;
$(OutputDirectory)/sdk/**/testhost.x86.exe;
$(OutputDirectory)/sdk/**/vstest.console.dll;
$(OutputDirectory)/sdk/**/vstest.console.resources.dll">
<Authenticode>$(InternalCertificateId)</Authenticode>

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

@ -47,7 +47,7 @@ namespace Microsoft.DotNet.New.Tests
// For testing the 2.1 templates - some of their packages are currently only in private feeds.
var configFile = Path.Combine(rootPath, "NuGet.Config");
AspNetNuGetConfiguration.WriteNuGetConfigWithAspNetPrivateFeeds(configFile);
// For "normal" builds, once the packages needed for 2.1 templates are in the public feeds
// For "normal" builds, once the packages needed for 2.1 templates are in the public feeds
//var configFile = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config");
foreach (string cSharpTemplate in cSharpTemplates)
@ -79,10 +79,10 @@ namespace Microsoft.DotNet.New.Tests
}
[Theory]
[InlineData("console", "RuntimeFrameworkVersion", "microsoft.netcore.app")]
[InlineData("console", "microsoft.netcore.app")]
// re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574
//[InlineData("classlib", "NetStandardImplicitPackageVersion", "netstandard.library")]
public void NewProjectRestoresCorrectPackageVersion(string type, string propertyName, string packageName)
//[InlineData("classlib", "netstandard.library")]
public void NewProjectRestoresCorrectPackageVersion(string type, string packageName)
{
var rootPath = TestAssets.CreateTestDirectory(identifier: $"_{type}").FullName;
var packagesDirectory = Path.Combine(rootPath, "packages");