Net Core/Net 5 - Improve CefSharp.Common.NETCore.targets RID handling

Resolves #3773

Author: amaitland

NuGet/PackageReference/CefSharp.Common.NETCore.targets

@@ -1,33 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <!-- Current supported values are Default, and NoAction (this target doesn't copy any files.) -->
+    <!-- Map RuntimeIdentifier e.g. converts from win10-x64 to win-x64 -->
+	<CefSharpRuntimeIdentifier>$(RuntimeIdentifier)</CefSharpRuntimeIdentifier>
+    <CefSharpRuntimeIdentifier Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-x86'))">win-x86</CefSharpRuntimeIdentifier>
+    <CefSharpRuntimeIdentifier Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-x64'))">win-x64</CefSharpRuntimeIdentifier>
+    <CefSharpRuntimeIdentifier Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-arm64'))">win-arm64</CefSharpRuntimeIdentifier>
+    <CefSharpRuntimeIdentifier Condition="'$(CefSharpRuntimeIdentifierOverride)' != ''">$(CefSharpRuntimeIdentifierOverride)</CefSharpRuntimeIdentifier>
+	
+	<!-- Current supported values are Default, and NoAction (this target doesn't copy any files.) -->
     <CefSharpBuildAction Condition="'$(CefSharpBuildAction)' == ''">Default</CefSharpBuildAction>
     <!--
     For Library projects with no RuntimeIdentifier we don't include our additional files and packages, the transitive reference should flow directly to the consuming projects.
     For class libraries that are often AnyCPU and consuming Exe/WinExe projects that are often win-x64 or win-x86 the resuiling build output
     is polluted with extra copies in sub folders.
     -->
-    <CefSharpBuildAction Condition="'$(CefSharpBuildAction)' == '' AND '$(OutputType)' == 'Library' AND '$(RuntimeIdentifier)' == ''">NoAction</CefSharpBuildAction>
+    <CefSharpBuildAction Condition="'$(CefSharpBuildAction)' == '' AND '$(OutputType)' == 'Library' AND '$(CefSharpRuntimeIdentifier)' == ''">NoAction</CefSharpBuildAction>
   </PropertyGroup>
   <ItemGroup>
-    <_CefSharpBrowserSubProcessFiles Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\runtimes\$(RuntimeIdentifier)\native\CefSharp.BrowserSubprocess.runtimeconfig.json'))"/>
-    <_CefSharpBrowserSubProcessFiles Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\runtimes\$(RuntimeIdentifier)\native\CefSharp.BrowserSubprocess.exe'))" Condition="'$(_TargetFrameworkVersionWithoutV)' >= '5.0' AND '$(PublishSingleFile)' == 'true' AND '$(SelfContained)' == 'true'"/>
-    <_CefSharpBrowserSubProcessFiles Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\runtimes\$(RuntimeIdentifier)\native\CefSharp.BrowserSubprocess.dll'))" Condition="'$(_TargetFrameworkVersionWithoutV)' >= '5.0' AND '$(PublishSingleFile)' == 'true' AND '$(SelfContained)' == 'true'"/>
+    <_CefSharpBrowserSubProcessFiles Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\runtimes\$(CefSharpRuntimeIdentifier)\native\CefSharp.BrowserSubprocess.runtimeconfig.json'))"/>
+    <_CefSharpBrowserSubProcessFiles Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\runtimes\$(CefSharpRuntimeIdentifier)\native\CefSharp.BrowserSubprocess.exe'))" Condition="'$(_TargetFrameworkVersionWithoutV)' >= '5.0' AND '$(PublishSingleFile)' == 'true' AND '$(SelfContained)' == 'true'"/>
+    <_CefSharpBrowserSubProcessFiles Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\runtimes\$(CefSharpRuntimeIdentifier)\native\CefSharp.BrowserSubprocess.dll'))" Condition="'$(_TargetFrameworkVersionWithoutV)' >= '5.0' AND '$(PublishSingleFile)' == 'true' AND '$(SelfContained)' == 'true'"/>
   </ItemGroup>
 
   <!--
   For SelfContained and PublishSingleFile we remove the CefSharp.BrowserSubprocess.runtimeconfig.json file so
   the BrowserSubprocess runs using the packaged .net runtime
   Issue https://github.com/cefsharp/CefSharp/issues/3407
   -->
-  <Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigAfterResolveAssemblyReferences" AfterTargets="ResolveAssemblyReferences" Condition="'$(RuntimeIdentifier)' != '' AND '$(SelfContained)' == 'true'">
+  <Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigAfterResolveAssemblyReferences" AfterTargets="ResolveAssemblyReferences" Condition="'$(CefSharpRuntimeIdentifier)' != '' AND '$(SelfContained)' == 'true'">
     <ItemGroup>
       <ReferenceCopyLocalPaths Remove="@(_CefSharpBrowserSubProcessFiles)" />
     </ItemGroup>
   </Target>
 
-  <Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigAfterComputeFilesToPublish" AfterTargets="ComputeFilesToPublish" Condition="'$(RuntimeIdentifier)' != '' AND '$(SelfContained)' == 'true'">
+  <Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigAfterComputeFilesToPublish" AfterTargets="ComputeFilesToPublish" Condition="'$(CefSharpRuntimeIdentifier)' != '' AND '$(SelfContained)' == 'true'">
     <ItemGroup>
       <ResolvedFileToPublish Remove="@(_CefSharpBrowserSubProcessFiles)" />
     </ItemGroup>
@@ -38,7 +45,7 @@
   SelfHosting of the BrowserSubprocess is required
   Issue https://github.com/cefsharp/CefSharp/issues/3407
   -->
-  <Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigBeforeComputeFilesToBundle" BeforeTargets="_ComputeFilesToBundle" Condition="'$(RuntimeIdentifier)' != '' AND '$(SelfContained)' == 'true'">
+  <Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigBeforeComputeFilesToBundle" BeforeTargets="_ComputeFilesToBundle" Condition="'$(CefSharpRuntimeIdentifier)' != '' AND '$(SelfContained)' == 'true'">
     <ItemGroup>
       <ResolvedFileToPublish Remove="@(_CefSharpBrowserSubProcessFiles)" />
     </ItemGroup>
@@ -47,7 +54,7 @@
  <!--
  Remove from $(project).deps.json (sometimes the main deps file is reused)
  -->
- <Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigBeforeGenerateDependencyFile" BeforeTargets="GenerateBuildDependencyFile;GeneratePublishDependencyFile" Condition="'$(RuntimeIdentifier)' != '' AND '$(SelfContained)' == 'true'">
+ <Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigBeforeGenerateDependencyFile" BeforeTargets="GenerateBuildDependencyFile;GeneratePublishDependencyFile" Condition="'$(CefSharpRuntimeIdentifier)' != '' AND '$(SelfContained)' == 'true'">
     <ItemGroup>
       <NativeCopyLocalItems Remove="@(_CefSharpBrowserSubProcessFiles)" />
     </ItemGroup>
@@ -63,6 +70,7 @@
     <Message Importance="high" Text="CefSharp After Build Diagnostic" />
     <Message Importance="high" Text="CefSharpBuildAction = $(CefSharpBuildAction)" />
     <Message Importance="high" Text="RuntimeIdentifier = $(RuntimeIdentifier)" />
+    <Message Importance="high" Text="CefSharpRuntimeIdentifier = $(CefSharpRuntimeIdentifier)" />
     <Message Importance="high" Text="Platform = $(Platform)" />
     <Message Importance="high" Text="PlatformName = $(PlatformName)" />
     <Message Importance="high" Text="Platforms = $(Platforms)" />
@@ -83,7 +91,7 @@
     <When Condition="'$(CefSharpBuildAction)' == 'NoAction'">
     <!-- Do nothing -->
     </When>
-    <When Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-x64'))">
+    <When Condition="'$(CefSharpRuntimeIdentifier)' == 'win-x64'">
       <ItemGroup>
         <Content Include="@(CefRuntimeWin64Locales)">
           <Link>locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
@@ -101,7 +109,7 @@
         </Content>
       </ItemGroup>
     </When>
-    <When Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-x86'))">
+    <When Condition="'$(CefSharpRuntimeIdentifier)' == 'win-x86'">
       <ItemGroup>
         <Content Include="@(CefRuntimeWin32Locales)">
           <Link>locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
@@ -119,7 +127,7 @@
         </Content>
       </ItemGroup>
     </When>
-    <When Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-arm64'))">
+    <When Condition="'$(CefSharpRuntimeIdentifier)' == 'win-arm64'">
       <ItemGroup>
         <Content Include="@(CefRuntimeWinArm64Locales)">
           <Link>locales\%(RecursiveDir)%(FileName)%(Extension)</Link>