Merge pull request #4110 from Marusyk/rmarusyk/4109

GH-4109: Add PublishReadyToRun to DotNetRestoreSettings

src/Cake.Common.Tests/Unit/Tools/DotNet/Restore/DotNetRestorerTests.cs

@@ -216,6 +216,20 @@ public void Should_Add_ForceEvaluate()
                 // Then
                 Assert.Equal($@"restore --force-evaluate", result.Args);
             }
+
+            [Fact]
+            public void Should_Add_PublishReadyToRun()
+            {
+                // Given
+                var fixture = new DotNetRestorerFixture();
+                fixture.Settings.PublishReadyToRun = true;
+
+                // When
+                var result = fixture.Run();
+
+                // Then
+                Assert.Equal("restore -p:PublishReadyToRun=true", result.Args);
+            }
         }
     }
 }

src/Cake.Common/Tools/DotNet/Restore/DotNetRestoreSettings.cs

@@ -108,6 +108,18 @@ public class DotNetRestoreSettings : DotNetSettings
         /// </remarks>
         public bool ForceEvaluate { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to compile your application assemblies as ReadyToRun (R2R) format.
+        /// </summary>
+        /// <remarks>
+        /// In .NET 6, dotnet restore followed by dotnet publish -p:PublishReadyToRun=true --no-restore will fail with the NETSDK1095 error.
+        /// This is because the crossgen binary is now shipped as a separate NuGet package, and so needs to be part of the restore operation for publishing to succeed.
+        /// <para>
+        /// Supported by .NET SDK version 6.0.100 and above.
+        /// </para>
+        /// </remarks>
+        public bool? PublishReadyToRun { get; set; }
+
         /// <summary>
         /// Gets or sets additional arguments to be passed to MSBuild.
         /// </summary>

src/Cake.Common/Tools/DotNet/Restore/DotNetRestorer.cs

@@ -148,12 +148,25 @@ private ProcessArgumentBuilder GetArguments(string root, DotNetRestoreSettings s
                 builder.AppendSwitchQuoted("--lock-file-path", " ", settings.LockFilePath.MakeAbsolute(_environment).FullPath);
             }
 
-            // force evaluate
+            // Force Evaluate
             if (settings.ForceEvaluate)
             {
                 builder.Append("--force-evaluate");
             }
 
+            // Publish ReadyToRun
+            if (settings.PublishReadyToRun.HasValue)
+            {
+                if (settings.PublishReadyToRun.Value)
+                {
+                    builder.Append("-p:PublishReadyToRun=true");
+                }
+                else
+                {
+                    builder.Append("-p:PublishReadyToRun=false");
+                }
+            }
+
             if (settings.MSBuildSettings != null)
             {
                 builder.AppendMSBuildSettings(settings.MSBuildSettings, _environment);