diff --git a/SampleTestAssembly/Properties/AssemblyInfo.cs b/SampleTestAssembly/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4a5bc90..0000000
--- a/SampleTestAssembly/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SampleTestAssembly")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SampleTestAssembly")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("bdafb5dd-ffb3-4a94-a312-dfb080010846")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SampleTestAssembly/SampleTestAssembly.csproj b/SampleTestAssembly/SampleTestAssembly.csproj
index 6854684..b8b1d3e 100644
--- a/SampleTestAssembly/SampleTestAssembly.csproj
+++ b/SampleTestAssembly/SampleTestAssembly.csproj
@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/xunit.runner.data/Properties/AssemblyInfo.cs b/xunit.runner.data/Properties/AssemblyInfo.cs
deleted file mode 100644
index c41dd9f..0000000
--- a/xunit.runner.data/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("xunit.runner.data")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("xunit.runner.data")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a1f579f4-443e-4f64-bc55-998ab86ff293")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/xunit.runner.data/xunit.runner.data.csproj b/xunit.runner.data/xunit.runner.data.csproj
index 0aab30d..d22e7a7 100644
--- a/xunit.runner.data/xunit.runner.data.csproj
+++ b/xunit.runner.data/xunit.runner.data.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <RootNamespace>Xunit.Runner.Data</RootNamespace>
     <TargetFramework>net452</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
+
 </Project>
\ No newline at end of file
diff --git a/xunit.runner.worker/Properties/AssemblyInfo.cs b/xunit.runner.worker/Properties/AssemblyInfo.cs
deleted file mode 100644
index 5aa7b35..0000000
--- a/xunit.runner.worker/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("xunit.runner.worker")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("xunit.runner.worker")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("9df97a2b-0eb5-4b12-9f81-69dfac979814")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/xunit.runner.worker/xunit.runner.worker.csproj b/xunit.runner.worker/xunit.runner.worker.csproj
index 1be4f1a..e1d06a2 100644
--- a/xunit.runner.worker/xunit.runner.worker.csproj
+++ b/xunit.runner.worker/xunit.runner.worker.csproj
@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>Xunit.Runner.Worker</RootNamespace>
     <TargetFramework>net452</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="xunit.runner.utility" Version="2.1.0" />
     <ProjectReference Include="..\xunit.runner.data\xunit.runner.data.csproj" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/xunit.runner.wpf/App.config b/xunit.runner.wpf/App.config
deleted file mode 100644
index 2d2a12d..0000000
--- a/xunit.runner.wpf/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
-    </startup>
-</configuration>
diff --git a/xunit.runner.wpf/Properties/AssemblyInfo.cs b/xunit.runner.wpf/Properties/AssemblyInfo.cs
index 2252cdb..aff6210 100644
--- a/xunit.runner.wpf/Properties/AssemblyInfo.cs
+++ b/xunit.runner.wpf/Properties/AssemblyInfo.cs
@@ -1,25 +1,4 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("xunit.runner.wpf")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("xunit.runner.wpf")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+using System.Windows;
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -39,17 +18,3 @@ using System.Windows;
                                               //(used if a resource is not found in the page, 
                                               // app, or any theme specific resource dictionaries)
 )]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/xunit.runner.wpf/xunit.runner.wpf.csproj b/xunit.runner.wpf/xunit.runner.wpf.csproj
index 6d4dcf8..6505610 100644
--- a/xunit.runner.wpf/xunit.runner.wpf.csproj
+++ b/xunit.runner.wpf/xunit.runner.wpf.csproj
@@ -1,14 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xunit.Runner.Wpf</RootNamespace>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <NuPkgVersion Condition="'$(appveyor_build_version)' != ''">$(appveyor_build_version)</NuPkgVersion>
-    <NuPkgVersion Condition="'$(NuPkgVersion)' == ''">1.0.0-local</NuPkgVersion>
-    <ApplicationIcon>Artwork\Application.ico</ApplicationIcon>
     <UseWpf>true</UseWpf>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <RootNamespace>Xunit.Runner.Wpf</RootNamespace>
+    <NoWarn>NU1701;$(NoWarn)</NoWarn>
+    <ApplicationIcon>Artwork\Application.ico</ApplicationIcon>
+    <Authors>Pilchie</Authors>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackAsTool>true</PackAsTool>
+    <Description>XUnit Gui written in WPF</Description>
+    <PackageProjectUrl>https://github.com/Pilchie/xunit.runner.wpf</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Pilchie/xunit.runner.wpf</RepositoryUrl>
+    <PackageTags>XUnit Gui test runner</PackageTags>
+    <NeutralLanguage>en-us</NeutralLanguage>
+    <PackageVersion Condition="'$(appveyor_build_vzersion)' != ''">$(appveyor_build_version)</PackageVersion>
+    <PackageVersion Condition="'$(NuPkgVersion)' == ''">1.0.0-local</PackageVersion>
+    <AssemblyVersion Condition="'$(appveyor_build_version)' != ''">$(appveyor_build_version)</AssemblyVersion>
+    <FileVersion Condition="'$(appveyor_build_version)' != ''">$(appveyor_build_version)</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,13 +30,6 @@
     <PackageReference Include="xunit.runner.utility" Version="2.4.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <NuGetManifest Include="xunit.runner.wpf.nuspec">
-      <Version>$(NuPkgVersion)</Version>
-      <PackageAnalysis>False</PackageAnalysis>
-    </NuGetManifest>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\SampleTestAssembly\SampleTestAssembly.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -40,4 +42,5 @@
     <Resource Include="Artwork\**\*.png" />
     <Resource Include="Artwork\Application.ico" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/xunit.runner.wpf/xunit.runner.wpf.nuspec b/xunit.runner.wpf/xunit.runner.wpf.nuspec
deleted file mode 100644
index e5bca01..0000000
--- a/xunit.runner.wpf/xunit.runner.wpf.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>xunit.runner.wpf</id>
-    <version>$version$</version>
-    <title>xUnit.Runner.WPF</title>
-    <authors>Pilchie</authors>
-    <owners>Pilchie</owners>
-    <projectUrl>https://github.com/Pilchie/xunit.runner.wpf</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>XUnit Gui written in WPF</description>
-    <tags>XUnit Gui test runner</tags>
-  </metadata>
-  <files>
-    <file src="bin\$Configuration$\*.dll" target="tools\"/>
-    <file src="xunit.runner.wpf.targets" target="build\net45"/>
-    <file src="bin\$Configuration$\*.exe" target="tools\" exclude="**\*vshost*"/>
-    <file src="bin\$Configuration$\*.config" target="tools\" exclude="**\*vshost*"/>
-  </files>
-</package>
diff --git a/xunit.runner.wpf/xunit.runner.wpf.targets b/xunit.runner.wpf/xunit.runner.wpf.targets
deleted file mode 100644
index 5766cc9..0000000
--- a/xunit.runner.wpf/xunit.runner.wpf.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <StartAction Condition="'$(StartActions)' == ''">Program</StartAction>
-    <StartProgram Condition="'$(StartProgram)' == ''">$(MSBuildThisFileDirectory)..\tools\xunit.runner.wpf.exe</StartProgram>
-    <StartArguments Condition="'$(StartArguments)' == ''">$(AssemblyName).dll</StartArguments>
-    <StartWorkingDirectory Condition="'$(StartWorkingDirectory)' == ''">$(OutputDirectory)</StartWorkingDirectory>
-  </PropertyGroup>
-</Project>