Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixing release paths #2975

Merged
merged 1 commit into from
Oct 7, 2023
Merged

fixing release paths #2975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/start-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -135,4 +135,3 @@ jobs:
contents: write
with:
package-name: Prism.Core
artifacts: "Artifacts/NuGet/*.nupkg,Artifacts/NuGet/*.snupkg,Artifacts/*.zip"
4 changes: 1 addition & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
<RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl>
<IncludeSymbols>True</IncludeSymbols>
<IncludeSource>True</IncludeSource>
<ArtifactStagingRoot>$(MSBuildThisFileDirectory)Artifacts</ArtifactStagingRoot>
<ArtifactStagingRoot Condition=" '$(BUILD_ARTIFACTSTAGINGDIRECTORY)' != '' ">$(BUILD_ARTIFACTSTAGINGDIRECTORY)</ArtifactStagingRoot>
<PackageOutputPath>$([System.IO.Path]::Combine('$(ArtifactStagingRoot)', 'NuGet'))</PackageOutputPath>
<PackageOutputPath>$(MSBuildThisFileDirectory)Artifacts</PackageOutputPath>
<EscapedCurrentDirectory>$([System.Text.RegularExpressions.Regex]::Escape('$(MSBuildThisFileDirectory)'))</EscapedCurrentDirectory>
<RelativeProjectPath>$([System.Text.RegularExpressions.Regex]::Replace('$(MSBuildProjectFullPath)', '$(EscapedCurrentDirectory)', ''))</RelativeProjectPath>
<PrismPackageIcon>$(MSBuildThisFileDirectory)images/prism-logo.png</PrismPackageIcon>
Expand Down
29 changes: 0 additions & 29 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,6 @@
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>

<Target Name="_ReleaseBinaryCopy"
Condition=" !'$(IsTestProject)' And '$(IsPackable)' "
BeforeTargets="AfterBuild;WpfPack">

<PropertyGroup>
<BinariesFolderName Condition=" '$(IsCoreProject)' ">Core</BinariesFolderName>
<BinariesFolderName Condition=" '$(IsFormsProject)' ">Forms</BinariesFolderName>
<BinariesFolderName Condition=" '$(IsWpfProject)' ">WPF</BinariesFolderName>
<BinariesFolderName Condition=" '$(IsUnoProject)' ">Uno</BinariesFolderName>
<BinariesFolderName Condition=" '$(IsMauiProject)' ">Maui</BinariesFolderName>
<ArtifactStaging>$([System.IO.Path]::Combine('$(ArtifactStagingRoot)', $(Configuration), '$(BinariesFolderName)', '$(TargetFramework)'))</ArtifactStaging>
</PropertyGroup>

<Copy SourceFiles="$(OutputPath)$(AssemblyName).dll"
DestinationFolder="$(ArtifactStaging)"
Condition=" Exists('$(OutputPath)$(AssemblyName).dll') " />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).xml"
DestinationFolder="$(ArtifactStaging)"
Condition=" Exists('$(OutputPath)$(AssemblyName).xml') " />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).pdb"
DestinationFolder="$(ArtifactStaging)"
Condition=" Exists('$(OutputPath)$(AssemblyName).pdb') " />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).pri"
DestinationFolder="$(ArtifactStaging)"
Condition=" Exists('$(OutputPath)$(AssemblyName).pri') " />

</Target>


<Choose>
<When Condition="$(IsUnoProject)">
<ItemGroup>
Expand Down
13 changes: 2 additions & 11 deletions build/consolidate-artifacts.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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"
Expand All @@ -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 }
Loading