Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ launchSettings.json
# Build results
obj/
bin/
Package/Release/
/dist/
*.binlog

# Python cache files
Expand Down
2 changes: 1 addition & 1 deletion .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
<BuildSysDir>$(RootDir)eng</BuildSysDir>
</PropertyGroup>

<Import Project="$(BuildSysDir)\Tasks.Targets" />
<Import Project="$(BuildSysDir)\Tasks.targets" />
<Import Project="$(MSBuildThisFileDirectory)\CurrentVersion.props" />

<PropertyGroup>
<PackageVersion Condition="'$(ReleaseLevel)' == 'final'">$(MajorVersion).$(MinorVersion).$(MicroVersion)</PackageVersion>
<PackageVersion Condition="'$(ReleaseLevel)' != 'final' or '$(ReleaseSerial)' != '0'">$(MajorVersion).$(MinorVersion).$(MicroVersion)-$(ReleaseLevel)$(ReleaseSerial)</PackageVersion>
<StageDir>$(RootDir)Package\$(Configuration)\Stage\IronPython-$(PackageVersion)</StageDir>
<PackageDir>$(RootDir)Package\$(Configuration)\Packages\IronPython-$(PackageVersion)</PackageDir>
<StageDir>$(RootDir)dist\$(Configuration)\Stage\IronPython-$(PackageVersion)</StageDir>
<PackageDir>$(RootDir)dist\$(Configuration)\Packages\IronPython-$(PackageVersion)</PackageDir>
<StdLibDirName>lib</StdLibDirName>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion eng/package/choco/IronPython.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<metadata>
<id>ironpython</id>
<version>3.4.0</version>
<packageSourceUrl>https://github.com/IronLanguages/ironpython3/tree/main/Package/choco</packageSourceUrl>
<packageSourceUrl>https://github.com/IronLanguages/ironpython3/tree/main/eng/package/choco</packageSourceUrl>
<title>IronPython</title>
<authors>IronPython Contributors, Microsoft</authors>
<copyright>© IronPython Contributors</copyright>
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/Install-IronPython.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down