From e860022e1a7b1ea825c1d185d1084feec24faf47 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 22 Nov 2017 08:31:19 -0800
Subject: [PATCH] Remove references to aspnetcore-ci-dev and fix properties in
 PackageArchive targets

---
 build/PackageArchive.targets                           |  4 ++--
 build/RuntimeStore.targets                             | 10 ++++------
 build/repo.props                                       |  6 ++++++
 build/repo.targets                                     |  7 +------
 build/tools/templates/Archive/Archive.csproj           |  2 +-
 build/tools/templates/RS.Manifest/RS.Manifest.csproj   |  2 +-
 .../tools/templates/RS.References/RS.References.csproj |  2 +-
 7 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets
index 4f15b34553..4475413337 100644
--- a/build/PackageArchive.targets
+++ b/build/PackageArchive.targets
@@ -22,7 +22,7 @@
       BuildArtifacts="@(ArtifactInfo)"
       PackageArtifacts="@(PackageArtifact)"
       ExternalDependencies="@(ExternalDependency)"
-      MetapackageVersion="$(MetapackageVersion)" />
+      MetapackageVersion="$(PackageVersion)" />
 
     <PropertyGroup>
       <FallbackStagingDir>$(_WorkRoot)obj\$(LzmaOutputPackageName)</FallbackStagingDir>
@@ -33,7 +33,7 @@
 
     <ItemGroup>
       <_FallbackArchiveRestoreSources Include="$(MetapackageRestoreSource)" Condition="Exists($(MetapackageRestoreSource))" />
-      <_FallbackArchiveRestoreSources Include="$(_DependencyMirrorDirectory)" Condition="Exists($(_DependencyMirrorDirectory))" />
+      <_FallbackArchiveRestoreSources Include="$(DependencyMirrorPackageDir)" Condition="Exists($(DependencyMirrorPackageDir))" />
     </ItemGroup>
 
     <RepoTasks.GenerateRestoreSourcesPropsFile
diff --git a/build/RuntimeStore.targets b/build/RuntimeStore.targets
index c369b30a0a..c0954a7e8b 100644
--- a/build/RuntimeStore.targets
+++ b/build/RuntimeStore.targets
@@ -2,8 +2,6 @@
   <Import Project="common.props" />
 
   <PropertyGroup>
-    <_DependencyBuildDirectory>$(RepositoryRoot).deps\build\</_DependencyBuildDirectory>
-    <_DependencyMirrorDirectory>$(RepositoryRoot).deps\mirror\</_DependencyMirrorDirectory>
     <_BuildScriptsDirectory>$(MSBuildThisFileDirectory)tools\scripts\</_BuildScriptsDirectory>
     <_WorkRoot>$(RepositoryRoot).w\</_WorkRoot>
     <_RuntimeStoreWorkDirectory>$(_WorkRoot).rw\</_RuntimeStoreWorkDirectory>
@@ -92,13 +90,13 @@
       <RSReferenceNupkgFile Include="$(RSReferencesWorkDirectory)**\*.nupkg" />
     </ItemGroup>
 
-    <Copy SourceFiles="@(RSReferenceNupkgFile)" DestinationFolder="$(_DependencyBuildDirectory)" />
+    <Copy SourceFiles="@(RSReferenceNupkgFile)" DestinationFolder="$(DependencyPackageDir)" />
   </Target>
 
   <Target Name="_PrepareRuntimeStoreBuildAssets">
     <ItemGroup>
-      <_RuntimeStoreRestoreSources Include="$(_DependencyBuildDirectory)" Condition="Exists($(_DependencyBuildDirectory))" />
-      <_RuntimeStoreRestoreSources Include="$(_DependencyMirrorDirectory)" Condition="Exists($(_DependencyMirrorDirectory))" />
+      <_RuntimeStoreRestoreSources Include="$(DependencyPackageDir)" Condition="Exists($(DependencyPackageDir))" />
+      <_RuntimeStoreRestoreSources Include="$(DependencyMirrorPackageDir)" Condition="Exists($(DependencyMirrorPackageDir))" />
       <_RuntimeStoreRestoreSources Include="$(BuildDir)" Condition="Exists($(BuildDir))" />
     </ItemGroup>
 
@@ -220,7 +218,7 @@
 
   <Target Name="AddManifestsToMetapackage">
     <ItemGroup>
