Fix directory references in packaging targets

Author: Lamparter

eng/choco/IronPython.nuspec

@@ -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/choco</packageSourceUrl>
     <title>IronPython</title>
     <authors>IronPython Contributors, Microsoft</authors>
     <copyright>© IronPython Contributors</copyright>

eng/deb/Deb.Packaging.targets

@@ -3,7 +3,7 @@
   <Target Name="DebPackage" Condition="'$(OS)' == 'Unix' AND '$(MacOS)' != 'true'" DependsOnTargets="Stage" AfterTargets="Package">
     <PropertyGroup>
       <TempFolder>temp</TempFolder>
-      <PackageDebFolder>Package/deb</PackageDebFolder>
+      <PackageDebFolder>eng/deb</PackageDebFolder>
       <PackageTempFolder>$(PackageDebFolder)/$(TempFolder)</PackageTempFolder>
     </PropertyGroup>
 

eng/msi/IronPython.Installer.wixproj

@@ -6,7 +6,7 @@
     <SuppressPdbOutput>true</SuppressPdbOutput>
     <SuppressSpecificWarnings>5151</SuppressSpecificWarnings>
     <SuppressIces>ICE61</SuppressIces>
-    <BindInputPaths Condition=" '$(BindInputPaths)' == '' ">$(RootDir)Package\$(Configuration)\Stage\IronPython-$(DisplayVersion)</BindInputPaths>
+    <BindInputPaths Condition=" '$(BindInputPaths)' == '' ">$(RootDir)eng\$(Configuration)\Stage\IronPython-$(DisplayVersion)</BindInputPaths>
     <BuildDir Condition=" '$(BuildDir)' == '' ">$(RootDir)bin\$(Configuration)</BuildDir>
     <MsiVersion Condition=" '$(MsiVersion)' == '' ">$(MajorVersion).$(MinorVersion).$(MicroVersion).$(AssemblyFileRevision)</MsiVersion>
     <SetMsiAssemblyNameFileVersion>True</SetMsiAssemblyNameFileVersion>

eng/msi/Msi.Packaging.targets

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <Target Name="MsiPackage" Condition="'$(OS)' != 'Unix'" DependsOnTargets="Stage" AfterTargets="Package">
-    <MSBuild Targets="Restore" Projects="$(RootDir)Package\msi\IronPython.Installer.wixproj" />
+    <MSBuild Targets="Restore" Projects="$(RootDir)eng\msi\IronPython.Installer.wixproj" />
     <MSBuild
-        Projects="$(RootDir)Package\msi\IronPython.Installer.wixproj"
+        Projects="$(RootDir)eng\msi\IronPython.Installer.wixproj"
         Properties="BindInputPaths=$(StageDir);OutputPath=$(PackageDir);Configuration=$(Configuration);Platform=x64"
     />
   </Target>

eng/msi/Product.wxs

@@ -19,7 +19,7 @@ WHEN PERFORMING MAJOR IP UPGRADES (e.g., 2.5 => 2.6):
 
     <Media Id="1" Cabinet="IronPy.cab" EmbedCab="yes" CompressionLevel="high" />
 
-    <Icon Id="ipy.ico" SourceFile="..\..\Src\IronPythonConsole\ipy.ico" />
+    <Icon Id="ipy.ico" SourceFile="..\..\src\platforms\IronPython.Console\ipy.ico" />
 
     <!-- Major upgrade -->
     <MajorUpgrade AllowSameVersionUpgrades="no" DowngradeErrorMessage="A later version of [ProductName] is already installed." />

eng/zip/Zip.Packaging.targets

@@ -6,8 +6,8 @@
     <ItemGroup>
       <ZipFiles Include="$(StageDir)\**\*.*" Exclude="$(StageDir)\README.md;$(StageDir)\**\*.pdb;$(StageDir)\netstandard2.0\**\*;$(StageDir)\netcoreapp3.1\**\*;$(StageDir)\net9.0*\**\*" />
       <ZipFiles Include="README.md" Link="$(MSBuildThisFileDirectory)README.md" />
-      <ZipFiles Include="scripts/Enter-IronPythonEnvironment.ps1" Link="$(RootDir)Src\Scripts\Enter-IronPythonEnvironment.ps1" />
-      <ZipFiles Include="scripts/Install-IronPython.ps1" Link="$(RootDir)Src\Scripts\Install-IronPython.ps1" />
+      <ZipFiles Include="scripts/Enter-IronPythonEnvironment.ps1" Link="$(RootDir)tests\scripts\Enter-IronPythonEnvironment.ps1" />
+      <ZipFiles Include="scripts/Install-IronPython.ps1" Link="$(RootDir)tests\scripts\Install-IronPython.ps1" />
     </ItemGroup>
     <Zip Files="@(ZipFiles)" ZipFileName="$(PackageDir)\IronPython.$(PackageVersion).zip" WorkingDirectory="$(StageDir)" />