From 9a9c587cb17fccf24efe2441267466833519e249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joa=CC=83o=20Neves?= <joao.neves@outsystems.com>
Date: Tue, 28 Nov 2023 11:36:06 +0000
Subject: [PATCH] Move packages props

---
 CefGlue.Common/CefGlue.Common.csproj               | 13 ++-----------
 CefGlue.CopyLocal.props                            | 12 ++----------
 CefGlue.Demo.Avalonia/CefGlue.Demo.Avalonia.csproj |  1 +
 CefGlue.Packages.props                             | 12 ++++++++++++
 Xilium.CefGlue.sln                                 |  1 +
 5 files changed, 18 insertions(+), 21 deletions(-)
 create mode 100644 CefGlue.Packages.props

diff --git a/CefGlue.Common/CefGlue.Common.csproj b/CefGlue.Common/CefGlue.Common.csproj
index 157a858f..8ffd47c4 100644
--- a/CefGlue.Common/CefGlue.Common.csproj
+++ b/CefGlue.Common/CefGlue.Common.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+    <Import Project="..\CefGlue.Packages.props" />
+    
     <PropertyGroup>
         <TargetFramework>$(DotnetVersion)</TargetFramework>
         <AssemblyName>Xilium.CefGlue.Common</AssemblyName>
@@ -28,16 +29,6 @@
         <PackageReference Include="NLog" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(Platform)' == 'x64'">
-        <PackageReference PrivateAssets="None" Include="chromiumembeddedframework.runtime.win-x64" />
-        <PackageReference PrivateAssets="None" Include="cef.redist.osx64" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(Platform)' == 'ARM64'">
-        <PackageReference PrivateAssets="None" Include="chromiumembeddedframework.runtime.win-arm64" />
-        <PackageReference PrivateAssets="None" Include="cef.redist.osx.arm64" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\CefGlue.Common.Shared\CefGlue.Common.Shared.csproj">
             <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
diff --git a/CefGlue.CopyLocal.props b/CefGlue.CopyLocal.props
index cde27640..1ef1fc36 100644
--- a/CefGlue.CopyLocal.props
+++ b/CefGlue.CopyLocal.props
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-    <ItemGroup Condition="'$(Platform)' == 'x64'">
-        <PackageReference Include="chromiumembeddedframework.runtime.win-x64" />
-        <PackageReference Include="cef.redist.osx64" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(Platform)' == 'ARM64'">
-        <PackageReference Include="chromiumembeddedframework.runtime.win-arm64" />
-        <PackageReference Include="cef.redist.osx.arm64" />
-    </ItemGroup>
-
+    <Import Project="CefGlue.Packages.props" />
+    
     <PropertyGroup>
         <BrowserProcessDir>$(MSBuildThisFileDirectory)CefGlue.BrowserProcess\bin\$(Platform)\$(Configuration)\$(DotnetVersion)</BrowserProcessDir>
         <RuntimeIdentifiers>osx-x64;win-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
diff --git a/CefGlue.Demo.Avalonia/CefGlue.Demo.Avalonia.csproj b/CefGlue.Demo.Avalonia/CefGlue.Demo.Avalonia.csproj
index f74f0757..7ccf68e3 100644
--- a/CefGlue.Demo.Avalonia/CefGlue.Demo.Avalonia.csproj
+++ b/CefGlue.Demo.Avalonia/CefGlue.Demo.Avalonia.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
+    <RollForward>LatestMajor</RollForward>
     <TargetFramework>$(DotnetVersion)</TargetFramework>
     <AssemblyName>Xilium.CefGlue.Demo.Avalonia</AssemblyName>
     <RootNamespace>Xilium.CefGlue.Demo.Avalonia</RootNamespace>
diff --git a/CefGlue.Packages.props b/CefGlue.Packages.props
new file mode 100644
index 00000000..13e0e08e
--- /dev/null
+++ b/CefGlue.Packages.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+    <ItemGroup Condition="'$(Platform)' == 'x64'">
+        <PackageReference PrivateAssets="None" Include="chromiumembeddedframework.runtime.win-x64" />
+        <PackageReference PrivateAssets="None" Include="cef.redist.osx64" />
+    </ItemGroup>
+    
+    <ItemGroup Condition="'$(Platform)' == 'ARM64'">
+        <PackageReference PrivateAssets="None" Include="chromiumembeddedframework.runtime.win-arm64" />
+        <PackageReference PrivateAssets="None" Include="cef.redist.osx.arm64" />
+    </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Xilium.CefGlue.sln b/Xilium.CefGlue.sln
index 867013bd..58d56ce6 100644
--- a/Xilium.CefGlue.sln
+++ b/Xilium.CefGlue.sln
@@ -26,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
+		CefGlue.Packages.props = CefGlue.Packages.props
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefGlue.Demo.WPF", "CefGlue.Demo.WPF\CefGlue.Demo.WPF.csproj", "{8E758128-CA79-4533-963E-91A1BF0558FB}"