From d012109c73a2aee3be8654ce78b526b08fc363a3 Mon Sep 17 00:00:00 2001
From: Christopher Scott <chriss@microsoft.com>
Date: Mon, 22 Jul 2024 09:53:54 -0500
Subject: [PATCH] revert removal of warnaserror (#44961)

---
 eng/Directory.Build.Common.props    | 5 ++---
 eng/pipelines/templates/jobs/ci.yml | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/eng/Directory.Build.Common.props b/eng/Directory.Build.Common.props
index 3da126724dd08..85a7168d99751 100644
--- a/eng/Directory.Build.Common.props
+++ b/eng/Directory.Build.Common.props
@@ -77,9 +77,8 @@
       AZPROVISION001; <!-- Provisioning -->
     </NoWarn>
 
-    <!-- Temporarily setting this to false while we resolve the security warning related to System.Text.Json -->
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <!-- 
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <!--
       .NET 8 now produces security warnings for nuget packages in dotnet restore. Keep these as warnings in T1 to avoid needing to update T1 library dependencies.
       See: https://learn.microsoft.com/en-us/dotnet/core/compatibility/sdk/8.0/dotnet-restore-audit#recommended-action
     -->
diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
index 817a8781df355..20b108a6ac538 100644
--- a/eng/pipelines/templates/jobs/ci.yml
+++ b/eng/pipelines/templates/jobs/ci.yml
@@ -103,7 +103,7 @@ jobs:
         parameters:
           LogFilePath: $(Build.ArtifactStagingDirectory)/pack.binlog
       - script: >-
-          dotnet pack eng/service.proj
+          dotnet pack eng/service.proj -warnaserror
           /p:ValidateRunApiCompat=true
           /p:SDKType=${{ parameters.SDKType }}
           /p:ServiceDirectory=${{ parameters.ServiceDirectory }}
@@ -239,7 +239,7 @@ jobs:
           LogFilePath: $(Build.ArtifactStagingDirectory)/rebuild.binlog
 
       - script: >-
-          dotnet build eng/service.proj
+          dotnet build eng/service.proj -warnaserror
           /t:rebuild
           /p:DebugType=none
           /p:SDKType=${{ parameters.SDKType }}
@@ -342,4 +342,3 @@ jobs:
             TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}
             # The value for ProjectListOverrideFilePropertyName should be the same as dependency.tests.yml parameter ProjectListOverrideFilePropertyName
             ProjectListOverrideFilePropertyName: 'ProjectListOverrideFile'
-