From 481d281d8f6824af94cf2339ce0d0a19b745b9cb Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 9 Oct 2024 15:14:10 +0000
Subject: [PATCH 1/2] Add nowarn for NU1903

---
 .../ReplaceTextInFile.cs                      | 36 +++++++++++++++++++
 .../repo-projects/Directory.Build.targets     | 31 ++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/ReplaceTextInFile.cs

diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/ReplaceTextInFile.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/ReplaceTextInFile.cs
new file mode 100644
index 000000000000..004457f4742f
--- /dev/null
+++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/ReplaceTextInFile.cs
@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.DotNet.UnifiedBuild.Tasks
+{
+    public class ReplaceTextInFile : Task
+    {
+        [Required]
+        public string InputFile { get; set; }
+
+        [Required]
+        public string OldText { get; set; }
+
+        [Required]
+        public string NewText { get; set; }
+
+
+        public override bool Execute()
+        {
+            string fileContents = File.ReadAllText(InputFile);
+            string newLineChars = FileUtilities.DetectNewLineChars(fileContents);
+
+            fileContents = fileContents.Replace(OldText, NewText);
+
+            File.WriteAllText(InputFile, FileUtilities.NormalizeNewLineChars(fileContents, newLineChars));
+
+            return true;
+        }
+    }
+}
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 2faa62b19256..2388062b7a54 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -35,6 +35,37 @@
     <ProdConManifestFile>$(PackageReportDir)prodcon-build.xml</ProdConManifestFile>
   </PropertyGroup>
 
+  <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.ReplaceTextInFile" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
+  <Target Name="AddNoWarns"
+          BeforeTargets="Build"
+          Condition=" EXISTS('$(ProjectDirectory)Directory.Build.props') OR EXISTS('$(ProjectDirectory)src/Directory.Build.props') "
+          Inputs="$(MSBuildProjectFullPath)"
+          Outputs="$(RepoCompletedSemaphorePath)AddNoWarns.complete" >
+
+    <!-- Don't warn on warnings that can be generated in source-build
+         but not necessarily in repo builds. 
+         NU1603 - See https://github.com/dotnet/source-build/issues/2766.
+         NU5104 - During preview builds, some packages have pre-release versions.
+                  Some repos with stable versions may need to uptake these packages 
+                  with pre-release versions because of PVP when building with 
+                  source-build.  -->
+    <PropertyGroup>
+      <OldText><![CDATA[</Project>]]></OldText>
+      <NewText>
+        <![CDATA[  <PropertyGroup>
+    <NoWarn>%24(NoWarn);NU1903;$(RepoNoWarns)</NoWarn>
+  </PropertyGroup>
+</Project>]]>
+      </NewText>
+
+      <DirectoryBuildPropsFile Condition=" EXISTS('$(ProjectDirectory)Directory.Build.props') ">$(ProjectDirectory)Directory.Build.props</DirectoryBuildPropsFile>
+      <DirectoryBuildPropsFile Condition=" '$(DirectoryBuildPropsFile)' == '' AND EXISTS('$(ProjectDirectory)src/Directory.Build.props') ">$(ProjectDirectory)src/Directory.Build.props</DirectoryBuildPropsFile>
+    </PropertyGroup>
+    <ReplaceTextInFile InputFile="$(DirectoryBuildPropsFile)"
+      OldText="$(OldText)"
+      NewText="$(NewText)" />
+  </Target>
+
   <!-- Returns the repository references of this project and all the projects this project references, recursively -->
   <Target Name="GetTransitiveRepositoryReferences" Returns="@(TransitiveRepositoryReference)">
     <ItemGroup>

From fd2fb047468fa8e408312e0ce3b76a4bb8f9a596 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 9 Oct 2024 16:34:20 +0000
Subject: [PATCH 2/2] Update target invocation logic

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 2388062b7a54..ee2d16f204f5 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -37,7 +37,6 @@
 
   <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.ReplaceTextInFile" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
   <Target Name="AddNoWarns"
-          BeforeTargets="Build"
           Condition=" EXISTS('$(ProjectDirectory)Directory.Build.props') OR EXISTS('$(ProjectDirectory)src/Directory.Build.props') "
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(RepoCompletedSemaphorePath)AddNoWarns.complete" >
@@ -423,6 +422,7 @@
           Outputs="$(BaseIntermediateOutputPath)Build.complete"
           Condition="'$(BuildCommand)' != ''"
           DependsOnTargets="BuildRepoReferences;
+                            AddNoWarns;
                             UpdateNuGetConfig;
                             UpdateGlobalJsonVersions;
                             UpdateEngCommonFiles;