From 9acb934f9fa6414b635c3b61bb03a8b40d35e7ec Mon Sep 17 00:00:00 2001
From: Andy Zivkovic <Andy.Zivkovic@microsoft.com>
Date: Mon, 30 Oct 2023 09:50:39 +0100
Subject: [PATCH] Move properties to NuGet.targets

---
 src/NuGet.Core/NuGet.Build.Tasks/NuGet.props   | 10 ----------
 src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets | 13 +++++++++++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.props b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.props
index 07a14d308da..cec99ecbab5 100644
--- a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.props
+++ b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.props
@@ -38,14 +38,4 @@ Copyright (c) .NET Foundation. All rights reserved.
     <CentralPackageVersionsFileImported>true</CentralPackageVersionsFileImported>
   </PropertyGroup>
 
-  <!--
-    Setup default NuGet property values.
-    Visual Studio's project property page requires defaults to be set to inform customers what the default values are.
-  -->
-  <PropertyGroup>
-    <NuGetAudit Condition=" '$(NuGetAudit)' == '' ">true</NuGetAudit>
-    <NuGetAuditLevel Condition=" '$(NuGetAuditLevel)' == '' ">low</NuGetAuditLevel>
-    <NuGetAuditMode Condition=" '$(NuGetAuditMode)' == '' ">direct</NuGetAuditMode>
-  </PropertyGroup>
-
 </Project>
diff --git a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets
index 697409d2877..80fb43ff32d 100644
--- a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets
+++ b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets
@@ -63,6 +63,19 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_CentralPackageVersionsEnabled Condition="'$(ManagePackageVersionsCentrally)' == 'true' AND '$(CentralPackageVersionsFileImported)' == 'true'">true</_CentralPackageVersionsEnabled>
   </PropertyGroup>
 
+  <!--
+    Visual Studio's project property page requires defaults to be set to inform customers what the default values are.
+    Project-system uses DefaultValueSourceLocation.AfterContext to detect when a customer's project changes the value, so these defaults must be set here in the targets file.
+  -->
+  <PropertyGroup>
+    <!-- Enable NuGetAudit by default -->
+    <NuGetAudit Condition=" '$(NuGetAudit)' == '' ">true</NuGetAudit>
+    <!-- Report on low severity vulnerabilities, and higher. Allowed values are: low, moderate, high, critical -->
+    <NuGetAuditLevel Condition=" '$(NuGetAuditLevel)' == '' ">low</NuGetAuditLevel>
+    <!-- Report known vulnerabilities on direct dependencies only. Allowed values are: direct, all -->
+    <NuGetAuditMode Condition=" '$(NuGetAuditMode)' == '' ">direct</NuGetAuditMode>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- Exclude packages from changing restore inputs.  -->
     <_GenerateRestoreGraphProjectEntryInputProperties>ExcludeRestorePackageImports=true</_GenerateRestoreGraphProjectEntryInputProperties>