diff --git a/nuget/build-appveyor.ps1 b/nuget/build-appveyor.ps1 index ee38e950b7..fafafdc2bd 100644 --- a/nuget/build-appveyor.ps1 +++ b/nuget/build-appveyor.ps1 @@ -9,6 +9,7 @@ sv version $env:APPVEYOR_BUILD_NUMBER sv version 9999.0.$version-nightly sv key $env:myget_key +. "include.ps1" .\build-version.ps1 $version sv reponame $env:APPVEYOR_REPO_NAME @@ -23,10 +24,10 @@ if ([string]::IsNullOrWhiteSpace($pullreq)) if($repobranch -eq "master") { echo "Repo branch matched" - nuget.exe push Perspex.$version.nupkg $key -Source https://www.myget.org/F/perspex-nightly/api/v2/package - nuget.exe push Perspex.Desktop.$version.nupkg $key -Source https://www.myget.org/F/perspex-nightly/api/v2/package - nuget.exe push Perspex.Skia.Desktop.$version.nupkg $key -Source https://www.myget.org/F/perspex-nightly/api/v2/package - nuget.exe push Perspex.Android.$version.nupkg $key -Source https://www.myget.org/F/perspex-nightly/api/v2/package + foreach($pkg in $Packages) + { + nuget.exe push $pkg.$version.nupkg $key -Source https://www.myget.org/F/perspex-nightly/api/v2/package + } } } diff --git a/nuget/build-version.ps1 b/nuget/build-version.ps1 index 65b673385e..49bf6c6947 100644 --- a/nuget/build-version.ps1 +++ b/nuget/build-version.ps1 @@ -1,9 +1,11 @@ $ErrorActionPreference = "Stop" -rm -Force -Recurse .\Perspex -ErrorAction SilentlyContinue -rm -Force -Recurse .\Perspex.Desktop -ErrorAction SilentlyContinue -rm -Force -Recurse .\Perspex.Skia.Desktop -ErrorAction SilentlyContinue -rm -Force -Recurse .\Perspex.Android -ErrorAction SilentlyContinue +. ".\include.ps1" + +foreach($pkg in $Packages) +{ + rm -Force -Recurse .\$pkg -ErrorAction SilentlyContinue +} rm -Force -Recurse *.nupkg -ErrorAction SilentlyContinue Copy-Item template Perspex -Recurse @@ -65,17 +67,18 @@ Copy-Item ..\src\Skia\Perspex.Skia.Desktop\bin\Release\Perspex.Skia.Desktop.dll Copy-Item ..\src\Android\Perspex.Android\bin\Release\Perspex.Android.dll $android Copy-Item ..\src\Skia\Perspex.Skia.Android\bin\Release\Perspex.Skia.Android.dll $android -(gc Perspex\Perspex.nuspec).replace('#VERSION#', $args[0]) | sc Perspex\Perspex.nuspec -(gc Perspex\Perspex.Desktop.nuspec).replace('#VERSION#', $args[0]) | sc Perspex.Desktop\Perspex.Desktop.nuspec -(gc Perspex\Perspex.Skia.Desktop.nuspec).replace('#VERSION#', $args[0]) | sc Perspex.Skia.Desktop\Perspex.Skia.Desktop.nuspec -(gc Perspex\Perspex.Android.nuspec).replace('#VERSION#', $args[0]) | sc Perspex.Android\Perspex.Android.nuspec -nuget.exe pack Perspex\Perspex.nuspec -nuget.exe pack Perspex.Desktop\Perspex.Desktop.nuspec -nuget.exe pack Perspex.Skia.Desktop\Perspex.Skia.Desktop.nuspec -nuget.exe pack Perspex.Android\Perspex.Android.nuspec +foreach($pkg in $Packages) +{ + (gc Perspex\$pkg.nuspec).replace('#VERSION#', $args[0]) | sc $pkg\$pkg.nuspec +} + +foreach($pkg in $Packages) +{ + nuget.exe pack $pkg\$pkg.nuspec +} -rm -Force -Recurse .\Perspex -rm -Force -Recurse .\Perspex.Desktop -rm -Force -Recurse .\Perspex.Skia.Desktop -rm -Force -Recurse .\Perspex.Android +foreach($pkg in $Packages) +{ + rm -Force -Recurse .\$pkg +} \ No newline at end of file diff --git a/nuget/include.ps1 b/nuget/include.ps1 new file mode 100644 index 0000000000..1898105862 --- /dev/null +++ b/nuget/include.ps1 @@ -0,0 +1 @@ +$Packages = @("Perspex", "Perspex.Desktop", "Perspex.Skia.Desktop", "Perspex.Android") \ No newline at end of file