diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index af364288c3..ae2f043894 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -52,19 +52,19 @@ jobs:
       dotnet --info
       printenv
       dotnet cake build.cake -target="Azure-OSX" -configuration="Release"
-  
   - task: PublishBuildArtifacts@1
     inputs:
-      pathToPublish: '$(Build.SourcesDirectory)/Build/Products/Release/'
-      artifactName: 'Avalonia.Native.OSX'
+      pathtoPublish: '$(Build.SourcesDirectory)/artifacts/nuget'
+      artifactName: 'NuGet'
   - task: PublishBuildArtifacts@1
     inputs:
-      pathToPublish: '$(Build.SourcesDirectory)/artifacts/bin'
-      artifactName: 'BinariesOSX'
+      pathToPublish: '$(Build.SourcesDirectory)/artifacts/zip'
+      artifactName: 'Samples'
   - task: PublishBuildArtifacts@1
     inputs:
-      pathToPublish: '$(Build.SourcesDirectory)/src/Avalonia.Native/nuget'
-      artifactName: 'Avalonia.Native.Nuspec'
+      pathToPublish: '$(Build.SourcesDirectory)/artifacts/bin'
+      artifactName: 'BinariesWindows'
+
 
 - job: Windows
   pool:
@@ -78,16 +78,4 @@ jobs:
     inputs:
       script: |
         set PATH=%PATH%;%USERPROFILE%\.dotnet\tools
-        dotnet cake build.cake -target="Azure-Windows" -configuration="Release"
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: '$(Build.SourcesDirectory)/artifacts/nuget'
-      artifactName: 'NuGet'
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathToPublish: '$(Build.SourcesDirectory)/artifacts/zip'
-      artifactName: 'Samples'
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathToPublish: '$(Build.SourcesDirectory)/artifacts/bin'
-      artifactName: 'BinariesWindows'
+        dotnet cake build.cake -target="Azure-Windows" -configuration="Release"
\ No newline at end of file
diff --git a/build.cake b/build.cake
index fbd915461f..f00da544c6 100644
--- a/build.cake
+++ b/build.cake
@@ -271,14 +271,12 @@ Task("Azure-Linux")
   .IsDependentOn("Run-Tests");
 
 Task("Azure-OSX")
-  .IsDependentOn("Run-Tests")
+  .IsDependentOn("Package")
   .IsDependentOn("Copy-Files-Impl")
   .IsDependentOn("Zip-Files-Impl");
 
 Task("Azure-Windows")
-  .IsDependentOn("Package")
-  .IsDependentOn("Copy-Files-Impl")
-  .IsDependentOn("Zip-Files-Impl");
+  .IsDependentOn("Run-Tests");
 
 ///////////////////////////////////////////////////////////////////////////////
 // EXECUTE
diff --git a/src/Avalonia.Native/nuget/Avalonia.Native.nuspec b/src/Avalonia.Native/nuget/Avalonia.Native.nuspec
deleted file mode 100644
index bd7344f91c..0000000000
--- a/src/Avalonia.Native/nuget/Avalonia.Native.nuspec
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
-  <metadata>
-    <id>Avalonia.Native</id>
-    <version>$avalonia-version$</version>
-    <authors>Avalonia Team</authors>
-    <owners>stevenk</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-    <projectUrl>https://github.com/AvaloniaUI/Avalonia</projectUrl>
-    <description>The Avalonia UI framework</description>
-    <copyright>Copyright 2018</copyright>
-    <tags>Avalonia</tags>
-    <dependencies>
-      <dependency id="Avalonia" version="$avalonia-version$" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="..\AvaloniaUI.BinariesWindows\Avalonia.Native.dll" target="lib\netstandard2.0\Avalonia.Native.dll" />
-    <file src="..\Avalonia.Native.OSX\libAvalonia.Native.OSX.dylib" target="runtimes\osx\native\libAvaloniaNative.dylib" />
-  </files>
-</package>
\ No newline at end of file