Skip to content
This repository was archived by the owner on Jun 10, 2020. It is now read-only.

Commit 04baac8

Browse files
TimothyMothraTimothyMothra
authored
Merge pull request #978 from microsoft/develop
merge develop to master (prep 2.8-beta3)
2 parents f05e614 + e1d1a7a commit 04baac8

File tree

96 files changed

+4642
-1794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+4642
-1794
lines changed

‎.vsts/linux-build.yml

+27-16
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ pool:
22
vmImage: 'ubuntu-16.04'
33
steps:
44

5-
- task: DotNetCoreInstaller@0
6-
displayName: install dotnet core 2.1.500
5+
- task: DotNetCoreInstaller@2
6+
displayName: install dotnet core 3.0.100-preview8-013656
77
inputs:
8-
version: "2.1.500"
8+
version: "3.0.100-preview8-013656"
99

1010
- task: DotNetCoreCLI@1
1111
displayName: Restore solutions
@@ -21,37 +21,48 @@ steps:
2121
arguments: "--configuration Release"
2222

2323
- task: DotNetCoreCLI@1
24-
displayName: Test 2.0
24+
displayName: Functional Tests 3.0
25+
continueOnError: true
26+
inputs:
27+
command: "test"
28+
projects: "test/**/TestApp30.Tests30.csproj"
29+
arguments: "--configuration Release -l trx"
30+
31+
- task: DotNetCoreInstaller@2
32+
displayName: install dotnet core 2.2.104
33+
inputs:
34+
version: "2.2.104"
35+
36+
- task: DotNetCoreCLI@1
37+
displayName: Functional Tests 2.0
2538
continueOnError: true
2639
inputs:
2740
command: "test"
2841
projects: "test/**/*Tests20.csproj"
2942
arguments: "--configuration Release -l trx"
3043

31-
- task: DotNetCoreInstaller@0
32-
displayName: install dotnet core 1.1.5
44+
- task: DotNetCoreCLI@1
45+
displayName: Unit Tests for AspNetCore
46+
continueOnError: true
3347
inputs:
34-
version: "1.1.5"
48+
command: "test"
49+
projects: "test/**/*AspNetCore.Tests.csproj"
50+
arguments: "--configuration Release -l trx"
3551

3652
- task: DotNetCoreCLI@1
37-
displayName: Test 1.1.5
53+
displayName: Unit Tests + Func Tests for WorkerService
3854
continueOnError: true
3955
inputs:
4056
command: "test"
41-
projects: "test/**/*Tests.csproj"
42-
arguments: "--configuration Release -l trx --filter Category!=WindowsOnly"
57+
projects: "test/**/*WorkerService.Tests.csproj"
58+
arguments: "--configuration Release -l trx"
4359

4460

4561
- task: PublishTestResults@2
4662
inputs:
4763
testRunner: "VSTest"
4864
testResultsFiles: "**/*.trx"
4965

50-
- task: DotNetCoreInstaller@0
51-
displayName: install dotnet core 2.1.500
52-
inputs:
53-
version: "2.1.500"
54-
5566
- task: DotNetCoreCLI@1
5667
displayName: Package Nuget
5768
inputs:
@@ -63,4 +74,4 @@ steps:
6374
inputs:
6475
PathtoPublish: "$(build.artifactstagingdirectory)"
6576
ArtifactName: "drop"
66-
ArtifactType: "Container"
77+
ArtifactType: "Container"

‎ApplicationInsights.AspNetCore.sln

