13 files changed, 499 insertions, 16 deletions

diff --git a/src/internal/WixInternal.MSTestSupport/MsbuildUtilities.cs b/src/internal/WixInternal.MSTestSupport/MsbuildUtilities.cs
index 8f3fecd9..516143dd 100644
--- a/src/internal/WixInternal.MSTestSupport/MsbuildUtilities.cs
+++ b/src/internal/WixInternal.MSTestSupport/MsbuildUtilities.cs
@@ -30,7 +30,8 @@ namespace WixInternal.MSTestSupport
 
             if (binlog)
             {
-                MsbuildUtilities.GetQuotedSwitch(buildSystem, "bl", Path.ChangeExtension(projectPath, ".binlog"));
+                var binlogSwitch = MsbuildUtilities.GetQuotedSwitch(buildSystem, "bl", Path.ChangeExtension(projectPath, ".binlog"));
+                allArgs.Add(binlogSwitch);
             }
 
             if (arguments != null)
diff --git a/src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj b/src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj
index e7061e74..b1bf8781 100644
--- a/src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj
+++ b/src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows7.0</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
diff --git a/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/Package.wxs b/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/Package.wxs
index 8bd191d8..3671c0ca 100644
--- a/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/Package.wxs
+++ b/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/Package.wxs
@@ -7,9 +7,9 @@
     </StandardDirectory>
 
     <Feature Id='Main' Title='WpfApp'>
-      <Component Directory='ApplicationFolder'>
-        <File Source='CsprojWpfNetCore.exe' />
-      </Component>
+      <Files Directory='ApplicationFolder' Include='!(bindpath.CsprojWpfNetCore)\**'>
+        <Exclude Files="**\*.pdb" />
+      </Files>
     </Feature>
   </Package>
 </Wix>
diff --git a/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj b/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWpfNetCore.wixproj
index 686092b6..df333242 100644
--- a/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj
+++ b/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWpfNetCore.wixproj
@@ -1,17 +1,13 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 <Project Sdk='WixToolset.Sdk'>
-<!-- <Project> -->
-  <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\net8.0\Sdk\Sdk.props' /> -->
 
-  <PropertyGroup>
-    <!-- <WixBinDir>D:\src\wix4\build\wix\Debug\net472\</WixBinDir> -->
-    <!-- <WixBinDir64>D:\src\wix4\build\wix\Debug\publish\WixToolset.Sdk\tools\net472\x64\</WixBinDir64> -->
-  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="abc\Bad.wxs" />
+  </ItemGroup>
 
   <ItemGroup>
     <!-- SkipPublish="true" BindPath="$(MSBuildProjectDirectory)\does\not\exist" BindName="Xxx" Publish="true" -->
     <ProjectReference Include="..\CsprojWpfNetCore\CsprojWpfNetCore.csproj" Publish="true" />
   </ItemGroup>
 
-  <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\net8.0\Sdk\Sdk.targets' /> -->
 </Project>
