Change redist-installer references to redist and make repo buildable

ViktorHofer · ViktorHofer · commit 91613bbfb6d8 · 2025-03-17T22:30:46.000+01:00
diff --git a/eng/Build.props b/eng/Build.props
@@ -13,7 +13,7 @@
        it depends on assets from other verticals that are built in the first build pass. -->
   <ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
                         '$(OS)' == 'Windows_NT'">
-    <ProjectToBuild Include="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj" DotNetBuildPass="2" />
+    <ProjectToBuild Include="$(RepoRoot)src\Layout\redist\redist.csproj" DotNetBuildPass="2" />
   </ItemGroup>
 
 </Project>
diff --git a/eng/Publishing.props b/eng/Publishing.props
@@ -29,7 +29,7 @@
 
   <Target Name="GetNonStableProductVersion">
     <!-- Retrieve the non-stable product version. -->
-    <MSBuild Projects="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj"
+    <MSBuild Projects="$(RepoRoot)src\Layout\redist\redist.csproj"
              Targets="ReturnProductVersion">
       <Output TaskParameter="TargetOutputs" PropertyName="NonStableProductVersion" />
     </MSBuild>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -85,7 +85,7 @@
       <Sha>544cf0ccbc744015001933658c04f4bf364abb07</Sha>
       <SourceBuild RepoName="runtime" ManagedOnly="false" />
     </Dependency>
-    <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
+    <!-- Change blob version in GenerateInstallerLayout.targets if this is unpinned to service targeting pack -->
     <!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
     <Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
       <Uri>https://github.com/dotnet/core-setup</Uri>
diff --git a/sdk.sln b/sdk.sln
@@ -484,8 +484,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-format.UnitTests", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer", "src\Layout\finalizer\finalizer.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Layout\redist-installer\redist-installer.proj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sdk", "src\Layout\pkg\dotnet-sdk.proj", "{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.Redist.Common.Net.Core.SDK.VSTemplateLocator", "src\Layout\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj", "{0CBA5FB8-71A3-457A-89F3-E52B9602164A}"
@@ -944,10 +942,6 @@ Global
 		{32DA04FF-A951-43EA-B2FA-86A825009A97}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FAADC193-BA41-449D-97CE-0EF82836046A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAADC193-BA41-449D-97CE-0EF82836046A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAADC193-BA41-449D-97CE-0EF82836046A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FAADC193-BA41-449D-97CE-0EF82836046A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1184,7 +1178,6 @@ Global
 		{7382A1CB-AA9A-4136-A548-17D7A67C6B0C} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
 		{D7495CE7-64E5-4715-9304-799A41EC1D71} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
 		{32DA04FF-A951-43EA-B2FA-86A825009A97} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
-		{FAADC193-BA41-449D-97CE-0EF82836046A} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
 		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
 		{0CBA5FB8-71A3-457A-89F3-E52B9602164A} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
 		{21C21975-84C1-4A24-8E21-F7EC790A4584} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
diff --git a/source-build.slnf b/source-build.slnf
@@ -20,7 +20,6 @@
       "src\\Compatibility\\Microsoft.DotNet.ApiSymbolExtensions\\Microsoft.DotNet.ApiSymbolExtensions.csproj",
       "src\\Containers\\Microsoft.NET.Build.Containers\\Microsoft.NET.Build.Containers.csproj",
       "src\\Containers\\packaging\\package.csproj",
-      "src\\Layout\\redist-installer\\redist-installer.proj",
       "src\\Layout\\pkg\\dotnet-sdk.proj",
       "src\\Layout\\redist\\redist.csproj",
       "src\\Layout\\redist\\tools\\tool_fsc.csproj",
diff --git a/src/Layout/Directory.Build.props b/src/Layout/Directory.Build.props
@@ -69,4 +69,8 @@
     <SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-$(Architecture)</SharedFrameworkRid>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <SdkPkgSourcesRootDirectory>$(MSBuildThisFileDirectory)pkg\</SdkPkgSourcesRootDirectory>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/Layout/Directory.Build.targets b/src/Layout/Directory.Build.targets
@@ -5,12 +5,14 @@
   <PropertyGroup>
     <DownloadsFolder>$(ArtifactsObjDir)redist-downloads\</DownloadsFolder>
 
-    <SdkLayoutOutputDirectory>$(ArtifactsBinDir)redist\$(Configuration)\layouts\dotnet-toolset-internal\</SdkLayoutOutputDirectory>
-    <RedistLayoutPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet\</RedistLayoutPath>
+    <RedistBasedOutputPath>$(ArtifactsBinDir)redist\$(Configuration)\$(SdkTargetFramework)\</RedistBasedOutputPath>
+    <SdkLayoutOutputDirectory>$(RedistBasedOutputPath)layouts\dotnet-toolset-internal\</SdkLayoutOutputDirectory>
+    <RedistLayoutPath>$(RedistBasedOutputPath)dotnet\</RedistLayoutPath>
     <SdkOutputDirectory>$(RedistLayoutPath)sdk\$(Version)</SdkOutputDirectory>
 