+39-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27004.2008
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29209.152
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF}"
77
EndProject
@@ -32,23 +32,36 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsigh
3232
EndProject
3333
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTestUtils", "test\FunctionalTestUtils\FunctionalTestUtils.csproj", "{B7217A00-66FA-49A8-8EF3-39C07E1F7E33}"
3434
EndProject
35-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp.FunctionalTests", "test\EmptyApp.FunctionalTests\EmptyApp.FunctionalTests.csproj", "{71CE2DB2-C7AA-4454-B5F2-774BC575E321}"
35+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp.FunctionalTests10", "test\EmptyApp.FunctionalTests\EmptyApp.FunctionalTests10.csproj", "{71CE2DB2-C7AA-4454-B5F2-774BC575E321}"
3636
EndProject
3737
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp20.FunctionalTests20", "test\EmptyApp20.FunctionalTests\EmptyApp20.FunctionalTests20.csproj", "{C47AFD8A-3326-4391-8115-69349C04C3DA}"
3838
EndProject
3939
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTestUtils20", "test\FunctionalTestUtils20\FunctionalTestUtils20.csproj", "{937AF006-898E-43FD-80A6-B20D7E3A1944}"
4040
EndProject
41-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework.FunctionalTests", "test\MVCFramework.FunctionalTests\MVCFramework.FunctionalTests.csproj", "{1D5825CC-2EC9-43A1-BE32-778EFF5EAC80}"
41+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework.FunctionalTests10", "test\MVCFramework.FunctionalTests\MVCFramework.FunctionalTests10.csproj", "{1D5825CC-2EC9-43A1-BE32-778EFF5EAC80}"
4242
EndProject
4343
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework20.FunctionalTests20", "test\MVCFramework20.FunctionalTests\MVCFramework20.FunctionalTests20.csproj", "{51198C41-CD4A-4006-84D4-DE20A0A44363}"
4444
EndProject
45-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi.FunctionalTests", "test\WebApi.FunctionalTests\WebApi.FunctionalTests.csproj", "{325C4ECE-BD4A-4CF2-BC80-FBD1024B5935}"
45+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi.FunctionalTests10", "test\WebApi.FunctionalTests\WebApi.FunctionalTests10.csproj", "{325C4ECE-BD4A-4CF2-BC80-FBD1024B5935}"
4646
EndProject
4747
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi20.FunctionalTests20", "test\WebApi20.FunctionalTests\WebApi20.FunctionalTests20.csproj", "{C3B3F515-0305-4809-A9A8-37FD80428F74}"
4848
EndProject
4949
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsTypes", "test\ApplicationInsightsTypes\ApplicationInsightsTypes.csproj", "{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}"
5050
EndProject
51+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp30", "test\TestApp30\TestApp30.csproj", "{8E71FECF-E090-409E-8551-C597F9DFB91C}"
52+
EndProject
53+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp30.Tests30", "test\TestApp30.Tests\TestApp30.Tests30.csproj", "{FE9DB9A7-D9AE-4188-945C-393D70022D9A}"
54+
EndProject
55+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights.WorkerService", "src\Microsoft.ApplicationInsights.WorkerService\Microsoft.ApplicationInsights.WorkerService.csproj", "{AECEE8DD-09AE-4DEA-8690-F76A37C0534B}"
56+
EndProject
57+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "src\Shared\Shared.shproj", "{D56F2979-D6BC-4EF2-BB9B-4077B3290599}"
58+
EndProject
59+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ApplicationInsights.WorkerService.Tests", "test\Microsoft.ApplicationInsights.WorkerService.Tests\Microsoft.ApplicationInsights.WorkerService.Tests.csproj", "{A41D3299-5E41-4B73-8C8E-DD64824BC9E6}"
60+
EndProject
5161
Global
62+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
63+
src\Shared\Shared.projitems*{d56f2979-d6bc-4ef2-bb9b-4077b3290599}*SharedItemsImports = 13
64+
EndGlobalSection
5265
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5366
Debug|Any CPU = Debug|Any CPU
5467
Release|Any CPU = Release|Any CPU
@@ -98,6 +111,22 @@ Global
98111
{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}.Debug|Any CPU.Build.0 = Debug|Any CPU
99112
{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}.Release|Any CPU.ActiveCfg = Release|Any CPU
100113
{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}.Release|Any CPU.Build.0 = Release|Any CPU
114+
{8E71FECF-E090-409E-8551-C597F9DFB91C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115+
{8E71FECF-E090-409E-8551-C597F9DFB91C}.Debug|Any CPU.Build.0 = Debug|Any CPU
116+
{8E71FECF-E090-409E-8551-C597F9DFB91C}.Release|Any CPU.ActiveCfg = Release|Any CPU
117+
{8E71FECF-E090-409E-8551-C597F9DFB91C}.Release|Any CPU.Build.0 = Release|Any CPU
118+
{FE9DB9A7-D9AE-4188-945C-393D70022D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119+
{FE9DB9A7-D9AE-4188-945C-393D70022D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
120+
{FE9DB9A7-D9AE-4188-945C-393D70022D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
121+
{FE9DB9A7-D9AE-4188-945C-393D70022D9A}.Release|Any CPU.Build.0 = Release|Any CPU
122+
{AECEE8DD-09AE-4DEA-8690-F76A37C0534B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
123+
{AECEE8DD-09AE-4DEA-8690-F76A37C0534B}.Debug|Any CPU.Build.0 = Debug|Any CPU
124+
{AECEE8DD-09AE-4DEA-8690-F76A37C0534B}.Release|Any CPU.ActiveCfg = Release|Any CPU
125+
{AECEE8DD-09AE-4DEA-8690-F76A37C0534B}.Release|Any CPU.Build.0 = Release|Any CPU
126+
{A41D3299-5E41-4B73-8C8E-DD64824BC9E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
127+
{A41D3299-5E41-4B73-8C8E-DD64824BC9E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
128+
{A41D3299-5E41-4B73-8C8E-DD64824BC9E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
129+
{A41D3299-5E41-4B73-8C8E-DD64824BC9E6}.Release|Any CPU.Build.0 = Release|Any CPU
101130
EndGlobalSection
102131
GlobalSection(SolutionProperties) = preSolution
103132
HideSolutionNode = FALSE
@@ -115,6 +144,11 @@ Global
115144
{325C4ECE-BD4A-4CF2-BC80-FBD1024B5935} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
116145
{C3B3F515-0305-4809-A9A8-37FD80428F74} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
117146
{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
147+
{8E71FECF-E090-409E-8551-C597F9DFB91C} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
148+
{FE9DB9A7-D9AE-4188-945C-393D70022D9A} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
149+
{AECEE8DD-09AE-4DEA-8690-F76A37C0534B} = {2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF}
150+
{D56F2979-D6BC-4EF2-BB9B-4077B3290599} = {2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF}
151+
{A41D3299-5E41-4B73-8C8E-DD64824BC9E6} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
118152
EndGlobalSection
119153
GlobalSection(ExtensibilityGlobals) = postSolution
120154
SolutionGuid = {047855A4-470F-43B1-8B74-69651DD6B8A6}

‎CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## Version 2.8.0-beta3
4+
- [Make W3C Correlation default and leverage native W3C support from Activity.](https://github.com/microsoft/ApplicationInsights-aspnetcore/pull/958)
5+
- [Make W3C Correlation default and leverage native W3C support from Activity for Asp.Net Core 3.0.](https://github.com/microsoft/ApplicationInsights-aspnetcore/pull/958)
6+
- [Fix: Azure Functions performance degradation when W3C enabled.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/900)
7+
- [Fix: AppId is never set is Response Headers.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/956)
8+
- [Support correlation-context in absence of request-id or traceparent.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/901)
9+
- [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)
10+
- [Fix: System.NullReferenceException in WebSessionTelemetryInitializer.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/903)
11+
- Updated Base SDK/Web SDK/Logging Adaptor SDK version dependency to 2.11.0-beta2
12+
- Updated System.Diagnostics.DiagnosticSource to 4.6.0-preview8.
13+
14+
- [Add new package for .NET Core WorkerServices (Adds GenericHost support)](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/708)
15+
316
## Version 2.8.0-beta2
417
- [Fix MVCBeforeAction property fetcher to work with .NET Core 3.0 changes.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/936)
518
- [Catch generic exception from DiagnosticSourceListeners and log instead of failing user request.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/957)

‎src/Microsoft.ApplicationInsights.AspNetCore/DiagnosticListeners/Implementation/ContextData.cs

-50
This file was deleted.

‎src/Microsoft.ApplicationInsights.AspNetCore/DiagnosticListeners/Implementation/HeadersUtilities.cs

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public static StringValues SetHeaderKeyValue(string[] currentHeaders, string key
7272
/// Http Headers only allow Printable US-ASCII characters.
7373
/// Remove all other characters.
7474
/// </summary>
75+
/// <returns>sanitized string.</returns>
7576
public static string SanitizeString(string input)
7677
{
7778
if (string.IsNullOrWhiteSpace(input))

0 commit comments

Comments
 (0)