Build WebView in ARM64 (#307)

* Added support for ARM64

* Updated solution configuration

* Updated config

* Improved versioning

* Deployment in ARM64

* Test projects

* Fixed sample app publish script

* Fixed bundling

* Added package suffix

* Added PlatformTarget

* Removed PlatformTarget and bump version

* Changed build configurations

* Update publish.cmd

* Delete publish.cmd

Author: alvesmiguel1

.gitignore

@@ -26,3 +26,4 @@ launchSettings.json
 .idea
 WebViewControl/FodyWeavers.xsd
 WebViewControl.Avalonia/FodyWeavers.xsd
+**/*.DS_Store

Directory.Build.props

@@ -2,16 +2,29 @@
 <Project>
   <PropertyGroup>
     <DotnetVersion>net6.0</DotnetVersion>
+    <Platforms>x64;ARM64</Platforms>
+    <AvaloniaVersion>0.10.17</AvaloniaVersion>
+    <CefGlueVersion>106.5249.18</CefGlueVersion>
   </PropertyGroup>
 
   <PropertyGroup>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
-    <Version>2.106.7</Version>
+    <Version>2.106.8</Version>
     <Authors>OutSystems</Authors>
     <Product>WebViewControl</Product>
     <Copyright>Copyright © OutSystems 2023</Copyright>
     <PackageProjectUrl>https://github.com/OutSystems/WebView</PackageProjectUrl>
     <PackageOutputPath>$(MSBuildProjectDirectory)\..\nuget</PackageOutputPath>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Platform)' == '' or '$(Platform)' == 'x64'">
+    <PackageSuffix />
+    <CefGluePackageSuffix />
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Platform)' == 'ARM64'">
+    <PackageSuffix>-ARM64</PackageSuffix>
+    <CefGluePackageSuffix>.ARM64</CefGluePackageSuffix>
+  </PropertyGroup>
 </Project>

Directory.Packages.props

@@ -16,12 +16,15 @@
     </ItemDefinitionGroup>
 
     <ItemGroup>
-        <PackageVersion Include="Avalonia" Version="0.10.17" />
-        <PackageVersion Include="Avalonia.Desktop" Version="0.10.17" />
-        <PackageVersion Include="Avalonia.ReactiveUI" Version="0.10.17" />
+        <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
 
-        <PackageVersion Include="CefGlue.Avalonia" Version="106.5249.7" />
-        <PackageVersion Include="CefGlue.Wpf" Version="106.5249.7" />
+        <PackageVersion Include="CefGlue.Avalonia" Version="$(CefGlueVersion)" />
+        <PackageVersion Include="CefGlue.WPF" Version="$(CefGlueVersion)" />
+
+        <PackageVersion Include="CefGlue.Avalonia.ARM64" Version="$(CefGlueVersion)" />
+        <PackageVersion Include="CefGlue.WPF.ARM64" Version="$(CefGlueVersion)" />
 
         <PackageVersion Include="Microsoft.CSharp" Version="4.5.0" />
         <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />

SampleWebView.Avalonia/App.xaml

@@ -5,7 +5,8 @@
     <TargetFramework>$(DotnetVersion)</TargetFramework>
     <RollForward>LatestMajor</RollForward>
     <Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport</Configurations>
-    <RuntimeIdentifiers>osx-x64;win-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>osx-x64;win-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
+    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
   </PropertyGroup>
 
   <PropertyGroup>

SampleWebView.Avalonia/App.xaml.cs

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-arm64 -p:Platform=ARM64
+
+TARGETAPP=bin/ARM64/Debug/net6.0/osx-arm64/publish/SampleWebView.app/Contents/MacOS
+chmod +x "$TARGETAPP/CefGlueBrowserProcess/Xilium.CefGlue.BrowserProcess"
+chmod +x "$TARGETAPP/SampleWebView.Avalonia"

SampleWebView.Avalonia/MainWindow.xaml

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -p:Platform=x64
+
+TARGETAPP=bin/x64/Debug/net6.0/osx-x64/publish/SampleWebView.app/Contents/MacOS
+chmod +x "$TARGETAPP/CefGlueBrowserProcess/Xilium.CefGlue.BrowserProcess"
+chmod +x "$TARGETAPP/SampleWebView.Avalonia"

SampleWebView.Avalonia/MainWindow.xaml.cs

@@ -5,10 +5,10 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(MSBuildProjectDirectory)\bin\</OutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>$(Platform)</PlatformTarget>
     <IsPackable>false</IsPackable>
     <Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport</Configurations>
-    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>

SampleWebView.Avalonia/MainWindowViewModel.cs

@@ -9,17 +9,17 @@
     <Company></Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageId>WebViewControl-Avalonia</PackageId>
+    <PackageId>WebViewControl-Avalonia$(PackageSuffix)</PackageId>
     <Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport</Configurations>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAvaloniaRemoteDebugSupport|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)' == 'ReleaseAvaloniaRemoteDebugSupport'">
     <DefineConstants>REMOTE_DEBUG_SUPPORT</DefineConstants>
-    <PackageId>WebViewControl-Avalonia-RemoteDebugSupport</PackageId>
+    <PackageId>WebViewControl-Avalonia-RemoteDebugSupport$(PackageSuffix)</PackageId>
     <Optimize>true</Optimize>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAvalonia|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)' == 'ReleaseAvalonia'">
     <Optimize>true</Optimize>
   </PropertyGroup>
 
@@ -64,7 +64,7 @@
   <ItemGroup>
     <!--When we upload Avalonia here, we should increase the version of both WebViewControl.Avalonia as well as ReactViewControl.Avalonia-->
     <PackageReference Include="Avalonia" />
-    <PackageReference PrivateAssets="None" Include="CefGlue.Avalonia" />
+    <PackageReference PrivateAssets="None" Include="CefGlue.Avalonia$(CefGluePackageSuffix)" />
     <PackageReference Include="Microsoft.CSharp" />
     <PackageReference Include="System.Runtime.Loader" />
   </ItemGroup>

SampleWebView.Avalonia/Program.cs

@@ -10,11 +10,11 @@
     <Copyright>Copyright ©  2023</Copyright>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageId>WebViewControl-WPF</PackageId>
+    <PackageId>WebViewControl-WPF$(PackageSuffix)</PackageId>
     <Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport</Configurations>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWPF|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)' == 'ReleaseWPF'">
     <Optimize>true</Optimize>
   </PropertyGroup>
 
@@ -43,7 +43,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference PrivateAssets="None" Include="CefGlue.Wpf" />
+    <PackageReference PrivateAssets="None" Include="CefGlue.Wpf$(CefGluePackageSuffix)" />
   </ItemGroup>
 
 </Project>