-    <RedistInstallerLayoutPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\dotnet\</RedistInstallerLayoutPath>
-    <SdkInternalLayoutPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\i\</SdkInternalLayoutPath>
+    <RedistInstallerBaseOutputPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\</RedistInstallerBaseOutputPath>
+    <RedistInstallerLayoutPath>$(RedistInstallerBaseOutputPath)dotnet\</RedistInstallerLayoutPath>
+    <SdkInternalLayoutPath>$(RedistInstallerBaseOutputPath)i\</SdkInternalLayoutPath>
     <InstallerOutputDirectory>$(RedistInstallerLayoutPath)sdk\$(Version)\</InstallerOutputDirectory>
   </PropertyGroup>
 
diff --git a/src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj b/src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src\Microsoft.Net.Sdk.AnalyzerRedirecting\Microsoft.Net.Sdk.AnalyzerRedirecting.csproj" />
-    <ProjectReference Include="..\redist-installer\redist-installer.proj" />
+    <ProjectReference Include="..\redist\redist.csproj" />
   </ItemGroup>
 
   <!-- Shared infra to build and use the sdk-tasks -->
diff --git a/src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj b/src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\redist-installer\redist-installer.proj" />
+    <ProjectReference Include="..\redist\redist.csproj" />
   </ItemGroup>
 
   <Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">
diff --git a/src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj b/src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\redist-installer\redist-installer.proj" />
+    <ProjectReference Include="..\redist\redist.csproj" />
   </ItemGroup>
 
   <Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">
diff --git a/src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj b/src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\redist-installer\redist-installer.proj" />
+    <ProjectReference Include="..\redist\redist.csproj" />
   </ItemGroup>
 
   <Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">
diff --git a/src/Layout/pkg/dotnet-sdk.proj b/src/Layout/pkg/dotnet-sdk.proj
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\redist-installer\redist-installer.proj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\redist\redist.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Layout/redist-installer/Directory.Build.targets b/src/Layout/redist-installer/Directory.Build.targets
diff --git a/src/Layout/redist-installer/redist-installer.proj b/src/Layout/redist-installer/redist-installer.proj
diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj
@@ -17,6 +17,9 @@
     <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NETSDK1205</MSBuildWarningsAsMessages>
     <!-- The D.B.targets file is in subfolder so that the tools projects don't import it. -->
     <DirectoryBuildTargetsPath>$(MSBuildThisFileDirectory)targets\Directory.Build.targets</DirectoryBuildTargetsPath>
+    <!-- Needed to calculate the stable FileVersion for the sdk bundle version. -->
+    <IsShippingPackage>true</IsShippingPackage>
+    <NoWarn>$(NoWarn);NU1505</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -47,9 +50,11 @@
     <PackageReference Include="Microsoft.Build.Framework" VersionOverride="$(MicrosoftBuildVersion)" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="$(MicrosoftBuildVersion)" />
     <PackageReference Include="Microsoft.NET.StringTools" VersionOverride="$(MicrosoftBuildVersion)" />
+
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(GenerateSdkBundleOnly)' != 'true'">
     <!-- These project references with ReferenceOutputAssembly="false" should also set SkipGetTargetFrameworkProperties="true".  Otherwise, only the inner
          build of a multi-targeted project will be built to fulfill the project reference, and if the redist project depends on output that is created
          in the outer build (which is the case for some of these references), there may be sporadic incorrect builds if the outer build happens to run concurrently
@@ -63,6 +68,12 @@
     <ProjectReference Include="..\..\Resolvers\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj" />
     <ProjectReference Include="$(RepoRoot)src\BuiltInTools\dotnet-watch\dotnet-watch.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
     <ProjectReference Include="$(RepoRoot)src\BuiltInTools\dotnet-format\dotnet-format.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true"  Private="false" />
+
+    <ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\finalizer\finalizer.csproj" Condition="'$(OS)' == 'Windows_NT'" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true"  Private="false" />
   </ItemGroup>
 
   <ItemGroup>
@@ -98,4 +109,6 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="ReturnProductVersion" Returns="$(FullNugetVersion)" />
+
 </Project>
diff --git a/src/Layout/redist/targets/BundledTemplates.targets b/src/Layout/redist/targets/BundledTemplates.targets
@@ -76,15 +76,15 @@
 
   <Target Name="LayoutTemplatesForMSI" DependsOnTargets="CalculateTemplatesVersions;GetRepoTemplates" Condition="$(ProductMonikerRid.StartsWith('win'))">
     <Copy SourceFiles="%(BundledTemplatesWithInstallPaths.RestoredNupkgPath)"
