Merge pull request #3441 from peterhuene/fix-gen-tasks-on-cache-invalidation

Fix regeneration of files when asset cache changes.

Author: Peter Huene

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

@@ -46,6 +46,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <ItemGroup>
     <GenerateRuntimeConfigurationFilesInputs Include="$(ProjectAssetsFile)" />
+    <GenerateRuntimeConfigurationFilesInputs Include="$(ProjectAssetsCacheFile)" />
     <GenerateRuntimeConfigurationFilesInputs Include="$(UserRuntimeConfig)" Condition=" Exists($(UserRuntimeConfig)) " />
   </ItemGroup>
 
@@ -153,7 +154,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                             _ComputePackageReferencePublish"
           BeforeTargets="CopyFilesToOutputDirectory"
           Condition="'$(GenerateDependencyFile)' == 'true'"
-          Inputs="$(ProjectAssetsFile);$(MSBuildAllProjects)"
+          Inputs="$(ProjectAssetsFile);$(ProjectAssetsCacheFile);$(MSBuildAllProjects)"
           Outputs="$(ProjectDepsFilePath)">
 
     <ItemGroup>

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs

@@ -720,5 +720,50 @@ public void It_builds_with_unicode_characters_in_path()
                 .Should()
                 .Pass();
         }
+
+        [Fact]
+        public void It_regenerates_files_if_self_contained_changes()
+        {
+            const string TFM = "netcoreapp3.0";
+
+            var runtimeIdentifier = EnvironmentInfo.GetCompatibleRid(TFM);
+
+            var testProject = new TestProject()
+            {
+                Name = "GenerateFilesTest",
+                TargetFrameworks = TFM,
+                RuntimeIdentifier = runtimeIdentifier,
+                IsSdkProject = true,
+                IsExe = true
+            };
+
+            var testAsset = _testAssetsManager
+                .CreateTestProject(testProject)
+                .Restore(Log, testProject.Name);
+
+            var buildCommand = new BuildCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
+
+            buildCommand
+                .Execute()
+                .Should()
+                .Pass();
+
+            var outputPath = buildCommand.GetOutputDirectory(targetFramework: TFM, runtimeIdentifier: runtimeIdentifier).FullName;
+            var depsFilePath = Path.Combine(outputPath, $"{testProject.Name}.deps.json");
+            var runtimeConfigPath = Path.Combine(outputPath, $"{testProject.Name}.runtimeconfig.json");
+
+            var depsFileLastWriteTime = File.GetLastWriteTimeUtc(depsFilePath);
+            var runtimeConfigLastWriteTime = File.GetLastWriteTimeUtc(runtimeConfigPath);
+
+            WaitForUtcNowToAdvance();
+
+            buildCommand
+                .Execute("/p:SelfContained=false")
+                .Should()
+                .Pass();
+
+            depsFileLastWriteTime.Should().NotBe(File.GetLastWriteTimeUtc(depsFilePath));
+            runtimeConfigLastWriteTime.Should().NotBe(File.GetLastWriteTimeUtc(runtimeConfigPath));
+        }
     }
 }