Merge pull request #237 from dotnet/juhoyosa/rollforward-release

Roll forward on major version
dotnet · May 1, 2019 · b2c67ec · b2c67ec
2 parents 4936a8c + 9035f4d
commit b2c67ec
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/...icrosoft.Diagnostics.Tools.RuntimeClient/Microsoft.Diagnostics.Tools.RuntimeClient.csproj b/...icrosoft.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
@@ -0,0 +1,3 @@
+{
+  "rollForwardOnNoCandidateFx": 2
+}
diff --git a/src/Tools/dotnet-counters/runtimeconfig.template.json b/src/Tools/dotnet-counters/runtimeconfig.template.json
@@ -0,0 +1,3 @@
+{
+  "rollForwardOnNoCandidateFx": 2
+}
diff --git a/src/Tools/dotnet-dump/runtimeconfig.template.json b/src/Tools/dotnet-dump/runtimeconfig.template.json
@@ -0,0 +1,3 @@
+{
+  "rollForwardOnNoCandidateFx": 2
+}
diff --git a/src/Tools/dotnet-sos/runtimeconfig.template.json b/src/Tools/dotnet-sos/runtimeconfig.template.json
@@ -0,0 +1,3 @@
+{
+  "rollForwardOnNoCandidateFx": 2
+}
diff --git 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
@@ -0,0 +1,3 @@
+{
+  "rollForwardOnNoCandidateFx": 2
+}