From eb5b94e3c48b00079597fb9f75cbeef757eb7ef1 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Mon, 26 Mar 2018 16:03:09 -0700
Subject: [PATCH] Make consistent variable names for RestoreSourcePropsPath

---
 build/RepositoryBuild.targets                      |  2 +-
 build/RuntimeStore.targets                         | 14 +++++++-------
 build/Templating.targets                           |  2 +-
 build/repo.targets                                 |  8 ++++----
 .../tools/templates/RS.Manifest/RS.Manifest.csproj |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index bbcc652f82..07d45bb2c6 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -41,7 +41,7 @@
       <!-- Should reduce allowable package feeds to only nuget.org. -->
       <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:AspNetUniverseBuildOffline=true</RepositoryBuildArguments>
       <!-- If there are duplicate properties, the properties which are defined later in the order would override the earlier ones -->
-      <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath)</RepositoryBuildArguments>
+      <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath)</RepositoryBuildArguments>
       <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath)</RepositoryBuildArguments>
       <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:BuildNumber=$(BuildNumber)</RepositoryBuildArguments>
       <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:Configuration=$(Configuration)</RepositoryBuildArguments>
diff --git a/build/RuntimeStore.targets b/build/RuntimeStore.targets
index 5fc3b44466..9592fc5be5 100644
--- a/build/RuntimeStore.targets
+++ b/build/RuntimeStore.targets
@@ -49,12 +49,12 @@
     <!-- Set _Target=Restore so the project will be re-evaluated to include Internal.AspNetCore.Sdk MSBuild properties on the next step. -->
     <MSBuild Projects="$(MetapackageWorkDirectory)Microsoft.AspNetCore.All.csproj"
       Targets="Restore"
-      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);AspNetUniverseBuildOffline=true;_Target=Restore" />
+      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath);AspNetUniverseBuildOffline=true;_Target=Restore" />
 
     <!-- Pack -->
     <MSBuild Projects="$(MetapackageWorkDirectory)Microsoft.AspNetCore.All.csproj"
       Targets="Pack"
-      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);AspNetUniverseBuildOffline=true" />
+      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath);AspNetUniverseBuildOffline=true" />
 
     <!-- Copy to output directory -->
     <ItemGroup>
@@ -86,12 +86,12 @@
     <!-- Set _Target=Restore so the project will be re-evaluated to include Internal.AspNetCore.Sdk MSBuild properties on the next step. -->
     <MSBuild Projects="$(RSReferencesWorkDirectory)RS.References.csproj"
       Targets="Restore"
-      Properties="Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);_Target=Restore" />
+      Properties="Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath);_Target=Restore" />
 
     <!-- Pack -->
     <MSBuild Projects="$(RSReferencesWorkDirectory)RS.References.csproj"
       Targets="Pack"
-      Properties="Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath)" />
+      Properties="Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath)" />
 
     <!-- Copy to output directory -->
     <ItemGroup>
@@ -110,11 +110,11 @@
 
     <RepoTasks.GenerateRestoreSourcesPropsFile
       Sources="@(_RuntimeStoreRestoreSources)"
-      OutputPath="$(GeneratedRestoreSourcesPropsPath)" />
+      OutputPath="$(GeneratedRestoreSourcePropsPath)" />
 
     <PropertyGroup>
       <_RsManifestProps>MicrosoftAspNetCoreAllPackageVersion=$(PackageVersion)</_RsManifestProps>
-      <_RsManifestProps>$(_RsManifestProps);DotNetRestoreSourcesPropsPath=$(GeneratedRestoreSourcesPropsPath)</_RsManifestProps>
+      <_RsManifestProps>$(_RsManifestProps);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath)</_RsManifestProps>
     </PropertyGroup>
   </Target>
 
@@ -152,7 +152,7 @@
     <PropertyGroup>
       <HostingStartupWorkDir>$(_WorkRoot)HostingStartup\</HostingStartupWorkDir>
       <_HostingStartupProps>DepsOutputPath=$(_DepsOutputDirectory)</_HostingStartupProps>
