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

Update project.json template to be netcoreapp1.0

Browse source 
It should be time, now that RID inference is off, to update dotnet new to finally use netcoreapp1.0.
This commit is contained in:
Peter Marcu 2016-04-01 10:34:04 -07:00 • committed by Peter Marcu
parent f6fa1cf060
commit d8858e4d6b
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template
View file

@ -10,6 +10,6 @@
} }
}, },
"frameworks": { "frameworks": {
"netstandard1.5": {} "netcoreapp1.0": {}
} }
} }

12
test/EndToEnd/EndToEndTest.cs
View file

@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
{ {
public class EndToEndTest : TestBase public class EndToEndTest : TestBase
{ {
private static readonly string NetStandardTfm = "netstandard1.5"; private static readonly string NetCoreAppTfm = "netcoreapp1.0";
private static readonly string s_expectedOutput = "Hello World!" + Environment.NewLine; private static readonly string s_expectedOutput = "Hello World!" + Environment.NewLine;
private static readonly string s_testdirName = "e2etestroot"; private static readonly string s_testdirName = "e2etestroot";
private static readonly string s_outputdirName = "test space/bin"; private static readonly string s_outputdirName = "test space/bin";
@ -44,7 +44,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
[Fact] [Fact]
public void TestDotnetBuild() public void TestDotnetBuild()
{ {
var buildCommand = new BuildCommand(TestProject, output: OutputDirectory, framework: NetStandardTfm); var buildCommand = new BuildCommand(TestProject, output: OutputDirectory, framework: NetCoreAppTfm);
buildCommand.Execute().Should().Pass(); buildCommand.Execute().Should().Pass();
@ -55,7 +55,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
public void TestDotnetIncrementalBuild() public void TestDotnetIncrementalBuild()
{ {
// first build // first build
var buildCommand = new BuildCommand(TestProject, output: OutputDirectory, framework: NetStandardTfm); var buildCommand = new BuildCommand(TestProject, output: OutputDirectory, framework: NetCoreAppTfm);
buildCommand.Execute().Should().Pass(); buildCommand.Execute().Should().Pass();
TestOutputExecutable(OutputDirectory, buildCommand.GetPortableOutputName(), s_expectedOutput); TestOutputExecutable(OutputDirectory, buildCommand.GetPortableOutputName(), s_expectedOutput);
@ -90,7 +90,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
return; return;
} }
var buildCommand = new BuildCommand(TestProject, output: OutputDirectory, native: true, framework: NetStandardTfm); var buildCommand = new BuildCommand(TestProject, output: OutputDirectory, native: true, framework: NetCoreAppTfm);
buildCommand.Execute().Should().Pass(); buildCommand.Execute().Should().Pass();
@ -105,7 +105,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
return; return;
} }
var buildCommand = new BuildCommand(TestProject, output: OutputDirectory, native: true, nativeCppMode: true, framework: NetStandardTfm); var buildCommand = new BuildCommand(TestProject, output: OutputDirectory, native: true, nativeCppMode: true, framework: NetCoreAppTfm);
buildCommand.Execute().Should().Pass(); buildCommand.Execute().Should().Pass();
@ -121,7 +121,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
} }
// first build // first build
var buildCommand = new BuildCommand(TestProject, output: OutputDirectory, native: true, nativeCppMode: true, framework: NetStandardTfm); var buildCommand = new BuildCommand(TestProject, output: OutputDirectory, native: true, nativeCppMode: true, framework: NetCoreAppTfm);
var binariesOutputDirectory = GetCompilationOutputPath(OutputDirectory, false); var binariesOutputDirectory = GetCompilationOutputPath(OutputDirectory, false);
buildCommand.Execute().Should().Pass(); buildCommand.Execute().Should().Pass();