From b3be19b8209db7e20a3f6c504a41b46df82309c6 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Fri, 6 Jul 2018 17:56:42 -0700
Subject: [PATCH] Fix up runtimeconfig.json files for tools (dotnet, MSBuild,
 VSTest, etc) to target .NET Core 3.0

---
 src/redist/redist.csproj | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 92ee7d8f6..ee0e506b6 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -25,7 +25,7 @@
                             PublishDotnetTools;
                             PublishVersionFile;
                             PublishAppHostTemplate;
-                            RetargetVSTestConsole;
+                            RetargetTools;
                             GenerateMSBuildExtensions"
           AfterTargets="Publish" />
 
@@ -258,15 +258,17 @@
           DependsOnTargets="GetNuGetPackagesArchive">
   </Target>
 
-  <Target Name="RetargetVSTestConsole">
+  <Target Name="RetargetTools">
     <PropertyGroup>
-      <VSTestRuntimeConfigPath>$(PublishDir)/vstest.console.runtimeconfig.json</VSTestRuntimeConfigPath>
       <ReplacementPattern>"version": ".*"</ReplacementPattern>
       <ReplacementString>"version": "$(MicrosoftNETCoreAppPackageVersion)"</ReplacementString>
     </PropertyGroup>
+    <ItemGroup>
+      <ToolRuntimeConfigPath Include="$(PublishDir)/**/*.runtimeconfig.json" />
+    </ItemGroup>
     <ReplaceFileContents
-      InputFiles="$(VSTestRuntimeConfigPath)"
-      DestinationFiles="$(VSTestRuntimeConfigPath)"
+      InputFiles="@(ToolRuntimeConfigPath)"
+      DestinationFiles="@(ToolRuntimeConfigPath)"
       ReplacementPatterns="$(ReplacementPattern)"
       ReplacementStrings="$(ReplacementString)" />
   </Target>