File tree Expand file tree Collapse file tree 7 files changed +9
-9
lines changed
Expand file tree Collapse file tree 7 files changed +9
-9
lines changed Original file line number Diff line number Diff line change 5656 - uses : actions/upload-artifact@v7
5757 with :
5858 name : packages-${{ matrix.os }}
59- path : Package /Release/Packages
59+ path : dist /Release/Packages
6060
6161 test :
6262 runs-on : ${{ matrix.os }}
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ launchSettings.json
1010# Build results
1111obj /
1212bin /
13- Package / Release /
13+ / dist /
1414* .binlog
1515
1616# Python cache files
Original file line number Diff line number Diff line change 6464 - task : CopyFiles@2
6565 displayName : Copy Packages
6666 inputs :
67- SourceFolder : ' $(Build.Repository.LocalPath)/Package /Release/Packages'
67+ SourceFolder : ' $(Build.Repository.LocalPath)/dist /Release/Packages'
6868 Contents : |
6969 **/*.nupkg
7070 **/*.snupkg
Original file line number Diff line number Diff line change 1414 <BuildSysDir >$(RootDir)eng</BuildSysDir >
1515 </PropertyGroup >
1616
17- <Import Project =" $(BuildSysDir)\Tasks.Targets " />
17+ <Import Project =" $(BuildSysDir)\Tasks.targets " />
1818 <Import Project =" $(MSBuildThisFileDirectory)\CurrentVersion.props" />
1919
2020 <PropertyGroup >
2121 <PackageVersion Condition =" '$(ReleaseLevel)' == 'final'" >$(MajorVersion).$(MinorVersion).$(MicroVersion)</PackageVersion >
2222 <PackageVersion Condition =" '$(ReleaseLevel)' != 'final' or '$(ReleaseSerial)' != '0'" >$(MajorVersion).$(MinorVersion).$(MicroVersion)-$(ReleaseLevel)$(ReleaseSerial)</PackageVersion >
23- <StageDir >$(RootDir)Package \$(Configuration)\Stage\IronPython-$(PackageVersion)</StageDir >
24- <PackageDir >$(RootDir)Package \$(Configuration)\Packages\IronPython-$(PackageVersion)</PackageDir >
23+ <StageDir >$(RootDir)dist \$(Configuration)\Stage\IronPython-$(PackageVersion)</StageDir >
24+ <PackageDir >$(RootDir)dist \$(Configuration)\Packages\IronPython-$(PackageVersion)</PackageDir >
2525 <StdLibDirName >lib</StdLibDirName >
2626 </PropertyGroup >
2727
Original file line number Diff line number Diff line change 55 <metadata >
66 <id >ironpython</id >
77 <version >3.4.0</version >
8- <packageSourceUrl >https://github.com/IronLanguages/ironpython3/tree/main/Package /choco</packageSourceUrl >
8+ <packageSourceUrl >https://github.com/IronLanguages/ironpython3/tree/main/eng/package /choco</packageSourceUrl >
99 <title >IronPython</title >
1010 <authors >IronPython Contributors, Microsoft</authors >
1111 <copyright >© IronPython Contributors</copyright >
Original file line number Diff line number Diff line change @@ -74,7 +74,7 @@ if (-not $ZipFile) {
7474 # Script run from within a checked out code base
7575 # Locate the zip archive in the standard location of the package target
7676 $projectRoot = $PSScriptRoot | Split-Path | Split-Path
77- $zipFiles = @ (Resolve-Path (Join-Path $projectRoot " Package /Release/Packages/IronPython-*/IronPython.3.*.zip" ))
77+ $zipFiles = @ (Resolve-Path (Join-Path $projectRoot " dist /Release/Packages/IronPython-*/IronPython.3.*.zip" ))
7878 if ($zipFiles.Count -gt 1 ) {
7979 Write-Error (@ (" Ambiguous implicit project zip files:" ) + $zipFiles -join " `n " )
8080 } elseif ($zipFiles.Count -lt 1 ) {
Original file line number Diff line number Diff line change @@ -232,7 +232,7 @@ function Purge() {
232232
233233 Write-Verbose " Deleting packaging artifacts..."
234234 foreach ($dir in @ (" Release" , " Debug" )) {
235- if (Test-Path (Join-Path $_BASEDIR " Package " $dir - OutVariable targetPath)) {
235+ if (Test-Path (Join-Path $_BASEDIR " dist " $dir - OutVariable targetPath)) {
236236 Remove-Item - Path $targetPath - Force - Recurse
237237 }
238238 }
You can’t perform that action at this time.
0 commit comments