-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from driver1998/webview2
Separate WebView2 Projection
- Loading branch information
Showing
8 changed files
with
98 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # DisposableMemory.ModernNetUAP.WinUI | ||
|
|
||
| Provides WinUI 2 projections and build support on top of DisposableMemory.ModernNetUAP.XamlCompiler. | ||
|
|
||
| # DisposableMemory.ModernNetUAP.WinUI | ||
|
|
||
| Provides WinUI 2 projections and build support on top of DisposableMemory.ModernNetUAP.XamlCompiler. | ||
|
|
||
| Also works with the new official .NET 9 UWP support. |
82 changes: 35 additions & 47 deletions
82
projections/WinUI/WinUIProjection.csproj → WinUIProjection/WinUIProjection.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,36 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <Import Project="build/DisposableMemory.ModernNetUAP.WinUI.props" /> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| <IsAotCompatible>true</IsAotCompatible> | ||
| <WindowsSdkPackageVersion>10.0.19041.39</WindowsSdkPackageVersion> | ||
| <CsWinRTUseWindowsUIXamlProjections>true</CsWinRTUseWindowsUIXamlProjections> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageId>DisposableMemory.ModernNetUAP.WinUI</PackageId> | ||
| <Version>2.8.6.2</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> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <PackageReadmeFile>README.md</PackageReadmeFile> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.Web.WebView2" Version="$(_PkgWebView2_Version)" GeneratePathProperty="true"> | ||
| <ExcludeAssets>build; buildtransitive; compile; runtime</ExcludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.UI.Xaml" Version="$(_PkgWinUI_Version)" GeneratePathProperty="true"> | ||
| <ExcludeAssets>build; buildtransitive; compile; runtime</ExcludeAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <CsWinRTFilters> | ||
| -include Microsoft | ||
| </CsWinRTFilters> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <CsWinRTInputs Include="$(PkgMicrosoft_UI_Xaml)\lib\uap10.0\Microsoft.UI.Xaml.winmd" /> | ||
| <CsWinRTInputs Include="$(PkgMicrosoft_Web_WebView2)\lib\Microsoft.Web.WebView2.Core.winmd" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="build\*" Pack="true" PackagePath="build" /> | ||
| <None Include="README.md" Pack="true" PackagePath="\" /> | ||
| </ItemGroup> | ||
| <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> | ||
| <IsAotCompatible>true</IsAotCompatible> | ||
| <WindowsSdkPackageVersion>10.0.19041.39</WindowsSdkPackageVersion> | ||
| <CsWinRTUseWindowsUIXamlProjections>true</CsWinRTUseWindowsUIXamlProjections> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.Web.WebView2" Version="$(_PkgWebView2_Version)" GeneratePathProperty="true"> | ||
| <ExcludeAssets>build; buildtransitive; compile; runtime</ExcludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.UI.Xaml" Version="$(_PkgWinUI_Version)" GeneratePathProperty="true"> | ||
| <ExcludeAssets>build; buildtransitive; compile; runtime</ExcludeAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <CsWinRTFilters> | ||
| -include Microsoft.UI.Xaml | ||
| </CsWinRTFilters> | ||
| </PropertyGroup> | ||
|
|
||
| <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\net8.0-windows10.0.17763.0\Microsoft.Web.WebView2.Core.Projection.dll" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <Project Sdk="Microsoft.Build.NoTargets"> | ||
| <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>$(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> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <PackageReadmeFile>README.md</PackageReadmeFile> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <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" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\WinUIProjection\WinUIProjection.csproj"> | ||
| <OutputItemType>Content</OutputItemType> | ||
| <IncludeAssets>all</IncludeAssets> | ||
| <Pack>true</Pack> | ||
| <PackagePath>lib/net8.0-windows10.0.19041.0</PackagePath> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| </Project> |
19 changes: 0 additions & 19 deletions
19
projections/WinUI/build/DisposableMemory.ModernNetUAP.WinUI.targets
This file was deleted.
Oops, something went wrong.