Rename _RestorePackagePruningDefault to RestorePackagePruningDefault (#6753)

Author: nkolev92

src/NuGet.Clients/NuGet.SolutionRestoreManager/VSNominationUtilities.cs

@@ -338,7 +338,7 @@ internal static bool GetUseLegacyDependencyResolver(IReadOnlyList<IVsTargetFrame
 
         internal static bool IsPruningEnabledGlobally(IReadOnlyList<IVsTargetFrameworkInfo4> tfms)
         {
-            foreach (var value in GetNonEvaluatedPropertyOrNull(tfms, "_RestorePackagePruningDefault", s => s))
+            foreach (var value in GetNonEvaluatedPropertyOrNull(tfms, "RestorePackagePruningDefault", s => s))
             {
                 if (value is not null && MSBuildStringUtility.IsTrue(value))
                 {

src/NuGet.Core/NuGet.Build.Tasks.Console/MSBuildStaticGraphRestore.cs

@@ -1082,7 +1082,7 @@ internal static bool GetPackagePruningDefault(IEnumerable<IMSBuildProject> inner
         {
             foreach (var item in innerBuilds.NoAllocEnumerate())
             {
-                if (item.IsPropertyTrue("_RestorePackagePruningDefault"))
+                if (item.IsPropertyTrue("RestorePackagePruningDefault"))
                 {
                     return true;
                 }

src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets

@@ -83,7 +83,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!-- Package pruning is enabled for all projects targeting .NET 10 or greater, including multi-targeted projects. -->
   <PropertyGroup>
     <!-- We only set the RestoreEnablePackagePruning default for single TFM projects. 
-    For multi-targeted projects that requires knowing the other inner builds, so we rely on _RestorePackagePruningDefault. -->
+    For multi-targeted projects that requires knowing the other inner builds, so we rely on RestorePackagePruningDefault. -->
     <RestoreEnablePackagePruning Condition="'$(RestoreEnablePackagePruning)' == ''
                     AND '$(UsingMicrosoftNETSdk)' == 'true'
                     AND '$(TargetFrameworks)' == ''
@@ -93,13 +93,13 @@ Copyright (c) .NET Foundation. All rights reserved.
                     AND ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion)' != '' AND $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '10.0')))"
                     >true</RestoreEnablePackagePruning>
     <RestoreEnablePackagePruning Condition="$(RestoreEnablePackagePruning) == '' AND '$(TargetFrameworks)' == ''">false</RestoreEnablePackagePruning>
-    <_RestorePackagePruningDefault Condition="'$(UsingMicrosoftNETSdk)' == 'true'
+    <RestorePackagePruningDefault Condition="'$(UsingMicrosoftNETSdk)' == 'true'
                     AND '$(NuGetExeSkipSdkAnalysisLevelCheck)' != 'true'
                     AND '$(SdkAnalysisLevel)' != ''
                     AND $([MSBuild]::VersionGreaterThanOrEquals('$(SdkAnalysisLevel)', '10.0.100'))
                     AND ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion)' != '' AND $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '10.0')))"
-                    >true</_RestorePackagePruningDefault>
-    <_RestorePackagePruningDefault Condition="'$(_RestorePackagePruningDefault)' == ''">false</_RestorePackagePruningDefault>
+                    >true</RestorePackagePruningDefault>
+    <RestorePackagePruningDefault Condition="'$(RestorePackagePruningDefault)' == ''">false</RestorePackagePruningDefault>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -1217,7 +1217,7 @@ Copyright (c) .NET Foundation. All rights reserved.
         <RuntimeIdentifierGraphPath>$(RuntimeIdentifierGraphPath)</RuntimeIdentifierGraphPath>
         <WindowsTargetPlatformMinVersion>$(WindowsTargetPlatformMinVersion)</WindowsTargetPlatformMinVersion>
         <RestoreEnablePackagePruning>$(RestoreEnablePackagePruning)</RestoreEnablePackagePruning>
-        <_RestorePackagePruningDefault>$(_RestorePackagePruningDefault)</_RestorePackagePruningDefault>
+        <RestorePackagePruningDefault>$(RestorePackagePruningDefault)</RestorePackagePruningDefault>
         <NuGetAuditMode>$(NuGetAuditMode)</NuGetAuditMode>
       </_RestoreGraphEntry>
     </ItemGroup>

src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/MSBuildRestoreUtility.cs

@@ -727,7 +727,7 @@ internal static void AddPrunePackageReferences(PackageSpec spec, IEnumerable<IMS
             bool isPruningEnabledGlobally = false;
             foreach (var item in targetFrameworkInfos)
             {
-                if (IsPropertyTrue(item, "_RestorePackagePruningDefault"))
+                if (IsPropertyTrue(item, "RestorePackagePruningDefault"))
                 {
                     isPruningEnabledGlobally = true;
                     break;

src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/PackageSpecFactory.cs

@@ -252,7 +252,7 @@ private static bool GetPackagePruningDefault(IProject project)
         {
             foreach (var item in project.TargetFrameworks.NoAllocEnumerate())
             {
-                if (item.Value.IsPropertyTrue("_RestorePackagePruningDefault"))
+                if (item.Value.IsPropertyTrue("RestorePackagePruningDefault"))
                 {
                     return true;
                 }

src/NuGet.Core/NuGet.PackageManagement/Projects/ProjectBuildProperties.cs

@@ -63,6 +63,6 @@ public static class ProjectBuildProperties
         public const string UsingMicrosoftNETSdk = nameof(UsingMicrosoftNETSdk);
         public const string RestoreUseLegacyDependencyResolver = nameof(RestoreUseLegacyDependencyResolver);
         public const string RestoreEnablePackagePruning = nameof(RestoreEnablePackagePruning);
-        public const string RestorePackagePruningDefault = "_" + nameof(RestorePackagePruningDefault);
+        public const string RestorePackagePruningDefault = nameof(RestorePackagePruningDefault);
     }
 }

src/NuGet.Core/NuGet.PackageManagement/PublicAPI.Unshipped.txt

@@ -1,2 +1,2 @@
 #nullable enable
-~const NuGet.ProjectManagement.ProjectBuildProperties.RestorePackagePruningDefault = "_RestorePackagePruningDefault" -> string
+~const NuGet.ProjectManagement.ProjectBuildProperties.RestorePackagePruningDefault = "RestorePackagePruningDefault" -> string

test/NuGet.Core.FuncTests/Msbuild.Integration.Test/NuGetPropertyDefaultsTests.cs

@@ -134,7 +134,7 @@ public void PackagePruningDefaults_RestoreEnablePackagePruning(string SdkAnalysi
         [InlineData("9.0.100", "net8.0", "false")]
         [InlineData("9.0.100", "netstandard2.1", "false")]
         [InlineData("9.0.100", "netstandard2.0", "false")]
-        public void PackagePruningDefaults__RestorePackagePruningDefault(string SdkAnalysisLevel, string targetFramework, string expected)
+        public void PackagePruningDefaults_RestorePackagePruningDefault(string SdkAnalysisLevel, string targetFramework, string expected)
         {
             // Arrange
             using var testDirectory = TestDirectory.Create();
@@ -145,7 +145,7 @@ public void PackagePruningDefaults__RestorePackagePruningDefault(string SdkAnaly
             var projectFilePath = Path.Combine(testDirectory, "my.proj");
             File.WriteAllText(projectFilePath, projectText);
 
-            string args = $"{projectFilePath} -getProperty:_RestorePackagePruningDefault";
+            string args = $"{projectFilePath} -getProperty:RestorePackagePruningDefault";
             if (!string.IsNullOrEmpty(SdkAnalysisLevel)) args += $" -p:SdkAnalysisLevel={SdkAnalysisLevel}";
 
             var framework = NuGetFramework.Parse(targetFramework);

test/NuGet.Core.Tests/NuGet.Build.Tasks.Console.Test/MSBuildStaticGraphRestoreTests.cs

@@ -1306,7 +1306,7 @@ public void GetPackagePruningDefault(string firstDefault, string secondDefault,
                         { "TargetFrameworkIdentifier", ".NETFramework" },
                         { "TargetFrameworkVersion", "v4.7.2" },
                         { "TargetFrameworkMoniker", ".NETFramework,Version=v4.7.2" },
-                        { "_RestorePackagePruningDefault", firstDefault },
+                        { "RestorePackagePruningDefault", firstDefault },
                     },
                     new Dictionary<string, IList<IMSBuildItem>>
                     {
@@ -1323,7 +1323,7 @@ public void GetPackagePruningDefault(string firstDefault, string secondDefault,
                         { "TargetFrameworkIdentifier", ".NETFramework" },
                         { "TargetFrameworkVersion", "v4.7.1" },
                         { "TargetFrameworkMoniker", ".NETFramework,Version=v4.7.1" },
-                        { "_RestorePackagePruningDefault", secondDefault },
+                        { "RestorePackagePruningDefault", secondDefault },
                     },
                     new Dictionary<string, IList<IMSBuildItem>>
                     {
@@ -1339,7 +1339,7 @@ public void GetPackagePruningDefault(string firstDefault, string secondDefault,
                         { "TargetFrameworkIdentifier", ".NETFramework" },
                         { "TargetFrameworkVersion", "v4.7.0" },
                         { "TargetFrameworkMoniker", ".NETFramework,Version=v4.7.0" },
-                        { "_RestorePackagePruningDefault", thirdDefault },
+                        { "RestorePackagePruningDefault", thirdDefault },
                     },
                     new Dictionary<string, IList<IMSBuildItem>>
                     {