-      <_HostingStartupProps>$(_HostingStartupProps);DotNetRestoreSourcesPropsPath=$(GeneratedRestoreSourcesPropsPath)</_HostingStartupProps>
+      <_HostingStartupProps>$(_HostingStartupProps);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath)</_HostingStartupProps>
       <_HostingStartupProps>$(_HostingStartupProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion)</_HostingStartupProps>
       <_HostingStartupProps>$(_HostingStartupProps);HostingStartupPackageName=$(HostingStartupPackageName)</_HostingStartupProps>
       <_HostingStartupProps>$(_HostingStartupProps);HostingStartupPackageVersion=$(HostingStartupPackageVersion)</_HostingStartupProps>
diff --git a/build/Templating.targets b/build/Templating.targets
index 175942417e..003ad20ddb 100644
--- a/build/Templating.targets
+++ b/build/Templating.targets
@@ -8,7 +8,7 @@
       <GeneratedNoTimestampPackageVersionPropsPath>$(IntermediateDir)dependencies.notimestamp.props</GeneratedNoTimestampPackageVersionPropsPath>
       <TemplateProjCommmonProperties>
         RepositoryRoot=$(TemplatingProjectRoot);
-        DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);
+        DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath);
         BuildNumber=$(BuildNumber);
         Configuration=$(Configuration);
         SkipBillOfMaterials=true;
diff --git a/build/repo.targets b/build/repo.targets
index 47b6aa7521..caeb8ab94e 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -18,7 +18,7 @@
     <!-- For external packages that come from feeds we don't mirror. -->
     <IntermediateExternalPackageDir>$(IntermediateDir)ext\</IntermediateExternalPackageDir>
     <GeneratedPackageVersionPropsPath>$(IntermediateDir)dependencies.props</GeneratedPackageVersionPropsPath>
-    <GeneratedRestoreSourcesPropsPath>$(IntermediateDir)sources.props</GeneratedRestoreSourcesPropsPath>
+    <GeneratedRestoreSourcePropsPath>$(IntermediateDir)sources.props</GeneratedRestoreSourcePropsPath>
 
     <PrepareDependsOn>$(PrepareDependsOn);VerifyPackageArtifactConfig;PrepareOutputPath</PrepareDependsOn>
     <CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts</CleanDependsOn>
@@ -62,7 +62,7 @@
 
     <RepoTasks.GenerateRestoreSourcesPropsFile
       Sources="@(_LineupSources)"
-      OutputPath="$(GeneratedRestoreSourcesPropsPath)" />
+      OutputPath="$(GeneratedRestoreSourcePropsPath)" />
   </Target>
 
   <Target Name="CleanUniverseArtifacts">
@@ -166,14 +166,14 @@
       Solutions="@(Solution)"
       Artifacts="@(ArtifactInfo);@(ShippedArtifactInfo)"
       Repositories="@(Repository);@(ShippedRepository)"
-      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath)" />
+      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath)" />
 
     <RepoTasks.AnalyzeBuildGraph
       Solutions="@(Solution)"
       Artifacts="@(ArtifactInfo)"
       Dependencies="@(ExternalDependency)"
       StartGraphAt="$(BuildGraphOf)"
-      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath)">
+      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath)">
       <Output TaskParameter="RepositoryBuildOrder" ItemName="RepositoryBuildOrder" />
     </RepoTasks.AnalyzeBuildGraph>
   </Target>
diff --git a/build/tools/templates/RS.Manifest/RS.Manifest.csproj b/build/tools/templates/RS.Manifest/RS.Manifest.csproj
index abb2d76d90..7d1d0f66ab 100644
--- a/build/tools/templates/RS.Manifest/RS.Manifest.csproj
+++ b/build/tools/templates/RS.Manifest/RS.Manifest.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(DotNetRestoreSourcesPropsPath)" Condition="'$(DotNetRestoreSourcesPropsPath)' != ''" />
+  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>