From 63faf3282d0c5aa53cb6eecfa981cf4036dbfbcc Mon Sep 17 00:00:00 2001
From: Forgind <Forgind@users.noreply.github.com>
Date: Fri, 28 Jul 2023 12:20:25 -0700
Subject: [PATCH] Progress

---
 src/redist/targets/BundledManifests.targets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets
index a0f146506..bae041b3f 100644
--- a/src/redist/targets/BundledManifests.targets
+++ b/src/redist/targets/BundledManifests.targets
@@ -119,6 +119,15 @@
       <FormattedBaselineManifest Include="}" />
     </ItemGroup>
 
+<<<<<<< Updated upstream
     <WriteLinestoFile File="$(RedistLayoutPath)sdk-manifests\BaselineManifest.json" Lines="@(FormattedBaselineManifest)" />
+=======
+    <PropertyGroup>
+      <BaselineManifestFileName Condition="''$(DotNetFinalVersionKind)' == 'release'">BaselineManifest</BaselineManifestFileName>
+      <BaselineManifestFileName Condition="''$(DotNetFinalVersionKind)' != 'release'">BaselineManifest</BaselineManifestFileName>
+    </PropertyGroup>
+
+    <WriteLinestoFile File="$(RedistLayoutPath)sdk-manifests\$(BaselineManifestFileName).json" Lines="@(FormattedBaselineManifest)" />
+>>>>>>> Stashed changes
   </Target>
 </Project>