Skip to content

Commit 004bfa4

Browse files
committed
Rename root folder Package to dist
1 parent 15442c6 commit 004bfa4

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
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 }}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ launchSettings.json
1010
# Build results
1111
obj/
1212
bin/
13-
Package/Release/
13+
/dist/
1414
*.binlog
1515

1616
# Python cache files

.vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
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

Build.proj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
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

eng/package/choco/IronPython.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
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>

eng/scripts/Install-IronPython.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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) {

make.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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
}

0 commit comments

Comments
 (0)