Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/aspnetcore.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPranav K <prkrishn@hotmail.com>2017-12-02 02:56:47 +0300
committerPranav K <prkrishn@hotmail.com>2017-12-02 03:04:01 +0300
commit3a76af803ab8734d11a63e255c1cacf6438761e6 (patch)
treeab7d1503283769a5bf01ad4d79bba3a6ec416f80
parent400ef9e3b1ba7af7565f7bf198584429f5abbc83 (diff)
Rename the parameter used to specify additional sources to avoid conflating with DotNetRestoreSources used in projects
-rw-r--r--build/repo.targets2
-rw-r--r--run.ps12
-rwxr-xr-xrun.sh4
3 files changed, 4 insertions, 4 deletions
diff --git a/build/repo.targets b/build/repo.targets
index eaa6a28c94..2c2b64d08a 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -92,7 +92,7 @@
<_LineupPackages Include="%(ArtifactInfo.PackageId)" Version="%(ArtifactInfo.Version)" Condition=" '%(ArtifactInfo.ArtifactType)' == 'NuGetPackage' " />
<_LineupPackages Include="Microsoft.AspNetCore.All" Version="$(PackageVersion)" />
- <_RestoreSources Include="$(DotNetRestoreSources)" Condition="'$(DotNetRestoreSources)' != ''" />
+ <_RestoreSources Include="$(DotNetAdditionalRestoreSources)" Condition="'$(DotNetAdditionalRestoreSources)' != ''" />
<_RestoreSources Include="$(DependencyPackageDir)" Condition="'$(DependencyPackageDir)' != '' AND Exists('$(DependencyPackageDir)')" />
<_RestoreSources Include="$(BuildDir)" />
<_RestoreSources Include="$(IntermediateExternalPackageDir)" />
diff --git a/run.ps1 b/run.ps1
index 18d3b23a9f..588b0dde31 100644
--- a/run.ps1
+++ b/run.ps1
@@ -202,7 +202,7 @@ if ($PackageVersionPropsUrl) {
}
if ($RestoreSources) {
- $MSBuildArguments += "-p:DotNetRestoreSources=$RestoreSources"
+ $MSBuildArguments += "-p:DotNetAdditionalRestoreSources=$RestoreSources"
}
if ($AssetRootUrl) {
diff --git a/run.sh b/run.sh
index 8113372e1e..fc2bda858a 100755
--- a/run.sh
+++ b/run.sh
@@ -183,7 +183,7 @@ while [[ $# -gt 0 ]]; do
;;
--restore-sources|-RestoreSources)
shift
- resourceSources="${1:-}"
+ restore_sources="${1:-}"
[ -z "$restore_sources" ] && __usage
;;
-u|--update|-Update)
@@ -242,7 +242,7 @@ if [ "$package_version_props_url" ]; then
fi
if [ "$restore_sources" ]; then
- msbuild_args+="-p:DotNetRestoreSources=\"$restore_sources\" "
+ msbuild_args+="-p:DotNetAdditionalRestoreSources=\"$restore_sources\" "
fi
[ -z "$channel" ] && channel='dev'