diff --git a/NuGet.config b/NuGet.config index 09870da28882..b7be4e0c5b7f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -32,6 +32,7 @@ + diff --git a/eng/Versions.props b/eng/Versions.props index 6efb45f7f10f..40f5c4de1396 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.15.0-preview-25359-101 - 17.15.0-preview-25359-101 + 17.15.0-preview-25361-09 + 17.15.0-preview-25361-09 17.11.4 17.13 diff --git a/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs b/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs index 0e497bc11d8b..9b09a682c264 100644 --- a/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs +++ b/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs @@ -61,56 +61,6 @@ internal sealed class VirtualProjectBuildingCommand : CommandBase "MSBuild.rsp", ]; - internal static readonly string TargetOverrides = """ - - - - - - - - - - - - - - - <_GenerateRestoreGraphProjectEntryInput Include="@(_RestoreProjectPathItems)" Exclude="$(MSBuildProjectFullPath)" /> - - - - - - - - - - - - - """; - public VirtualProjectBuildingCommand( string entryPointFileFullPath, MSBuildArgs msbuildArgs) @@ -118,7 +68,12 @@ public VirtualProjectBuildingCommand( Debug.Assert(Path.IsPathFullyQualified(entryPointFileFullPath)); EntryPointFileFullPath = entryPointFileFullPath; - MSBuildArgs = msbuildArgs; + MSBuildArgs = msbuildArgs.CloneWithAdditionalProperties(new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "BuildNonexistentProjectsByDefault", bool.TrueString }, + { "RestoreUseSkipNonexistentTargets", bool.FalseString }, + } + .AsReadOnly()); } public string EntryPointFileFullPath { get; } @@ -780,9 +735,6 @@ public static void WriteProjectFile( """); } - - writer.WriteLine(); - writer.WriteLine(TargetOverrides); } writer.WriteLine(""" diff --git a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs index 98b62c75dd06..aed861337464 100644 --- a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs +++ b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs @@ -1893,8 +1893,6 @@ public void Api() - {VirtualProjectBuildingCommand.TargetOverrides} - """)}},"Diagnostics":[]} @@ -1961,8 +1959,6 @@ public void Api_Diagnostic_01() - {VirtualProjectBuildingCommand.TargetOverrides} - """)}},"Diagnostics": @@ -2033,8 +2029,6 @@ public void Api_Diagnostic_02() - {VirtualProjectBuildingCommand.TargetOverrides} - """)}},"Diagnostics":