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

Merge pull request #6254 from mlorbetske/dev/mlorbe/UpdateTemplatesAndEngine

Browse source 
Update template engine & template versions
This commit is contained in:
Livar 2017-04-06 18:01:12 -07:00 committed by GitHub
commit e1b4556641
19 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/DependencyVersions.props
View file

@ -11,12 +11,12 @@
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
<TemplateEngineVersion>1.0.0-beta2-20170328-177</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170328-177</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170328-177</TemplateEngineTemplate2_0Version>
<TemplateEngineVersion>1.0.0-beta2-20170405-182</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170405-182</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170405-182</TemplateEngineTemplate2_0Version>
<PlatformAbstractionsVersion>1.0.3</PlatformAbstractionsVersion>
<DependencyModelVersion>1.0.3</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.0-alpha-88</CliCommandLineParserVersion>
<CliCommandLineParserVersion>0.1.0-alpha-138</CliCommandLineParserVersion>
</PropertyGroup>

2
build/compile/LzmaArchive.targets
View file

@ -92,7 +92,7 @@
<DotNetNew ToolPath="$(OutputDirectory)"
TemplateType="console"
TemplateArgs="--debug:ephemeral-hive"
TemplateArgs="--debug:ephemeral-hive --skip-restore"
WorkingDirectory="$(NuGetPackagesArchiveProject)/Console" />
<DotNetRestore ToolPath="$(OutputDirectory)"

2
build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs
View file

@ -47,7 +47,7 @@ namespace Microsoft.DotNet.Cli.Build
{
ToolPath = ToolPath,
TemplateType = newArgs[0],
TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\"",
TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\" --skip-restore",
HostObject = HostObject,
BuildEngine = BuildEngine
};

2
src/dotnet/commands/dotnet-migrate/TemporaryDotnetNewTemplateProject.cs
View file

@ -53,7 +53,7 @@ namespace Microsoft.DotNet.Tools.Migrate
}
Directory.CreateDirectory(tempDir);
RunCommand("new", new string[] { "console", "-o", tempDir, "--debug:ephemeral-hive" }, tempDir);
RunCommand("new", new string[] { "console", "-o", tempDir, "--debug:ephemeral-hive", "--skip-restore" }, tempDir);
return tempDir;
}

2
src/dotnet/commands/dotnet-new/NewCommandShim.cs
View file

@ -24,7 +24,7 @@ namespace Microsoft.DotNet.Tools.New
public static int Run(string[] args)
{
return New3Command.Run(CommandName, CreateHost(), FirstRun, args);
return New3Command.Run(CommandName, CreateHost(), new TelemetryLogger(null), FirstRun, args);
}
private static ITemplateEngineHost CreateHost()

2
src/dotnet/dotnet.csproj
View file

@ -40,7 +40,7 @@
<PackageReference Include="Microsoft.Win32.Registry" Version="4.3.0" />
<PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
<PackageReference Include="Microsoft.DotNet.Cli.CommandLine" Version="0.1.0-alpha-132" />
<PackageReference Include="Microsoft.DotNet.Cli.CommandLine" Version="$(CliCommandLineParserVersion)" />
<PackageReference Include="Microsoft.TemplateEngine.Abstractions" Version="$(TemplateEngineVersion)" />
<PackageReference Include="Microsoft.TemplateEngine.Cli" Version="$(TemplateEngineVersion)" />
<PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(TemplateEngineVersion)" />

2
test/EndToEnd/GivenDotNetUsesMSBuild.cs
View file

