bump version 2.8.0-beta3 (#974)

* bump version 2.8.0-beta3 * re-enable DiagnosticSource tests
microsoft · Sep 11, 2019 · 1672611 · 1672611
1 parent 64639fa
commit 1672611
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - [Non Product - Asp.Net Core 3.0 Functional Tests Added. This leverages the built-in integration test capability of ASP.NET Core via Microsoft.AspNetCore.MVC.Testing](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/539)
 - [Fix: System.NullReferenceException in WebSessionTelemetryInitializer.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/903)
 - Updated Base SDK version dependency to 2.11.0-beta2
+- Updated System.Diagnostics.DiagnosticSource to 4.6.0-preview8.
 
 ## Version 2.8.0-beta2
 - [Fix MVCBeforeAction property fetcher to work with .NET Core 3.0 changes.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/936)

diff --git a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj
@@ -74,13 +74,13 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.11.0-beta2" />
-    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.11.0-beta1" />
-    <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.11.0-beta1" />
-    <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.11.0-beta1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.11.0-beta2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.11.0-beta2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.11.0-beta2" />
     <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.11.0-beta2" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.0.2" />           
     <PackageReference Include="System.Text.Encodings.Web" Version="4.3.1" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview7.19362.9" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview8.19405.3" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">

diff --git a/test/EmptyApp.FunctionalTests/FunctionalTest/RequestTelemetryEmptyAppTests.cs b/test/EmptyApp.FunctionalTests/FunctionalTest/RequestTelemetryEmptyAppTests.cs
@@ -48,7 +48,6 @@ public void TestBasicRequestPropertiesAfterRequestingNotExistingPage()
             }
         }
 
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
         public void TestMixedTelemetryItemsReceived()
         {
             InProcessServer server;

diff --git a/test/EmptyApp.FunctionalTests/FunctionalTest/TelemetryModuleWorkingEmptyAppTests.cs b/test/EmptyApp.FunctionalTests/FunctionalTest/TelemetryModuleWorkingEmptyAppTests.cs
@@ -12,7 +12,6 @@ public TelemetryModuleWorkingEmptyAppTests(ITestOutputHelper output) : base(outp
         }
         // The NET451 conditional check is wrapped inside the test to make the tests visible in the test explorer. We can move them to the class level once if the issue is resolved.
 
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
         public void TestBasicDependencyPropertiesAfterRequestingBasicPage()
         {
             this.ValidateBasicDependency(assemblyName, "/");

diff --git a/test/EmptyApp20.FunctionalTests/FunctionalTest/RequestTelemetryEmptyAppTests.cs b/test/EmptyApp20.FunctionalTests/FunctionalTest/RequestTelemetryEmptyAppTests.cs
@@ -63,7 +63,6 @@ public void TestBasicRequestPropertiesAfterRequestingNotExistingPage()
             }
         }
 
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
         public void TestMixedTelemetryItemsReceived()
         {
             using (var server = new InProcessServer(assemblyName, this.output))

diff --git a/test/EmptyApp20.FunctionalTests/FunctionalTest/TelemetryModuleWorkingEmptyAppTests.cs b/test/EmptyApp20.FunctionalTests/FunctionalTest/TelemetryModuleWorkingEmptyAppTests.cs
@@ -14,7 +14,6 @@ public TelemetryModuleWorkingEmptyAppTests(ITestOutputHelper output) : base (out
 
         // The NET451 conditional check is wrapped inside the test to make the tests visible in the test explorer. We can move them to the class level once if the issue is resolved.
 
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
         public void TestBasicDependencyPropertiesAfterRequestingBasicPage()
         {
             const string RequestPath = "/";

diff --git a/test/MVCFramework.FunctionalTests/FunctionalTest/RequestTelemetryMvcTests.cs b/test/MVCFramework.FunctionalTests/FunctionalTest/RequestTelemetryMvcTests.cs
@@ -68,7 +68,6 @@ public void TestBasicRequestPropertiesAfterRequestingNotExistingController()
             }
         }
 
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
         public void TestMixedTelemetryItemsReceived()
         {
             InProcessServer server;

diff --git a/test/MVCFramework.FunctionalTests/FunctionalTest/TelemetryModuleWorkingMvcTests.cs b/test/MVCFramework.FunctionalTests/FunctionalTest/TelemetryModuleWorkingMvcTests.cs
@@ -14,7 +14,6 @@ public TelemetryModuleWorkingMvcTests(ITestOutputHelper output) : base(output)
 
         // The NET451 conditional check is wrapped inside the test to make the tests visible in the test explorer. We can move them to the class level once if the issue is resolved.
 
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
         public void TestBasicDependencyPropertiesAfterRequestingBasicPage()
         {
             this.ValidateBasicDependency(assemblyName, "/Home/About/5", InProcessServer.UseApplicationInsights);

diff --git a/test/MVCFramework20.FunctionalTests/FunctionalTest/RequestTelemetryMvcTests.cs b/test/MVCFramework20.FunctionalTests/FunctionalTest/RequestTelemetryMvcTests.cs
@@ -87,7 +87,6 @@ public void TestBasicRequestPropertiesAfterRequestingNotExistingController()
             }
         }
 
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
         public void TestMixedTelemetryItemsReceived()
         {
             using (var server = new InProcessServer(assemblyName, this.output))

diff --git a/test/MVCFramework20.FunctionalTests/FunctionalTest/TelemetryModuleWorkingMvcTests.cs b/test/MVCFramework20.FunctionalTests/FunctionalTest/TelemetryModuleWorkingMvcTests.cs
@@ -15,7 +15,6 @@ public TelemetryModuleWorkingMvcTests(ITestOutputHelper output) : base(output)
 
         // The NET451 conditional check is wrapped inside the test to make the tests visible in the test explorer. We can move them to the class level once if the issue is resolved.
 
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
         public void TestBasicDependencyPropertiesAfterRequestingBasicPage()
         {
             const string RequestPath = "/Home/About/5";

diff --git a/test/WebApi.FunctionalTests/FunctionalTest/TelemetryModuleWorkingWebApiTests.cs b/test/WebApi.FunctionalTests/FunctionalTest/TelemetryModuleWorkingWebApiTests.cs
@@ -15,7 +15,6 @@ public TelemetryModuleWorkingWebApiTests(ITestOutputHelper output) : base (outpu
         }
         // The NET451 conditional check is wrapped inside the test to make the tests visible in the test explorer. We can move them to the class level once if the issue is resolved.
 
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
 
         public void TestBasicDependencyPropertiesAfterRequestingBasicPage()
         {

diff --git a/test/WebApi20.FunctionalTests/FunctionalTest/MultipleWebHostsTests.cs b/test/WebApi20.FunctionalTests/FunctionalTest/MultipleWebHostsTests.cs
@@ -19,7 +19,6 @@ public MultipleWebHostsTests(ITestOutputHelper output) : base(output)
         {
         }
 
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
         public void TwoWebHostsCreatedSequentially()
         {
             using (var server1 = new InProcessServer(assemblyName, this.output))
@@ -51,7 +50,6 @@ public void TwoWebHostsCreatedSequentially()
             }
         }
 
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
         public void TwoWebHostsCreatedInParallel()
         {
             using (var server1 = new InProcessServer(assemblyName, this.output))

diff --git a/test/WebApi20.FunctionalTests/FunctionalTest/RequestDependencyCorrelationTests.cs b/test/WebApi20.FunctionalTests/FunctionalTest/RequestDependencyCorrelationTests.cs
@@ -21,7 +21,6 @@ public RequestDependencyCorrelationTests(ITestOutputHelper output) : base (outpu
 
         // The NET451 conditional check is wrapped inside the test to make the tests visible in the test explorer. We can move them to the class level once if the issue is resolved.
 
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
         public void TestBasicDependencyPropertiesAfterRequestingBasicPage()
         {
             const string RequestPath = "/api/values";
@@ -39,7 +38,6 @@ public void TestBasicDependencyPropertiesAfterRequestingBasicPage()
         }
 
         // We may need to add more tests to cover Request + Dependency Tracking
-        [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
         public void TestDependencyAndRequestWithW3CStandard()
         {
             const string RequestPath = "/api/values";
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            [Fact(Skip = "Re-Enable once DependencyTrackingModule is updated to latest DiagnosticSource.")]
             public void TestMixedTelemetryItemsReceived()
             {
                 InProcessServer server;
@@ Expand Down @@