fixing packing

2 files changed, 31 insertions, 23 deletions

diff --git a/Source/nuspecs/nuget.ps1 b/Source/nuspecs/nuget.ps1
index 6351cae..a2bf9e9 100644
--- a/Source/nuspecs/nuget.ps1
+++ b/Source/nuspecs/nuget.ps1
@@ -1,26 +1,10 @@
-param([string]$configuration, [string]$solutionPath)
-
-$nugetOutputDirectory = '../Build'
+$nugetOutputDirectory = '../Build'
 
 $releaseNotesUri = 'https://github.com/PrismLibrary/Prism/wiki/Release-Notes-'
 $coreFileVersion = '1.0.0'
 $nugetFileName = 'nuget.exe'
 
-
-if($solutionPath -like '*PrismLibrary_XF*' -and $configuration -eq 'Release')
-{
-    Write-Host "Packing PrismLibrary_XF"
-    dotnet pack $solutionPath -c $configuration --no-build
-    return
-}
-
-if($configuration -eq 'Test' -or $solutionPath -notlike 'PrismLibrary.sln')
-{
-    Write-Host "Returning without packing $solutionPath"
-    return
-}
-
-Write-Host "Packing $solutionPath"
+Write-Host "Packing $env:solution_name"
 
 function Get-FileVersion
 {
diff --git a/appveyor.yml b/appveyor.yml
index bbce2f4..9b88bf4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -56,11 +56,11 @@ assembly_info:
 environment:
   matrix:
   - solution_name: .\Source\PrismLibrary_Core.sln
-  - solution_name: .\Source\PrismLibrary_Win10.sln
   - solution_name: .\Sandbox\Windows10\HelloWorld\HelloWorld.sln
+  - solution_name: .\Source\PrismLibrary_Win10.sln
   - solution_name: .\Source\PrismLibrary_Wpf.sln
-  - solution_name: .\Source\PrismLibrary_XF.sln
   - solution_name: .\Sandbox\Xamarin\HelloWorld\HelloWorld.sln
+  - solution_name: .\Source\PrismLibrary_XF.sln
   - solution_name: .\Source\PrismLibrary.sln
 
 matrix:
@@ -103,9 +103,32 @@ build_script:
   - msbuild %solution_name% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 after_build:
-  #- dotnet pack %solution_name%
-  # -ps: Write-Host "Completed build for $env:solution_name"
-- ps: .\Source\nuspecs\nuget.ps1 -configuration $env:Configuration -solutionPath $env:solution_name
+- ps: >-
+    if($env:solution_name.EndsWith("PrismLibrary_XF.sln") -and $env:Configuration -eq 'Release')
+
+    {
+        Write-Host "Packing PrismLibrary_XF"
+        dotnet pack $env:solution_name -c $env:Configuration --no-build
+    }
+
+    elseif($env:Configuration -eq 'Release' -and $env:solution_name.EndsWith("PrismLibrary.sln"))
+
+    {
+        Write-Host "Packing $env:solution_name"
+        .\Source\nuspecs\nuget.ps1
+    }
+
+    if($env:Configuration -eq 'Release')
+
+    {
+        $env:SOLUTION_ARTIFACTS_DIRECTORY = (Get-Item $env:solution_name).Basename
+
+        New-Item -ItemType Directory -Force -Path $env:SOLUTION_ARTIFACTS_DIRECTORY
+
+        Copy-Item "**\bin\Release\**\Prism*dll","**\bin\Release\**\Prism*xml" -Destination ./$env:SOLUTION_ARTIFACTS_DIRECTORY/ -Recurse -Exclude "*Tool*" -Force -Confirm:$False
+
+        Get-ChildItem $env:SOLUTION_ARTIFACTS_DIRECTORY
+    }
 
 test_script:
   # UWP tests are not currently not supported by appveyor: https://github.com/appveyor/ci/issues/393
@@ -114,6 +137,7 @@ test_script:
 artifacts:
   - path: '**\Build\*.nupkg'
   - path: '**\nuspecs\**\*.nupkg'
+  - path: '$(solution_artifacts_directory)'
 
 deploy:
 - provider: NuGet