From ec607676aea40454b33e0f5f261378b6b1c89450 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 24 Feb 2025 14:42:55 +0100
Subject: [PATCH] Remove dotnet-toolset-internal & dotnet-toolset-langpack
 archives

- dotnet-toolset-internal isn't used anymore. It was the transport package
  from dotnet/sdk to dotnet/installer.
- dotnet-toolset-langpack isn't used anymore. It got added in 3.0.1xx but
  was later then abandoned.

Contributes to https://github.com/dotnet/sdk/issues/45762
---
 .../targets/GenerateLayout.targets            |  5 +---
 .../targets/GenerateMSIs.targets              |  6 ----
 src/Layout/redist/redist.csproj               |  1 -
 .../redist/targets/GenerateArchive.targets    | 29 -------------------
 .../redist/targets/GenerateLayout.targets     | 29 ++++---------------
 src/Layout/redist/targets/Version.targets     |  1 -
 6 files changed, 6 insertions(+), 65 deletions(-)
 delete mode 100644 src/Layout/redist/targets/GenerateArchive.targets

diff --git a/src/Installer/redist-installer/targets/GenerateLayout.targets b/src/Installer/redist-installer/targets/GenerateLayout.targets
index 73b47ba7d048..0ef83f0679ad 100644
--- a/src/Installer/redist-installer/targets/GenerateLayout.targets
+++ b/src/Installer/redist-installer/targets/GenerateLayout.targets
@@ -378,14 +378,11 @@
     <!-- From Version.targets in SDK redist -->
     <PropertyGroup>
       <ArtifactNameSdk>dotnet-toolset-internal</ArtifactNameSdk>
-      <ArtifactNameSdkLanguagePack>dotnet-toolset-langpack</ArtifactNameSdkLanguagePack>
     </PropertyGroup>
 
     <!-- From GenerateLayout.targets in SDK redist -->
     <PropertyGroup>
-      <LayoutDirectory>$(ArtifactsBinDir)redist\$(Configuration)\layouts\</LayoutDirectory>
-      <SdkLayoutOutputDirectory>$(LayoutDirectory)$(ArtifactNameSdk)\</SdkLayoutOutputDirectory>
-      <SdkLanguagePackOutputDirectory>$(LayoutDirectory)$(ArtifactNameSdkLanguagePack)\</SdkLanguagePackOutputDirectory>
+      <SdkLayoutOutputDirectory>$(ArtifactsBinDir)redist\$(Configuration)\layouts\$(ArtifactNameSdk)\</SdkLayoutOutputDirectory>
     </PropertyGroup>
 
     <!-- https://github.com/dotnet/msbuild/issues/5881#issuecomment-802492423 -->
diff --git a/src/Installer/redist-installer/targets/GenerateMSIs.targets b/src/Installer/redist-installer/targets/GenerateMSIs.targets
index 196936d0f428..5cfee615cd28 100644
--- a/src/Installer/redist-installer/targets/GenerateMSIs.targets
+++ b/src/Installer/redist-installer/targets/GenerateMSIs.targets
@@ -41,12 +41,6 @@
       <CombinedFrameworkSdkHostMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostMSIInstallerFile>
       <SdkBundleInstallerOutputGuidString>$(ProductBandCombinedHostHostFxrFrameworkSdkName)</SdkBundleInstallerOutputGuidString>
 
-      <!--<SdkDebianIntermediateDirectory>$(IntermediateOutputPath)debian/sdk/</SdkDebianIntermediateDirectory>
-      <LayoutDirectory Condition=" '$(OSName)' == 'ubuntu' OR '$(OSName)' == 'debian' ">$(SdkDebianIntermediateDirectory)debianLayoutDirectory</LayoutDirectory>
-      <LayoutDirectory Condition=" '$(OSName)' != 'ubuntu' AND '$(OSName)' != 'debian' ">$(IntermediateOutputPath)layouts</LayoutDirectory>
-      <SdkLayoutOutputDirectory>$(LayoutDirectory)$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
-      <MSBuildExtensionsOutputDirectory>$(LayoutDirectory)MSBuildExtensions</MSBuildExtensionsOutputDirectory>-->
-
       <!-- This number comes from arcade and combines the date based build number id and the revision (incremental number per day) -->
       <CombinedBuildNumberAndRevision>$(_PatchNumber)</CombinedBuildNumberAndRevision>
       <!-- Fallback to 0 when patch number is not set. This happens only during CI. -->
diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj
index ceab916eb041..eb9372e9932f 100644
--- a/src/Layout/redist/redist.csproj
+++ b/src/Layout/redist/redist.csproj
@@ -24,7 +24,6 @@
   <Import Project="targets\BundledTools.targets" />
   <Import Project="targets\PublishDotnetWatch.targets" />
   <Import Project="targets\GenerateLayout.targets" />
-  <Import Project="targets\GenerateArchive.targets" />
   <Import Project="targets\OverlaySdkOnLKG.targets" Condition="'$(DotNetBuild)' != 'true'" />
   <Import Project="targets\MSBuildExtensions.targets" />
 