-          DestinationFolder="$(BaseOutputPath)$(Configuration)\templates-%(BundledTemplatesWithInstallPaths.TemplateFrameworkVersion)\templates\%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)" />
+          DestinationFolder="$(RedistInstallerBaseOutputPath)templates-%(BundledTemplatesWithInstallPaths.TemplateFrameworkVersion)\templates\%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)" />
 
     <!-- Copy the current Microsoft.DotNet.Common.ItemTemplates and Microsoft.DotNet.Common.ProjectTemplates packages to the layout location. -->
     <PropertyGroup>
       <CurrentTemplateInstallPath Condition="'%(BundledTemplatesWithInstallPaths.TemplateFrameworkVersion)' == '10.0'">%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)</CurrentTemplateInstallPath>
       <CurrentTemplateFrameworkVersion>%(CurrentVersionBundledTemplates.TemplateFrameworkVersion)</CurrentTemplateFrameworkVersion>
     </PropertyGroup>
     <Copy SourceFiles="@(RepoTemplate)"
-          DestinationFiles="$(BaseOutputPath)$(Configuration)\templates-$(CurrentTemplateFrameworkVersion)\templates\$(CurrentTemplateInstallPath)\$([System.String]::Copy('%(Filename)%(Extension)').ToLowerInvariant())" />
+          DestinationFiles="$(RedistInstallerBaseOutputPath)templates-$(CurrentTemplateFrameworkVersion)\templates\$(CurrentTemplateInstallPath)\$([System.String]::Copy('%(Filename)%(Extension)').ToLowerInvariant())" />
   </Target>
 
 </Project>
diff --git a/src/Layout/redist/targets/Directory.Build.targets b/src/Layout/redist/targets/Directory.Build.targets
@@ -5,9 +5,25 @@
   <!-- Shared infra to build and use the sdk-tasks -->
   <Import Project="$(RepoRoot)src\Tasks\sdk-tasks\sdk-tasks.InTree.targets" />
 
-  <Import Project="BundledSdks.targets" />
-  <Import Project="PublishDotnetWatch.targets" />
-  <Import Project="GenerateLayout.targets" />
-  <Import Project="OverlaySdkOnLKG.targets" Condition="'$(DotNetBuild)' != 'true'" />
+  <Import Project="RestoreLayout.targets" />
+  <Import Project="BundledManifests.targets" />
+
+  <ImportGroup Condition="'$(GenerateSdkBundleOnly)' != 'true'">
+    <Import Project="BundledSdks.targets" />
+    <Import Project="PublishDotnetWatch.targets" />
+    <Import Project="GenerateLayout.targets" />
+    <Import Project="OverlaySdkOnLKG.targets" Condition="'$(DotNetBuild)' != 'true'" />
+
+    <Import Project="BundledTemplates.targets" />
+    <Import Project="BundledDotnetTools.targets" />
+    <Import Project="GenerateBundledVersions.targets" />
+    <Import Project="Crossgen.targets" />
+    <Import Project="GenerateInstallerLayout.targets" />
+    <Import Project="GenerateArchives.targets" />
+  </ImportGroup>
+
+  <!-- Installers -->
+  <Import Project="GenerateMSIs.targets" Condition="'$(OS)' == 'Windows_NT' and '$(SkipBuildingInstallers)' != 'true'" />
+  <Import Project="GeneratePKG.targets" Condition="'$(OSName)' == 'osx' and '$(SkipBuildingInstallers)' != 'true'" />
 
 </Project>
diff --git a/src/Layout/redist/targets/GenerateArchives.targets b/src/Layout/redist/targets/GenerateArchives.targets
@@ -1,8 +1,8 @@
 <Project>
 
   <Target Name="GenerateArchives"
-          DependsOnTargets="GenerateLayout"
-          BeforeTargets="AfterBuild">
+          DependsOnTargets="GenerateInstallerLayout"
+          AfterTargets="Build">
     <!-- When running in Docker under a Windows host, tar is warning "file changed as we read it" for several files and returning exit code 1.
          So this flag allows that to be ignored. -->
     <PropertyGroup Condition="'$(IgnoreTarExitCode)' == ''">
diff --git a/src/Layout/redist/targets/GenerateBundledVersions.targets b/src/Layout/redist/targets/GenerateBundledVersions.targets
@@ -1391,14 +1391,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Target Name="GenerateBundledMSBuildProps">
     <PropertyGroup>
