From a504ee0ff42c171226ef85670b8c38b064d17874 Mon Sep 17 00:00:00 2001
From: Juan Hoyos <juan.hoyos@microsoft.com>
Date: Tue, 30 Apr 2019 13:29:49 -0700
Subject: [PATCH] Add runtime config template for major rollforward

---
 .../Microsoft.Diagnostics.Tools.RuntimeClient.csproj  | 11 -----------
 src/Tools/dotnet-analyze/runtimeconfig.template.json  |  3 +++
 src/Tools/dotnet-counters/runtimeconfig.template.json |  3 +++
 src/Tools/dotnet-dump/runtimeconfig.template.json     |  3 +++
 src/Tools/dotnet-sos/runtimeconfig.template.json      |  3 +++
 src/Tools/dotnet-trace/dotnet-trace.csproj            |  2 +-
 src/Tools/dotnet-trace/runtimeconfig.template.json    |  3 +++
 7 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 src/Tools/dotnet-analyze/runtimeconfig.template.json
 create mode 100644 src/Tools/dotnet-counters/runtimeconfig.template.json
 create mode 100644 src/Tools/dotnet-dump/runtimeconfig.template.json
 create mode 100644 src/Tools/dotnet-sos/runtimeconfig.template.json
 create mode 100644 src/Tools/dotnet-trace/runtimeconfig.template.json

diff --git a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Microsoft.Diagnostics.Tools.RuntimeClient.csproj b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Microsoft.Diagnostics.Tools.RuntimeClient.csproj
index 4bef423b9..8cb7efc5b 100644
--- a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Microsoft.Diagnostics.Tools.RuntimeClient.csproj
+++ b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Microsoft.Diagnostics.Tools.RuntimeClient.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <Import Project="$(MSBuildThisFileDirectory)\..\Common.props" />
-
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -13,13 +11,4 @@
     <PackageTags>Diagnostic</PackageTags>
     <PackageReleaseNotes>$(Description)</PackageReleaseNotes>
   </PropertyGroup>
-
-  <PropertyGroup>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingLibraryVersion)" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Tools/dotnet-analyze/runtimeconfig.template.json b/src/Tools/dotnet-analyze/runtimeconfig.template.json
new file mode 100644
index 000000000..f022b7ffc
--- /dev/null
+++ b/src/Tools/dotnet-analyze/runtimeconfig.template.json
@@ -0,0 +1,3 @@
+{
+  "rollForwardOnNoCandidateFx": 2
+}
\ No newline at end of file
diff --git a/src/Tools/dotnet-counters/runtimeconfig.template.json b/src/Tools/dotnet-counters/runtimeconfig.template.json
new file mode 100644
index 000000000..f022b7ffc
--- /dev/null
+++ b/src/Tools/dotnet-counters/runtimeconfig.template.json
@@ -0,0 +1,3 @@
+{
+  "rollForwardOnNoCandidateFx": 2
+}
\ No newline at end of file
diff --git a/src/Tools/dotnet-dump/runtimeconfig.template.json b/src/Tools/dotnet-dump/runtimeconfig.template.json
new file mode 100644
index 000000000..f022b7ffc
--- /dev/null
+++ b/src/Tools/dotnet-dump/runtimeconfig.template.json
@@ -0,0 +1,3 @@
+{
+  "rollForwardOnNoCandidateFx": 2
+}
\ No newline at end of file
diff --git a/src/Tools/dotnet-sos/runtimeconfig.template.json b/src/Tools/dotnet-sos/runtimeconfig.template.json
new file mode 100644
index 000000000..f022b7ffc
--- /dev/null
+++ b/src/Tools/dotnet-sos/runtimeconfig.template.json
@@ -0,0 +1,3 @@
+{
+  "rollForwardOnNoCandidateFx": 2
+}
\ No newline at end of file
diff --git a/src/Tools/dotnet-trace/dotnet-trace.csproj b/src/Tools/dotnet-trace/dotnet-trace.csproj
index a8fa5598f..09230a303 100644
--- a/src/Tools/dotnet-trace/dotnet-trace.csproj
+++ b/src/Tools/dotnet-trace/dotnet-trace.csproj
@@ -17,13 +17,13 @@
 
     <IsPackable>True</IsPackable>
     <PackAsTool>True</PackAsTool>
-    <RuntimeFrameworkVersion>2.1.0</RuntimeFrameworkVersion>
     <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="System.CommandLine.Experimental" Version="$(SystemCommandLineExperimentalVersion)" />
     <PackageReference Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />
+    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.41" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Tools/dotnet-trace/runtimeconfig.template.json b/src/Tools/dotnet-trace/runtimeconfig.template.json
new file mode 100644
index 000000000..f022b7ffc
--- /dev/null
+++ b/src/Tools/dotnet-trace/runtimeconfig.template.json
@@ -0,0 +1,3 @@
+{
+  "rollForwardOnNoCandidateFx": 2
+}
\ No newline at end of file
-- 
2.34.1