diff --git a/src/Layout/redist/targets/GenerateArchive.targets b/src/Layout/redist/targets/GenerateArchive.targets
deleted file mode 100644
index 8badfdee7ef9..000000000000
--- a/src/Layout/redist/targets/GenerateArchive.targets
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project>
-  <Target Name="GenerateArchives"
-          DependsOnTargets="GenerateLayout;GetCurrentRuntimeInformation"
-          AfterTargets="Pack">
-
-    <!-- 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)' == ''">
-      <IgnoreTarExitCode>false</IgnoreTarExitCode>
-      <IgnoreTarExitCode Condition="'$(DOTNET_CORESDK_IGNORE_TAR_EXIT_CODE)' == '1'">true</IgnoreTarExitCode>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(Version)</ArtifactNameWithVersionSdk>
-
-      <ArtifactNameWithVersionSdkLanguagePack>$(ArtifactNameSdkLanguagePack)-$(Version)</ArtifactNameWithVersionSdkLanguagePack>
-    </PropertyGroup>
-
-    <ZipFileCreateFromDirectory
-        SourceDirectory="$(SdkLayoutOutputDirectory)"
-        DestinationArchive="$(ArtifactsNonShippingPackagesDir)$(ArtifactNameWithVersionSdk).zip"
-        OverwriteDestination="true" />
-
-    <ZipFileCreateFromDirectory
-        SourceDirectory="$(SdkLanguagePackOutputDirectory)"
-        DestinationArchive="$(ArtifactsNonShippingPackagesDir)$(ArtifactNameWithVersionSdkLanguagePack).zip"
-        OverwriteDestination="true" />
-  </Target>
-</Project>
diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
index 5cfe9d673031..3bc52e05e89d 100644
--- a/src/Layout/redist/targets/GenerateLayout.targets
+++ b/src/Layout/redist/targets/GenerateLayout.targets
@@ -488,37 +488,18 @@
                             GetDotnetWatchRedistOutputDirectory"
           AfterTargets="Build">
     <PropertyGroup>
-      <LayoutDirectory>$(BaseOutputPath)$(Configuration)\layouts\</LayoutDirectory>
-      <SdkLayoutOutputDirectory>$(LayoutDirectory)$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
-      <SdkLanguagePackOutputDirectory>$(LayoutDirectory)$(ArtifactNameSdkLanguagePack)</SdkLanguagePackOutputDirectory>
+      <SdkLayoutOutputDirectory>$(BaseOutputPath)$(Configuration)\layouts\$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
     </PropertyGroup>
 
     <ItemGroup>
       <ToolsetLayoutInput Include="$(OutputPath)/**/*" />
-      <ToolsetLanguagePackInput Include="$(OutputPath)/**/*.resources.dll" />
-
-      <!--
-        Include redist outputs published by dotnet-watch.csproj build.
-      -->
+      <!-- Include redist outputs published by dotnet-watch.csproj build. -->
       <ToolsetLayoutInput Include="$(DotnetWatchRedistOutputDirectory)/**/*" LayoutSubdirectory="DotnetTools\dotnet-watch\"/>
-      <ToolsetLanguagePackInput Include="$(DotnetWatchRedistOutputDirectory)/**/*.resources.dll" LayoutSubdirectory="DotnetTools\dotnet-watch\"/>
     </ItemGroup>
 
-    <!-- Set up Items Defining Layouts for easy change -->
-    <ItemGroup>
-      <LayoutDefinition Include="Sdk">
-        <InputFiles>@(ToolsetLayoutInput)</InputFiles>
-        <OutputFiles>@(ToolsetLayoutInput -> '$(SdkLayoutOutputDirectory)\%(LayoutSubdirectory)%(RecursiveDir)%(Filename)%(Extension)')</OutputFiles>
-      </LayoutDefinition>
-
-      <LayoutDefinition Include="SdkLanguagePack">
-        <InputFiles>@(ToolsetLanguagePackInput)</InputFiles>
-        <OutputFiles>@(ToolsetLanguagePackInput -> '$(SdkLanguagePackOutputDirectory)\%(LayoutSubdirectory)%(RecursiveDir)%(Filename)%(Extension)')</OutputFiles>
-      </LayoutDefinition>
-    </ItemGroup>
-
-    <Copy SourceFiles="%(LayoutDefinition.InputFiles)"
-          DestinationFiles="%(LayoutDefinition.OutputFiles)"
+    <Copy SourceFiles="@(ToolsetLayoutInput)"
+          DestinationFiles="@(ToolsetLayoutInput->'$(SdkLayoutOutputDirectory)\%(LayoutSubdirectory)%(RecursiveDir)%(Filename)%(Extension)')"
           SkipUnchangedFiles="true" />
   </Target>
+
 </Project>
diff --git a/src/Layout/redist/targets/Version.targets b/src/Layout/redist/targets/Version.targets
index caa59a5e398e..a1c8e6a85003 100644
--- a/src/Layout/redist/targets/Version.targets
+++ b/src/Layout/redist/targets/Version.targets
@@ -1,6 +1,5 @@
 <Project>
   <PropertyGroup>
     <ArtifactNameSdk>dotnet-toolset-internal</ArtifactNameSdk>
-    <ArtifactNameSdkLanguagePack>dotnet-toolset-langpack</ArtifactNameSdkLanguagePack>
   </PropertyGroup>
 </Project>