Fix build errors about WinForms references if WinUI 2 nuget is added …

…to the .NET XAML project
driver1998 · Jul 28, 2024 · a3f69d2 · a3f69d2
1 parent 6a8ff61
commit a3f69d2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/projections/WinUI/WinUIProjection.csproj b/projections/WinUI/WinUIProjection.csproj
@@ -12,7 +12,7 @@
 
 	<PropertyGroup>
 		<PackageId>DisposableMemory.ModernNetUAP.WinUI</PackageId>
-		<Version>2.8.6-preview</Version>
+		<Version>2.8.6-preview2</Version>
 		<Authors>driver1998</Authors>
 		<Description>WinUI 2.x Projections and build support for Modern .NET, requires DisposableMemory.ModernNetUAP.XamlCompiler package.</Description>
 		<PackageProjectUrl>https://github.com/driver1998/ModernNetUAP.XamlCompiler</PackageProjectUrl>

diff --git a/projections/WinUI/build/DisposableMemory.ModernNetUAP.WinUI.targets b/projections/WinUI/build/DisposableMemory.ModernNetUAP.WinUI.targets
@@ -12,10 +12,16 @@
 		<ItemGroup>
 			<!-- WinUI 2 WinMDs -->
 			<XamlCompileReferencePathWinMD Include="$(PkgMicrosoft_WinUI)/**/*.winmd" />
-			<XamlCompileReferencePathWinMD Include="$(PkgMicrosoft_WebView2)/**/*.winmd" />
+			<XamlCompileReferencePathWinMD Include="$(PkgMicrosoft_WebView2)/lib/**/*.winmd" />
 
 			<!-- Projections -->
 			<ReferencePathProjections Include="$(WinUIProjectionPackagePath)lib\**\WinUIProjection.dll" />
+
+			<!-- Add WinForms and WPF WebView2 DLLs as "projections" as well, 
+			     we don't want them to be referenced during XAML compilation -->
+			<ReferencePathProjections Include="$(PkgMicrosoft_WebView2)lib\**\Microsoft.Web.WebView2.Core.dll" />
+			<ReferencePathProjections Include="$(PkgMicrosoft_WebView2)lib\**\Microsoft.Web.WebView2.WinForms.dll" />
+			<ReferencePathProjections Include="$(PkgMicrosoft_WebView2)lib\**\Microsoft.Web.WebView2.Wpf.dll" />
 		</ItemGroup>
 		<Message Importance="high" Text="WinUIXamlCompileReferenceWrap"></Message>
 	</Target>