Merge pull request #9555 from halex2005/merges/release/2.1.4xx-to-master

Add nunit project and item templates to bundle
This commit is contained in:
Livar 2018-06-26 13:50:12 -07:00 committed by GitHub
commit 8cffe4a578
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 0 deletions

View file

@ -7,5 +7,7 @@
<BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspNetCoreVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="$(AspNetCoreVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(AspNetCoreVersion)" />
<BundledTemplate Include="NUnit3.DotNetNew.Template" Version="$(NUnit3TemplatesVersion)" />
</ItemGroup>
</Project>

View file

@ -58,6 +58,7 @@
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
<XliffTasksPackageVersion>0.2.0-beta-000042</XliffTasksPackageVersion>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
<NUnit3TemplatesVersion>1.5.1</NUnit3TemplatesVersion>
</PropertyGroup>
<!-- NOTE: The property group above is in alignment with orchestrated build version naming conventions. -->

View file

@ -19,6 +19,7 @@ namespace Microsoft.DotNet.New.Tests
[InlineData("C#", "console", false)]
[InlineData("C#", "classlib", false)]
[InlineData("C#", "mstest", false)]
[InlineData("C#", "nunit", false)]
[InlineData("C#", "xunit", false)]
[InlineData("C#", "web", false)]
[InlineData("C#", "mvc", false)]
@ -30,11 +31,13 @@ namespace Microsoft.DotNet.New.Tests
// re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574
//[InlineData("F#", "classlib", false)]
[InlineData("F#", "mstest", false)]
[InlineData("F#", "nunit", false)]
[InlineData("F#", "xunit", false)]
[InlineData("F#", "mvc", false)]
[InlineData("VB", "console", false)]
[InlineData("VB", "classlib", false)]
[InlineData("VB", "mstest", false)]
[InlineData("VB", "nunit", false)]
[InlineData("VB", "xunit", false)]
public void TemplateRestoresAndBuildsWithoutWarnings(
string language,