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

Addressing code review comments.

Browse source
This commit is contained in:
Livar Cunha 2016-09-27 16:29:56 -07:00
parent c04f7a0cd0
commit 715f1f6a10
5 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
View file

@ -5,7 +5,6 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp1.0</TargetFrameworks> <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
src/dotnet/commands/dotnet-new/CSharp_MSBuild/$projectName$.csproj
View file

@ -7,8 +7,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs" Exclude="$(GlobalExclude)" /> <Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" /> <EmbeddedResource Include="**\*.resx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

7
src/dotnet/commands/dotnet-new/Program.cs
View file

@ -94,12 +94,11 @@ namespace Microsoft.DotNet.Tools.New
private static void ReplaceProjectJsonTemplateValues(string projectDirectory) private static void ReplaceProjectJsonTemplateValues(string projectDirectory)
{ {
string projectJsonFile = Path.Combine(projectDirectory, "project.json"); string projectJsonFile = Path.Combine(projectDirectory, "project.json");
string projectJsonTemplateFile = Path.Combine(projectDirectory, "project.json.template");
if(File.Exists(Path.Combine(projectDirectory, "project.json.template"))) if(File.Exists(projectJsonTemplateFile))
{ {
File.Move( File.Move(projectJsonTemplateFile, projectJsonFile);
Path.Combine(projectDirectory, "project.json.template"),
projectJsonFile);
} }
} }

1
test/EndToEnd/GivenDotNetUsesMSBuild.cs
View file

@ -33,6 +33,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
.Should() .Should()
.Pass(); .Pass();
//TODO: https://github.com/dotnet/sdk/issues/187 - remove framework from below.
new Run3Command() new Run3Command()
.WithWorkingDirectory(projectDirectory) .WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput("--framework netcoreapp1.0") .ExecuteWithCapturedOutput("--framework netcoreapp1.0")

2
test/dotnet-run3.Tests/GivenDotnetRun3RunsCsProj.cs
View file

@ -29,6 +29,7 @@ namespace Microsoft.DotNet.Cli.Run3.Tests
.Should() .Should()
.Pass(); .Pass();
//TODO: https://github.com/dotnet/sdk/issues/187 - remove framework from below.
new Run3Command() new Run3Command()
.WithWorkingDirectory(testProjectDirectory) .WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput("--framework netcoreapp1.0") .ExecuteWithCapturedOutput("--framework netcoreapp1.0")
@ -53,6 +54,7 @@ namespace Microsoft.DotNet.Cli.Run3.Tests
.Should() .Should()
.Pass(); .Pass();
//TODO: https://github.com/dotnet/sdk/issues/187 - remove framework from below.
new Run3Command() new Run3Command()
.WithWorkingDirectory(testProjectDirectory) .WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput("--framework netcoreapp1.0") .ExecuteWithCapturedOutput("--framework netcoreapp1.0")