From 4039af267d61323d65b943639e41f3be119146c5 Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@andrewnurse.net>
Date: Thu, 27 Apr 2017 09:47:38 -0700
Subject: [PATCH 1/3] fix drop share reference

---
 build/repo.targets | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/build/repo.targets b/build/repo.targets
index 1a7f5513ce..0450a4682b 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -136,21 +136,20 @@
 
   <Target Name="BuildFallbackArchive">
     <!-- Validate Arguments -->
+    <Error Text="COHERENCE_SIGNED_DROP_LOCATION is not specified. This requires a path like \\aspnetci\drops\Coherence-Signed\{branch}\{build-number}"
+        Condition=" '$(COHERENCE_SIGNED_DROP_LOCATION)' == '' " />
     <Error Text="Required Property 'BuildNumber' not provided" Condition="'$(BuildNumber)' == ''" />
 
     <!-- Determine ASP.NET Package Version -->
     <PropertyGroup>
-        <CoherenceSignedRoot Condition="'$(COHERENCE_SIGNED_DROP_ROOT)' != ''">$(COHERENCE_SIGNED_DROP_ROOT)</CoherenceSignedRoot>
-        <CoherenceSignedRoot Condition="'$(CoherenceSignedRoot)' == ''">\\aspnetci\Drops\Coherence-Signed\dev</CoherenceSignedRoot>
-
         <NoTimestampSuffix Condition="'$(TIMESTAMP_FREE_VERSION)' != ''">$(TIMESTAMP_FREE_VERSION)</NoTimestampSuffix>
         <NoTimestampSuffix Condition="'$(NoTimestampSuffix)' == ''">final</NoTimestampSuffix>
 
         <NoTimestampVersion>$(VersionPrefix)-$(VersionSuffix)-$(NoTimestampSuffix)</NoTimestampVersion>
         <TimestampVersion>$(VersionPrefix)-$(VersionSuffix)-$(BuildNumber)</TimestampVersion>
 
-        <NoTimestampSource>$(CoherenceSignedRoot)\$(BuildNumber)\Signed\Packages-NoTimeStamp</NoTimestampSource>
-        <TimestampSource>$(CoherenceSignedRoot)\$(BuildNumber)\Signed\Packages</TimestampSource>
+        <NoTimestampSource>$(COHERENCE_SIGNED_DROP_LOCATION)\Signed\Packages-NoTimeStamp</NoTimestampSource>
+        <TimestampSource>$(COHERENCE_SIGNED_DROP_LOCATION)\Signed\Packages</TimestampSource>
     </PropertyGroup>
 
     <!-- Run the actual target twice, once for timestamped packages, once for non-timestamped packages -->
@@ -164,11 +163,10 @@
         <PublishDir Condition="'$(PublishShare)' != ''">$(PublishShare)\fallbackArchives</PublishDir>
     </PropertyGroup>
     <Copy SourceFiles="artifacts\nuGetPackagesArchive.$(BuildNumber).timestamped;artifacts\nuGetPackagesArchive.$(BuildNumber).notimestamp" DestinationFolder="$(PublishDir)" Condition="'$(PublishDir)' != ''" />
-
   </Target>
 
   <Target Name="AddManifestsToNupkg">
-    <Error Text="COHERENCE_DROP_LOCATION is not specified. This requires a path like \\aspnetci\drops\Coherence\{build-number}"
+    <Error Text="COHERENCE_DROP_LOCATION is not specified. This requires a path like \\aspnetci\drops\Coherence\{branch}\{build-number}"
         Condition=" '$(COHERENCE_DROP_LOCATION)' == '' " />
 
     <ItemGroup>

From aeba0c9026acc186a5f7212d76c1a01ef51d3d0e Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@andrewnurse.net>
Date: Thu, 27 Apr 2017 11:27:20 -0700
Subject: [PATCH 2/3] derped the publish source

---
 build/repo.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/repo.targets b/build/repo.targets
index 0450a4682b..9040518748 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -162,7 +162,7 @@
     <PropertyGroup>
         <PublishDir Condition="'$(PublishShare)' != ''">$(PublishShare)\fallbackArchives</PublishDir>
     </PropertyGroup>
-    <Copy SourceFiles="artifacts\nuGetPackagesArchive.$(BuildNumber).timestamped;artifacts\nuGetPackagesArchive.$(BuildNumber).notimestamp" DestinationFolder="$(PublishDir)" Condition="'$(PublishDir)' != ''" />
+    <Copy SourceFiles="$(RepositoryRoot)artifacts\nuGetPackagesArchive.$(BuildNumber).timestamped.lzma;$(RepositoryRoot)artifacts\nuGetPackagesArchive.$(BuildNumber).notimestamp.lzma" DestinationFolder="$(PublishDir)" Condition="'$(PublishDir)' != ''" />
   </Target>
 
   <Target Name="AddManifestsToNupkg">

From c56d76693e5bfb357076ba47ecc8e196f5965b7c Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Thu, 27 Apr 2017 11:31:19 -0700
Subject: [PATCH 3/3] Rename file

---
 build/{Build.RuntimeStore.nuspec => Build.RS.nuspec} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename build/{Build.RuntimeStore.nuspec => Build.RS.nuspec} (100%)

diff --git a/build/Build.RuntimeStore.nuspec b/build/Build.RS.nuspec
similarity index 100%
rename from build/Build.RuntimeStore.nuspec
rename to build/Build.RS.nuspec