diff --git a/Sharp7.Rx.Tests/Sharp7.Rx.Tests.csproj b/Sharp7.Rx.Tests/Sharp7.Rx.Tests.csproj
index 186e465..39dae7a 100644
--- a/Sharp7.Rx.Tests/Sharp7.Rx.Tests.csproj
+++ b/Sharp7.Rx.Tests/Sharp7.Rx.Tests.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SpecFlow" Version="2.4.0" />
   </ItemGroup>
diff --git a/Sharp7.Rx/Sharp7.Rx.csproj b/Sharp7.Rx/Sharp7.Rx.csproj
index c4da9c6..305f24b 100644
--- a/Sharp7.Rx/Sharp7.Rx.csproj
+++ b/Sharp7.Rx/Sharp7.Rx.csproj
@@ -1,11 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <Version>1.0.0</Version>
+    <Authors>Federico Barresi</Authors>
+    <Company>evopro AG</Company>
+    <Description>Reactive framework for Sharp7, the Ethernet S7 PLC communication suite</Description>
+    <PackageProjectUrl>https://github.com/evopro-ag/Sharp7Reactive</PackageProjectUrl>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/evopro-ag/Sharp7Reactive/master/LICENSE</PackageLicenseUrl>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Sharp7" Version="1.0.13" />
+    <PackageReference Include="Sharp7" Version="1.0.18" />
     <PackageReference Include="System.Reactive" Version="4.1.0" />
   </ItemGroup>
 
diff --git a/_nuspec/Sharp7.Rx.nuspec b/_nuspec/Sharp7.Rx.nuspec
deleted file mode 100644
index bcc694e..0000000
--- a/_nuspec/Sharp7.Rx.nuspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <metadata>
-    <id>Sharp7.Rx</id>
-    <version>$version$</version>
-    <title>Sharp7.Rx</title>
-    <authors>evopro AG</authors>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Reactive framework for Sharp7, the Ethernet S7 PLC communication suite</description>
-    <projectUrl>https://github.com/evopro-ag/Sharp7Reactive</projectUrl>
-    <licenseUrl>https://raw.githubusercontent.com/evopro-ag/Sharp7Reactive/master/LICENSE</licenseUrl>
-    <copyright>Copyright 2018</copyright>
-    <dependencies>
-        <dependency id="System.Reactive" version="4.1"/>
-        <dependency id="Sharp7" version="1.0"/>
-    </dependencies>
-    </metadata>
-  <files>
-    <file src="..\Sharp7.Rx\bin\Release\netstandard2.0\Sharp7.Rx.dll" target="lib\netstandard2.0" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/_nuspec/nuget.exe b/_nuspec/nuget.exe
deleted file mode 100644
index a34c367..0000000
Binary files a/_nuspec/nuget.exe and /dev/null differ
diff --git a/_nuspec/pack.ps1 b/_nuspec/pack.ps1
deleted file mode 100644
index 4de2296..0000000
--- a/_nuspec/pack.ps1
+++ /dev/null
@@ -1,8 +0,0 @@
-Write-Host "Setting .nuspec version tag to $env:appveyor_build_version"
-
-$content = (Get-Content _nuspec\Sharp7.Rx.nuspec) 
-$content = $content -replace '\$version\$', $env:appveyor_build_version
-
-$content | Out-File _nuspec\Sharp7.Rx.compiled.nuspec
-
-& _nuspec\NuGet.exe pack _nuspec\Sharp7.Rx.compiled.nuspec
\ No newline at end of file