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

Commit 08c8db5

Browse files
TimothyMothraTimothyMothra
authored
Merge pull request #984 from microsoft/develop
merge develop to master (prep 2.11)
2 parents 04baac8 + 8d9c7d0 commit 08c8db5

8 files changed

+76
-51
lines changed

‎ApplicationInsights.AspNetCore.sln

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
Common.targets = Common.targets
1414
dirs.proj = dirs.proj
1515
NuGet.config = NuGet.config
16+
Nupkg.props = Nupkg.props
1617
Readme.md = Readme.md
1718
RunTestsCore.ps1 = RunTestsCore.ps1
1819
SetEnv.targets = SetEnv.targets

‎CHANGELOG.md

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

3+
## Version 2.8.0
4+
- Updated Bask SDK/Web SDK/Logging Adaptor SDK to 2.11.0
5+
- Updated System.Diagnostics.DiagnosticSource to 4.6.0
6+
7+
38
## Version 2.8.0-beta3
49
- [Make W3C Correlation default and leverage native W3C support from Activity.](https://github.com/microsoft/ApplicationInsights-aspnetcore/pull/958)
510
- [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)

‎NuGet.config

+1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
<clear />
55
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
66
<add key="applicationinsights" value="https://www.myget.org/F/applicationinsights/api/v3/index.json" />
7+
<add key="Net Core Feed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/3.0.100-rc2-014277/nuget/v3/index.json" />
78
</packageSources>
89
</configuration>

‎Nupkg.props

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition="$(OS) == 'Windows_NT'">
4+
<!-- Including this file will generate both the *.nupkg and *.symbols.nupkg -->
5+
<!--https://docs.microsoft.com/en-us/nuget/create-packages/symbol-packages-snupkg-->
6+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
7+
<IncludeSymbols>True</IncludeSymbols>
8+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
9+
</PropertyGroup>
10+
11+
<PropertyGroup>
12+
<!-- These are the common properties used when generating the nupkg -->
13+
<!-- https://docs.microsoft.com/en-us/nuget/schema/msbuild-targets -->
14+
<Company>Microsoft</Company>
15+
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
16+
<!-- <PackageVersion>Defined in GlobalStaticVersion.props</PackageVersion> -->
17+
<Authors>Microsoft</Authors>
18+
<Owners>Microsoft,AppInsightsSdk</Owners>
19+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
20+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
21+
<PackageProjectUrl>https://go.microsoft.com/fwlink/?LinkId=392727</PackageProjectUrl>
22+
<PackageIconUrl>https://appanacdn.blob.core.windows.net/cdn/icons/aic.png</PackageIconUrl>
23+
<RepositoryUrl>https://github.com/Microsoft/applicationinsights-aspnetcore</RepositoryUrl>
24+
<RepositoryType>Git</RepositoryType>
25+
<PackageType>Dependency</PackageType>
26+
<ContentTargetFolders>content</ContentTargetFolders>
27+
<PackageReleaseNotes>For the release notes please follow http://go.microsoft.com/fwlink/?LinkId=535037</PackageReleaseNotes>
28+
<!-- <PackageOutputPath>Defined in Directory.Build.props</PackageOutputPath> -->
29+
<PackageTags>Azure;Monitoring;Analytics;ApplicationInsights;Telemetry;AppInsights;</PackageTags>
30+
</PropertyGroup>
31+
32+
<PropertyGroup>
33+
<!-- These Properties are unique to the project and must be set in the csproj -->
34+
<PackageId>UNDEFINED</PackageId>
35+
<Title>UNDEFINED</Title>
36+
<Description>UNDEFINED</Description>
37+
<!-- <PackageTags>$(PackageTags) newTag1 newTag2</PackageTags> -->
38+
</PropertyGroup>
39+
40+
</Project>

‎Readme.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
- [Microsoft.ApplicationInsights.AspNetCore](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore/)
44
[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.AspNetCore.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore)
5+
- [Microsoft.ApplicationInsights.WorkerService](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WorkerService/)
6+
[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.WorkerService.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.WorkerService)
7+
8+
59

610
Windows: [![Build Status](https://mseng.visualstudio.com/AppInsights/_apis/build/status/ChuckNorris/AI_ASPNETCore_Develop?branchName=develop)](https://mseng.visualstudio.com/AppInsights/_build/latest?definitionId=3717&branchName=develop)
711

‎src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj

+12-25
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\..\Nupkg.props" />
3+
24
<PropertyGroup>
35
<AssemblyName>Microsoft.ApplicationInsights.AspNetCore</AssemblyName>
4-
<VersionPrefix>2.8.0-beta3</VersionPrefix>
6+
<VersionPrefix>2.8.0</VersionPrefix>
57
<LangVersion>7.2</LangVersion>
68
<TargetFrameworks>netstandard2.0;net451;net46;netstandard1.6</TargetFrameworks>
79
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.6;netstandard2.0</TargetFrameworks>
@@ -18,24 +20,9 @@
1820
<AssemblyTitle>Application Insights for ASP.NET Core Web Applications</AssemblyTitle>
1921
<Title>Application Insights for ASP.NET Core Web Applications</Title>
2022
<Description>Application Insights for ASP.NET Core web applications. See https://azure.microsoft.com/documentation/articles/app-insights-asp-net-five/ for more information. Privacy statement: https://go.microsoft.com/fwlink/?LinkId=512156</Description>
23+
<PackageTags>$(PackageTags)aspnetcore;</PackageTags>
2124
</PropertyGroup>
2225

23-
<PropertyGroup>
24-
<!--Normalized Nupkg properties. I will remove this PropertyGroup in a follow up PR.-->
25-
<Authors>Microsoft</Authors>
26-
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
27-
<RepositoryType>git</RepositoryType>
28-
<RepositoryUrl>https://github.com/Microsoft/ApplicationInsights-aspnetcore.git</RepositoryUrl>
29-
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
30-
<IncludeSymbols>True</IncludeSymbols>
31-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
32-
<PackageTags>Azure;Monitoring;Analytics;ApplicationInsights;Telemetry;AppInsights;aspnetcore;</PackageTags>
33-
<PackageIconUrl>https://appanacdn.blob.core.windows.net/cdn/icons/aic.png</PackageIconUrl>
34-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
35-
<PackageProjectUrl>https://go.microsoft.com/fwlink/?LinkId=392727</PackageProjectUrl>
36-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
37-
</PropertyGroup>
38-
3926
<PropertyGroup>
4027
<!--Package Settings-->
4128
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -77,14 +64,14 @@
7764

7865

7966
<ItemGroup>
80-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.11.0-beta2" />
81-
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.11.0-beta2" />
82-
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.11.0-beta2" />
83-
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.11.0-beta2" />
84-
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.11.0-beta2" />
67+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.11.0" />
68+
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.11.0" />
69+
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.11.0" />
70+
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.11.0" />
71+
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.11.0" />
8572
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.0.2" />
8673
<PackageReference Include="System.Text.Encodings.Web" Version="4.3.1" />
87-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview8.19405.3" />
74+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.6.0" />
8875
</ItemGroup>
8976

9077
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
@@ -94,8 +81,8 @@
9481

9582
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
9683
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
97-
<PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.11.0-beta2" />
98-
<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.11.0-beta2" />
84+
<PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.11.0" />
85+
<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.11.0" />
9986
<PackageReference Include="System.Text.Encodings.Web" Version="4.3.1" />
10087
</ItemGroup>
10188

‎src/Microsoft.ApplicationInsights.AspNetCore/RequestTrackingTelemetryModule.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ namespace Microsoft.ApplicationInsights.AspNetCore
1010
using Microsoft.ApplicationInsights.AspNetCore.Extensions;
1111
using Microsoft.ApplicationInsights.AspNetCore.Implementation;
1212
using Microsoft.ApplicationInsights.Extensibility;
13+
using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing;
1314
using Microsoft.AspNetCore.Hosting;
1415

1516
/// <summary>
@@ -112,7 +113,7 @@ public void Initialize(TelemetryConfiguration configuration)
112113
}
113114
catch (Exception e)
114115
{
115-
AspNetCoreEventSource.Instance.RequestTrackingModuleInitializationFailed(e.Message);
116+
AspNetCoreEventSource.Instance.RequestTrackingModuleInitializationFailed(e.ToInvariantString());
116117
}
117118
}
118119

‎src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj

+11-25
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\..\Nupkg.props" />
23

34
<PropertyGroup>
45
<AssemblyName>Microsoft.ApplicationInsights.WorkerService</AssemblyName>
5-
<VersionPrefix>2.8.0-beta3</VersionPrefix>
6+
<VersionPrefix>2.8.0</VersionPrefix>
67
<LangVersion>7.2</LangVersion>
78
<TargetFrameworks>netstandard2.0</TargetFrameworks>
9+
810
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\src\$(MSBuildProjectName)</OutputPath>
911
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)'=='' ">..\..\artifacts\obj\src\$(MSBuildProjectName)</IntermediateOutputPath>
1012
<DefineConstants>$(DefineConstants);AI_ASPNETCORE_WORKER;</DefineConstants>
1113
</PropertyGroup>
1214

