Remove dotnet-toolset-internal & dotnet-toolset-langpack archives (#47059)

Author: ViktorHofer

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 -->

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. -->

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" />
 

src/Layout/redist/targets/GenerateArchive.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>

src/Layout/redist/targets/GenerateLayout.targets

@@ -1,6 +1,5 @@
 <Project>
   <PropertyGroup>
     <ArtifactNameSdk>dotnet-toolset-internal</ArtifactNameSdk>
-    <ArtifactNameSdkLanguagePack>dotnet-toolset-langpack</ArtifactNameSdkLanguagePack>
   </PropertyGroup>
 </Project>