-      <MinimumMSBuildVersionFile>$(RedistInstallerLayoutPath)sdk/$(Version)/minimumMSBuildVersion</MinimumMSBuildVersionFile>
+      <MinimumMSBuildVersionFile>$(MSBuildProjectDirectory)\minimumMSBuildVersion</MinimumMSBuildVersionFile>
       <BundledMSBuildPropsFileName>Microsoft.NETCoreSdk.BundledMSBuildInformation.props</BundledMSBuildPropsFileName>
       <_ShippingMSBuildVersion>$(MicrosoftBuildVersion)</_ShippingMSBuildVersion>
       <_ShippingMSBuildVersion Condition="$(_ShippingMSBuildVersion.Contains('-'))">$(MicrosoftBuildVersion.Split('-')[0])</_ShippingMSBuildVersion>
       <BundledMSBuildVersion>$(_ShippingMSBuildVersion)</BundledMSBuildVersion>
     </PropertyGroup>
 
-    <Error Text="No MSBuild version file found under '$(RedistInstallerLayoutPath)sdk/$(Version)'" Condition="!Exists('$(MinimumMSBuildVersionFile)')" />
+    <Error Text="No MSBuild version file found: '$(MinimumMSBuildVersionFile)'" Condition="!Exists('$(MinimumMSBuildVersionFile)')" />
 
     <ReadLinesFromFile File="$(MinimumMSBuildVersionFile)">
       <Output TaskParameter="Lines" PropertyName="MinimumMSBuildVersion"/>
@@ -1442,13 +1442,11 @@ Copyright (c) .NET Foundation. All rights reserved.
   </ItemGroup>
 
   <Target Name="LayoutRuntimeGraph"
-          DependsOnTargets="GenerateBundledVersionsProps">
-
+          DependsOnTargets="GenerateBundledVersionsProps;PublishPortableRuntimeIdentifierGraph">
     <GenerateSdkRuntimeIdentifierChain
           RuntimeIdentifier="$(PortableProductMonikerRid)"
-          RuntimeIdentifierGraphPath="$(InstallerOutputDirectory)PortableRuntimeIdentifierGraph.json"
+          RuntimeIdentifierGraphPath="$(RedistBasedOutputPath)PortableRuntimeIdentifierGraph.json"
           RuntimeIdentifierChainOutputPath="$(InstallerOutputDirectory)NETCoreSdkRuntimeIdentifierChain.txt" />
-
   </Target>
 
 </Project>
diff --git a/src/Layout/redist/targets/GenerateInstallerLayout.targets b/src/Layout/redist/targets/GenerateInstallerLayout.targets
@@ -59,7 +59,7 @@
     <Copy SourceFiles="@(DotnetToolsetInternalSource)" DestinationFiles="@(DotnetToolsetInternalDestination)" SkipUnchangedFiles="true" />
   </Target>
 
-  <Target Name="RetargetTools">
+  <Target Name="RetargetInstallerTools">
     <ItemGroup>
       <ToolRuntimeConfigPath Include="$(RedistInstallerLayoutPath)sdk/$(Version)/**/*.runtimeconfig.json" />
     </ItemGroup>
@@ -138,8 +138,9 @@
     <ReplaceFilesWithSymbolicLinks Directory="$(RedistInstallerLayoutPath)/packs/Microsoft.AspNetCore.App.Runtime.$(SharedFrameworkRid)/$(MicrosoftAspNetCoreAppRuntimePackageVersion)" LinkToFilesFrom="$(RedistInstallerLayoutPath)/shared/Microsoft.AspNetCore.App/$(MicrosoftAspNetCoreAppRuntimePackageVersion)" />
   </Target>
 
-  <Target Name="GenerateLayout"
+  <Target Name="GenerateInstallerLayout"
           DependsOnTargets="DownloadBundledComponents;
+                            GenerateLayout;
                             LayoutBundledComponents;
                             GenerateVersionFile;
                             CopyKnownWorkloadManifestFile;
@@ -150,15 +151,11 @@
                             LayoutBaselineWorkloadSet;
                             LayoutWorkloadUserLocalMarker;
                             LayoutBundledTools;
-                            RetargetTools;
+                            RetargetInstallerTools;
                             CrossgenLayout;
                             LayoutAppHostTemplate;
                             ReplaceBundledRuntimePackFilesWithSymbolicLinks"
-          BeforeTargets="AfterBuild" />
-
-  <Target Name="GenerateInternalLayout"
-          DependsOnTargets="GenerateLayout"
-          BeforeTargets="AfterBuild" >
+          AfterTargets="Build">
     <RemoveDir Directories="$(SdkInternalLayoutPath)" />
     <MakeDir Directories="$(SdkInternalLayoutPath)" />
 
diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
diff --git a/src/Layout/redist/targets/GenerateMSIs.targets b/src/Layout/redist/targets/GenerateMSIs.targets
diff --git a/src/Layout/redist/targets/GeneratePKG.targets b/src/Layout/redist/targets/GeneratePKG.targets
