Merge redist installer with redist

[ViktorHofer]

Follow-up on 735bd6e & d374e88
Contributes to #45551

Commit 1 - Move redist-installer targets and packaging folder:
redist-installer targets -> src/Layout/redist/targets/
redist-installer packaging files -> src/Layout/pkg/

Commit 2 - Change redist-installer references to redist and make the repo buildable

[Copilot]

Copilot reviewed 81 out of 93 changed files in this pull request and generated no comments.

Files not reviewed (12)

• eng/Build.props: Language not supported
• eng/Publishing.props: Language not supported
• eng/Version.Details.xml: Language not supported
• sdk.sln: Language not supported
• source-build.slnf: Language not supported
• src/Layout/Directory.Build.props: Language not supported
• src/Layout/Directory.Build.targets: Language not supported
• src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj: Language not supported
• src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj: Language not supported
• src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj: Language not supported
• src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj: Language not supported
• src/Layout/pkg/dotnet-sdk.proj: Language not supported

[ViktorHofer]

I validated this change by running windiff over the artifacts/bin directory with and without this change and all the differences are expected.

[marcpopMSFT]

@ViktorHofer thanks for taking care of this. Do you know what impact it has to local build perf or to the stage 2 sdk we use for testing? Are we set to replace overlay sdk now?

[ViktorHofer]

Happy to help here. This was bugging me for some time and it made VMR work harder so I took a stab at it.

Do you know what impact it has to local build perf or to the stage 2 sdk we use for testing? Are we set to replace overlay sdk now?

This doesn't have any negative impact on the build times but also shouldn't have any noticeable positive impact given that most time is spent in restore, csc and wix.

Yes, I think that most of the OverlaySdkOnLKG logic if not all can eventually be removed.

At the moment the artifacts are still kept separate. The logical next step would be to carefully merge them:

sdk/src/Layout/Directory.Build.targets

Lines 8 to 15 in ad154d6

	<SdkLayoutOutputDirectory>$(ArtifactsBinDir)redist\$(Configuration)\layouts\dotnet-toolset-internal\</SdkLayoutOutputDirectory>
	<RedistLayoutPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet\</RedistLayoutPath>
	<SdkOutputDirectory>$(RedistLayoutPath)sdk\$(Version)</SdkOutputDirectory>
	<RedistInstallerBaseOutputPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\</RedistInstallerBaseOutputPath>
	<RedistInstallerLayoutPath>$(RedistInstallerBaseOutputPath)dotnet\</RedistInstallerLayoutPath>
	<SdkInternalLayoutPath>$(RedistInstallerBaseOutputPath)i\</SdkInternalLayoutPath>
	<InstallerOutputDirectory>$(RedistInstallerLayoutPath)sdk\$(Version)\</InstallerOutputDirectory>

Overall, this has a significant engineering thrive and disk space impact. By consolidating the artifacts paths and using hard links where possible, the size of the artifacts bin directory should significantly decrease.

[marcpopMSFT]

Sounds good. This gets us closer to removing the overlay targets which should save a lot of space and build time. Thanks again.