Merge pull request #59 from WeihanLi/master

Update template

Xunit.DependencyInjection.Template/README.md

@@ -7,7 +7,7 @@ used for create a xunit test project with Xunit.DependencyInjection
 ## Package
 
 ``` bash
-nuget pack Xunit.DependencyInjection.Template.nuspec
+dotnet pack -o out
 ```
 
 publish the nupkg file to nuget for release
@@ -28,7 +28,7 @@ dotnet new xunit-di
 
 > Create test project with Specific TargetFramework:
 
-By default, we create test project targeted at `netcoreapp3.1`, you can change the target framework via `-f <targetFrameworkName>` or `--framework <targetFrameworkName>`
+By default, we create test project targeted at `net6.0`, you can change the target framework via `-f <targetFrameworkName>` or `--framework <targetFrameworkName>`
 
 ``` bash
 dotnet new xunit-di -f net5.0
@@ -46,10 +46,10 @@ dotnet templating Wiki: <https://github.com/dotnet/templating/wiki>
 
 ``` bash
 # package
-nuget pack Xunit.DependencyInjection.Template.nuspec
+dotnet pack Xunit.DependencyInjection.Template.csproj
 
 # install
-dotnet new -i Xunit.DependencyInjection.Template.1.0.0.nupkg
+dotnet new -i Xunit.DependencyInjection.Template.1.1.0.nupkg
 
 # testing
 dotnet new xunit-di -n TestProject

Xunit.DependencyInjection.Template/Xunit.DependencyInjection.Template.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Title>Xunit.DependencyInjection.Template</Title>
+    <Authors>Wei Peng</Authors>
+    <PackageType>Template</PackageType>
+    <PackageId>Xunit.DependencyInjection.Template</PackageId>
+    <PackageVersion>1.1.0</PackageVersion>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>    
+    <PackageTags>xunit ioc di DependencyInjection test</PackageTags>
+    <Description>Xunit.DependencyInjection project template</Description>
+    <PackageReleaseNotes>Update to .NET 6</PackageReleaseNotes>    
+    <PackageProjectUrl>https://github.com/pengweiqhca/Xunit.DependencyInjection/tree/master/Xunit.DependencyInjection.Template</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/pengweiqhca/Xunit.DependencyInjection</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IncludeSymbols>false</IncludeSymbols>
+    <IncludeContentInPack>true</IncludeContentInPack>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <ContentTargetFolders>content</ContentTargetFolders>    
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="content/**" />
+    <Compile Remove="**\*" />
+  </ItemGroup>
+</Project>

Xunit.DependencyInjection.Template/content/.template.config/template.json

@@ -19,7 +19,7 @@
         "description": "The target framework for the project.",
         "replaces": "TargetFrameworkOverride",
         "datatype": "text",
-        "defaultValue": "netcoreapp3.1"
+        "defaultValue": "net6.0"
       }
     },
     "sources":[],

Xunit.DependencyInjection.Template/content/TProject.csproj

@@ -7,17 +7,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="Xunit.DependencyInjection" Version="7.1.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Xunit.DependencyInjection" Version="8.1.0" />
   </ItemGroup>
 
 </Project>