Improve the check for RuntimeIdentifier to also allow non-portable RIDs like "win7-x64" or "win10-x86". (#3295)

Issue: #3197

Author: kpreisser

NuGet/PackageReference/CefSharp.Common.NETCore.targets

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Choose>
-    <When Condition="'$(RuntimeIdentifier)' == 'win-x64'">
+    <When Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-x64'))">
       <ItemGroup>
         <Content Include="@(CefRuntimeWin64Locales)">
 		  <Link>locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
@@ -17,7 +17,7 @@
 		</Content>
       </ItemGroup>
     </When>
-	<When Condition="'$(RuntimeIdentifier)' == 'win-x86'">
+	<When Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-x86'))">
       <ItemGroup>
         <Content Include="@(CefRuntimeWin32Locales)">
 		  <Link>locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
@@ -62,7 +62,7 @@
 		  <Visible>false</Visible>
 		</Content>
 		<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\lib\netcoreapp3.1\Ijwhost.dll">
-		  <Link>runtimes\win-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
+		  <Link>runtimes\win-x86\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		  <PublishState>Included</PublishState>
 		  <Visible>false</Visible>