Skip to content

Commit

Permalink
Use WebView2 preview with a projection that supports AOT
Browse files Browse the repository at this point in the history
  • Loading branch information
driver1998 committed Sep 24, 2024
1 parent 3f0305a commit 8cdf9cc
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 28 deletions.
5 changes: 0 additions & 5 deletions BuildTasks/BuildTasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,4 @@
<PackageReference Include="Mono.Cecil" Version="$(_PkgMono_Cecil_Version)" PrivateAssets="all"/>
</ItemGroup>


<ItemGroup>
<None Include="build\*" Pack="true" PackagePath="build" />
<None Include="README.md" Pack="true" PackagePath="\" />
</ItemGroup>
</Project>
6 changes: 4 additions & 2 deletions WinUIProjection/WinUIProjection.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="build/DisposableMemory.ModernNetUAP.WinUI.props" />
<Import Project="../WinUIProjectionPackage/PackageVersion.props"/>

<PropertyGroup>
<Version>$(WinUIProjectionPackageVersion)</Version>
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand All @@ -13,7 +15,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
<PackageReference Include="Microsoft.Web.WebView2" Version="$(_PkgWebView2_Version)" GeneratePathProperty="true">
<ExcludeAssets>build; compile; runtime</ExcludeAssets>
<ExcludeAssets>build; buildtransitive; compile; runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.UI.Xaml" Version="$(_PkgWinUI_Version)" GeneratePathProperty="true">
<ExcludeAssets>build; buildtransitive; compile; runtime</ExcludeAssets>
Expand All @@ -29,6 +31,6 @@
<ItemGroup>
<CsWinRTInputs Include="$(PkgMicrosoft_UI_Xaml)\lib\uap10.0\Microsoft.UI.Xaml.winmd" />
<CsWinRTInputs Include="$(PkgMicrosoft_Web_WebView2)\lib\Microsoft.Web.WebView2.Core.winmd" />
<Reference Include="$(PkgMicrosoft_Web_WebView2)\lib_manual\net6.0-windows10.0.17763.0\Microsoft.Web.WebView2.Core.Projection.dll" />
<Reference Include="$(PkgMicrosoft_Web_WebView2)\lib_manual\net8.0-windows10.0.17763.0\Microsoft.Web.WebView2.Core.Projection.dll" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PkgWinUI_Version>2.8.6</_PkgWinUI_Version>
<_PkgWebView2_Version>1.0.2739.15</_PkgWebView2_Version>
<_PkgWebView2_Version>1.0.2839-prerelease</_PkgWebView2_Version>
<WebView2EnableCsWinRTProjection>true</WebView2EnableCsWinRTProjection>
</PropertyGroup>
</Project>

This file was deleted.

6 changes: 6 additions & 0 deletions WinUIProjectionPackage/PackageVersion.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WinUIProjectionPackageVersion>2.8.6.3-preview</WinUIProjectionPackageVersion>
</PropertyGroup>
</Project>
12 changes: 7 additions & 5 deletions WinUIProjectionPackage/WinUIProjectionPackage.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<Project Sdk="Microsoft.Build.NoTargets">
<Import Project="build/DisposableMemory.ModernNetUAP.WinUI.props" />
<Import Project="../WinUIProjection/build/DisposableMemory.ModernNetUAP.WinUI.props" />
<Import Project="PackageVersion.props"/>

<PropertyGroup>
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
<PackageId>DisposableMemory.ModernNetUAP.WinUI</PackageId>
<Version>2.8.6.11</Version>
<Version>$(WinUIProjectionPackageVersion)</Version>
<Authors>driver1998</Authors>
<Description>WinUI 2.x Projections and build support for Modern .NET.</Description>
<PackageProjectUrl>https://github.com/driver1998/ModernNetUAP.XamlCompiler</PackageProjectUrl>
Expand All @@ -15,12 +17,12 @@
</PropertyGroup>

<ItemGroup>
<None Include="build\*" Pack="true" PackagePath="build" />
<None Include="..\README.md" Pack="true" PackagePath="\" />
<None Include="..\WinUIProjection\build\*" Pack="true" PackagePath="build" />
<None Include="..\WinUIProjection\README.md" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Web.WebView2" Version="$(_PkgWebView2_Version)" PrivateAssets="none"/>
<PackageReference Include="Microsoft.Web.WebView2" Version="$(_PkgWebView2_Version)" PrivateAssets="none" />
</ItemGroup>

<ItemGroup>
Expand Down

This file was deleted.

0 comments on commit 8cdf9cc

Please sign in to comment.