Fix crossgen2 shared framework name and clean-up (#48917)

Fix crossgen2 RID specific package names and use more specific property
names to avoid confusion about shared framework meanings.

1 files changed, 17 insertions, 17 deletions

diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets
index b1d2bde97cb..22435626d3c 100644
--- a/eng/targetingpacks.targets
+++ b/eng/targetingpacks.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <SharedFrameworkName Condition="'$(SharedFrameworkName)' == ''">Microsoft.NETCore.App</SharedFrameworkName>
+    <LocalFrameworkOverrideName Condition="'$(LocalFrameworkOverrideName)' == ''">$(MicrosoftNetCoreAppFrameworkName)</LocalFrameworkOverrideName>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DisableImplicitFrameworkReferences)' != 'true' and
@@ -13,26 +13,26 @@
 
   <!-- Add Known* items if the SDK doesn't support the TargetFramework yet. -->
   <ItemGroup Condition="'$(_UseLocalTargetingRuntimePack)' == 'true'">
-    <KnownFrameworkReference Include="$(SharedFrameworkName)"
+    <KnownFrameworkReference Include="$(LocalFrameworkOverrideName)"
                              DefaultRuntimeFrameworkVersion="$(ProductVersion)"
                              IsTrimmable="true"
                              LatestRuntimeFrameworkVersion="$(ProductVersion)"
-                             RuntimeFrameworkName="$(SharedFrameworkName)"
-                             RuntimePackNamePatterns="$(SharedFrameworkName).Runtime.**RID**"
+                             RuntimeFrameworkName="$(LocalFrameworkOverrideName)"
+                             RuntimePackNamePatterns="$(LocalFrameworkOverrideName).Runtime.**RID**"
                              RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;ios-arm64;ios-arm;ios-x64;ios-x86;tvos-arm64;tvos-x64;maccatalyst-x64;maccatalyst-arm64;android-arm64;android-arm;android-x64;android-x86;browser-wasm;osx-arm64"
                              TargetFramework="$(NetCoreAppCurrent)"
-                             TargetingPackName="$(SharedFrameworkName).Ref"
+                             TargetingPackName="$(LocalFrameworkOverrideName).Ref"
                              TargetingPackVersion="$(ProductVersion)"
                              Condition="'@(KnownFrameworkReference)' == '' or !@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" />
-    <KnownAppHostPack Include="$(SharedFrameworkName)" 
-                      AppHostPackNamePattern="$(SharedFrameworkName).Host.**RID**"
+    <KnownAppHostPack Include="$(LocalFrameworkOverrideName)" 
+                      AppHostPackNamePattern="$(LocalFrameworkOverrideName).Host.**RID**"
                       AppHostPackVersion="$(ProductVersion)"
                       AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64"
                       TargetFramework="$(NetCoreAppCurrent)"
                       Condition="'@(KnownAppHostPack)' == '' or !@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" />
-    <KnownCrossgen2Pack Include="$(SharedFrameworkName).Crossgen2"
+    <KnownCrossgen2Pack Include="$(LocalFrameworkOverrideName).Crossgen2"
                         TargetFramework="$(NetCoreAppCurrent)"
-                        Crossgen2PackNamePattern="$(SharedFrameworkName).Crossgen2.**RID**"
+                        Crossgen2PackNamePattern="$(LocalFrameworkOverrideName).Crossgen2.**RID**"
                         Crossgen2PackVersion="$(ProductVersion)"
                         Crossgen2RuntimeIdentifiers="linux-musl-x64;linux-x64;win-x64"
                         Condition="'@(KnownCrossgen2Pack)' == '' or !@(KnownCrossgen2Pack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" />
@@ -76,7 +76,7 @@
     </PropertyGroup>
     <ItemGroup>
       <Reference Remove="@(Reference)"
-                 Condition="'%(Reference.FrameworkReferenceName)' == '$(SharedFrameworkName)'" />
+                 Condition="'%(Reference.FrameworkReferenceName)' == '$(LocalFrameworkOverrideName)'" />
     </ItemGroup>
   </Target>
 
@@ -97,9 +97,9 @@
           AfterTargets="ProcessFrameworkReferences">
     <ItemGroup>
       <PackageDownload Remove="@(PackageDownload)"
-                       Condition="'$(UsePackageDownload)' == 'true' and $([System.String]::Copy('%(Identity)').StartsWith('$(SharedFrameworkName).Runtime'))" />
+                       Condition="'$(UsePackageDownload)' == 'true' and $([System.String]::Copy('%(Identity)').StartsWith('$(LocalFrameworkOverrideName).Runtime'))" />
       <PackageReference Remove="@(PackageReference)"
-                        Condition="'$(UsePackageDownload)' != 'true' and $([System.String]::Copy('%(Identity)').StartsWith('$(SharedFrameworkName).Runtime'))" />
+                        Condition="'$(UsePackageDownload)' != 'true' and $([System.String]::Copy('%(Identity)').StartsWith('$(LocalFrameworkOverrideName).Runtime'))" />
     </ItemGroup>
   </Target>
 
@@ -111,23 +111,23 @@
       <ResolvedTargetingPack Path="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
                              NuGetPackageVersion="$(ProductVersion)"
                              PackageDirectory="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
-                             Condition="'%(ResolvedTargetingPack.RuntimeFrameworkName)' == '$(SharedFrameworkName)' and
+                             Condition="'%(ResolvedTargetingPack.RuntimeFrameworkName)' == '$(LocalFrameworkOverrideName)' and
                                         Exists('$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml')" />
       <ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)"
-                           Condition="'%(ResolvedRuntimePack.FrameworkName)' == '$(SharedFrameworkName)'" />
+                           Condition="'%(ResolvedRuntimePack.FrameworkName)' == '$(LocalFrameworkOverrideName)'" />
       <ResolvedFrameworkReference TargetingPackPath="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
                                   TargetingPackVersion="$(ProductVersion)"
-                                  Condition="'%(Identity)' == '$(SharedFrameworkName)'" />
+                                  Condition="'%(Identity)' == '$(LocalFrameworkOverrideName)'" />
     </ItemGroup>
   </Target>
 
-  <!-- Update the local targeting pack's version as it's written into the runtimeconfig.json file to select the shared framework. -->
+  <!-- Update the local targeting pack's version as it's written into the runtimeconfig.json file to select the right framework. -->
   <Target Name="UpdateRuntimeFrameworkVersion"
           Condition="'$(_UseLocalTargetingRuntimePack)' == 'true'"
           AfterTargets="ResolveTargetingPackAssets">
     <ItemGroup>
       <RuntimeFramework Version="$(ProductVersion)"
-                        Condition="'%(RuntimeFramework.FrameworkName)' == '$(SharedFrameworkName)'" />
+                        Condition="'%(RuntimeFramework.FrameworkName)' == '$(LocalFrameworkOverrideName)'" />
     </ItemGroup>
   </Target>