Skip to content

Commit 26ddda1

Browse files
barnsonDavidCizek
barnson
authored and
DavidCizek
committed
Minor improvements to Burn, tests, and doc.
1 parent 5682714 commit 26ddda1

5 files changed

Lines changed: 39 additions & 37 deletions

File tree

‎src/burn/engine/core.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ extern "C" HRESULT CoreDetect(
383383
pEngineState->registration.fEligibleForCleanup = FALSE;
384384
}
385385

386-
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));
386+
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));
387387

388388
if (BURN_PACKAGE_TYPE_MSI == pPackage->type)
389389
{

‎src/test/wix/WixE2E/WixE2EFixture.cs‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -136,35 +136,36 @@ public void CanIncrementalBuildPackageWithNativeWindowsAppWithEdits()
136136
Assert.AreNotEqual(firstHashes, secondHashes);
137137
}
138138

139-
//[TestMethod]
139+
[Ignore]
140+
[TestMethod]
140141
//[Fact(Skip = "Investigate if .NET Core WebApplications can be incrementally built")]
141-
//public void CanIncrementalBuildPackageWithNetCoreWebAppWithoutEdits()
142-
//{
143-
// var projectDirectory = TestData.Get("TestData", "WixprojPackageCsprojWebApplicationNetCore");
144-
// var projectPath = Path.Combine(projectDirectory, "WixprojPackageCsprojWebApplicationNetCore.wixproj");
145-
// var projectBinPath = Path.Combine(projectDirectory, "bin");
142+
public void CanIncrementalBuildPackageWithNetCoreWebAppWithoutEdits()
143+
{
144+
var projectDirectory = TestData.Get("TestData", "WixprojPackageCsprojWebApplicationNetCore");
145+
var projectPath = Path.Combine(projectDirectory, "WixprojPackageCsprojWebApplicationNetCore.wixproj");
146+
var projectBinPath = Path.Combine(projectDirectory, "bin");
146147

147-
// CleanEverything();
148+
CleanEverything();
148149

149-
// var result = RestoreAndBuild(projectPath);
150-
// result.AssertSuccess();
150+
var result = RestoreAndBuild(projectPath);
151+
result.AssertSuccess();
151152

152-
// var firstBuiltFiles = Directory.GetFiles(projectBinPath, "*.*", SearchOption.AllDirectories).ToArray();
153-
// var firstHashes = firstBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
153+
var firstBuiltFiles = Directory.GetFiles(projectBinPath, "*.*", SearchOption.AllDirectories).ToArray();
154+
var firstHashes = firstBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
154155

155-
// //var packageWxsPath = Path.Combine(projectDirectory, "Package.wxs");
156-
// //File.SetLastWriteTime(packageWxsPath, DateTime.Now);
156+
//var packageWxsPath = Path.Combine(projectDirectory, "Package.wxs");
157+
//File.SetLastWriteTime(packageWxsPath, DateTime.Now);
157158

158-
// // This should be an incremental build that does work because a file was updated.
159-
// //
160-
// result = RestoreAndBuild(projectPath);
161-
// result.AssertSuccess();
159+
// This should be an incremental build that does work because a file was updated.
160+
//
161+
result = RestoreAndBuild(projectPath);
162+
result.AssertSuccess();
162163

163-
// var secondBuiltFiles = Directory.GetFiles(projectBinPath, "*.*", SearchOption.AllDirectories).ToArray();
164-
// var secondHashes = secondBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
164+
var secondBuiltFiles = Directory.GetFiles(projectBinPath, "*.*", SearchOption.AllDirectories).ToArray();
165+
var secondHashes = secondBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
165166

166-
// WixAssert.CompareLineByLine(firstHashes, secondHashes);
167-
//}
167+
WixAssert.CompareLineByLine(firstHashes, secondHashes);
168+
}
168169

169170
private static void CleanEverything()
170171
{

‎src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -828,10 +828,10 @@ public void CanBuildMultiTargetingWixlibUsingRids(BuildSystem buildSystem)
828828

829829
WixAssert.CompareLineByLine(new[]
830830
{
831-
@"net472_x64\e_sqlite3.dll - 1601536",
832-
@"net472_x86\e_sqlite3.dll - 1207296",
833-
@"net8_x64\e_sqlite3.dll - 1601536",
834-
@"net8_x86\e_sqlite3.dll - 1207296",
831+
@"net472_x64\e_sqlite3.dll - 1911296",
832+
@"net472_x86\e_sqlite3.dll - 1503232",
833+
@"net8_x64\e_sqlite3.dll - 1911296",
834+
@"net8_x86\e_sqlite3.dll - 1503232",
835835
}, releaseFileSizes);
836836
}
837837
}
@@ -898,14 +898,14 @@ public void CanBuildMultiTargetingWixlibUsingRidsWithReleaseAndDebug(BuildSystem
898898

899899
WixAssert.CompareLineByLine(new[]
900900
{
901-
@"debug_net472_x64\e_sqlite3.dll - 1601536",
902-
@"debug_net472_x86\e_sqlite3.dll - 1207296",
903-
@"debug_net8_x64\e_sqlite3.dll - 1601536",
904-
@"debug_net8_x86\e_sqlite3.dll - 1207296",
905-
@"release_net472_x64\e_sqlite3.dll - 1601536",
906-
@"release_net472_x86\e_sqlite3.dll - 1207296",
907-
@"release_net8_x64\e_sqlite3.dll - 1601536",
908-
@"release_net8_x86\e_sqlite3.dll - 1207296",
901+
@"debug_net472_x64\e_sqlite3.dll - 1911296",
902+
@"debug_net472_x86\e_sqlite3.dll - 1503232",
903+
@"debug_net8_x64\e_sqlite3.dll - 1911296",
904+
@"debug_net8_x86\e_sqlite3.dll - 1503232",
905+
@"release_net472_x64\e_sqlite3.dll - 1911296",
906+
@"release_net472_x86\e_sqlite3.dll - 1503232",
907+
@"release_net8_x64\e_sqlite3.dll - 1911296",
908+
@"release_net8_x86\e_sqlite3.dll - 1503232",
909909
}, releaseFileSizes);
910910
}
911911
}

‎src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/TestExe/TestExe.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.0" />
11+
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="10.0.9" />
12+
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
1213
</ItemGroup>
1314
</Project>

‎src/xsd/wix/Upgrade.xsd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<annotation>
1515
<documentation>
1616
Nesting a Property element under an Upgrade element has been deprecated.
17-
Please nest Property elements in any of the other supported locations.
17+
Use ProductSearch instead.
1818
</documentation>
1919
</annotation>
2020
</element>
@@ -25,4 +25,4 @@
2525
</annotation>
2626
</attribute>
2727
</complexType>
28-
</element>
28+
</element>

0 commit comments

Comments
 (0)