Merge pull request #1 from StefanKoell/main

avalonia rc2.2 update, x64 and arm64 rid
royalapplications · Jul 3, 2023 · 77fc59a · 77fc59a
2 parents 5b3dc9e + c098f39
commit 77fc59a
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 44 deletions.
diff --git a/src/RoyalApps.Community.Avalonia.Common/RoyalApps.Community.Avalonia.Common.csproj b/src/RoyalApps.Community.Avalonia.Common/RoyalApps.Community.Avalonia.Common.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
+      <PackageReference Include="Avalonia" Version="11.0.0-rc2.2" />
     </ItemGroup>
 
 </Project>
diff --git a/...RoyalApps.Community.Avalonia.InteropDemo/InteropDemo.WinForms/InteropDemo.WinForms.csproj b/...RoyalApps.Community.Avalonia.InteropDemo/InteropDemo.WinForms/InteropDemo.WinForms.csproj
@@ -2,6 +2,9 @@
 
     <PropertyGroup>
         <TargetFramework>net7.0-windows</TargetFramework>
+        <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+        <Platforms>x64;ARM64</Platforms>
+        <Configurations>Debug;Release</Configurations>
         <UseWindowsForms>true</UseWindowsForms>
         <Nullable>enable</Nullable>
         <RootNamespace>InteropDemo.WinForms</RootNamespace>

diff --git a/src/RoyalApps.Community.Avalonia.InteropDemo/InteropDemo/InteropDemo.csproj b/src/RoyalApps.Community.Avalonia.InteropDemo/InteropDemo/InteropDemo.csproj
@@ -1,8 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net7.0-windows</TargetFramework>
-    <RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <Platforms>x64;ARM64</Platforms>
+    <Configurations>Debug;Release</Configurations>
     <UseWindowsForms>true</UseWindowsForms>
     <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
@@ -21,14 +24,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-rc1.1" />
+    <PackageReference Include="Avalonia" Version="11.0.0-rc2.2" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc2.2" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-rc2.2" />
 
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc2.2" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
-    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.2-beta">
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.18-beta">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -39,18 +42,4 @@
     <ProjectReference Include="..\InteropDemo.WinForms\InteropDemo.WinForms.csproj" />
   </ItemGroup>
 
-<!--  <ItemGroup>-->
-<!--    <Compile Update="Views\FreeRdpView.axaml.cs">-->
-<!--      <DependentUpon>FreeRdpView.axaml</DependentUpon>-->
-<!--      <SubType>Code</SubType>-->
-<!--    </Compile>-->
-<!--    <Compile Update="Views\EoChromiumView.axaml.cs">-->
-<!--      <DependentUpon>EoChromiumView.axaml</DependentUpon>-->
-<!--      <SubType>Code</SubType>-->
-<!--    </Compile>-->
-<!--    <Compile Update="Views\ExternalApplicationView.axaml.cs">-->
-<!--      <DependentUpon>ExternalApplicationView.axaml</DependentUpon>-->
-<!--      <SubType>Code</SubType>-->
-<!--    </Compile>-->
-<!--  </ItemGroup>-->
 </Project>
diff --git a/src/RoyalApps.Community.Avalonia.InteropDemo/InteropDemo/MainWindow.axaml b/src/RoyalApps.Community.Avalonia.InteropDemo/InteropDemo/MainWindow.axaml
@@ -20,8 +20,8 @@
                                                              MaterialOpacity="0.55" />
                         </ExperimentalAcrylicBorder.Material>
                 </ExperimentalAcrylicBorder>
-                <Panel Margin="{Binding #MainWindowView.OffScreenMargin}">
-                        <Panel Margin="{Binding #MainWindowView.WindowDecorationMargin}">
+                <Panel>
+                        <Panel>
                                 <interopDemo:MainView />
                         </Panel>
                 </Panel>

diff --git a/src/RoyalApps.Community.Avalonia.InteropDemo/InteropDemo/Program.cs b/src/RoyalApps.Community.Avalonia.InteropDemo/InteropDemo/Program.cs
@@ -16,6 +16,9 @@ public static void Main(string[] args) => BuildAvaloniaApp()
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
-            .With(new Win32PlatformOptions{ UseWindowsUIComposition = true})
+            .With(new Win32PlatformOptions
+            {
+                CompositionMode = new [] {Win32CompositionMode.WinUIComposition, Win32CompositionMode.LowLatencyDxgiSwapChain, Win32CompositionMode.RedirectionSurface},
+            })
             .LogToTrace();
 }
diff --git a/src/RoyalApps.Community.Avalonia.Windows/RoyalApps.Community.Avalonia.Windows.csproj b/src/RoyalApps.Community.Avalonia.Windows/RoyalApps.Community.Avalonia.Windows.csproj
@@ -17,8 +17,9 @@
 
     <PropertyGroup>
         <TargetFramework>net7.0-windows</TargetFramework>
+        <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
         <Configurations>Debug;Release</Configurations>
-        <Platforms>AnyCPU;x64;ARM64</Platforms>
+        <Platforms>x64;ARM64</Platforms>
         <UseWindowsForms>true</UseWindowsForms>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -28,7 +29,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
+        <PackageReference Include="Avalonia" Version="11.0.0-rc2.2" />
         <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.2-beta">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/RoyalApps.Community.Avalonia.sln b/src/RoyalApps.Community.Avalonia.sln
@@ -17,26 +17,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentat
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|ARM64 = Debug|ARM64
+		Release|x64 = Release|x64
+		Release|ARM64 = Release|ARM64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{785B7C0E-76F1-490E-92C1-D49D73865A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{785B7C0E-76F1-490E-92C1-D49D73865A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{785B7C0E-76F1-490E-92C1-D49D73865A27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{785B7C0E-76F1-490E-92C1-D49D73865A27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Release|Any CPU.Build.0 = Release|Any CPU
+		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Debug|ARM64.Build.0 = Debug|ARM64
+		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Debug|x64.ActiveCfg = Debug|x64
+		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Debug|x64.Build.0 = Debug|x64
+		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Release|ARM64.ActiveCfg = Release|ARM64
+		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Release|ARM64.Build.0 = Release|ARM64
+		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Release|x64.ActiveCfg = Release|x64
+		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Release|x64.Build.0 = Release|x64
+		{F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Debug|ARM64.Build.0 = Debug|ARM64
+		{F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Debug|x64.ActiveCfg = Debug|x64
+		{F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Debug|x64.Build.0 = Debug|x64
+		{F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Release|ARM64.Build.0 = Release|ARM64
+		{F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Release|x64.ActiveCfg = Release|x64
+		{F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Release|x64.Build.0 = Release|x64
+		{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Debug|ARM64.Build.0 = Debug|ARM64
+		{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Debug|x64.ActiveCfg = Debug|x64
+		{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Debug|x64.Build.0 = Debug|x64
+		{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Release|ARM64.ActiveCfg = Release|ARM64
+		{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Release|ARM64.Build.0 = Release|ARM64
+		{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Release|x64.ActiveCfg = Release|x64
+		{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7} = {554C9939-BB72-4B27-AB7B-C18758071539}