diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 96111e88e..d352574e9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,7 +56,7 @@ jobs: - uses: actions/upload-artifact@v7 with: name: packages-${{ matrix.os }} - path: Package/Release/Packages + path: dist/Release/Packages test: runs-on: ${{ matrix.os }} diff --git a/.gitignore b/.gitignore index d958128bc..b3dbb2cbb 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ launchSettings.json # Build results obj/ bin/ -Package/Release/ +/dist/ *.binlog # Python cache files diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 6cf24f69d..efe759131 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -64,7 +64,7 @@ jobs: - task: CopyFiles@2 displayName: Copy Packages inputs: - SourceFolder: '$(Build.Repository.LocalPath)/Package/Release/Packages' + SourceFolder: '$(Build.Repository.LocalPath)/dist/Release/Packages' Contents: | **/*.nupkg **/*.snupkg diff --git a/Build.proj b/Build.proj index 5c3396c3d..fcfd3f6f7 100644 --- a/Build.proj +++ b/Build.proj @@ -14,14 +14,14 @@ $(RootDir)eng - + $(MajorVersion).$(MinorVersion).$(MicroVersion) $(MajorVersion).$(MinorVersion).$(MicroVersion)-$(ReleaseLevel)$(ReleaseSerial) - $(RootDir)Package\$(Configuration)\Stage\IronPython-$(PackageVersion) - $(RootDir)Package\$(Configuration)\Packages\IronPython-$(PackageVersion) + $(RootDir)dist\$(Configuration)\Stage\IronPython-$(PackageVersion) + $(RootDir)dist\$(Configuration)\Packages\IronPython-$(PackageVersion) lib diff --git a/eng/package/choco/IronPython.nuspec b/eng/package/choco/IronPython.nuspec index 6a616379f..7146a75d7 100644 --- a/eng/package/choco/IronPython.nuspec +++ b/eng/package/choco/IronPython.nuspec @@ -5,7 +5,7 @@ ironpython 3.4.0 - https://github.com/IronLanguages/ironpython3/tree/main/Package/choco + https://github.com/IronLanguages/ironpython3/tree/main/eng/package/choco IronPython IronPython Contributors, Microsoft © IronPython Contributors diff --git a/eng/scripts/Install-IronPython.ps1 b/eng/scripts/Install-IronPython.ps1 index 3ccc58af7..a0269ad1e 100755 --- a/eng/scripts/Install-IronPython.ps1 +++ b/eng/scripts/Install-IronPython.ps1 @@ -74,7 +74,7 @@ if (-not $ZipFile) { # Script run from within a checked out code base # Locate the zip archive in the standard location of the package target $projectRoot = $PSScriptRoot | Split-Path | Split-Path - $zipFiles = @(Resolve-Path (Join-Path $projectRoot "Package/Release/Packages/IronPython-*/IronPython.3.*.zip")) + $zipFiles = @(Resolve-Path (Join-Path $projectRoot "dist/Release/Packages/IronPython-*/IronPython.3.*.zip")) if ($zipFiles.Count -gt 1) { Write-Error (@("Ambiguous implicit project zip files:") + $zipFiles -join "`n") } elseif ($zipFiles.Count -lt 1) { diff --git a/make.ps1 b/make.ps1 index 0a016ecb9..e02bb09db 100755 --- a/make.ps1 +++ b/make.ps1 @@ -232,7 +232,7 @@ function Purge() { Write-Verbose "Deleting packaging artifacts..." foreach ($dir in @("Release", "Debug")) { - if (Test-Path (Join-Path $_BASEDIR "Package" $dir -OutVariable targetPath)) { + if (Test-Path (Join-Path $_BASEDIR "dist" $dir -OutVariable targetPath)) { Remove-Item -Path $targetPath -Force -Recurse } }