Merge pull request #568 from Microsoft/develop

Merge to master for 2.4.0-beta5 with updated DiagnosticSource.
microsoft · Jun 14, 2017 · 7844752 · 7844752
2 parents 4dca736 + 26d49e7
commit 7844752
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 This changelog will be used to generate documentation on [release notes page](http://azure.microsoft.com/en-us/documentation/articles/app-insights-release-notes-dotnet/).
 
+## Version 2.4.0-beta5
+- Updated version of DiagnosticSource referenced.
+
 ## Version 2.4.0-beta4
 - Made Metric class private and fixed various metrics related issues.
 

diff --git a/GlobalStaticVersion.props b/GlobalStaticVersion.props
@@ -8,7 +8,7 @@
     <SemanticVersionMajor>2</SemanticVersionMajor>
     <SemanticVersionMinor>4</SemanticVersionMinor>
     <SemanticVersionPatch>0</SemanticVersionPatch>
-    <PreReleaseMilestone>beta4</PreReleaseMilestone>
+    <PreReleaseMilestone>beta5</PreReleaseMilestone>
     <!-- 
       Date when Semantic Version was changed. 
       Update for every public release.

diff --git a/Test/CoreSDK.Test/Net45/Core.Net45.Tests.csproj b/Test/CoreSDK.Test/Net45/Core.Net45.Tests.csproj
@@ -31,7 +31,7 @@
     <Reference Include="System" />
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.4.0-beta-25124-07\lib\net45\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.4.0-preview2-25405-01\lib\net45\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Net" />

diff --git a/Test/CoreSDK.Test/Net45/packages.config b/Test/CoreSDK.Test/Net45/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="OpenCover" version="4.6.519" targetFramework="net45" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.4.0-beta-25124-07" targetFramework="net45" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.4.0-preview2-25405-01" targetFramework="net45" />
   <package id="xunit.assert" version="2.0.0-beta-build2650" targetFramework="net45" />
 </packages>
diff --git a/Test/CoreSDK.Test/Net46/Core.Net46.Tests.csproj b/Test/CoreSDK.Test/Net46/Core.Net46.Tests.csproj
@@ -31,7 +31,7 @@
     <Reference Include="System" />
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.4.0-beta-25124-07\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.4.0-preview2-25405-01\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Net" />

diff --git a/Test/CoreSDK.Test/Net46/packages.config b/Test/CoreSDK.Test/Net46/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.4.0-beta-25124-07" targetFramework="net46" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.4.0-preview2-25405-01" targetFramework="net46" />
   <package id="xunit.assert" version="2.0.0-beta-build2650" targetFramework="net46" />
 </packages>
diff --git a/Test/CoreSDK.Test/Standalone/Core.Standalone.Tests.csproj b/Test/CoreSDK.Test/Standalone/Core.Standalone.Tests.csproj
@@ -48,7 +48,7 @@
       <HintPath>..\..\..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.4.0-beta-25124-07\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.4.0-preview2-25405-01\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.FileVersionInfo, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll</HintPath>

diff --git a/Test/CoreSDK.Test/Standalone/packages.config b/Test/CoreSDK.Test/Standalone/packages.config
@@ -10,7 +10,7 @@
   <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net46" />
   <package id="System.Console" version="4.3.0" targetFramework="net46" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net46" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.4.0-beta-25124-07" targetFramework="net46" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.4.0-preview2-25405-01" targetFramework="net46" />
   <package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net46" />
   <package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="net46" />
   <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net46" />

diff --git a/src/Core/NuGet/Package.nuspec b/src/Core/NuGet/Package.nuspec
@@ -23,18 +23,18 @@
         <dependency id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28"/>
       </group>
       <group targetFramework="net45">
-        <dependency id="System.Diagnostics.DiagnosticSource" version="4.4.0-beta-25130-03" />
+        <dependency id="System.Diagnostics.DiagnosticSource" version="4.4.0-preview2-25405-01" />
       </group>
       <group targetFramework="net46">
-        <dependency id="System.Diagnostics.DiagnosticSource" version="4.4.0-beta-25130-03" />
+        <dependency id="System.Diagnostics.DiagnosticSource" version="4.4.0-preview2-25405-01" />
       </group>
       <group targetFramework="wp8">
         <dependency id="Microsoft.Bcl.Async" version="1.0.168" />
       </group>
       <group targetFramework="netstandard1.3">
         <dependency id="NETStandard.Library" version="1.6.1" />
         <dependency id="System.Diagnostics.StackTrace" version="4.3.0" />
-        <dependency id="System.Diagnostics.DiagnosticSource" version="4.4.0-beta-25130-03" />
+        <dependency id="System.Diagnostics.DiagnosticSource" version="4.4.0-preview2-25405-01" />
       </group>
     </dependencies>
   </metadata>