Minor improvements to Burn, tests, and doc.

5 files changed, 39 insertions, 37 deletions

diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp
index 926c327b..956ef041 100644
--- a/src/burn/engine/core.cpp
+++ b/src/burn/engine/core.cpp
@@ -383,7 +383,7 @@ extern "C" HRESULT CoreDetect(
             pEngineState->registration.fEligibleForCleanup = FALSE;
         }
 
-        LogId(REPORT_STANDARD, MSG_DETECTED_PACKAGE, pPackage->sczId, LoggingPackageStateToString(pPackage->currentState), LoggingBoolToString(pPackage->fCached), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->installRegistrationState), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->cacheRegistrationState), LoggingPackageScopeToString(pPackage->scope), LoggingInstallScopeToString(pPackage->fDetectedPerMachine));
+        LogId(REPORT_STANDARD, MSG_DETECTED_PACKAGE, pPackage->sczId, LoggingPackageStateToString(pPackage->currentState), BURN_PACKAGE_TYPE_MSI == pPackage->type ? LoggingBoolToString(pPackage->fCached) : "(not configurable scope)", LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->installRegistrationState), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->cacheRegistrationState), LoggingPackageScopeToString(pPackage->scope), LoggingInstallScopeToString(pPackage->fDetectedPerMachine));
 
         if (BURN_PACKAGE_TYPE_MSI == pPackage->type)
         {
diff --git a/src/test/wix/WixE2E/WixE2EFixture.cs b/src/test/wix/WixE2E/WixE2EFixture.cs
index abea0ec7..8f993808 100644
--- a/src/test/wix/WixE2E/WixE2EFixture.cs
+++ b/src/test/wix/WixE2E/WixE2EFixture.cs
@@ -136,35 +136,36 @@ namespace WixToolsetTest.WixE2E
             Assert.AreNotEqual(firstHashes, secondHashes);
         }
 
-        //[TestMethod]
+        [Ignore]
+        [TestMethod]
         //[Fact(Skip = "Investigate if .NET Core WebApplications can be incrementally built")]
-        //public void CanIncrementalBuildPackageWithNetCoreWebAppWithoutEdits()
-        //{
-        //    var projectDirectory = TestData.Get("TestData", "WixprojPackageCsprojWebApplicationNetCore");
-        //    var projectPath = Path.Combine(projectDirectory, "WixprojPackageCsprojWebApplicationNetCore.wixproj");
-        //    var projectBinPath = Path.Combine(projectDirectory, "bin");
+        public void CanIncrementalBuildPackageWithNetCoreWebAppWithoutEdits()
+        {
+            var projectDirectory = TestData.Get("TestData", "WixprojPackageCsprojWebApplicationNetCore");
+            var projectPath = Path.Combine(projectDirectory, "WixprojPackageCsprojWebApplicationNetCore.wixproj");
+            var projectBinPath = Path.Combine(projectDirectory, "bin");
 
-        //    CleanEverything();
+            CleanEverything();
 
-        //    var result = RestoreAndBuild(projectPath);
-        //    result.AssertSuccess();
+            var result = RestoreAndBuild(projectPath);
+            result.AssertSuccess();
 
-        //    var firstBuiltFiles = Directory.GetFiles(projectBinPath, "*.*", SearchOption.AllDirectories).ToArray();
-        //    var firstHashes = firstBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
+            var firstBuiltFiles = Directory.GetFiles(projectBinPath, "*.*", SearchOption.AllDirectories).ToArray();
+            var firstHashes = firstBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
 
-        //    //var packageWxsPath = Path.Combine(projectDirectory, "Package.wxs");
-        //    //File.SetLastWriteTime(packageWxsPath, DateTime.Now);
+            //var packageWxsPath = Path.Combine(projectDirectory, "Package.wxs");
+            //File.SetLastWriteTime(packageWxsPath, DateTime.Now);
 
-        //    // This should be an incremental build that does work because a file was updated.
-        //    //
-        //    result = RestoreAndBuild(projectPath);
-        //    result.AssertSuccess();
+            // This should be an incremental build that does work because a file was updated.
+            //
+            result = RestoreAndBuild(projectPath);
+            result.AssertSuccess();
 
-        //    var secondBuiltFiles = Directory.GetFiles(projectBinPath, "*.*", SearchOption.AllDirectories).ToArray();
-        //    var secondHashes = secondBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
+            var secondBuiltFiles = Directory.GetFiles(projectBinPath, "*.*", SearchOption.AllDirectories).ToArray();
+            var secondHashes = secondBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
 
-        //    WixAssert.CompareLineByLine(firstHashes, secondHashes);
-        //}
+            WixAssert.CompareLineByLine(firstHashes, secondHashes);
+        }
 
         private static void CleanEverything()
         {
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index 7d2d8af5..33dc6b1f 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -828,10 +828,10 @@ namespace WixToolsetTest.Sdk
 
                 WixAssert.CompareLineByLine(new[]
                 {
-                    @"net472_x64\e_sqlite3.dll - 1601536",
-                    @"net472_x86\e_sqlite3.dll - 1207296",
-                    @"net8_x64\e_sqlite3.dll - 1601536",
-                    @"net8_x86\e_sqlite3.dll - 1207296",
+                    @"net472_x64\e_sqlite3.dll - 1911296",
+                    @"net472_x86\e_sqlite3.dll - 1503232",
+                    @"net8_x64\e_sqlite3.dll - 1911296",
+                    @"net8_x86\e_sqlite3.dll - 1503232",
                 }, releaseFileSizes);
             }
         }
