From 17497ffb9791d7434b35c7560cbe1b3faa894072 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Thu, 22 Aug 2019 14:04:28 -0500
Subject: [PATCH 1/2] Set up auto-update for infra packages

---
 eng/Version.Details.xml | 16 ++++++++++++++++
 eng/Versions.props      | 10 +++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8e160ebe80..2ec35030a1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -127,5 +127,21 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>c7f03b2cf06bdfc64dad4140fd0d486127095cd8</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19422.24">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>c7f03b2cf06bdfc64dad4140fd0d486127095cd8</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19422.24">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>c7f03b2cf06bdfc64dad4140fd0d486127095cd8</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19422.24">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>c7f03b2cf06bdfc64dad4140fd0d486127095cd8</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.SourceLink" Version="1.0.0-beta2-19367-01">
+      <Uri>https://github.com/dotnet/sourcelink</Uri>
+      <Sha></Sha>
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index d909297513..9417a407a1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,9 +36,11 @@
   <!--Package versions-->
   <PropertyGroup>
     <!-- arcade -->
-    <MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19308.1</MicrosoftDotNetBuildTasksPackagingPackageVersion>
-    <MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19410.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19308.1</MicrosoftDotNetVersionToolsTasksPackageVersion>
+    <MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19422.24</MicrosoftDotNetBuildTasksFeedPackageVersion>
+    <MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19422.24</MicrosoftDotNetBuildTasksPackagingPackageVersion>
+    <MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19422.24</MicrosoftDotNetVersionToolsTasksPackageVersion>
+    <!-- sourcelink -->
+    <MicrosoftSourceLinkVersion>1.0.0-beta2-19367-01</MicrosoftSourceLinkVersion>
     <!-- corefx -->
     <MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha1.19409.9</MicrosoftNETCorePlatformsPackageVersion>
     <MicrosoftNETCoreTargetsPackageVersion>5.0.0-alpha1.19409.9</MicrosoftNETCoreTargetsPackageVersion>
@@ -85,8 +87,6 @@
     <NugetPackagingPackageVersion>4.9.4</NugetPackagingPackageVersion>
     <MicrosoftTargetingPackPrivateWinRTPackageVersion>1.0.5</MicrosoftTargetingPackPrivateWinRTPackageVersion>
     <MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
-    <!-- Infrastructure and test-only. -->
-    <MicrosoftSourceLinkVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkVersion>
   </PropertyGroup>
   <!--Package names-->
   <PropertyGroup>

From 776b9c4605ae3569a02c8191fe99b4291a48daaa Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Thu, 22 Aug 2019 14:54:45 -0500
Subject: [PATCH 2/2] React to packaging tools centralizing specs

---
 eng/jobs/steps/upload-job-artifacts.yml                       | 4 +++-
 .../NuGetArtifactTester.cs                                    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/eng/jobs/steps/upload-job-artifacts.yml b/eng/jobs/steps/upload-job-artifacts.yml
index 776b284b21..8b9e42f6ae 100644
--- a/eng/jobs/steps/upload-job-artifacts.yml
+++ b/eng/jobs/steps/upload-job-artifacts.yml
@@ -8,7 +8,9 @@ steps:
     displayName: Prepare job-specific Artifacts subdirectory
     inputs:
       SourceFolder: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)'
-      Contents: '**/*'
+      Contents: |
+        Shipping/**/*
+        NonShipping/**/*
       TargetFolder: '$(Build.StagingDirectory)/Artifacts/${{ parameters.name }}'
       CleanTargetFolder: true
     condition: and(succeeded(), eq(variables._BuildConfig, 'Release'))
diff --git a/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs b/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs
index 421311d8e8..b46b78150f 100644
--- a/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs
+++ b/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs
@@ -36,8 +36,8 @@ public static NuGetArtifactTester OpenOrNull(
             id = id ?? project;
 
             string nuspecPath = Path.Combine(
-                dirs.BaseBinFolder,
-                project,
+                dirs.BaseArtifactsFolder,
+                "packages",
                 dirs.Configuration,
                 "specs",
                 $"{id}.nuspec");