From 3752264b8e59291d4ed1e52965a422bc175042b6 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Fri, 28 Oct 2016 10:22:22 -0700
Subject: [PATCH] Pulling in the new msbuild based xunit template

---
 .../CSharp_xunittest/$projectName$.csproj     | 34 +++++++++++++++++++
 .../dotnet-new/CSharp_xunittest/Tests.cs      | 14 ++++++++
 src/dotnet/commands/dotnet-new/Program.cs     |  3 +-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 src/dotnet/commands/dotnet-new/CSharp_xunittest/$projectName$.csproj
 create mode 100644 src/dotnet/commands/dotnet-new/CSharp_xunittest/Tests.cs

diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_xunittest/$projectName$.csproj
new file mode 100644
index 000000000..de3f57990
--- /dev/null
+++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/$projectName$.csproj
@@ -0,0 +1,34 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+    <EmbeddedResource Include="**\*.resx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App">
+      <Version>1.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Sdk">
+      <Version>1.0.0-alpha-20161026-2</Version>
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>15.0.0-preview-20161024-02</Version>
+    </PackageReference>
+    <PackageReference Include="xunit">
+      <Version>2.2.0-beta3-build3402</Version>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio">
+      <Version>2.2.0-beta4-build1188</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/Tests.cs b/src/dotnet/commands/dotnet-new/CSharp_xunittest/Tests.cs
new file mode 100644
index 000000000..5a74b4e60
--- /dev/null
+++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/Tests.cs
@@ -0,0 +1,14 @@
+using System;
+using Xunit;
+
+namespace Tests
+{
+    public class Tests
+    {
+        [Fact]
+        public void Test1()
+        {
+            Assert.True(true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/dotnet/commands/dotnet-new/Program.cs b/src/dotnet/commands/dotnet-new/Program.cs
index 8d682b303..847ba33a0 100644
--- a/src/dotnet/commands/dotnet-new/Program.cs
+++ b/src/dotnet/commands/dotnet-new/Program.cs
@@ -137,7 +137,8 @@ namespace Microsoft.DotNet.Tools.New
                                { 
                                    new { Name = "Console", isMsBuild = true }, 
                                    new { Name = "Web", isMsBuild = true }, 
-                                   new { Name = "Lib", isMsBuild = true }
+                                   new { Name = "Lib", isMsBuild = true },
+                                   new { Name = "Xunittest", isMsBuild = true }
                                }
             };