@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
{
string projectDirectory = directory.Path;
string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive";
string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive --skip-restore";
new NewCommandShim()
.WithWorkingDirectory(projectDirectory)
.Execute(newArgs)

2
test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs
View file

@ -56,7 +56,7 @@ Options:
try
{
string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive";
string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive --skip-restore";
new NewCommandShim()
.WithWorkingDirectory(projDir.Path)
.ExecuteWithCapturedOutput(args)

2
test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
View file

@ -46,7 +46,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
string dir = "pkgs";
string args = $"--packages {dir}";
string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive";
string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive --skip-restore";
new NewCommandShim()
.WithWorkingDirectory(rootPath)
.Execute(newArgs)

2
test/dotnet-list-reference.Tests/GivenDotnetListReference.cs
View file

@ -195,7 +195,7 @@ Options:
try
{
string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive";
string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive --skip-restore";
new NewCommandShim()
.WithWorkingDirectory(dir.Path)
.ExecuteWithCapturedOutput(newArgs)

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

@ -21,13 +21,13 @@ namespace Microsoft.DotNet.New.Tests
new NewCommand()
.WithWorkingDirectory(rootPath)
.Execute($"console --debug:ephemeral-hive");
.Execute($"console --debug:ephemeral-hive --skip-restore");
DateTime expectedState = Directory.GetLastWriteTime(rootPath);
var result = new NewCommand()
.WithWorkingDirectory(rootPath)
.ExecuteWithCapturedOutput($"console --debug:ephemeral-hive");
.ExecuteWithCapturedOutput($"console --debug:ephemeral-hive --skip-restore");
DateTime actualState = Directory.GetLastWriteTime(rootPath);
@ -64,7 +64,7 @@ namespace Microsoft.DotNet.New.Tests
new NewCommand()
.WithWorkingDirectory(projectFolder)
.Execute($"{projectType} --debug:ephemeral-hive")
.Execute($"{projectType} --debug:ephemeral-hive --skip-restore")
.Should().Pass();
new RestoreCommand()
@ -86,7 +86,7 @@ namespace Microsoft.DotNet.New.Tests
new NewCommand()
.WithWorkingDirectory(rootPath)
.Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive")
.Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive --skip-restore")
.Should().Pass();
new RestoreCommand()

2
test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs
View file

@ -44,7 +44,7 @@ namespace Microsoft.DotNet.New.Tests
string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName;
new TestCommand("dotnet") { WorkingDirectory = rootPath }
.Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive")
.Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive --skip-restore")
.Should().Pass();
if (useNuGetConfigForAspNet)

2
test/dotnet-pack.Tests/PackTests.cs
View file

@ -216,7 +216,7 @@ namespace Microsoft.DotNet.Tools.Pack.Tests
string dir = "pkgs";
string args = $"--packages {dir}";
string newArgs = $"console -o \"{rootPath}\"";
string newArgs = $"console -o \"{rootPath}\" --skip-restore";
new NewCommandShim()
.WithWorkingDirectory(rootPath)
.Execute(newArgs)

2
test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs
View file

@ -155,7 +155,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
string dir = "pkgs";
string args = $"--packages {dir}";
string newArgs = $"console -o \"{rootPath}\"";
string newArgs = $"console -o \"{rootPath}\" --skip-restore";
new NewCommandShim()
.WithWorkingDirectory(rootPath)
.Execute(newArgs)

2
test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs
View file

@ -53,7 +53,7 @@ Options:
try
{
string newArgs = $"classlib -o \"{projDir.Path}\"";
string newArgs = $"classlib -o \"{projDir.Path}\" --skip-restore";
new NewCommandShim()
.WithWorkingDirectory(projDir.Path)
.ExecuteWithCapturedOutput(newArgs)

4
test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs
View file

@ -24,7 +24,7 @@ namespace Microsoft.DotNet.Restore.Tests
string dir = "pkgs";
string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir));
string newArgs = $"console -o \"{rootPath}\"";
string newArgs = $"console -o \"{rootPath}\" --skip-restore";
new NewCommandShim()
.WithWorkingDirectory(rootPath)
.Execute(newArgs)
@ -51,7 +51,7 @@ namespace Microsoft.DotNet.Restore.Tests
string dir = "pkgs";
string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir));
string newArgs = $"classlib -o \"{rootPath}\"";
string newArgs = $"classlib -o \"{rootPath}\" --skip-restore";
new NewCommandShim()
.WithWorkingDirectory(rootPath)
.Execute(newArgs)

2
test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs
View file

@ -144,7 +144,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests
string dir = "pkgs";
string args = $"--packages {dir}";
string newArgs = $"console -o \"{rootPath}\"";
string newArgs = $"console -o \"{rootPath}\" --skip-restore";
new NewCommandShim()
.WithWorkingDirectory(rootPath)
.Execute(newArgs)

2
test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
View file

@ -1,4 +1,4 @@
// 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. 
using System;

2
test/dotnet.Tests/dotnet.Tests.csproj
View file

@ -42,6 +42,6 @@
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
<PackageReference Include="xunit.netcore.extensions" Version="1.0.0-prerelease-00206" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
<PackageReference Include="Microsoft.DotNet.Cli.CommandLine" Version="0.1.0-alpha-132" />
<PackageReference Include="Microsoft.DotNet.Cli.CommandLine" Version="$(CliCommandLineParserVersion)" />
</ItemGroup>
</Project>