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

Merge pull request #4143 from eerhardt/NewSDK

Browse source 
Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160907-1
This commit is contained in:
Eric Erhardt 2016-09-07 15:44:23 -05:00 • committed by GitHub
commit ab8e1b707b
3 changed files with 26 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/TestProjects/MSBuildTestApp/project.json
View file

@ -2,7 +2,7 @@
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Sdk": "1.0.0-alpha-20160831-1", "Microsoft.NETCore.Sdk": "1.0.0-alpha-20160907-1",
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"version": "1.0.1", "version": "1.0.1",
"type": "platform" "type": "platform"

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

@ -3,7 +3,7 @@
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Sdk": "1.0.0-alpha-20160831-1", "Microsoft.NETCore.Sdk": "1.0.0-alpha-20160907-1",
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"type": "platform", "type": "platform",
"version": "1.0.1" "version": "1.0.1"

54
test/EndToEnd/GivenDotNetUsesMSBuild.cs
View file

@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information. // Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Runtime.InteropServices;
using Microsoft.DotNet.Tools.Test.Utilities; using Microsoft.DotNet.Tools.Test.Utilities;
using Xunit; using Xunit;
@ -12,40 +11,35 @@ namespace Microsoft.DotNet.Tests.EndToEnd
[Fact] [Fact]
public void ItCanNewRestoreBuildRunMSBuildProject() public void ItCanNewRestoreBuildRunMSBuildProject()
{ {
// The current ResolveNuGetAssets target does not work on case-sensitive file systems. We need https://github.com/dotnet/sdk/pull/10 using (DisposableDirectory directory = Temp.CreateDirectory())
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ||
RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{ {
using (DisposableDirectory directory = Temp.CreateDirectory()) string projectDirectory = directory.Path;
{
string projectDirectory = directory.Path;
new NewCommand() new NewCommand()
.WithWorkingDirectory(projectDirectory) .WithWorkingDirectory(projectDirectory)
.Execute("-t msbuild") .Execute("-t msbuild")
.Should() .Should()
.Pass(); .Pass();
new RestoreCommand() new RestoreCommand()
.WithWorkingDirectory(projectDirectory) .WithWorkingDirectory(projectDirectory)
.Execute() .Execute()
.Should() .Should()
.Pass(); .Pass();
new Build3Command() new Build3Command()
.WithWorkingDirectory(projectDirectory) .WithWorkingDirectory(projectDirectory)
.Execute() .Execute()
.Should() .Should()
.Pass(); .Pass();
new Run3Command() new Run3Command()
.WithWorkingDirectory(projectDirectory) .WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput() .ExecuteWithCapturedOutput()
.Should() .Should()
.Pass() .Pass()
.And .And
.HaveStdOutContaining("Hello World!"); .HaveStdOutContaining("Hello World!");
}
} }
} }
} }