Rename the parameter used to specify additional sources to avoid conflating with DotNetRestoreSources used in projects

This commit is contained in:
Pranav K 2017-12-01 15:56:47 -08:00
parent 400ef9e3b1
commit 3a76af803a
3 changed files with 4 additions and 4 deletions

View File

@ -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)" />

View File

@ -202,7 +202,7 @@ if ($PackageVersionPropsUrl) {
}
if ($RestoreSources) {
$MSBuildArguments += "-p:DotNetRestoreSources=$RestoreSources"
$MSBuildArguments += "-p:DotNetAdditionalRestoreSources=$RestoreSources"
}
if ($AssetRootUrl) {

4
run.sh
View File

@ -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'