From 35ffcf7e0ece3b88e44393eda24eb2a574441014 Mon Sep 17 00:00:00 2001
From: Yexuan Xiao <bizwen@nykz.org>
Date: Sat, 13 Jun 2026 23:39:25 +0800
Subject: [PATCH 1/2] Output the module intermediate files to
 `$(IntDir)Microsoft\cppwinrt\`

---
 nuget/Microsoft.Windows.CppWinRT.targets | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nuget/Microsoft.Windows.CppWinRT.targets b/nuget/Microsoft.Windows.CppWinRT.targets
index a297258f3..b1da90be9 100644
--- a/nuget/Microsoft.Windows.CppWinRT.targets
+++ b/nuget/Microsoft.Windows.CppWinRT.targets
@@ -917,6 +917,10 @@ $(XamlMetaDataProviderPch)
                 <CompileAs>CompileAsCppModule</CompileAs>
                 <ModulesSupported>true</ModulesSupported>
                 <PrecompiledHeader>NotUsing</PrecompiledHeader>
+                <ModuleOutputFile>$(IntDir)Microsoft\cppwinrt\</ModuleOutputFile>
+                <ObjectFileName>$(IntDir)Microsoft\cppwinrt\</ObjectFileName>
+                <ModuleDependenciesFile>$(IntDir)Microsoft\cppwinrt\</ModuleDependenciesFile>
+                <SourceDependenciesFile>$(IntDir)Microsoft\cppwinrt\</SourceDependenciesFile>
             </ClCompile>
         </ItemGroup>
     </Target>
@@ -924,7 +928,7 @@ $(XamlMetaDataProviderPch)
     <!--
       When CppWinRTBuildModule is true, export the generated files directory and IFC output
       directory so that consuming projects can resolve them via ProjectReference.
-      The IFC files are written to IntDir by MSBuild's module build system.
+      The IFC files are written to '$(IntDir)Microsoft\cppwinrt\' by MSBuild's module build system.
     -->
     <Target Name="CppWinRTGetModuleOutputs"
             Condition="'$(CppWinRTBuildModule)'=='true'"
@@ -932,8 +936,7 @@ $(XamlMetaDataProviderPch)
         <ItemGroup>
             <CppWinRTModuleOutputs Include="$(MSBuildProjectFullPath)">
                 <CppWinRTModuleGeneratedFilesDir>$(GeneratedFilesDir)</CppWinRTModuleGeneratedFilesDir>
-                <CppWinRTModuleIfcDir>$(IntDir)</CppWinRTModuleIfcDir>
-                <CppWinRTModuleLibDir>$(OutDir)</CppWinRTModuleLibDir>
+                <CppWinRTModuleIfcDir>$(IntDir)Microsoft\cppwinrt\</CppWinRTModuleIfcDir>
             </CppWinRTModuleOutputs>
         </ItemGroup>
     </Target>

From 54b6792d68c802e28929d02e4260a9fe8ee6c088 Mon Sep 17 00:00:00 2001
From: Yexuan Xiao <bizwen@nykz.org>
Date: Sun, 14 Jun 2026 01:23:59 +0800
Subject: [PATCH 2/2] Update Microsoft.Windows.CppWinRT.targets

---
 nuget/Microsoft.Windows.CppWinRT.targets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nuget/Microsoft.Windows.CppWinRT.targets b/nuget/Microsoft.Windows.CppWinRT.targets
index b1da90be9..b476ea9ec 100644
--- a/nuget/Microsoft.Windows.CppWinRT.targets
+++ b/nuget/Microsoft.Windows.CppWinRT.targets
@@ -920,7 +920,6 @@ $(XamlMetaDataProviderPch)
                 <ModuleOutputFile>$(IntDir)Microsoft\cppwinrt\</ModuleOutputFile>
                 <ObjectFileName>$(IntDir)Microsoft\cppwinrt\</ObjectFileName>
                 <ModuleDependenciesFile>$(IntDir)Microsoft\cppwinrt\</ModuleDependenciesFile>
-                <SourceDependenciesFile>$(IntDir)Microsoft\cppwinrt\</SourceDependenciesFile>
             </ClCompile>
         </ItemGroup>
     </Target>