diff --git a/Sdk/Sdk.targets b/Sdk/Sdk.targets
index d6072b3e6b4..c720d02b2ed 100644
--- a/Sdk/Sdk.targets
+++ b/Sdk/Sdk.targets
@@ -11,5 +11,5 @@
 -->
 
 <Project>
-  <Import Project="../Targets/*.targets" Condition="'$(MSBuildProjectName)' != 'NuGetPush'" />
+  <Import Project="$(MSBuildThisFileDirectory)../Targets/*.targets" />
 </Project>
diff --git a/Targets/PushDgmjrNuGetSoftware.targets b/Targets/PushDgmjrNuGetSoftware.targets
new file mode 100644
index 00000000000..fa334839ecb
--- /dev/null
+++ b/Targets/PushDgmjrNuGetSoftware.targets
@@ -0,0 +1,20 @@
+<Project>
+  <Target Name="PushDgmjrNuGetSoftware" AfterTargets="Pack" DependsOnTargets="Pack;GetPackageVersion" Condition="'$(GeneratePackageOnBuild)' == 'true' And '$(DesignTimeBuild)' != 'true' And ('$(Configuration)' == 'Local' Or $(InitialTargets.Contains('PushLocal')))">
+    <NuGetPush.Tasks.GetNuGetApiKey
+      Source="dgmjr.nuget.software"
+      MSBuildProjectDirectory="$(MSBuildProjectDirectory)">
+      <Output TaskParameter="ApiKey" PropertyName="DGMJR_NUGET_SOFTWARE_API_KEY" />
+    </NuGetPush.Tasks.GetNuGetApiKey>
+    <!-- <Message Text="DGMJR_NUGET_SOFTWARE_API_KEY: $(DGMJR_NUGET_SOFTWARE_API_KEY)" Importance="high" /> -->
+    <Exec Command="dotnet nuget delete $(PackageId) $(PackageVersion) -s dgmjr.nuget.software --non-interactive -k:$(DGMJR_NUGET_SOFTWARE_API_KEY)" ContinueOnError="true" IgnoreExitCode="true" />
+    <Exec Command="dotnet nuget push $(PackageTargetPath) -s dgmjr.nuget.software --skip-duplicate -k:$(DGMJR_NUGET_SOFTWARE_API_KEY)" Condition="Exists('$(PackageTargetPath)')" IgnoreExitCode="true" />
+    <!-- <Warning Text="Deleting package $(PackageId), version $(PackageVersion) from Feedz.io and pushing a new version..." />
+    <NuGetPush.Tasks.DeleteAndPush
+      Source="Feedz.io"
+      MSBuildProjectDirectory="$(MSBuildProjectDirectory)"
+      ApiKey="$(FEEDZ_IO_API_KEY)"
+      PackageId="$(PackageId)"
+      Version="$(PackageVersion)"
+      PackagePath="$(PackageTargetPath)" /> -->
+  </Target>
+</Project>
diff --git a/Targets/PushFeedz.io.targets b/Targets/PushFeedz.io.targets.no
similarity index 100%
rename from Targets/PushFeedz.io.targets
rename to Targets/PushFeedz.io.targets.no
diff --git a/lib/netstandard2.0/NuGetPush.deps.json b/lib/netstandard2.0/NuGetPush.deps.json
index c9770f0da28..874a44dd6bf 100644
--- a/lib/netstandard2.0/NuGetPush.deps.json
+++ b/lib/netstandard2.0/NuGetPush.deps.json
@@ -56,12 +56,6 @@
           "System.Runtime.Loader": "4.0.0",
           "System.Text.Encoding.CodePages": "6.0.0",
           "System.Threading.Tasks.Dataflow": "6.0.0"
-        },
-        "runtime": {
-          "lib/netstandard2.0/Microsoft.Build.dll": {
-            "assemblyVersion": "15.1.0.0",
-            "fileVersion": "15.9.20.62856"
-          }
         }
       },
       "Microsoft.Build.Artifacts/6.1.10": {},
@@ -135,12 +129,6 @@
         "dependencies": {
           "System.Memory": "4.5.5",
           "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        },
-        "runtime": {
-          "lib/netstandard2.0/Microsoft.NET.StringTools.dll": {
-            "assemblyVersion": "1.0.0.0",
-            "fileVersion": "17.4.0.51802"
-          }
         }
       },
       "Microsoft.NETCore.Platforms/1.1.0": {},
