diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 21c8c74d1..4235816eb 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -65,12 +65,6 @@
-
-
-
-
-
-
@@ -87,7 +81,7 @@
-
+
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/LongPathFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/LongPathFixture.cs
index 2cada64d1..3bf7f0066 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/LongPathFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/LongPathFixture.cs
@@ -36,6 +36,7 @@ public void TestLongPathSupport()
}
var intermediateFolder = Path.Combine(baseFolder, "obj");
+ var outputPath = Path.Combine(baseFolder, "bin", "test.msi");
var result = WixRunner.Execute(
[
@@ -45,9 +46,22 @@ public void TestLongPathSupport()
"-loc", Path.Combine(folder, "Package.en-us.wxl"),
"-bindpath", Path.Combine(folder, "data"),
"-intermediateFolder", intermediateFolder,
- "-o", Path.Combine(baseFolder, "bin", "test.msi")
+ "-o", outputPath,
]);
+ if (result.ExitCode == 223/*WindowsInstallerBackendErrors.OpenDatabaseFailed*/
+ && result.Messages.Length > 0)
+ {
+ // In a bit of a twist, WiX's long-path support relies on 8.3 short file names. As
+ // [Raymond Chen suggests](https://devblogs.microsoft.com/oldnewthing/20181004-00/?p=99895),
+ // not all file systems support 8.3 names. That includes ReFS, the file system used
+ // by Dev Drives. So pass the test if the failure is due to missing 8.3 names.
+ Assert.Equal(outputPath, result.Messages[0].MessageArgs[0]);
+ Assert.Equal("The Windows Installer service failed to start. Contact your support personnel.", result.Messages[0].MessageArgs[1]);
+
+ return;
+ }
+
result.AssertSuccess();
Assert.True(File.Exists(Path.Combine(baseFolder, "bin", "test.msi")));