Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit d8087d3

Browse files
mlorbetskemlorbetske
committed
Update engine and templates, update to SetupCrossgen 224 - Coherence 25975
1 parent 3a3825d commit d8087d3

File tree

15 files changed

+26
-29
lines changed

15 files changed

+26
-29
lines changed

‎NuGet.Config‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
55
<clear />
66
<add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
7-
<add key="preview2-verification-feed" value="https://dotnet.myget.org/F/dotnet-2-0-0-preview2-final/api/v3/index.json" />
87
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
9-
<add key="aspnet-final" value="https://dotnet.myget.org/F/aspnetcore-2-0-0-preview1-no-timestamp/api/v3/index.json" />
10-
<add key="aspnet-release" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
8+
<add key="aspnet" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
119
<add key="websdkfeed" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
1210
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
1311
<add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
@@ -16,7 +14,6 @@
1614
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
1715
<add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
1816
<add key="build_tools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
19-
<add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" />
2017
<add key="web-api" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
2118
<add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
2219
</packageSources>

‎build/DependencyVersions.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
2323
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
2424
<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
25-
<TemplateEngineVersion>1.0.0-beta2-20170614-260</TemplateEngineVersion>
26-
<TemplateEngineTemplateVersion>1.0.0-beta2-20170620-266</TemplateEngineTemplateVersion>
27-
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170620-266</TemplateEngineTemplate2_0Version>
25+
<TemplateEngineVersion>1.0.0-beta2-20170629-268</TemplateEngineVersion>
26+
<TemplateEngineTemplateVersion>1.0.0-beta2-20170629-268</TemplateEngineTemplateVersion>
27+
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170629-268</TemplateEngineTemplate2_0Version>
2828
<PlatformAbstractionsVersion>2.0.0-preview3-25426-01</PlatformAbstractionsVersion>
2929
<DependencyModelVersion>2.0.0-preview3-25426-01</DependencyModelVersion>
3030
<CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>
@@ -34,10 +34,10 @@
3434
<XliffTasksVersion>0.2.0-beta-000042</XliffTasksVersion>
3535

3636
<!-- This should either be timestamped or notimestamp as appropriate -->
37-
<AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>
38-
<AspNetCoreRuntimeVersion>2.0.0-preview2-215</AspNetCoreRuntimeVersion>
39-
<AspNetCoherenceLabel>preview2</AspNetCoherenceLabel>
40-
<AspNetCoreCoherenceTimestamp>25794</AspNetCoreCoherenceTimestamp>
37+
<AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>
38+
<AspNetCoreRuntimeVersion>dev-224</AspNetCoreRuntimeVersion>
39+
<AspNetCoherenceLabel>preview3</AspNetCoherenceLabel>
40+
<AspNetCoreCoherenceTimestamp>25975</AspNetCoreCoherenceTimestamp>
4141

4242
</PropertyGroup>
4343

‎build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public override bool Execute()
4747
{
4848
ToolPath = ToolPath,
4949
TemplateType = newArgs[0],
50-
TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\" --no-restore",
50+
TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\"",
5151
HostObject = HostObject,
5252
BuildEngine = BuildEngine
5353
};

‎src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public void CreateWithEphemeralHiveAndNoRestore(
1515
string outputDirectory,
1616
string workingDirectory)
1717
{
18-
RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive", "--no-restore" }, workingDirectory);
18+
RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive" }, workingDirectory);
1919
}
2020
private void RunCommand(string commandToExecute, IEnumerable<string> args, string workingDirectory)
2121
{

‎test/EndToEnd/GivenDotNetUsesMSBuild.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void ItCanNewRestoreBuildRunCleanMSBuildProject()
1919
{
2020
string projectDirectory = directory.Path;
2121

22-
string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive --no-restore";
22+
string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive";
2323
new NewCommandShim()
2424
.WithWorkingDirectory(projectDirectory)
2525
.Execute(newArgs)

‎test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private ProjDir NewLib(string dir = null, [System.Runtime.CompilerServices.Calle
6868

6969
try
7070
{
71-
string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive --no-restore";
71+
string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive";
7272
new NewCommandShim()
7373
.WithWorkingDirectory(projDir.Path)
7474
.ExecuteWithCapturedOutput(args)

‎test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void ItRunsWhenRestoringToSpecificPackageDir()
9393
string dir = "pkgs";
9494
string args = $"--packages {dir}";
9595

96-
string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore";
96+
string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive";
9797
new NewCommandShim()
9898
.WithWorkingDirectory(rootPath)
9999
.Execute(newArgs)

‎test/dotnet-list-reference.Tests/GivenDotnetListReference.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private ProjDir NewLib(string testProjectName = "temp", [System.Runtime.Compiler
209209

210210
try
211211
{
212-
string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive --no-restore";
212+
string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive";
213213
new NewCommandShim()
214214
.WithWorkingDirectory(dir.Path)
215215
.ExecuteWithCapturedOutput(newArgs)

‎test/dotnet-new.Tests/GivenThatIWantANewApp.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ public void When_dotnet_new_is_invoked_mupliple_times_it_should_fail()
2121

2222
new NewCommand()
2323
.WithWorkingDirectory(rootPath)
24-
.Execute($"console --debug:ephemeral-hive --no-restore");
24+
.Execute($"console --debug:ephemeral-hive");
2525

2626
DateTime expectedState = Directory.GetLastWriteTime(rootPath);
2727

2828
var result = new NewCommand()
2929
.WithWorkingDirectory(rootPath)
30-
.ExecuteWithCapturedOutput($"console --debug:ephemeral-hive --no-restore");
30+
.ExecuteWithCapturedOutput($"console --debug:ephemeral-hive");
3131

3232
DateTime actualState = Directory.GetLastWriteTime(rootPath);
3333

@@ -64,7 +64,7 @@ private void CreateAndRestoreNewProject(
6464

6565
new NewCommand()
6666
.WithWorkingDirectory(projectFolder)
67-
.Execute($"{projectType} --debug:ephemeral-hive --no-restore")
67+
.Execute($"{projectType} --debug:ephemeral-hive")
6868
.Should().Pass();
6969

7070
// https://github.com/dotnet/templating/issues/946 - remove DisableImplicitAssetTargetFallback once this is fixed.
@@ -87,7 +87,7 @@ public void NewProjectRestoresCorrectPackageVersion(string type, string property
8787

8888
new NewCommand()
8989
.WithWorkingDirectory(rootPath)
90-
.Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive --no-restore")
90+
.Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive")
9191
.Should().Pass();
9292

9393
new RestoreCommand()

‎test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void TemplateRestoresAndBuildsWithoutWarnings(
4040
string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName;
4141

4242
new TestCommand("dotnet") { WorkingDirectory = rootPath }
43-
.Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive --no-restore")
43+
.Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive")
4444
.Should().Pass();
4545

4646
if (useNuGetConfigForAspNet)

0 commit comments

Comments
 (0)