Merge pull request #5787 from mlorbetske/dev/mlorbe/UpdateTemplatePackages

Template update for 1.0.4/1.1.1
This commit is contained in:
Piotr Puszkiewicz 2017-02-22 15:22:56 -08:00 committed by GitHub
commit 0074f4718b
12 changed files with 18 additions and 15 deletions

View file

@ -9,5 +9,6 @@
<add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" /> <add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
<add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" /> <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" /> <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

View file

@ -3,8 +3,8 @@
<ItemGroup> <ItemGroup>
<BundledTemplate Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" /> <BundledTemplate Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates" Version="$(TemplateEngineTemplateVersion)" /> <BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.1.x" Version="$(TemplateEngineTemplateVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates" Version="$(TemplateEngineTemplateVersion)" /> <BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.1.x" Version="$(TemplateEngineTemplateVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates" Version="$(TemplateEngineTemplateVersion)" /> <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.1.x" Version="$(TemplateEngineTemplateVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View file

@ -9,7 +9,7 @@
<CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version> <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0-preview-20170217-05</CLI_TestPlatform_Version> <CLI_TestPlatform_Version>15.0.0-preview-20170217-05</CLI_TestPlatform_Version>
<TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion> <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta1-20170206-112</TemplateEngineTemplateVersion> <TemplateEngineTemplateVersion>1.0.0-beta1-20170222-125</TemplateEngineTemplateVersion>
<PlatformAbstractionsVersion>1.1.1</PlatformAbstractionsVersion> <PlatformAbstractionsVersion>1.1.1</PlatformAbstractionsVersion>
<DependencyModelVersion>1.0.2</DependencyModelVersion> <DependencyModelVersion>1.0.2</DependencyModelVersion>
</PropertyGroup> </PropertyGroup>

View file

@ -88,7 +88,7 @@
<DotNetNew ToolPath="$(Stage2Directory)" <DotNetNew ToolPath="$(Stage2Directory)"
TemplateType="Mvc" TemplateType="Mvc"
TemplateArgs="-au Individual --debug:ephemeral-hive" TemplateArgs="-au Individual -f netcoreapp1.0 --debug:ephemeral-hive --no-tools"
WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" /> WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" />
<DotNetRestore ToolPath="$(Stage2Directory)" <DotNetRestore ToolPath="$(Stage2Directory)"
@ -98,7 +98,7 @@
<DotNetNew ToolPath="$(Stage2Directory)" <DotNetNew ToolPath="$(Stage2Directory)"
TemplateType="Mvc" TemplateType="Mvc"
TemplateArgs="-au Individual -f netcoreapp1.1 --debug:ephemeral-hive" TemplateArgs="-au Individual -f netcoreapp1.1 --debug:ephemeral-hive --no-tools"
WorkingDirectory="$(NuGetPackagesArchiveProject)/Web1.1" /> WorkingDirectory="$(NuGetPackagesArchiveProject)/Web1.1" />
<DotNetRestore ToolPath="$(Stage2Directory)" <DotNetRestore ToolPath="$(Stage2Directory)"

View file

@ -26,8 +26,8 @@ namespace Microsoft.DotNet.Cli.Build
private static string[][] _templatesAndArgs = new string[][] private static string[][] _templatesAndArgs = new string[][]
{ {
new string[] { "mvc", "-au Individual -f netcoreapp1.0" }, new string[] { "mvc", "-au Individual -f netcoreapp1.0 --no-tools" },
new string[] { "mvc", "-au Individual -f netcoreapp1.1" } new string[] { "mvc", "-au Individual -f netcoreapp1.1 --no-tools" }
}; };
public override bool Execute() public override bool Execute()

View file

@ -12,8 +12,8 @@ namespace Microsoft.DotNet.Configurer
{ {
private static IReadOnlyList<IReadOnlyList<string>> _templatesUsedToPrimeCache = new List<IReadOnlyList<string>>() private static IReadOnlyList<IReadOnlyList<string>> _templatesUsedToPrimeCache = new List<IReadOnlyList<string>>()
{ {
new List<string>() { "mvc", "-f", "netcoreapp1.0", "-au", "Individual", "--debug:ephemeral-hive" }, new List<string>() { "mvc", "-f", "netcoreapp1.0", "-au", "Individual", "--debug:ephemeral-hive", "--no-tools" },
new List<string>() { "mvc", "-f", "netcoreapp1.1", "-au", "Individual", "--debug:ephemeral-hive" } new List<string>() { "mvc", "-f", "netcoreapp1.1", "-au", "Individual", "--debug:ephemeral-hive", "--no-tools" }
}; };
private readonly ICommandFactory _commandFactory; private readonly ICommandFactory _commandFactory;

View file

@ -63,10 +63,10 @@ namespace Microsoft.DotNet.Configurer.UnitTests
SetupCommandMock(_dotnetNewCommandMock); SetupCommandMock(_dotnetNewCommandMock);
commandFactoryMock commandFactoryMock
.Setup(c => c.Create("new", new[] { "mvc", "-f", "netcoreapp1.0", "-au", "Individual", "--debug:ephemeral-hive" }, null, Constants.DefaultConfiguration)) .Setup(c => c.Create("new", new[] { "mvc", "-f", "netcoreapp1.0", "-au", "Individual", "--debug:ephemeral-hive", "--no-tools" }, null, Constants.DefaultConfiguration))
.Returns(_dotnetNewCommandMock.Object); .Returns(_dotnetNewCommandMock.Object);
commandFactoryMock commandFactoryMock
.Setup(c => c.Create("new", new[] { "mvc", "-f", "netcoreapp1.1", "-au", "Individual", "--debug:ephemeral-hive" }, null, Constants.DefaultConfiguration)) .Setup(c => c.Create("new", new[] { "mvc", "-f", "netcoreapp1.1", "-au", "Individual", "--debug:ephemeral-hive", "--no-tools" }, null, Constants.DefaultConfiguration))
.Returns(_dotnetNewCommandMock.Object); .Returns(_dotnetNewCommandMock.Object);
_dotnetRestoreCommandMock = new Mock<ICommand>(); _dotnetRestoreCommandMock = new Mock<ICommand>();

View file

@ -65,7 +65,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
.Execute() .Execute()
.Should().Pass(); .Should().Pass();
var outputDll = Directory.EnumerateFiles(Path.Combine(rootPath, "bin"), "*.dll", SearchOption.AllDirectories).Single(); var outputDll = Directory.EnumerateFiles(Path.Combine(rootPath, "bin"), "*.dll", SearchOption.AllDirectories).Single(x => !x.Contains("DiaSymReader"));
var outputRunCommand = new TestCommand("dotnet"); var outputRunCommand = new TestCommand("dotnet");

View file

@ -8,5 +8,6 @@
<add key="aspnet101" value="https://www.myget.org/F/aspnet101/api/v3/index.json" /> <add key="aspnet101" value="https://www.myget.org/F/aspnet101/api/v3/index.json" />
<add key="dotnet-web" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" /> <add key="dotnet-web" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" /> <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

View file

@ -7,5 +7,6 @@
<add key="aspnet101" value="https://www.myget.org/F/aspnet101/api/v3/index.json" /> <add key="aspnet101" value="https://www.myget.org/F/aspnet101/api/v3/index.json" />
<add key="dotnet-web" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" /> <add key="dotnet-web" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" /> <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

View file

@ -107,7 +107,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
var outputProgram = rootDir var outputProgram = rootDir
.GetDirectory("bin", configuration, "netcoreapp1.0", "publish", $"{rootDir.Name}.dll") .GetDirectory("bin", configuration, "netcoreapp1.1", "publish", $"{rootDir.Name}.dll")
.FullName; .FullName;
new TestCommand(outputProgram) new TestCommand(outputProgram)

View file

@ -118,7 +118,7 @@ A command is running to initially populate your local package cache, to improve
_nugetCacheFolder _nugetCacheFolder
.GetDirectory("microsoft.aspnetcore.mvc") .GetDirectory("microsoft.aspnetcore.mvc")
.Should().HaveDirectories(new string[] { "1.0.2", "1.1.1" }); .Should().HaveDirectories(new string[] { "1.0.3", "1.1.2" });
} }
private string GetDotnetVersion() private string GetDotnetVersion()