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

Merge pull request #7121 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen277Coherence26182

Browse source 
Update to SetupCrossgen 277 - Coherence 26182
This commit is contained in:
Livar 2017-07-10 20:52:09 -07:00 committed by GitHub
commit da3ff8fb7c
15 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build/DependencyVersions.props
View file

@ -22,9 +22,9 @@
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion> <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion> <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion> <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
<TemplateEngineVersion>1.0.0-beta2-20170707-280</TemplateEngineVersion> <TemplateEngineVersion>1.0.0-beta2-20170710-283</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170707-280</TemplateEngineTemplateVersion> <TemplateEngineTemplateVersion>1.0.0-beta2-20170710-283</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170707-280</TemplateEngineTemplate2_0Version> <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170710-283</TemplateEngineTemplate2_0Version>
<PlatformAbstractionsVersion>2.0.0-preview3-25510-01</PlatformAbstractionsVersion> <PlatformAbstractionsVersion>2.0.0-preview3-25510-01</PlatformAbstractionsVersion>
<DependencyModelVersion>2.0.0-preview3-25510-01</DependencyModelVersion> <DependencyModelVersion>2.0.0-preview3-25510-01</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion> <CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>
@ -35,9 +35,9 @@
<!-- This should either be timestamped or notimestamp as appropriate --> <!-- This should either be timestamped or notimestamp as appropriate -->
<AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor> <AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>
<AspNetCoreRuntimeVersion>dev-270</AspNetCoreRuntimeVersion> <AspNetCoreRuntimeVersion>dev-277</AspNetCoreRuntimeVersion>
<AspNetCoherenceLabel>rtm</AspNetCoherenceLabel> <AspNetCoherenceLabel>rtm</AspNetCoherenceLabel>
<AspNetCoreCoherenceTimestamp>26151</AspNetCoreCoherenceTimestamp> <AspNetCoreCoherenceTimestamp>26182</AspNetCoreCoherenceTimestamp>
</PropertyGroup> </PropertyGroup>

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

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

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

@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Tools.Migrate
string outputDirectory, string outputDirectory,
string workingDirectory) string workingDirectory)
{ {
RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive" }, workingDirectory); RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive", "--no-restore" }, workingDirectory);
} }
private void RunCommand(string commandToExecute, IEnumerable<string> args, string workingDirectory) private void RunCommand(string commandToExecute, IEnumerable<string> args, string workingDirectory)
{ {

1
src/dotnet/dotnet.csproj
View file

@ -65,6 +65,7 @@
<PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliMigrateVersion)" /> <PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliMigrateVersion)" />
<PackageReference Include="Microsoft.TemplateEngine.Abstractions" Version="$(TemplateEngineVersion)" /> <PackageReference Include="Microsoft.TemplateEngine.Abstractions" Version="$(TemplateEngineVersion)" />
<PackageReference Include="Microsoft.TemplateEngine.Cli" Version="$(TemplateEngineVersion)" /> <PackageReference Include="Microsoft.TemplateEngine.Cli" Version="$(TemplateEngineVersion)" />
<PackageReference Include="Microsoft.TemplateEngine.Cli.Localization" Version="$(TemplateEngineVersion)" />
<PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(TemplateEngineVersion)" /> <PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(TemplateEngineVersion)" />
<PackageReference Include="Microsoft.TemplateEngine.Utils" Version="$(TemplateEngineVersion)" /> <PackageReference Include="Microsoft.TemplateEngine.Utils" Version="$(TemplateEngineVersion)" />
<PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" /> <PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" />

2
test/EndToEnd/GivenDotNetUsesMSBuild.cs
View file

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

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

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

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

@ -93,7 +93,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
string dir = "pkgs"; string dir = "pkgs";
string args = $"--packages {dir}"; 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 --no-restore";
new NewCommandShim() new NewCommandShim()
.WithWorkingDirectory(rootPath) .WithWorkingDirectory(rootPath)
.Execute(newArgs) .Execute(newArgs)

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

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

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

@ -21,13 +21,13 @@ namespace Microsoft.DotNet.New.Tests
new NewCommand() new NewCommand()
.WithWorkingDirectory(rootPath) .WithWorkingDirectory(rootPath)
.Execute($"console --debug:ephemeral-hive"); .Execute($"console --debug:ephemeral-hive --no-restore");
DateTime expectedState = Directory.GetLastWriteTime(rootPath); DateTime expectedState = Directory.GetLastWriteTime(rootPath);
var result = new NewCommand() var result = new NewCommand()
.WithWorkingDirectory(rootPath) .WithWorkingDirectory(rootPath)
.ExecuteWithCapturedOutput($"console --debug:ephemeral-hive"); .ExecuteWithCapturedOutput($"console --debug:ephemeral-hive --no-restore");
DateTime actualState = Directory.GetLastWriteTime(rootPath); DateTime actualState = Directory.GetLastWriteTime(rootPath);
@ -64,7 +64,7 @@ namespace Microsoft.DotNet.New.Tests
new NewCommand() new NewCommand()
.WithWorkingDirectory(projectFolder) .WithWorkingDirectory(projectFolder)
.Execute($"{projectType} --debug:ephemeral-hive") .Execute($"{projectType} --debug:ephemeral-hive --no-restore")
.Should().Pass(); .Should().Pass();
// https://github.com/dotnet/templating/issues/946 - remove DisableImplicitAssetTargetFallback once this is fixed. // https://github.com/dotnet/templating/issues/946 - remove DisableImplicitAssetTargetFallback once this is fixed.
@ -87,7 +87,7 @@ namespace Microsoft.DotNet.New.Tests
new NewCommand() new NewCommand()
.WithWorkingDirectory(rootPath) .WithWorkingDirectory(rootPath)
.Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive") .Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive --no-restore")
.Should().Pass(); .Should().Pass();
new RestoreCommand() new RestoreCommand()

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

@ -42,9 +42,11 @@ namespace Microsoft.DotNet.New.Tests
bool skipSpaWebpackSteps) bool skipSpaWebpackSteps)
{ {
string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName; string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName;
//This works around the SPA templates not currently supporting the "--no-restore" switch
string noRestoreDirective = skipSpaWebpackSteps ? "" : "--no-restore";
new TestCommand("dotnet") { WorkingDirectory = rootPath } 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 {noRestoreDirective}")
.Should().Pass(); .Should().Pass();
if (useNuGetConfigForAspNet) if (useNuGetConfigForAspNet)

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

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

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

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

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

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

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

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

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

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