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

Bundle SPA templates package

Browse source
This commit is contained in:
Steve Sanderson 2017-05-24 16:52:14 +01:00
parent ac3ed6fbe6
commit 7e0747ec89
3 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build/BundledTemplates.props
View file

@ -5,5 +5,6 @@
<BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.2.0" Version="$(TemplateEngineTemplate2_0Version)" /> <BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.2.0" Version="$(TemplateEngineTemplate2_0Version)" />
<BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" /> <BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" /> <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(SpaTemplateVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

1
build/DependencyVersions.props
View file

@ -21,6 +21,7 @@
<CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion> <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
<CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion> <CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
<MicroBuildVersion>0.2.0</MicroBuildVersion> <MicroBuildVersion>0.2.0</MicroBuildVersion>
<SpaTemplateVersion>1.0.0-preview-000249</SpaTemplateVersion>
<!-- This should either be timestamped or notimestamp as appropriate --> <!-- This should either be timestamped or notimestamp as appropriate -->
<AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor> <AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>

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

@ -16,22 +16,26 @@ namespace Microsoft.DotNet.New.Tests
public class GivenThatIWantANewAppWithSpecifiedType : TestBase public class GivenThatIWantANewAppWithSpecifiedType : TestBase
{ {
[Theory] [Theory]
[InlineData("C#", "console", false)] [InlineData("C#", "console", false, false)]
[InlineData("C#", "classlib", false)] [InlineData("C#", "classlib", false, false)]
[InlineData("C#", "mstest", false)] [InlineData("C#", "mstest", false, false)]
[InlineData("C#", "xunit", false)] [InlineData("C#", "xunit", false, false)]
[InlineData("C#", "web", false)] [InlineData("C#", "web", false, false)]
[InlineData("C#", "mvc", false)] [InlineData("C#", "mvc", false, false)]
[InlineData("C#", "webapi", false)] [InlineData("C#", "webapi", false, false)]
[InlineData("F#", "console", false)] [InlineData("C#", "angular", false, true)]
[InlineData("F#", "classlib", false)] [InlineData("C#", "react", false, true)]
[InlineData("F#", "mstest", false)] [InlineData("C#", "reactredux", false, true)]
[InlineData("F#", "xunit", false)] [InlineData("F#", "console", false, false)]
[InlineData("F#", "mvc", true)] [InlineData("F#", "classlib", false, false)]
[InlineData("F#", "mstest", false, false)]
[InlineData("F#", "xunit", false, false)]
[InlineData("F#", "mvc", true, false)]
public void TemplateRestoresAndBuildsWithoutWarnings( public void TemplateRestoresAndBuildsWithoutWarnings(
string language, string language,
string projectType, string projectType,
bool useNuGetConfigForAspNet) bool useNuGetConfigForAspNet,
bool skipSpaWebpackSteps)
{ {
if (language == "F#" && !EnvironmentInfo.HasSharedFramework("netcoreapp1.0")) if (language == "F#" && !EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
{ {
@ -52,6 +56,13 @@ namespace Microsoft.DotNet.New.Tests
File.Copy(configFile.FullName, Path.Combine(rootPath, "NuGet.Config")); File.Copy(configFile.FullName, Path.Combine(rootPath, "NuGet.Config"));
} }
if (skipSpaWebpackSteps)
{
// Not all CI machines have Node installed, so the build would fail if we tried
// to run Webpack. Bypass this by making it appear that Webpack already ran.
Directory.CreateDirectory(Path.Combine(rootPath, "wwwroot", "dist"));
}
new TestCommand("dotnet") new TestCommand("dotnet")
.WithWorkingDirectory(rootPath) .WithWorkingDirectory(rootPath)
.Execute($"restore") .Execute($"restore")