Merge pull request #2229 from nguerrera/fix-clean-without-assets-file

Fix regression in clean when no assets file is present

Author: nguerrera

build/build.ps1

@@ -92,6 +92,9 @@ function InitializeDotNetCli {
     $env:DOTNET_INSTALL_DIR = $env:DotNetCoreSdkDir    
   }
 
+  # Save MSBuild crash files info to log directory so that they are captured as build artifacts
+  $env:MSBUILDDEBUGPATH=$LogDir
+
   # Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version, 
   # otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues.
   if (($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$($GlobalJson.sdk.version)"))) {

build/build.sh

@@ -167,6 +167,9 @@ function InitializeDotNetCli {
     export DOTNET_INSTALL_DIR="$DotNetCoreSdkDir"
   fi
 
+  # Save MSBuild crash files info to log directory so that they are captured as build artifacts
+  export MSBUILDDEBUGPATH="$log_dir"
+
   ReadJson "$global_json_file" "version"
   local dotnet_sdk_version="$readjsonvalue"
   local dotnet_root=""

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

@@ -92,14 +92,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <PropertyGroup>
     <CoreCleanDependsOn>
-      SuppressAssetsLogMessages;
+      _SdkBeforeClean
       $(CoreCleanDependsOn)
     </CoreCleanDependsOn>
   </PropertyGroup>
 
   <PropertyGroup>
     <RebuildDependsOn>
-      UnsuppressAssetsLogMessages;
+      _SdkBeforeRebuild;
       $(RebuildDependsOn)
     </RebuildDependsOn>
   </PropertyGroup>
@@ -200,29 +200,16 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ItemGroup>
   </Target>
 
-  <!--
-    ============================================================
-                                        SuppressAssetsLogMessages
-
-    Suppresses log messages from an existing project assets file.
-    ============================================================
-    -->
-  <Target Name="SuppressAssetsLogMessages" Condition="'$(UnsuppressAssetsLogMessages)' != 'true'">
-    <PropertyGroup>
+  <Target Name="_SdkBeforeClean">
+    <PropertyGroup Condition="'$(_CleaningWithoutRebuilding)' == ''">
+      <_CleaningWithoutRebuilding>true</_CleaningWithoutRebuilding>
       <EmitAssetsLogMessages>false</EmitAssetsLogMessages>
     </PropertyGroup>
   </Target>
 
-  <!--
-    ============================================================
-                                        UnsuppressAssetsLogMessages
-
-    Unsuppresses log messages from an existing project assets file.
-    ============================================================
-    -->
-  <Target Name="UnsuppressAssetsLogMessages">
+  <Target Name="_SdkBeforeRebuild">
     <PropertyGroup>
-      <UnsuppressAssetsLogMessages>true</UnsuppressAssetsLogMessages>
+      <_CleaningWithoutRebuilding>false</_CleaningWithoutRebuilding>
     </PropertyGroup>
   </Target>
 

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets

@@ -126,7 +126,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ResolvePackageDependenciesForBuildDependsOn>
   </PropertyGroup>
   <Target Name="ResolvePackageDependenciesForBuild"
-          Condition=" '$(DesignTimeBuild)' != 'true' Or Exists('$(ProjectAssetsFile)')"
+          Condition=" ('$(DesignTimeBuild)' != 'true' and '$(_CleaningWithoutRebuilding)' != 'true')
+                      Or Exists('$(ProjectAssetsFile)')"
           BeforeTargets="AssignProjectConfiguration"
           DependsOnTargets="$(ResolvePackageDependenciesForBuildDependsOn)" />
 

src/Tests/Microsoft.NET.Clean.Tests/GivenThatWeWantToCleanAProject.cs

@@ -53,5 +53,41 @@ public void It_cleans_without_logging_assets_message()
                 .And
                 .NotHaveStdOutContaining("warning");
         }
+
+        [Fact]
+        public void It_cleans_without_assets_file_present()
+        {
+            var testAsset = _testAssetsManager
+                .CopyTestAsset("HelloWorld")
+                .WithSource();
+
+            var assetsFilePath = Path.Combine(testAsset.TestRoot, "obj", "project.assets.json");
+            File.Exists(assetsFilePath).Should().BeFalse();
+
+            var cleanCommand = new CleanCommand(Log, testAsset.TestRoot);
+
+            cleanCommand
+                .Execute()
+                .Should()
+                .Pass();
+        }
+
+        // Related to https://github.com/dotnet/sdk/issues/2233
+        // This test will fail if the naive fix for not reading assets file during clean is attempted
+        [Fact]
+        public void It_can_clean_and_build_without_using_rebuild()
+        {
+            var testAsset = _testAssetsManager
+              .CopyTestAsset("HelloWorld")
+              .WithSource()
+              .Restore(Log);
+
+            var cleanAndBuildCommand = new MSBuildCommand(Log, "Clean;Build", testAsset.TestRoot);
+
+            cleanAndBuildCommand
+                .Execute()
+                .Should()
+                .Pass();
+        }
     }
 }