From 3f453adadfa0fb7d299e34ae7a65183188ad050b Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 3 May 2024 07:52:04 +0200
Subject: [PATCH 1/2] Create 0001-Disable-sdk-Installer-portion.patch

---
 .../0001-Disable-sdk-Installer-portion.patch  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 src/SourceBuild/patches/sdk/0001-Disable-sdk-Installer-portion.patch

diff --git a/src/SourceBuild/patches/sdk/0001-Disable-sdk-Installer-portion.patch b/src/SourceBuild/patches/sdk/0001-Disable-sdk-Installer-portion.patch
new file mode 100644
index 000000000000..2e859f47e5c8
--- /dev/null
+++ b/src/SourceBuild/patches/sdk/0001-Disable-sdk-Installer-portion.patch
@@ -0,0 +1,23 @@
+From 8f96fb2b9cc1935a6893b021c035905b277682c0 Mon Sep 17 00:00:00 2001
+From: Viktor Hofer <viktor.hofer@microsoft.com>
+Date: Fri, 3 May 2024 05:51:06 +0000
+Subject: [PATCH] Disable sdk Installer portion
+
+---
+ source-build.slnf | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/source-build.slnf b/source-build.slnf
+index dd00078d19..9c7531bebe 100644
+--- a/source-build.slnf
++++ b/source-build.slnf
+@@ -21,8 +21,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\\Installer\\redist-installer\\redist-installer.csproj",
+-      "src\\Installer\\core-sdk-tasks\\core-sdk-tasks.csproj",
+       "src\\Layout\\redist\\redist.csproj",
+       "src\\Layout\\tool_fsharp\\tool_fsc.csproj",
+       "src\\Layout\\tool_msbuild\\tool_msbuild.csproj",
+--

From a49a5f03100d3fe0dd0ca38c3ecc259f0a1c8e0a Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 3 May 2024 08:21:39 +0200
Subject: [PATCH 2/2] Update and rename
 0001-Disable-sdk-Installer-portion.patch to
 0001-Make-redist-installer.csproj-a-dummy.patch

---
 .../0001-Disable-sdk-Installer-portion.patch  | 23 --------
 ...Make-redist-installer.csproj-a-dummy.patch | 59 +++++++++++++++++++
 2 files changed, 59 insertions(+), 23 deletions(-)
 delete mode 100644 src/SourceBuild/patches/sdk/0001-Disable-sdk-Installer-portion.patch
 create mode 100644 src/SourceBuild/patches/sdk/0001-Make-redist-installer.csproj-a-dummy.patch

diff --git a/src/SourceBuild/patches/sdk/0001-Disable-sdk-Installer-portion.patch b/src/SourceBuild/patches/sdk/0001-Disable-sdk-Installer-portion.patch
deleted file mode 100644
index 2e859f47e5c8..000000000000
--- a/src/SourceBuild/patches/sdk/0001-Disable-sdk-Installer-portion.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8f96fb2b9cc1935a6893b021c035905b277682c0 Mon Sep 17 00:00:00 2001
-From: Viktor Hofer <viktor.hofer@microsoft.com>
-Date: Fri, 3 May 2024 05:51:06 +0000
-Subject: [PATCH] Disable sdk Installer portion
-
----
- source-build.slnf | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/source-build.slnf b/source-build.slnf
-index dd00078d19..9c7531bebe 100644
---- a/source-build.slnf
-+++ b/source-build.slnf
-@@ -21,8 +21,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\\Installer\\redist-installer\\redist-installer.csproj",
--      "src\\Installer\\core-sdk-tasks\\core-sdk-tasks.csproj",
-       "src\\Layout\\redist\\redist.csproj",
-       "src\\Layout\\tool_fsharp\\tool_fsc.csproj",
-       "src\\Layout\\tool_msbuild\\tool_msbuild.csproj",
---
diff --git a/src/SourceBuild/patches/sdk/0001-Make-redist-installer.csproj-a-dummy.patch b/src/SourceBuild/patches/sdk/0001-Make-redist-installer.csproj-a-dummy.patch
new file mode 100644
index 000000000000..6587fc6e2c90
--- /dev/null
+++ b/src/SourceBuild/patches/sdk/0001-Make-redist-installer.csproj-a-dummy.patch
@@ -0,0 +1,59 @@
+From e9227c298e8950a6fbbd13072249e04a641c9c35 Mon Sep 17 00:00:00 2001
+From: Viktor Hofer <viktor.hofer@microsoft.com>
+Date: Fri, 3 May 2024 06:20:29 +0000
+Subject: [PATCH] Make redist-instlaler.csproj a dummy
+
+---
+ .../redist-installer/redist-installer.csproj  | 40 -------------------
+ 1 file changed, 40 deletions(-)
+
+diff --git a/src/Installer/redist-installer/redist-installer.csproj b/src/Installer/redist-installer/redist-installer.csproj
+index 8913fff18a..54e2cadc07 100644
+--- a/src/Installer/redist-installer/redist-installer.csproj
++++ b/src/Installer/redist-installer/redist-installer.csproj
+@@ -11,44 +11,4 @@
+     <BundleNativeAotCompiler Condition="'$(BundleNativeAotCompiler)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(SourceBuildUseMonoRuntime)' != 'true'">true</BundleNativeAotCompiler>
+   </PropertyGroup>
+ 
+-  <ItemGroup>
+-    <FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)" RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
+-  </ItemGroup>
+-
+-  <ItemGroup>
+-    <!--
+-      These two projects reference assets from multiple architectures, so they can't be built until we have a join point job that can pull assets from multiple legs.
+-      https://github.com/dotnet/source-build/issues/4336
+-    -->
+-    <ProjectReference Include="..\..\Layout\redist\redist.csproj" ReferenceOutputAssembly="false" />
+-    <ProjectReference Include="projects\SdkResolver.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuild)' != 'true'" />
+-    <ProjectReference Include="projects\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuild)' != 'true'" />
+-  </ItemGroup>
+-
+-  <ItemGroup>
+-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" />
+-  </ItemGroup>
+-
+-  <Import Project="targets\BuildCoreSdkTasks.targets" />
+-  <Import Project="targets\GetRuntimeInformation.targets" />
+-  <Import Project="targets\SetBuildDefaults.targets" />
+-  <Import Project="targets\Versions.targets" />
+-  <Import Project="targets\Branding.targets" />
+-  <Import Project="targets\BundledTemplates.targets" />
+-  <Import Project="targets\BundledManifests.targets" />
+-  <Import Project="targets\BundledDotnetTools.targets" />
+-  <Import Project="targets\GenerateBundledVersions.targets" />
+-  <Import Project="targets\Crossgen.targets" />
+-  <Import Project="targets\GenerateLayout.targets" />
+-  <Import Project="targets\GenerateMSBuildExtensions.targets" />
+-  <Import Project="targets\FileExtensions.targets" />
+-  <Import Project="targets\GenerateArchives.targets" />
+-  <Import Project="targets\GenerateMSIs.targets" />
+-  <Import Project="targets\LinuxNativeInstallerDependencyVersions.targets" />
+-  <Import Project="targets\GenerateDebs.targets" />
+-  <Import Project="targets\GenerateRPMs.targets" />
+-  <Import Project="targets\GeneratePKG.targets" />
+-  <Import Project="targets\GenerateInstallers.targets" />
+-  <Import Project="targets\Badge.targets" />
+-
+ </Project>
+--