Fix compat pack publish script to work if we build corefx on debug or release mode (#28608)

safern · web-flow · commit b50c15c4d798 · 2018-03-29T15:54:11.000-05:00
diff --git a/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1 b/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1
@@ -28,7 +28,6 @@ $dotnetPath = -join($repoRoot, "\Tools\dotnetcli\dotnet.exe")
 $csprojPath = -join($PSScriptRoot, "\", (Get-ChildItem $PSScriptRoot"\*.csproj" | Select-Object -ExpandProperty Name))
 $packagesCachePath = -join($repoRoot, "\packages")
 $localPackageSourcePath = -join($repoRoot, "\bin\packages\Debug\")
-$restoreSources = -join("https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;https://api.nuget.org/v3/index.json;https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;", $localPackageSourcePath)
 
 if (!(Test-Path $localPackageSourcePath))
 {
@@ -40,6 +39,8 @@ if (!(Test-Path $localPackageSourcePath))
 	}
 }
 
+$restoreSources = -join("https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;https://api.nuget.org/v3/index.json;https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;", $localPackageSourcePath)
+
 $compatPackageVersion = _getPackageVersion "Microsoft.Windows.Compatibility"
 $privatePackageVersion = _getPackageVersion "Microsoft.Private.CoreFx.NETCoreApp"
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ $dotnetPath = -join($repoRoot, "\Tools\dotnetcli\dotnet.exe")`
`28`	`28`	`$csprojPath = -join($PSScriptRoot, "\", (Get-ChildItem $PSScriptRoot"\*.csproj" \| Select-Object -ExpandProperty Name))`
`29`	`29`	`$packagesCachePath = -join($repoRoot, "\packages")`
`30`	`30`	`$localPackageSourcePath = -join($repoRoot, "\bin\packages\Debug\")`
`31`		`-$restoreSources = -join("https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;https://api.nuget.org/v3/index.json;https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;", $localPackageSourcePath)`
`32`	`31`
`33`	`32`	`if (!(Test-Path $localPackageSourcePath))`
`34`	`33`	`{`
`@@ -40,6 +39,8 @@ if (!(Test-Path $localPackageSourcePath))`
`40`	`39`	`}`
`41`	`40`	`}`
`42`	`41`
	`42`	`+$restoreSources = -join("https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;https://api.nuget.org/v3/index.json;https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;", $localPackageSourcePath)`
	`43`	`+`
`43`	`44`	`$compatPackageVersion = _getPackageVersion "Microsoft.Windows.Compatibility"`
`44`	`45`	`$privatePackageVersion = _getPackageVersion "Microsoft.Private.CoreFx.NETCoreApp"`
`45`	`46`