Merge pull request dotnet#494 from dsplaisted/incremental-runtimeconf…

…ig-471 Fix handling of runtimeconfig files in incremental builds
mellinoe · Dec 14, 2016 · d5e4977 · d5e4977
2 parents 8e5f565 + 96a7d73
commit d5e4977
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/TestAssets/TestProjects/AppWithLibrary/TestApp/runtimeconfig.template.json b/TestAssets/TestProjects/AppWithLibrary/TestApp/runtimeconfig.template.json
@@ -0,0 +1,5 @@
+{
+  "configProperties": {
+    "System.GC.Server": true
+  }
+}
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
@@ -124,8 +124,14 @@ Copyright (c) .NET Foundation. All rights reserved.
                                        PlatformLibraryName="$(MicrosoftNETPlatformLibrary)"
                                        UserRuntimeConfig="$(UserRuntimeConfig)">
 
-      <Output TaskParameter="FilesWritten" ItemName="FileWrites" />
     </GenerateRuntimeConfigurationFiles>
+
+    <ItemGroup>
+      <!-- Do this in an ItemGroup instead of as an output parameter of the GenerateDepsFile task so that it still gets added to the item set
+          during incremental builds when the task is skipped -->
+      <FileWrites Include="$(ProjectRuntimeConfigFilePath)" Condition="Exists('$(ProjectRuntimeConfigFilePath)')"/>
+      <FileWrites Include="$(ProjectRuntimeConfigDevFilePath)" Condition="Exists('$(ProjectRuntimeConfigDevFilePath)')"/>
+    </ItemGroup>
 
   </Target>