@@ -898,14 +898,14 @@ namespace WixToolsetTest.Sdk
 
                 WixAssert.CompareLineByLine(new[]
                 {
-                    @"debug_net472_x64\e_sqlite3.dll - 1601536",
-                    @"debug_net472_x86\e_sqlite3.dll - 1207296",
-                    @"debug_net8_x64\e_sqlite3.dll - 1601536",
-                    @"debug_net8_x86\e_sqlite3.dll - 1207296",
-                    @"release_net472_x64\e_sqlite3.dll - 1601536",
-                    @"release_net472_x86\e_sqlite3.dll - 1207296",
-                    @"release_net8_x64\e_sqlite3.dll - 1601536",
-                    @"release_net8_x86\e_sqlite3.dll - 1207296",
+                    @"debug_net472_x64\e_sqlite3.dll - 1911296",
+                    @"debug_net472_x86\e_sqlite3.dll - 1503232",
+                    @"debug_net8_x64\e_sqlite3.dll - 1911296",
+                    @"debug_net8_x86\e_sqlite3.dll - 1503232",
+                    @"release_net472_x64\e_sqlite3.dll - 1911296",
+                    @"release_net472_x86\e_sqlite3.dll - 1503232",
+                    @"release_net8_x64\e_sqlite3.dll - 1911296",
+                    @"release_net8_x86\e_sqlite3.dll - 1503232",
                 }, releaseFileSizes);
             }
         }
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/TestExe/TestExe.csproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/TestExe/TestExe.csproj
index f11c87a8..a231ee46 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/TestExe/TestExe.csproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/TestExe/TestExe.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="10.0.9" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
   </ItemGroup>
 </Project>
diff --git a/src/xsd/wix/Upgrade.xsd b/src/xsd/wix/Upgrade.xsd
index fb9b5845..1b94589c 100644
--- a/src/xsd/wix/Upgrade.xsd
+++ b/src/xsd/wix/Upgrade.xsd
@@ -14,7 +14,7 @@
           <annotation>
             <documentation>
               Nesting a Property element under an Upgrade element has been deprecated.
-              Please nest Property elements in any of the other supported locations.
+              Use ProductSearch instead.
             </documentation>
           </annotation>
         </element>
@@ -25,4 +25,4 @@
         </annotation>
       </attribute>
     </complexType>
-  </element>
\ No newline at end of file
+  </element>