From: Adam Sitnik <adam.sitnik@gmail.com>
Date: Wed, 11 Mar 2020 09:25:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master' into chromiumFormat
X-Git-Tag: submit/tizen_5.5/20200504.045052~11^2^2~68^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b21791f7f27fef42179d51a82364452a2bd70ca;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git

Merge remote-tracking branch 'upstream/master' into chromiumFormat

# Conflicts:
#	eng/Versions.props
---

3b21791f7f27fef42179d51a82364452a2bd70ca
diff --cc eng/Versions.props
index d1bf29335,e7f330892..2fb361b4a
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@@ -31,10 -33,13 +33,13 @@@
      <SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
      <MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
      <!-- Other libs -->
-     <MicrosoftSymbolStoreVersion>1.0.55801</MicrosoftSymbolStoreVersion>
      <MicrosoftDiagnosticsRuntimeVersion>1.1.61812</MicrosoftDiagnosticsRuntimeVersion>
      <MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
 -    <MicrosoftDiagnosticsTracingTraceEventVersion>2.0.44</MicrosoftDiagnosticsTracingTraceEventVersion>
 +    <MicrosoftDiagnosticsTracingTraceEventVersion>2.0.50</MicrosoftDiagnosticsTracingTraceEventVersion>
+     <MicrosoftExtensionsConfigurationJsonVersion>3.1.2</MicrosoftExtensionsConfigurationJsonVersion>
+     <MicrosoftExtensionsConfigurationKeyPerFileVersion>3.1.2</MicrosoftExtensionsConfigurationKeyPerFileVersion>
+     <MicrosoftExtensionsLoggingVersion>3.1.2</MicrosoftExtensionsLoggingVersion>
+     <MicrosoftExtensionsLoggingConsoleVersion>3.1.2</MicrosoftExtensionsLoggingConsoleVersion>
      <SystemCommandLineExperimentalVersion>0.3.0-alpha.19602.1</SystemCommandLineExperimentalVersion>
      <SystemCommandLineRenderingVersion>0.3.0-alpha.19602.1</SystemCommandLineRenderingVersion>
      <SystemMemoryVersion>4.5.3</SystemMemoryVersion>