13-
1415
<PropertyGroup>
1516
<!--Nupkg properties-->
1617
<PackageId>Microsoft.ApplicationInsights.WorkerService</PackageId>
1718
<AssemblyTitle>Application Insights for .NET Core Worker Service Applications</AssemblyTitle>
1819
<Title>Application Insights for .NET Core Worker Service Applications</Title>
1920
<Description>Application Insights for .NET Core Worker Service (messaging, background tasks, and any non-HTTP workloads) applications. See https://azure.microsoft.com/documentation/articles/app-insights-asp-net-five/ for more information. Privacy statement: https://go.microsoft.com/fwlink/?LinkId=512156</Description>
20-
</PropertyGroup>
21-
22-
<PropertyGroup>
23-
<!--Normalized Nupkg properties. I will remove this PropertyGroup in a follow up PR.-->
24-
<Authors>Microsoft</Authors>
25-
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
26-
<RepositoryType>git</RepositoryType>
27-
<RepositoryUrl>https://github.com/Microsoft/ApplicationInsights-aspnetcore.git</RepositoryUrl>
28-
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
29-
<IncludeSymbols>True</IncludeSymbols>
30-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
31-
<PackageTags>Azure;Monitoring;Analytics;ApplicationInsights;Telemetry;AppInsights;aspnetcore;worker;console;backgroundtasks</PackageTags>
32-
<PackageIconUrl>https://appanacdn.blob.core.windows.net/cdn/icons/aic.png</PackageIconUrl>
33-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
34-
<PackageProjectUrl>https://go.microsoft.com/fwlink/?LinkId=392727</PackageProjectUrl>
35-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
21+
<PackageTags>$(PackageTags)worker;console;backgroundtasks;</PackageTags>
3622
</PropertyGroup>
3723

3824
<PropertyGroup>
@@ -75,13 +61,13 @@
7561
<Import Project="..\Shared\Shared.projitems" Label="Shared" />
7662

7763
<ItemGroup>
78-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.11.0-beta2" />
79-
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.11.0-beta2" />
80-
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.11.0-beta2" />
81-
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.11.0-beta2" />
82-
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.11.0-beta2" />
83-
<PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.11.0-beta2" />
84-
<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.11.0-beta2" />
64+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.11.0" />
65+
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.11.0" />
66+
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.11.0" />
67+
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.11.0" />
68+
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.11.0" />
69+
<PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.11.0" />
70+
<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.11.0" />
8571

8672
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
8773
</ItemGroup>

0 commit comments

Comments
 (0)