-      <MetaPackageNupkg Include="$(_DependencyBuildDirectory)Microsoft.AspNetCore.All.*.nupkg" />
+      <MetaPackageNupkg Include="$(DependencyPackageDir)Microsoft.AspNetCore.All.*.nupkg" />
       <ManifestFiles Include="$(ArtifactsDir)*.xml"/>
     </ItemGroup>
 
diff --git a/build/repo.props b/build/repo.props
index 275a931fe1..791f3bf931 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -8,6 +8,12 @@
     <SkipTests>false</SkipTests>
     <SkipTests Condition="'$(CompileOnly)' == 'true'">true</SkipTests>
     <IsFinalBuild Condition="'$(IsFinalBuild)' == ''">false</IsFinalBuild>
+
+    <SubmoduleRoot>$(RepositoryRoot)modules\</SubmoduleRoot>
+    <LineupBuildDir>$(ArtifactsDir)lineups\</LineupBuildDir>
+
+    <DependencyPackageDir>$(RepositoryRoot).deps\build\</DependencyPackageDir>
+    <DependencyMirrorPackageDir>$(RepositoryRoot).deps\mirror\</DependencyMirrorPackageDir>
   </PropertyGroup>
 
   <Import Project="artifacts.props" />
diff --git a/build/repo.targets b/build/repo.targets
index 2ab0b5bfb6..282a2ec44e 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -8,11 +8,6 @@
   <Import Project="push.targets" />
 
   <PropertyGroup>
-    <SubmoduleRoot>$(RepositoryRoot)modules\</SubmoduleRoot>
-    <LineupBuildDir>$(ArtifactsDir)lineups\</LineupBuildDir>
-    <_DependencyBuildDirectory>$(RepositoryRoot).deps\build\</_DependencyBuildDirectory>
-    <_DependencyPackagesDirectory>$(_DependencyBuildDirectory)</_DependencyPackagesDirectory>
-
     <_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'=='' AND '$(SkipTests)'=='true'">/t:Package /t:VerifyPackages</_RepositoryBuildTargets>
     <_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'==''">/t:Build</_RepositoryBuildTargets>
     <!-- For external packages that come from feeds will mirrored to aspnetcore feeds. -->
@@ -99,7 +94,7 @@
       <_LineupPackages Include="%(ArtifactInfo.PackageId)" Version="%(ArtifactInfo.Version)" Condition=" '%(ArtifactInfo.ArtifactType)' == 'NuGetPackage' " />
       <_LineupPackages Include="Microsoft.AspNetCore.All" Version="$(PackageVersion)" />
 
-      <_LineupSources Include="$(_DependencyPackagesDirectory)" Condition="'$(_DependencyPackagesDirectory)' != '' AND Exists('$(_DependencyPackagesDirectory)')" />
+      <_LineupSources Include="$(DependencyPackageDir)" Condition="'$(DependencyPackageDir)' != '' AND Exists('$(DependencyPackageDir)')" />
       <_LineupSources Include="$(BuildDir)" />
       <_LineupSources Include="$(IntermediateExternalPackageDir)" />
       <_LineupSources Include="$(IntermediateMirrorPackageDir)" />
diff --git a/build/tools/templates/Archive/Archive.csproj b/build/tools/templates/Archive/Archive.csproj
index 088d82c8fa..b548cc6f7a 100644
--- a/build/tools/templates/Archive/Archive.csproj
+++ b/build/tools/templates/Archive/Archive.csproj
@@ -10,7 +10,7 @@
     <RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;</RestoreSources>
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
       $(RestoreSources);
-      https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json;
+      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
       https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
     </RestoreSources>
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
diff --git a/build/tools/templates/RS.Manifest/RS.Manifest.csproj b/build/tools/templates/RS.Manifest/RS.Manifest.csproj
index d5b5a1c33a..e040db7443 100644
--- a/build/tools/templates/RS.Manifest/RS.Manifest.csproj
+++ b/build/tools/templates/RS.Manifest/RS.Manifest.csproj
@@ -7,7 +7,7 @@
     <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
       $(RestoreSources);
-      https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json;
+      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
       https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
     </RestoreSources>
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
diff --git a/build/tools/templates/RS.References/RS.References.csproj b/build/tools/templates/RS.References/RS.References.csproj
index b28793fed0..d99ebef658 100644
--- a/build/tools/templates/RS.References/RS.References.csproj
+++ b/build/tools/templates/RS.References/RS.References.csproj
@@ -6,7 +6,7 @@
     <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
       $(RestoreSources);
-      https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json;
+      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
       https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
     </RestoreSources>
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">