CONSIDER: 1 Project Turns Into 9 Evaluations With Pack Multitarget ->…

… Move PackRelease Default to Sdk.Props to be correct in this case

src/Cli/dotnet/ReleasePropertyProjectLocator.cs

@@ -32,8 +32,8 @@ public struct DependentCommandOptions
             public string? FrameworkOption;
             public string? ConfigurationOption;
 
-            public DependentCommandOptions(IEnumerable<string> slnOrProjectArgs, string? frameworkOption = null, string? configOption = null)
-            => (SlnOrProjectArgs, FrameworkOption, ConfigurationOption) = (slnOrProjectArgs, frameworkOption, configOption);
+            public DependentCommandOptions(IEnumerable<string> slnOrProjectArgs, string? configOption = null, string? frameworkOption = null)
+            => (SlnOrProjectArgs, ConfigurationOption, FrameworkOption) = (slnOrProjectArgs, configOption, frameworkOption);
         }
 
 
@@ -230,11 +230,9 @@ private Dictionary<string, string> InjectTargetFrameworkIntoGlobalProperties(Dic
         {
             if (_options.FrameworkOption != null)
             {
-                string givenFrameworkOption = _parseResult.GetValue(_options.FrameworkOption);
-
                 // Note: dotnet -f FRAMEWORK_1 --property:TargetFramework=FRAMEWORK_2 will use FRAMEWORK_1.
                 // So we can replace the value in the globals non-dubiously if it exists.
-                oldGlobalProperties[MSBuildPropertyNames.TARGET_FRAMEWORK] = givenFrameworkOption;
+                oldGlobalProperties[MSBuildPropertyNames.TARGET_FRAMEWORK] = _options.FrameworkOption;
             }
             return oldGlobalProperties;
         }

src/Cli/dotnet/commands/dotnet-pack/PackCommand.cs

@@ -10,6 +10,7 @@
 using System.CommandLine.Parsing;
 using Microsoft.DotNet.Tools.Publish;
 using System.Linq;
+using System.Diagnostics;
 
 namespace Microsoft.DotNet.Tools.Pack
 {
@@ -44,6 +45,8 @@ public static PackCommand FromParseResult(ParseResult parseResult, string msbuil
 
             msbuildArgs.AddRange(parseResult.OptionValuesToBeForwarded(PackCommandParser.GetCommand()));
 
+            Debugger.Launch();
+
             ReleasePropertyProjectLocator projectLocator = new ReleasePropertyProjectLocator(parseResult, MSBuildPropertyNames.PACK_RELEASE,
                 new ReleasePropertyProjectLocator.DependentCommandOptions(
                         parseResult.GetValue(PackCommandParser.SlnOrProjectArgument),

src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.targets

@@ -13,7 +13,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <PropertyGroup>
     <_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV'))</_TargetFrameworkVersionWithoutV>
-
+    
     <MicrosoftNETBuildExtensionsTasksAssembly Condition="'$(MicrosoftNETBuildExtensionsTasksAssembly)' == '' AND '$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)\tools\net8.0\Microsoft.NET.Build.Extensions.Tasks.dll</MicrosoftNETBuildExtensionsTasksAssembly>
     <MicrosoftNETBuildExtensionsTasksAssembly Condition="'$(MicrosoftNETBuildExtensionsTasksAssembly)' == ''">$(MSBuildThisFileDirectory)\tools\net472\Microsoft.NET.Build.Extensions.Tasks.dll</MicrosoftNETBuildExtensionsTasksAssembly>
 

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets

@@ -59,6 +59,17 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV'))</_TargetFrameworkVersionWithoutV>
   </PropertyGroup>
 
+  <!-- Evaluate the two below properties so they are available early enough to be defined in any ProjectInstance evaluation. -->
+  <!-- Default the value of PackRelease for every project. Note that this is pre-evaluated by the CLI in an evaluation before evaluation (see ReleasePropertyProjectLocator.cs).-->
+  <PropertyGroup Condition="'$(PackRelease)' == ''">
+    <PackRelease>true</PackRelease>
+  </PropertyGroup>
+
+  <!-- Default the value of PublishRelease for 8.0+ TFMs. Note that this is pre-evaluated by the CLI in an evaluation before evaluation (see ReleasePropertyProjectLocator.cs).-->
+  <PropertyGroup Condition="'$(PublishRelease)' == '' and '$(_TargetFrameworkVersionWithoutV)' >= '8.0'">
+    <PublishRelease>true</PublishRelease>
+  </PropertyGroup>
+
   <!--
     Import targets from RazorSDK if referenced
     Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.BeforeCommon.targets

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.targets

@@ -153,16 +153,11 @@ Copyright (c) .NET Foundation. All rights reserved.
     <NETSdkWarning ResourceName="UnnecessaryWindowsDesktopSDK" />
   </Target>
 
-  <!-- Default the value of PackRelease for every project. Note that this is pre-evaluated by the CLI in an evaluation before evaluation (see ReleasePropertyProjectLocator.cs).-->
-  <PropertyGroup Condition="'$(PackRelease)' == ''">
-    <PackRelease>true</PackRelease>
-  </PropertyGroup>
-
   <!-- Default the value of PublishRelease for 8.0+ TFMs. Note that this is pre-evaluated by the CLI in an evaluation before evaluation (see ReleasePropertyProjectLocator.cs).-->
   <PropertyGroup Condition="'$(PublishRelease)' == '' and '$(_TargetFrameworkVersionWithoutV)' >= '8.0'">
     <PublishRelease>true</PublishRelease>
   </PropertyGroup>
-  
+
   <!-- This verifies that the configuration between projects in a solution set by PackRelease agree.
   PackRelease only affects the CLI since VS has its own Configuration UI and it's not possible to detect like this in MSBuild.
   _IsPacking will only be set if packing in the CLI, so that's fine here. The pack targets are all outside of the SDK, which is why this is here.-->

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props

@@ -24,6 +24,14 @@ Copyright (c) .NET Foundation. All rights reserved.
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
   </PropertyGroup>
 
+  <!-- Default the value of PackRelease for every project. Note that this is pre-evaluated by the CLI in an evaluation before evaluation (see ReleasePropertyProjectLocator.cs).
+  Multitargeting pack splits a single 2 TFM project into 9 separate evaluations, with different target imports. Microsoft.NET.SDK.DefaultItems.Targets ...
+  is where PublishRelease is defaulted because it depends on _TargetFrameworkVersionWithoutV. Most targets do not run in some instances of dotnet pack.
+  So, we must set PackRelease here. Even though this occurs before project import, the project import can override PackRelease later, before the pre-evaluation, so this is fine.-->
+  <PropertyGroup Condition="'$(PackRelease)' == ''">
+    <PackRelease>true</PackRelease>
+  </PropertyGroup>
+
   <!-- User-facing configuration-agnostic defaults -->
   <PropertyGroup>
     <OutputType Condition=" '$(OutputType)' == '' ">Library</OutputType>

src/Tests/Microsoft.NET.Pack.Tests/GivenThatWeWantToPackAHelloWorldProject.cs

@@ -111,8 +111,10 @@ public void It_packs_with_release_if_PackRelease_property_set(bool optedOut)
             Assert.True(File.Exists(expectedAssetPath));
         }
 
-        [Fact]
-        public void It_packs_with_release_if_PackRelease_property_set_in_csproj()
+        [Theory]
+        [InlineData("true")]
+        [InlineData("false")]
+        public void It_packs_with_release_if_PackRelease_property_set_in_csproj(string valueOfPackRelease)
         {
             var helloWorldAsset = _testAssetsManager
                .CopyTestAsset("HelloWorld")
@@ -121,7 +123,7 @@ public void It_packs_with_release_if_PackRelease_property_set_in_csproj()
                {
                    var ns = project.Root.Name.Namespace;
                    var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First();
-                   propertyGroup.Add(new XElement(ns + "PackRelease", "true"));
+                   propertyGroup.Add(new XElement(ns + "PackRelease", valueOfPackRelease));
                });
 
             var packCommand = new DotnetPackCommand(Log, helloWorldAsset.TestRoot);
@@ -131,30 +133,34 @@ public void It_packs_with_release_if_PackRelease_property_set_in_csproj()
                 .Should()
                 .Pass();
 
-            var expectedAssetPath = Path.Combine(helloWorldAsset.Path, "bin", "Release", "HelloWorld.1.0.0.nupkg");
+            var expectedAssetPath = Path.Combine(helloWorldAsset.Path, "bin", valueOfPackRelease == "true" ? "Release" : "Debug", "HelloWorld.1.0.0.nupkg");
             Assert.True(File.Exists(expectedAssetPath));
         }
 
         [InlineData("")]
         [InlineData("false")]
         [Theory]
-        public void It_packs_successfully_with_debug_with_Mutlitargeting_where_net_8_and_net_7_project_defines_PackRelease_or_not(string packReleaseValue)
+        public void It_packs_successfully_with_Mutlitargeting_where_net_8_and_net_7_project_defines_PackRelease_or_not(string packReleaseValue)
         {
             var helloWorldAsset = _testAssetsManager
-                .CopyTestAsset("HelloWorld")
+                .CopyTestAsset("HelloWorld", identifier: packReleaseValue)
                 .WithSource()
                 .WithTargetFrameworks("net8.0;net7.0")
                 .WithProjectChanges(project =>
                 {
                     var ns = project.Root.Name.Namespace;
                     var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First();
-                     propertyGroup.Add(new XElement(packReleaseValue != "" ? ns + "PackRelease" + packReleaseValue : ""));
+                     propertyGroup.Add(packReleaseValue != "" ? 
+                         new XElement(ns + "PackRelease", packReleaseValue)
+                         :
+                         new XElement(ns + "Foo", packReleaseValue)
+                    );
                 });
 
             var packCommand = new DotnetPackCommand(Log, helloWorldAsset.TestRoot);
 
             packCommand
-                .Execute()
+                .Execute("-bl:C:\\users\\noahgilson\\whydoesthispackdebug.binlog")
                 .Should()
                 .Pass();
 

src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToTestAMultitargetedSolutionWithPublishReleaseOrPackRelease.cs

@@ -50,16 +50,17 @@ internal Tuple<TestSolution, List<TestProject>> Setup(ITestOutputHelper log, Lis
                 IsExe = true
             };
             testProject.RecordProperties("Configuration", "Optimize", PReleaseProperty);
-            var mainProject = _testAssetsManager.CreateTestProject(testProject, callingMethod: testPath, identifier: PReleaseProperty);
+            testProject.AdditionalProperties[PReleaseProperty] = firstProjPReleaseValue;
+            var mainProject = _testAssetsManager.CreateTestProject(testProject, callingMethod: testPath, identifier: string.Join("", firstProjTfms) + PReleaseProperty);
 
             var referencedProject = new TestProject("ReferencedProject")
             {
                 TargetFrameworks = String.Join(";", secondProjTfms),
                 IsExe = false
             };
             referencedProject.RecordProperties("Configuration", "Optimize", PReleaseProperty);
-            testProject.AdditionalProperties[PReleaseProperty] = secondProjPReleaseValue;
-            var secondProject = _testAssetsManager.CreateTestProject(referencedProject, callingMethod: testPath, identifier: PReleaseProperty);
+            referencedProject.AdditionalProperties[PReleaseProperty] = secondProjPReleaseValue;
+            var secondProject = _testAssetsManager.CreateTestProject(referencedProject, callingMethod: testPath, identifier: string.Join("", secondProjTfms) + PReleaseProperty);
 
             List<TestAsset> projects = new List<TestAsset> { mainProject, secondProject };
 
@@ -74,7 +75,6 @@ internal Tuple<TestSolution, List<TestProject>> Setup(ITestOutputHelper log, Lis
 
         [InlineData(PublishRelease, "net8.0", true)]
         [InlineData(PublishRelease, "-p:TargetFramework=net8.0", false)]
-        [InlineData(PackRelease, "-p:TargetFramework=net8.0", false)]
         [Theory]
         public void ItUsesReleaseWithATargetFrameworkOptionNet8ForNet6AndNet7MultitargetingProjectWithPReleaseUndefined(string releaseProperty, string args, bool passDashF)
         {
@@ -87,7 +87,7 @@ public void ItUsesReleaseWithATargetFrameworkOptionNet8ForNet6AndNet7Multitarget
 
             var dotnetCommand = new DotnetCommand(Log, releaseProperty == PublishRelease ? publish : pack);
             dotnetCommand
-                .Execute(passDashF ? "-f" : "", args, sln.SolutionPath, "-bl:C:\\users\\noahgilson\\releaseframework.binlog")
+                .Execute(passDashF ? "-f" : "", args, sln.SolutionPath)
                 .Should()
                 .Pass();
 

src/Tests/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs

@@ -455,19 +455,12 @@ public void A_PublishRelease_property_does_not_override_other_command_configurat
 
             System.IO.File.WriteAllText(helloWorldAsset.Path + "/Directory.Build.props", "<Project><PropertyGroup><PublishRelease>true</PublishRelease></PropertyGroup></Project>");
 
+            // Another command, which should not be affected by PublishRelease
             new BuildCommand(helloWorldAsset)
                .Execute()
                .Should()
                .Pass();
 
-            // Another command, which should not be affected by PublishRelease
-            var packCommand = new DotnetPackCommand(Log, helloWorldAsset.TestRoot);
-
-            packCommand
-                .Execute()
-                .Should()
-                .Pass();
-
             var expectedAssetPath = System.IO.Path.Combine(helloWorldAsset.Path, "bin", "Release", "HelloWorld.1.0.0.nupkg");
             Assert.False(File.Exists(expectedAssetPath));
         }