diff --git a/.gitignore b/.gitignore
index 8d5e04f..d6395d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,7 @@
 
 bin/
 obj/
+build/
+.idea/
 *.csproj.user
+
diff --git a/package.ps1 b/package.ps1
index 039e2d0..9dc16f1 100644
--- a/package.ps1
+++ b/package.ps1
@@ -16,7 +16,7 @@
 $pkgname = "Apache.NMS"
 $pkgver = "1.8-SNAPSHOT"
 $configurations = "release", "debug"
-$frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0", "netcf-3.5"
+$frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0", "netcf-3.5", "netstandard2.0"
 
 write-progress "Creating package directory." "Initializing..."
 if(!(test-path package))
@@ -39,9 +39,17 @@
         foreach($framework in $frameworks)
         {
             zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
+			if($framework -ieq "netstandard2.0") {
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml" 
+			} else {
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.deps.json"
+			}
             zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
+			if($framework -ieq "netstandard2.0") {
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
+			} else {
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.deps.json"
+			}
             if($framework -ieq "mono-2.0")
             {
                 zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
diff --git a/vs2019-nms-api-test.csproj b/vs2019-nms-api-test.csproj
index 7748240..2a4b42b 100644
--- a/vs2019-nms-api-test.csproj
+++ b/vs2019-nms-api-test.csproj
@@ -15,7 +15,7 @@
     <Company>Apache Software Foundation</Company>
     <Product>Apache NMS API</Product>
     <Description>Apache NMS (.Net Standard Messaging Library) Test Suite</Description>
-	<Copyright>Copyright (C) 2005-2019 Apache Software Foundation</Copyright>
+	  <Copyright>Copyright (C) 2005-2019 Apache Software Foundation</Copyright>
     <PackageProjectUrl>https://activemq.apache.org/components/nms/</PackageProjectUrl>
     <PackageLicense>https://github.com/apache/activemq-nms-api/blob/master/LICENSE.txt</PackageLicense>
     <PackageIconUrl>https://activemq.apache.org/assets/img/activemq_logo_icon.png</PackageIconUrl>
@@ -27,6 +27,15 @@
     <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>build\netstandard2.0\release</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>build\netstandard2.0\debug</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Remove="obj\**" />
     <Compile Remove="Resources\**" />
diff --git a/vs2019-nms-api.csproj b/vs2019-nms-api.csproj
index 851a190..0eea16a 100644
--- a/vs2019-nms-api.csproj
+++ b/vs2019-nms-api.csproj
@@ -27,6 +27,15 @@
     <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>build\netstandard2.0\release\</OutputPath>
+	<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>build\netstandard2.0\debug\</OutputPath>
+	<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Remove="obj\**" />
     <Compile Remove="Resources\**" />