diff --git a/src/wix/WixToolset.BuildTasks/ILogger.cs b/src/wix/WixToolset.BuildTasks/ILogger.cs
new file mode 100644
index 00000000..16db691e
--- /dev/null
+++ b/src/wix/WixToolset.BuildTasks/ILogger.cs
@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.BuildTasks
+{
+    public interface ILogger
+    {
+        bool HasLoggedErrors { get; }
+
+        void LogError(string message);
+
+        void LogWarning(string message);
+    }
+}
diff --git a/src/wix/WixToolset.BuildTasks/MSBuildLoggerAdapter.cs b/src/wix/WixToolset.BuildTasks/MSBuildLoggerAdapter.cs
new file mode 100644
index 00000000..5382254c
--- /dev/null
+++ b/src/wix/WixToolset.BuildTasks/MSBuildLoggerAdapter.cs
@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.BuildTasks
+{
+    using Microsoft.Build.Utilities;
+
+    internal class MSBuildLoggerAdapter : ILogger
+    {
+        private readonly TaskLoggingHelper log;
+
+        public MSBuildLoggerAdapter(TaskLoggingHelper log)
+        {
+            this.log = log;
+        }
+
+        public bool HasLoggedErrors => this.log.HasLoggedErrors;
+
+        public void LogError(string message)
+        {
+            this.log.LogError(message);
+        }
+
+        public void LogWarning(string message)
+        {
+            this.log.LogWarning(message);
+        }
+    }
+}
diff --git a/src/wix/WixToolset.BuildTasks/ResolveInstallerPlatform.cs b/src/wix/WixToolset.BuildTasks/ResolveInstallerPlatform.cs
new file mode 100644
index 00000000..5e551d7b
--- /dev/null
+++ b/src/wix/WixToolset.BuildTasks/ResolveInstallerPlatform.cs
@@ -0,0 +1,174 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.BuildTasks
+{
+    using System;
+    using System.Linq;
+    using Microsoft.Build.Framework;
+    using Microsoft.Build.Utilities;
+
+    /// <summary>
+    /// This task calculates the InstallerPlatform from the RuntimeIdentifier,
+    /// InitialInstallerPlatform and Platform properties.
+    /// </summary>
+    public class ResolveInstallerPlatform : Task
+    {
+        private readonly ILogger logger;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public ResolveInstallerPlatform()
+        {
+            this.logger = new MSBuildLoggerAdapter(this.Log);
+        }
+
+        /// <summary>
+        /// Constructor for dependency injection of logger used by unit tests.
+        /// </summary>
+        public ResolveInstallerPlatform(ILogger logger)
+        {
+            this.logger = logger;
+        }
+
+        /// <summary>
+        /// The optional RuntimeIdentifier property.
+        /// </summary>
+        public string RuntimeIdentifier { private get; set; }
+
+        /// <summary>
+        /// The optional InitialInstallerPlatform property.
+        /// </summary>
+        public string InitialInstallerPlatform { private get; set; }
+
+        /// <summary>
+        /// The InstallerPlatform property.
+        /// </summary>
+        public string InstallerPlatform { private get; set; }
+
+        /// <summary>
+        /// The optional Platform property.
+        /// </summary>
+        public string Platform { private get; set; }
+
+        /// <summary>
+        /// The resolved InstallerPlatform.
+        /// </summary>
+        [Output]
+        public string ResolvedInstallerPlatform { get; private set; }
+
+        /// <summary>
+        /// The optionally resolved Platform.
+        /// </summary>
+        [Output]
+        public string ResolvedPlatform { get; private set; }
+
+        /// <summary>
+        /// Convert the input properties into output items.
+        /// </summary>
+        /// <returns>True upon completion of the task execution.</returns>
+        public override bool Execute()
+        {
+            if (String.IsNullOrEmpty(this.RuntimeIdentifier))
+            {
+                this.ResolvedInstallerPlatform = this.InstallerPlatform;
+            }
+            else if (this.ValidateWindowsRuntimeIdentifier(this.RuntimeIdentifier, out var platform))
+            {
+                if (!String.IsNullOrEmpty(this.InitialInstallerPlatform) && !String.Equals(this.InitialInstallerPlatform, platform, StringComparison.OrdinalIgnoreCase))
+                {
+                    this.logger.LogError($"The RuntimeIdentifier '{this.RuntimeIdentifier}' resolves to platform '{platform}', which conflicts with the provided InstallerPlatform '{this.InitialInstallerPlatform}'.");
+                }
+                else
+                {
+                    this.ResolvedInstallerPlatform = platform;
+                }
+            }
+
+            // If Platform was a generic value, resolve it to the resolved installer platform.
+            if (String.IsNullOrEmpty(this.Platform)
+                || this.Platform.Equals("AnyCPU", StringComparison.OrdinalIgnoreCase)
+                || this.Platform.Equals("Any CPU", StringComparison.OrdinalIgnoreCase)
+                || this.Platform.Equals("Win32", StringComparison.OrdinalIgnoreCase))
+            {
+                this.ResolvedPlatform = this.ResolvedInstallerPlatform;
+            }
+            else if (!this.Platform.Equals(this.ResolvedInstallerPlatform, StringComparison.OrdinalIgnoreCase))
+            {
+                this.logger.LogWarning($"The provided Platform '{this.Platform}' does not match the resolved InstallerPlatform '{this.ResolvedInstallerPlatform}'. The output will be built using '{this.ResolvedInstallerPlatform}'.");
+            }
+
+            return !this.logger.HasLoggedErrors;
+        }
+
+        private bool ValidateWindowsRuntimeIdentifier(string runtimeIdentifier, out string platform)
+        {
+            platform = null;
+
+            var ridParts = runtimeIdentifier.Split('-');
+            if (ridParts.Length < 2)
+            {
+                this.logger.LogError($"The RuntimeIdentifier '{runtimeIdentifier}' is not valid.");
+
+                return false;
+            }
+
+            var os = ridParts[0];
+
+            if (!os.StartsWith("win", StringComparison.OrdinalIgnoreCase) || (os.Length > 3 && !Int32.TryParse(os.Substring(3), out var _)))
+            {
+                this.logger.LogError($"The RuntimeIdentifier '{runtimeIdentifier}' is not a valid Windows RuntimeIdentifier.");
+
+                return false;
+            }
+
+            // Ensure there is only one platform specified in the RID.
+            foreach (var part in ridParts.Skip(1))
+            {
+                string platformPart;
+                switch (part.ToLowerInvariant())
+                {
+                    case "x86":
+                    case "win32":
+                        platformPart = "x86";
+                        break;
+
+                    case "x64":
+                    case "amd64":
+                        platformPart = "x64";
+                        break;
+
+                    case "arm":
+                    case "arm32":
+                        platformPart = "arm";
+                        break;
+
+                    case "arm64":
+                        platformPart = "arm64";
+                        break;
+
+                    default:
+                        continue;
+                }
+
+                if (String.IsNullOrEmpty(platform))
+                {
+                    platform = platformPart;
+                }
+                else // there can be only one platform in the RID.
+                {
+                    this.logger.LogError($"The RuntimeIdentifier '{runtimeIdentifier}' specifies multiple platforms which is not supported.");
+                }
+            }
+
+            if (String.IsNullOrEmpty(platform))
+            {
+                this.logger.LogError($"The RuntimeIdentifier '{runtimeIdentifier}' does not specify a valid platform.");
+
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index ddc83052..bf0fdaca 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -40,6 +40,7 @@
   <UsingTask TaskName="CreateProjectReferenceDefineConstantsAndBindPaths" AssemblyFile="$(WixTasksPath)" />
   <UsingTask TaskName="WixAssignCulture" AssemblyFile="$(WixTasksPath)" />
   <UsingTask TaskName="ReadTracking" AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="ResolveInstallerPlatform" AssemblyFile="$(WixTasksPath)" />
   <UsingTask TaskName="ResolveWixReferences" AssemblyFile="$(WixTasksPath)" />
   <UsingTask TaskName="WixBuild" AssemblyFile="$(WixTasksPath)" />
   <UsingTask TaskName="WindowsInstallerValidation" AssemblyFile="$(WixTasksPath)" />
@@ -165,6 +166,7 @@
 
   <!-- Default Compiler properties. -->
   <PropertyGroup>
+    <_InitialInstallerPlatform>$(InstallerPlatform)</_InitialInstallerPlatform>
     <InstallerPlatform Condition=" '$(InstallerPlatform)' == '' and ('$(Platform)' == '' or '$(Platform)' == 'Win32' or '$(Platform)' == 'AnyCPU' or '$(Platform)' == 'Any CPU') ">x86</InstallerPlatform>
     <InstallerPlatform Condition=" '$(InstallerPlatform)' == '' ">$(Platform)</InstallerPlatform>
   </PropertyGroup>
@@ -207,6 +209,60 @@
   <!--
     ***********************************************************************************************
     ***********************************************************************************************
+                                                                Prepare For Build Section
+    ***********************************************************************************************
+    ***********************************************************************************************
+    -->
+  <PropertyGroup>
+    <PrepareForBuildDependsOn>
+      ResolveInstallerPlatform;
+      $(PrepareForBuildDependsOn)
+    </PrepareForBuildDependsOn>
+  </PropertyGroup>
+
+  <!--
+    ================================================================================================
+                                        ResolveInstallerPlatform
+
+    Uses the RuntimeIdentifier to validate and update the InstallerPlatform. If the RuntimeIdentifier is
+    not provided, the InstallerPlatform will continue to mirror the Platform.
+
+    [IN]
+    $(_InitialInstallerPlatform) - Set if InstallerPlatform was explcitly defined in project.
+    $(InstallerPlatform) - InstallerPlatform calculated from initial value of Platform.
+    $(RuntimeIdentfier) - Optional runtime identifier for output.
+    $(Platform) - Optional platform for output.
+
+    [OUT]
+    $(InstallerPlatform) - InstallerPlatform resolved based on the inputs.
+    $(PlatformName) - Potentially updates Platform name if Platform is generic and the RuntimeIdentifier
+                      changes the InstallerPlatform.
+    ================================================================================================
+    -->
+  <Target
+    Name="ResolveInstallerPlatform"
+    Returns="$(InstallerPlatform)">
+
+    <ResolveInstallerPlatform
+        RuntimeIdentifier="$(RuntimeIdentifier)"
+        InitialInstallerPlatform="$(_InitialInstallerPlatform)"
+        InstallerPlatform="$(InstallerPlatform)"
+        Platform="$(Platform)">
+      <Output TaskParameter="ResolvedInstallerPlatform"
+              PropertyName="_ResolvedInstallerPlatform" />
+      <Output TaskParameter="ResolvedPlatform"
+              PropertyName="_ResolvedPlatform" />
+    </ResolveInstallerPlatform>
+
+    <PropertyGroup>
+      <InstallerPlatform>$(_ResolvedInstallerPlatform)</InstallerPlatform>
+      <PlatformName Condition=" '$(_ResolvedPlatform)' != '' and '$(PlatformName)' == '$(Platform)' ">$(_ResolvedPlatform)</PlatformName>
+    </PropertyGroup>
+  </Target>
+
+  <!--
+    ***********************************************************************************************
+    ***********************************************************************************************
                                                                 Resolve References Section
     ***********************************************************************************************
     ***********************************************************************************************
diff --git a/src/wix/test/WixToolsetTest.BuildTasks/FakeMsbuildLogger.cs b/src/wix/test/WixToolsetTest.BuildTasks/FakeMsbuildLogger.cs
new file mode 100644
index 00000000..8bfb6145
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.BuildTasks/FakeMsbuildLogger.cs
@@ -0,0 +1,26 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.BuildTasks
+{
+    using System.Collections.Generic;
+    using WixToolset.BuildTasks;
+
+    public class FakeMsbuildLogger : ILogger
+    {
+        public List<string> Messages { get; } = new List<string>();
+
+        public bool HasLoggedErrors { get; private set; }
+
+        public void LogError(string message)
+        {
+            this.HasLoggedErrors = true;
+
+            this.Messages.Add("Error: " + message);
+        }
+
+        public void LogWarning(string message)
+        {
+            this.Messages.Add("Warning: " + message);
+        }
+    }
+}
diff --git a/src/wix/test/WixToolsetTest.BuildTasks/ResolveInstallerPlatformTaskFixture.cs b/src/wix/test/WixToolsetTest.BuildTasks/ResolveInstallerPlatformTaskFixture.cs
new file mode 100644
index 00000000..0da2e146
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.BuildTasks/ResolveInstallerPlatformTaskFixture.cs
@@ -0,0 +1,148 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.BuildTasks
+{
+    using WixInternal.TestSupport;
+    using WixToolset.BuildTasks;
+    using Xunit;
+
+    public class ResolveInstallerPlatformTaskFixture
+    {
+
+        [Fact]
+        public void Execute_WithOnlyInstallerPlatform_ResolvesCorrectly()
+        {
+            var logger = new FakeMsbuildLogger();
+
+            var task = new ResolveInstallerPlatform(logger)
+            {
+                InstallerPlatform = "x64",
+                Platform = "",
+            };
+
+            Assert.True(task.Execute());
+
+            Assert.Empty(logger.Messages);
+            Assert.Equal("x64", task.ResolvedInstallerPlatform);
+            Assert.Equal("x64", task.ResolvedPlatform);
+        }
+
+        [Fact]
+        public void Execute_WithInvalidRuntimeIdentifier_LogsErrorAndReturnsFalse()
+        {
+            var logger = new FakeMsbuildLogger();
+
+            var task = new ResolveInstallerPlatform(logger)
+            {
+                RuntimeIdentifier = "win10",
+            };
+
+            Assert.False(task.Execute());
+
+            WixAssert.CompareLineByLine(
+                new[] { "Error: The RuntimeIdentifier 'win10' is not valid." },
+                logger.Messages.ToArray());
+        }
+
+        [Fact]
+        public void Execute_WithNonWindowsRuntimeIdentifier_LogsErrorAndReturnsFalse()
+        {
+            var logger = new FakeMsbuildLogger();
+
+            var task = new ResolveInstallerPlatform(logger)
+            {
+                RuntimeIdentifier = "linux-x64",
+            };
+
+            Assert.False(task.Execute());
+
+            WixAssert.CompareLineByLine(
+                new[] { "Error: The RuntimeIdentifier 'linux-x64' is not a valid Windows RuntimeIdentifier." },
+                logger.Messages.ToArray());
+        }
+
+        [Fact]
+        public void Execute_WithRuntimeIdentifierSpecifyingMultiplePlatforms_LogsErrorAndReturnsFalse()
+        {
+            var logger = new FakeMsbuildLogger();
+
+            var task = new ResolveInstallerPlatform(logger)
+            {
+                RuntimeIdentifier = "win10-x64-arm64",
+                Platform = "",
+            };
+
+            Assert.False(task.Execute());
+
+            WixAssert.CompareLineByLine(
+                new[] { "Error: The RuntimeIdentifier 'win10-x64-arm64' specifies multiple platforms which is not supported." },
+                logger.Messages.ToArray());
+
+            // Despite the logged error the platform resolver sets the first platform it finds.
+            Assert.Equal("x64", task.ResolvedInstallerPlatform);
+            Assert.Equal("x64", task.ResolvedPlatform);
+        }
+
+        [Fact]
+        public void Execute_WithRuntimeIdentifierAndInitialInstallerPlatformMismatch_LogsErrorAndReturnsFalse()
+        {
+            var logger = new FakeMsbuildLogger();
+
+            var task = new ResolveInstallerPlatform(logger)
+            {
+                RuntimeIdentifier = "win10-x64",
+                InitialInstallerPlatform = "x86",
+                Platform = "",
+            };
+
+            Assert.False(task.Execute());
+
+            WixAssert.CompareLineByLine(
+                new[] { "Error: The RuntimeIdentifier 'win10-x64' resolves to platform 'x64', which conflicts with the provided InstallerPlatform 'x86'." },
+                logger.Messages.ToArray());
+
+            Assert.Null(task.ResolvedInstallerPlatform);
+            Assert.Null(task.ResolvedPlatform);
+        }
+
+        [Fact]
+        public void Execute_WithRuntimeIdentifierAndInitialInstallerPlatformMatches_ResolvesToPlatform()
+        {
+            var logger = new FakeMsbuildLogger();
+
+            var task = new ResolveInstallerPlatform(logger)
+            {
+                RuntimeIdentifier = "win10-x64",
+                InitialInstallerPlatform = "x64",
+                Platform = "",
+            };
+
+            Assert.True(task.Execute());
+
+            Assert.Empty(logger.Messages);
+            Assert.Equal("x64", task.ResolvedInstallerPlatform);
+            Assert.Equal("x64", task.ResolvedPlatform);
+        }
+
+        [Fact]
+        public void Execute_WithMismatchedPlatformProperty_LogsWarningButReturnsTrue()
+        {
+            var logger = new FakeMsbuildLogger();
+
+            var task = new ResolveInstallerPlatform(logger)
+            {
+                RuntimeIdentifier = "win10-x64",
+                Platform = "x86",
+            };
+
+            Assert.True(task.Execute());
+
+            WixAssert.CompareLineByLine(
+                new[] { "Warning: The provided Platform 'x86' does not match the resolved InstallerPlatform 'x64'. The output will be built using 'x64'." },
+                logger.Messages.ToArray());
+
+            Assert.Equal("x64", task.ResolvedInstallerPlatform);
+            Assert.Null(task.ResolvedPlatform);
+        }
+    }
+}
diff --git a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
index f1d03cd7..78596c6c 100644
--- a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
+++ b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
@@ -2,7 +2,9 @@
   <Settings>
     <HiddenComponentWarnings />
     <IgnoredTests>
-      <AllTestsSelector />
+      <FixtureTestSelector>
+        <FixtureName>WixToolsetTest.BuildTasks.WixBuildTaskFixture</FixtureName>
+      </FixtureTestSelector>
     </IgnoredTests>
   </Settings>
 </ProjectConfiguration>
\ No newline at end of file
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index 22cb0a75..78166e00 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -12,6 +12,9 @@ namespace WixToolsetTest.Sdk
     using System.Linq;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
     using WixInternal.MSTestSupport;
+    using WixToolset.Data;
+    using WixToolset.Data.Symbols;
+    using WixToolset.Data.WindowsInstaller.Rows;
 
     [TestClass]
     public class MsbuildFixture
@@ -648,6 +651,42 @@ namespace WixToolsetTest.Sdk
         [DataRow(BuildSystem.DotNetCoreSdk)]
         [DataRow(BuildSystem.MSBuild)]
         [DataRow(BuildSystem.MSBuild64)]
+        public void CanBuildWixlibWithRid(BuildSystem buildSystem)
+        {
+            var sourceFolder = TestData.Get(@"TestData", "Wixlib", "WithBadFiles");
+
+            using (var fs = new TestDataFolderFileSystem())
+            {
+                fs.Initialize(sourceFolder);
+                var baseFolder = fs.BaseFolder;
+                var binFolder = Path.Combine(baseFolder, @"bin\");
+                var projectPath = Path.Combine(baseFolder, "SkipBadFiles.wixproj");
+
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
+                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
+                    "-p:RuntimeIdentifier=win-arm64",
+                });
+                result.AssertSuccess();
+
+                var wixBuildCommands = MsbuildUtilities.GetToolCommandLines(result, "wix", "build", buildSystem);
+                WixAssert.Single(wixBuildCommands);
+
+                var wixlib = Intermediate.Load(Path.Combine(binFolder, "Release", "SkipBadFiles.wixlib"));
+                var properties = wixlib.Sections.SelectMany(s => s.Symbols).OfType<PropertySymbol>().ToList();
+                WixAssert.CompareLineByLine(
+                [
+                    "Property sysBUILDARCH=arm64",
+                    "Property Platform=arm64",
+                    "Property InstallerPlatform=arm64"
+                ], [.. properties.Select(p => $"Property {p.Id.Id}={p.Value}")]);
+            }
+        }
+
+        [TestMethod]
+        [DataRow(BuildSystem.DotNetCoreSdk)]
+        [DataRow(BuildSystem.MSBuild)]
+        [DataRow(BuildSystem.MSBuild64)]
         public void CanBuildPackageIncludingSimpleWixlib(BuildSystem buildSystem)
         {
             var sourceFolder = TestData.Get(@"TestData", "Wixlib");
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/WithBadFiles/Library.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/WithBadFiles/Library.wxs
index bcf79a1f..f946fcc6 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/WithBadFiles/Library.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/WithBadFiles/Library.wxs
@@ -1,7 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-      <StandardDirectory Id="ProgramFilesFolder">
-          <Directory Id="WixLibFolder" />
-      </StandardDirectory>
+    <Property Id="sysBUILDARCH" Value="$(sys.BUILDARCH)" />
+    <Property Id="Platform" Value="$(Platform)" />
+    <Property Id="InstallerPlatform" Value="$(InstallerPlatform)" />
   </Fragment>
 </Wix>