Revert "Fix PublishDotnetAot target NETSDK1047 error in CI" (#54164)

Author: marcpopMSFT

src/Layout/redist/targets/GenerateLayout.targets

@@ -523,8 +523,9 @@
     Only runs for native builds (TargetRid == HostRid) on supported platforms.
     Cross-compilation is not supported as NativeAOT requires native toolchain for target platform.
   -->
-  <Target Name="PublishDotnetAot"
-          Condition="'$(TargetRid)' == '$(HostRid)' and ($(TargetRid.StartsWith('win')) or $(TargetRid.StartsWith('linux')) or $(TargetRid.StartsWith('osx')))">
+  <!-- <Target Name="PublishDotnetAot"
+          Condition="'$(TargetRid)' == '$(HostRid)' and ($(TargetRid.StartsWith('win')) or $(TargetRid.StartsWith('linux')) or $(TargetRid.StartsWith('osx')))"> -->
+  <Target Name="PublishDotnetAot" Condition="false">
     <PropertyGroup>
       <!-- Define platform-specific native library naming -->
       <_DotnetAotNativeLibPrefix Condition="'$(OSName)' != 'win'">lib</_DotnetAotNativeLibPrefix>
@@ -538,22 +539,11 @@
       <_DotnetAotIntermediateDir>$(ArtifactsObjDir)dotnet-aot-redist\$(Configuration)\$(TargetRid)\</_DotnetAotIntermediateDir>
     </PropertyGroup>
 
-    <!--
-      In CI, Arcade's centralized NuGet restore runs via NuGet.targets and does not include
-      RuntimeIdentifier, so the assets file lacks the RID-specific target (NETSDK1047).
-      Restore here with RuntimeIdentifiers (plural) to add the RID target to the assets file.
-      BaseIntermediateOutputPath controls where project.assets.json is written.
-    -->
+    <!-- Restore and publish the dotnet-aot project as a NativeAOT shared library -->
     <MSBuild
-      Targets="Restore"
+      Targets="Restore;Publish"
       Projects="$(RepoRoot)/src/Cli/dotnet-aot/dotnet-aot.csproj"
-      Properties="Configuration=$(Configuration);RuntimeIdentifiers=$(TargetRid);BaseIntermediateOutputPath=$(_DotnetAotIntermediateDir)" />
-
-    <!-- Publish the dotnet-aot project as a NativeAOT shared library -->
-    <MSBuild
-      Targets="Publish"
-      Projects="$(RepoRoot)/src/Cli/dotnet-aot/dotnet-aot.csproj"
-      Properties="Configuration=$(Configuration);RuntimeIdentifier=$(TargetRid);PublishDir=$(_DotnetAotPublishDir);BaseIntermediateOutputPath=$(_DotnetAotIntermediateDir)" />
+      Properties="Configuration=$(Configuration);RuntimeIdentifier=$(TargetRid);PublishDir=$(_DotnetAotPublishDir);IntermediateOutputPath=$(_DotnetAotIntermediateDir)" />
 
     <!-- Verify the native library was produced -->
     <Error Condition="!Exists('$(_DotnetAotPublishDir)$(_DotnetAotNativeLibName)')"