Don't import BundledVersions multiple times (#52774)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: ViktorHofer

src/Layout/redist/targets/GenerateBundledVersions.targets

@@ -601,7 +601,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <PropertyGroup>
     <NetCoreRoot Condition="'%24(NetCoreRoot)' == ''">%24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\'))</NetCoreRoot>
-    <NetCoreSdkRoot Condition="'%24(NetCoreSdkRoot)' == ''">%24(MSBuildThisFileDirectory)</NetCoreSdkRoot>
+    <NetCoreSdkRoot>%24(MSBuildThisFileDirectory)</NetCoreSdkRoot>
     <NetCoreTargetingPackRoot Condition="'%24(NetCoreTargetingPackRoot)' == ''">%24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs</NetCoreTargetingPackRoot>
     <PrunePackageDataRoot Condition="'%24(PrunePackageDataRoot)' == ''">%24([MSBuild]::EnsureTrailingSlash('%24(MSBuildThisFileDirectory)'))PrunePackageData</PrunePackageDataRoot>
 

src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.BundledVersions.props

@@ -16,6 +16,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup Condition="'$(NETCoreSdkBundledVersionsProps)' == ''">
     <NETCoreSdkBundledVersionsProps>$(MSBuildThisFileDirectory)..\..\..\Microsoft.NETCoreSdk.BundledVersions.props</NETCoreSdkBundledVersionsProps>
   </PropertyGroup>
-  <Import Project="$(NETCoreSdkBundledVersionsProps)" Condition="Exists('$(NETCoreSdkBundledVersionsProps)')" /> 
+
+  <Import Project="$(NETCoreSdkBundledVersionsProps)" Condition="'$(NetCoreSdkRoot)' == '' and Exists('$(NETCoreSdkBundledVersionsProps)')" /> 
 
 </Project>

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.props

@@ -15,8 +15,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     <NETCoreSdkBundledVersionsProps>$(MSBuildThisFileDirectory)..\..\..\Microsoft.NETCoreSdk.BundledVersions.props</NETCoreSdkBundledVersionsProps>
   </PropertyGroup>
 
-  <!-- Import bundled version information that needs to be availble before the Common.props / D.B.props import
+  <!-- Import bundled version information that needs to be available before the Common.props / D.B.props import
        in order for users to be able to reference it. -->
-  <Import Project="$(NETCoreSdkBundledVersionsProps)" Condition="Exists('$(NETCoreSdkBundledVersionsProps)')" /> 
+  <Import Project="$(NETCoreSdkBundledVersionsProps)" Condition="'$(NetCoreSdkRoot)' == '' and Exists('$(NETCoreSdkBundledVersionsProps)')" /> 
 
 </Project>