@@ -159,12 +147,6 @@
           "System.Memory": "4.5.5",
           "System.Security.AccessControl": "6.0.0",
           "System.Security.Principal.Windows": "5.0.0"
-        },
-        "runtime": {
-          "lib/netstandard2.0/Microsoft.Win32.Registry.dll": {
-            "assemblyVersion": "5.0.0.0",
-            "fileVersion": "5.0.20.51904"
-          }
         }
       },
       "MinVer/4.2.0": {},
@@ -174,16 +156,6 @@
           "Microsoft.Build.Framework": "17.4.0",
           "Microsoft.Build.Tasks.Core": "17.4.0",
           "Microsoft.Build.Utilities.Core": "17.4.0"
-        },
-        "runtime": {
-          "lib/netstandard2.0/MSBuild.Usings.dll": {
-            "assemblyVersion": "0.0.1.0",
-            "fileVersion": "0.0.1.0"
-          },
-          "lib/netstandard2.0/System.Buffers.dll": {
-            "assemblyVersion": "4.0.3.0",
-            "fileVersion": "4.6.28619.1"
-          }
         }
       },
       "NETStandard.Library/2.0.3": {
@@ -343,15 +315,15 @@
         }
       },
       "Stef.Validation/0.1.0": {},
-      "System.Buffers/4.5.1": {},
-      "System.CodeDom/6.0.0": {
+      "System.Buffers/4.5.1": {
         "runtime": {
-          "lib/netstandard2.0/System.CodeDom.dll": {
-            "assemblyVersion": "6.0.0.0",
-            "fileVersion": "6.0.21.52210"
+          "lib/netstandard2.0/System.Buffers.dll": {
+            "assemblyVersion": "4.0.3.0",
+            "fileVersion": "4.6.28619.1"
           }
         }
       },
+      "System.CodeDom/6.0.0": {},
       "System.Collections/4.3.0": {
         "dependencies": {
           "Microsoft.NETCore.Platforms": "1.1.0",
@@ -363,24 +335,12 @@
         "dependencies": {
           "System.Memory": "4.5.5",
           "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        },
-        "runtime": {
-          "lib/netstandard2.0/System.Collections.Immutable.dll": {
-            "assemblyVersion": "6.0.0.0",
-            "fileVersion": "6.0.21.52210"
-          }
         }
       },
       "System.Configuration.ConfigurationManager/6.0.0": {
         "dependencies": {
           "System.Security.Cryptography.ProtectedData": "6.0.0",
           "System.Security.Permissions": "6.0.0"
-        },
-        "runtime": {
-          "lib/netstandard2.0/System.Configuration.ConfigurationManager.dll": {
-            "assemblyVersion": "6.0.0.0",
-            "fileVersion": "6.0.21.52210"
-          }
         }
       },
       "System.Diagnostics.Debug/4.3.0": {
@@ -491,12 +451,6 @@
       "System.Reflection.Metadata/6.0.0": {
         "dependencies": {
           "System.Collections.Immutable": "6.0.0"
-        },
-        "runtime": {
-          "lib/netstandard2.0/System.Reflection.Metadata.dll": {
-            "assemblyVersion": "6.0.0.0",
-            "fileVersion": "6.0.21.52210"
-          }
         }
       },
       "System.Reflection.Primitives/4.3.0": {
@@ -510,23 +464,11 @@
         "dependencies": {
           "System.Reflection": "4.3.0",
           "System.Runtime": "4.3.0"
-        },
-        "runtime": {
-          "lib/netstandard1.5/System.Reflection.TypeExtensions.dll": {
-            "assemblyVersion": "4.1.0.0",
-            "fileVersion": "1.0.24212.1"
-          }
         }
       },
       "System.Resources.Extensions/6.0.0": {
         "dependencies": {
           "System.Memory": "4.5.5"
-        },
-        "runtime": {
-          "lib/netstandard2.0/System.Resources.Extensions.dll": {
-            "assemblyVersion": "6.0.0.0",
-            "fileVersion": "6.0.21.52210"
-          }
         }
       },
       "System.Resources.ResourceManager/4.3.0": {
@@ -585,12 +527,6 @@
           "System.Runtime.InteropServices": "4.3.0",
           "System.Threading": "4.3.0",
           "runtime.native.System": "4.3.0"
-        },
-        "runtime": {
-          "lib/netstandard1.1/System.Runtime.InteropServices.RuntimeInformation.dll": {
-            "assemblyVersion": "4.0.1.0",
-            "fileVersion": "4.6.24705.1"
-          }
         }
       },
       "System.Runtime.Loader/4.0.0": {
@@ -598,23 +534,11 @@
           "System.IO": "4.3.0",
           "System.Reflection": "4.3.0",
           "System.Runtime": "4.3.0"
-        },
-        "runtime": {
-          "lib/netstandard1.5/System.Runtime.Loader.dll": {
-            "assemblyVersion": "4.0.0.0",
-            "fileVersion": "1.0.24212.1"
-          }
         }
       },
       "System.Security.AccessControl/6.0.0": {
         "dependencies": {
           "System.Security.Principal.Windows": "5.0.0"
-        },
-        "runtime": {
-          "lib/netstandard2.0/System.Security.AccessControl.dll": {
-            "assemblyVersion": "6.0.0.0",
-            "fileVersion": "6.0.21.52210"
-          }
         }
       },
       "System.Security.Cryptography.Cng/5.0.0": {
@@ -655,33 +579,14 @@
           "System.Memory": "4.5.5",
           "System.Security.AccessControl": "6.0.0",
           "System.Security.Cryptography.Pkcs": "6.0.4"
-        },
-        "runtime": {
-          "lib/netstandard2.0/System.Security.Cryptography.Xml.dll": {
-            "assemblyVersion": "6.0.0.0",
-            "fileVersion": "6.0.21.52210"
-          }
         }
       },
       "System.Security.Permissions/6.0.0": {
         "dependencies": {
           "System.Security.AccessControl": "6.0.0"
-        },
-        "runtime": {
-          "lib/netstandard2.0/System.Security.Permissions.dll": {
-            "assemblyVersion": "6.0.0.0",
-            "fileVersion": "6.0.21.52210"
-          }
-        }
-      },
-      "System.Security.Principal.Windows/5.0.0": {
-        "runtime": {
-          "lib/netstandard2.0/System.Security.Principal.Windows.dll": {
-            "assemblyVersion": "5.0.0.0",
-            "fileVersion": "5.0.20.51904"
-          }
         }
       },
+      "System.Security.Principal.Windows/5.0.0": {},
       "System.Text.Encoding/4.3.0": {
         "dependencies": {
           "Microsoft.NETCore.Platforms": "1.1.0",
@@ -693,12 +598,6 @@
         "dependencies": {
           "System.Memory": "4.5.5",
           "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        },
-        "runtime": {
-          "lib/netstandard2.0/System.Text.Encoding.CodePages.dll": {
-            "assemblyVersion": "6.0.0.0",
-            "fileVersion": "6.0.21.52210"
-          }
         }
       },
       "System.Text.Encodings.Web/7.0.0": {
@@ -735,12 +634,6 @@
         "dependencies": {
           "System.Runtime": "4.3.0",
           "System.Threading.Tasks": "4.3.0"
-        },
-        "runtime": {
-          "lib/netstandard1.3/System.Threading.dll": {
-            "assemblyVersion": "4.0.12.0",
-            "fileVersion": "4.6.24705.1"
-          }
         }
       },
       "System.Threading.Tasks/4.3.0": {
@@ -750,14 +643,7 @@
           "System.Runtime": "4.3.0"
         }
       },
-      "System.Threading.Tasks.Dataflow/6.0.0": {
-        "runtime": {
-          "lib/netstandard2.0/System.Threading.Tasks.Dataflow.dll": {
-            "assemblyVersion": "6.0.0.0",
-            "fileVersion": "6.0.21.52210"
-          }
-        }
-      },
+      "System.Threading.Tasks.Dataflow/6.0.0": {},
       "System.Threading.Tasks.Extensions/4.5.4": {
         "dependencies": {
           "System.Runtime.CompilerServices.Unsafe": "6.0.0"
@@ -933,7 +819,7 @@
     "MSBuild.Usings/0.0.1-Local": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-XGZCzevKzcgl+6d1lJpSgNiNJrdexUUgkg6b56pTsqXwoZaC3ty+jZqXr2mublrR+tL706N1vpJe6LXXKW8SKQ==",
+      "sha512": "sha512-LmUBDBe6yGmyuHYrtDYvgT6IgmRLCkoS+0M3+2egN590DTBnehSBBjyBa4lvJt4KNWv0DojcAR3NBBgTDHg4pQ==",
       "path": "msbuild.usings/0.0.1-local",
       "hashPath": "msbuild.usings.0.0.1-local.nupkg.sha512"
     },