diff --git a/.github/workflows/start-release.yml b/.github/workflows/start-release.yml
index 671c756857..efa430df3f 100644
--- a/.github/workflows/start-release.yml
+++ b/.github/workflows/start-release.yml
@@ -126,7 +126,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: NuGet
- path: .\artifacts
+ path: .\artifacts\nuget
release:
uses: avantipoint/workflow-templates/.github/workflows/generate-release.yml@master
@@ -135,4 +135,3 @@ jobs:
contents: write
with:
package-name: Prism.Core
- artifacts: "Artifacts/NuGet/*.nupkg,Artifacts/NuGet/*.snupkg,Artifacts/*.zip"
diff --git a/Directory.Build.props b/Directory.Build.props
index 2a44d8eadd..5bea576554 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,9 +11,7 @@
https://github.com/PrismLibrary/Prism
True
True
- $(MSBuildThisFileDirectory)Artifacts
- $(BUILD_ARTIFACTSTAGINGDIRECTORY)
- $([System.IO.Path]::Combine('$(ArtifactStagingRoot)', 'NuGet'))
+ $(MSBuildThisFileDirectory)Artifacts
$([System.Text.RegularExpressions.Regex]::Escape('$(MSBuildThisFileDirectory)'))
$([System.Text.RegularExpressions.Regex]::Replace('$(MSBuildProjectFullPath)', '$(EscapedCurrentDirectory)', ''))
$(MSBuildThisFileDirectory)images/prism-logo.png
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 6e9d24b3fd..f0fd2e81c5 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -11,35 +11,6 @@
$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
-
-
-
- Core
- Forms
- WPF
- Uno
- Maui
- $([System.IO.Path]::Combine('$(ArtifactStagingRoot)', $(Configuration), '$(BinariesFolderName)', '$(TargetFramework)'))
-
-
-
-
-
-
-
-
-
-
diff --git a/build/consolidate-artifacts.ps1 b/build/consolidate-artifacts.ps1
index 8385ad353f..28879012c6 100644
--- a/build/consolidate-artifacts.ps1
+++ b/build/consolidate-artifacts.ps1
@@ -2,18 +2,14 @@
$executionRoot = Get-Location
$artifactsRoot = $executionRoot, 'artifacts' -join '\'
-$binariesRoot = $executionRoot, 'artifacts', 'binaries' -join '\'
-$artifactsZipPath = $executionRoot, 'artifacts', 'Release.zip' -join '\'
$nugetRoot = $executionRoot, 'artifacts', 'nuget' -join '\'
-Get-ChildItem .\ -Include $binariesRoot -Recurse | ForEach-Object ($_) { Remove-Item $_.Fullname -Force -Recurse }
Get-ChildItem .\ -Include $nugetRoot -Recurse | ForEach-Object ($_) { Remove-Item $_.Fullname -Force -Recurse }
-New-Item -Path $binariesRoot -ItemType Directory -Force > $null
New-Item -Path $nugetRoot -ItemType Directory -Force > $null
$platforms = @('Forms', 'Wpf', 'Uno', 'Maui')
$core = @("Prism.Core", "Prism.Events", "Prism.dll", "Prism.pdb", "Prism.xml")
$allowedExtensions = @('.dll', '.pdb', '.xml', '.pri', '.nupkg', '.snupkg')
-$files = Get-ChildItem -Path $artifactsRoot -Filter "*" -Recurse | Where-Object { (Test-Path -Path $_.FullName -PathType Leaf) -and $_.FullName.StartsWith($binariesRoot) -eq $false -and $_.FullName.StartsWith($nugetRoot) -eq $false -and ($allowedExtensions -contains [System.IO.Path]::GetExtension($_.FullName)) }
+$files = Get-ChildItem -Path $artifactsRoot -Filter "*" -Recurse | Where-Object { (Test-Path -Path $_.FullName -PathType Leaf) -and $_.FullName.StartsWith($nugetRoot) -eq $false -and ($allowedExtensions -contains [System.IO.Path]::GetExtension($_.FullName)) }
if ($files.Count -eq 0)
{
@@ -50,8 +46,6 @@ foreach($file in $files)
$parentDirName = Split-Path -Path (Split-Path -Path $file.FullName -Parent) -Leaf
Write-Output "Determining Copy Path for $parentDirName"
- $copyPath = Join-Path $binariesRoot -ChildPath $parentDirName
-
if ((Test-Path -Path $copyPath -PathType Container) -eq $false)
{
Write-Output "Creating $copyPath"
@@ -62,7 +56,4 @@ foreach($file in $files)
}
}
-Get-ChildItem $artifactsRoot | Where-Object { $_.Name -ne 'binaries' -and $_.Name -ne 'nuget' } | ForEach-Object { Remove-Item $_.FullName -Force -Recurse }
-
-Compress-Archive -Path $binariesRoot -DestinationPath $artifactsZipPath -Force
-Remove-Item -Path $binariesRoot -Recurse -Force
+Get-ChildItem $artifactsRoot | Where-Object { $_.Name -ne 'nuget' } | ForEach-Object { Remove-Item $_.FullName -Force -Recurse }