Clean up build after rebase

Author: johnml1135

Build/Agent/FwBuildHelpers.psm1

@@ -195,27 +195,38 @@ function Invoke-WithFileLockRetry {
 function Remove-StaleObjFolders {
     <#
     .SYNOPSIS
-        Removes stale per-project obj/ folders from Src/.
+        Removes stale per-project obj/ folders from source trees.
     .DESCRIPTION
         Since SDK migration, intermediate output uses centralized Obj/ folder.
         Old per-project obj/ folders cause CS0579 duplicate attribute errors.
     #>
     param([Parameter(Mandatory)][string]$RepoRoot)
 
-    $srcPath = Join-Path $RepoRoot "Src"
-    try {
-        # Use .NET enumeration for performance (faster than Get-ChildItem -Recurse)
-        $staleObjFolders = [System.IO.Directory]::GetDirectories($srcPath, "obj", [System.IO.SearchOption]::AllDirectories)
-        if ($staleObjFolders.Length -gt 0) {
-            Write-Host "Removing stale per-project obj/ folders ($($staleObjFolders.Length) found)..." -ForegroundColor Yellow
-            foreach ($folder in $staleObjFolders) {
-                Remove-Item -Path $folder -Recurse -Force -ErrorAction SilentlyContinue
+    $scanRoots = @(
+        (Join-Path $RepoRoot "Src"),
+        (Join-Path $RepoRoot "Lib"),
+        (Join-Path $RepoRoot "FLExInstaller")
+    )
+
+    foreach ($root in $scanRoots) {
+        if (-not (Test-Path $root -PathType Container)) {
+            continue
+        }
+
+        try {
+            # Use .NET enumeration for performance (faster than Get-ChildItem -Recurse)
+            $staleObjFolders = [System.IO.Directory]::GetDirectories($root, "obj", [System.IO.SearchOption]::AllDirectories)
+            if ($staleObjFolders.Length -gt 0) {
+                Write-Host "Removing stale per-project obj/ folders under '$root' ($($staleObjFolders.Length) found)..." -ForegroundColor Yellow
+                foreach ($folder in $staleObjFolders) {
+                    Remove-Item -Path $folder -Recurse -Force -ErrorAction SilentlyContinue
+                }
+                Write-Host "[OK] Stale obj/ folders cleaned under '$root'" -ForegroundColor Green
             }
-            Write-Host "[OK] Stale obj/ folders cleaned" -ForegroundColor Green
         }
-    }
-    catch {
-        # Ignore enumeration errors (access denied, etc.)
+        catch {
+            # Ignore enumeration errors (access denied, etc.)
+        }
     }
 
     # Check for stale Output/Common/ (pre-configuration-aware build artifacts)

Build/nuget-common/packages.config

@@ -38,7 +38,6 @@
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.7.0" />
   <package id="NUnit3TestAdapter" version="4.3.2" />
   <package id="ParatextData" version="9.4.0.1-beta" targetFramework="net46"/>
-  <package id="ProDotNetZip" version="1.20.0" />
   <package id="protobuf-net" version="2.4.6" exclude="Build,Analyzers" />
   <package id="Sandwych.QuickGraph.Core" version="1.0.0" />
   <package id="SharpZipLib" version="1.4.0" exclude="Build,Analyzers" />

FLExInstaller/FieldWorks.OfflineBundle.wixproj

@@ -43,6 +43,12 @@
     <PackageReference Include="WixToolset.NetFx.wixext" Version="6.0.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <WixExtension Include="WixToolset.BootstrapperApplications.wixext" />
+    <WixExtension Include="WixToolset.Util.wixext" />
+    <WixExtension Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="Shared\Base\OfflineBundle.wxs" />
   </ItemGroup>

FLExInstaller/Shared/Base/Bundle.wxs

@@ -62,8 +62,6 @@
                   SourceFile="$(var.FieldWorks.Installer.TargetPath)"
                   Visible="no"
                   Vital="yes">
-			<!-- Treat MSI cancel (1602 / ERROR_INSTALL_USEREXIT) as bundle cancellation, not failure. -->
-			<ExitCode Value="1602" Behavior="cancel" />
       </MsiPackage>
     </PackageGroup>
   </Fragment>

FLExInstaller/Shared/Base/OfflineBundle.wxs

@@ -61,8 +61,6 @@
 					SourceFile="$(var.FieldWorks.Installer.TargetPath)"
 					Visible="no"
 					Vital="yes">
-				<!-- Treat MSI cancel (1602 / ERROR_INSTALL_USEREXIT) as bundle cancellation, not failure. -->
-				<ExitCode Value="1602" Behavior="cancel" />
 			</MsiPackage>
 		</PackageGroup>
 	</Fragment>

Src/LexText/Morphology/MorphologyEditorDll.csproj

@@ -4,9 +4,8 @@
     <AssemblyName>MorphologyEditorDll</AssemblyName>
     <RootNamespace>SIL.FieldWorks.XWorks.MorphologyEditor</RootNamespace>
     <TargetFramework>net48</TargetFramework>
-    <OutputType>Library</OutputType>    <NoWarn>168,169,219,414,649,1635,1702,1701,0579,0436</NoWarn>
+    <OutputType>Library</OutputType>    <NoWarn>168,169,219,414,649,1635,1702,1701,0436</NoWarn>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">