Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit 31cdea7

Browse files
author
Liudmila Molkova
authored
Merge pull request #289 from microsoft/develop
Develop to master 2.10.0 stable
2 parents c3c7d72 + 0ab0207 commit 31cdea7

32 files changed

+104
-98
lines changed

‎ApplicationInsightsSDKRules.ruleset‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<Rule Id="CA1001" Action="Warning" />
1212
<Rule Id="CA1009" Action="Warning" />
1313
<Rule Id="CA1016" Action="Warning" />
14+
<!-- Suppressing Message "Modify 'method' to catch a more specific exception type, or rethrow the exception" because we already catch Exceptions we care about and either log/ignore others. -->
15+
<Rule Id="CA1031" Action="None" />
1416
<Rule Id="CA1033" Action="Warning" />
1517
<Rule Id="CA1049" Action="Warning" />
1618
<Rule Id="CA1060" Action="Warning" />

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# Changelog
2+
3+
### Version 2.10.0
4+
- Update Base SDK to version 2.10.0
5+
26
### Version 2.10.0-beta4
37
- Update Base SDK to version 2.10.0-beta4
48
- [ILogger - If an exception is passed to log, then Exception.Message is populated as ExceptionTelemetry.Message. If TrackExceptionsAsExceptionTelemetry is false, then Exception.Message is stored as custom property "ExceptionMessage"](https://github.com/Microsoft/ApplicationInsights-dotnet-logging/pull/282)

‎GlobalStaticVersion.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<SemanticVersionMajor>2</SemanticVersionMajor>
99
<SemanticVersionMinor>10</SemanticVersionMinor>
1010
<SemanticVersionPatch>0</SemanticVersionPatch>
11-
<PreReleaseMilestone>beta4</PreReleaseMilestone>
11+
<PreReleaseMilestone></PreReleaseMilestone>
1212
<!--
1313
Date when Semantic Version was changed.
1414
Update for every public release.

‎HelloWorldTest/HelloWorldTest.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.props')" />
3+
<Import Project="..\..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -39,10 +39,10 @@
3939
</PropertyGroup>
4040
<ItemGroup>
4141
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\MSTest.TestFramework.1.3.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
42+
<HintPath>..\..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
4343
</Reference>
4444
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\MSTest.TestFramework.1.3.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
45+
<HintPath>..\..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
4646
</Reference>
4747
<Reference Include="System" />
4848
<Reference Include="System.Core" />
@@ -64,8 +64,8 @@
6464
<PropertyGroup>
6565
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
6666
</PropertyGroup>
67-
<Error Condition="!Exists('..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.props'))" />
68-
<Error Condition="!Exists('..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.targets'))" />
67+
<Error Condition="!Exists('..\..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props'))" />
68+
<Error Condition="!Exists('..\..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets'))" />
6969
</Target>
70-
<Import Project="..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.targets')" />
70+
<Import Project="..\..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets')" />
7171
</Project>

‎HelloWorldTest/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MSTest.TestAdapter" version="1.3.0" targetFramework="net461" />
4-
<package id="MSTest.TestFramework" version="1.3.0" targetFramework="net461" />
3+
<package id="MSTest.TestAdapter" version="1.4.0" targetFramework="net461" />
4+
<package id="MSTest.TestFramework" version="1.4.0" targetFramework="net461" />
55
</packages>

‎src/DiagnosticSourceListener/DiagnosticSourceListener.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838

3939

4040
<ItemGroup>
41-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
42-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1">
41+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0" />
42+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.2">
4343
<PrivateAssets>all</PrivateAssets>
4444
</PackageReference>
45-
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
45+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
4646
<PrivateAssets>All</PrivateAssets>
4747
</PackageReference>
4848
<PackageReference Include="Desktop.Analyzers" Version="1.1.0">

‎src/DiagnosticSourceListener/DiagnosticSourceTelemetryModule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public DiagnosticSourceTelemetryModule() : this(Track)
4646
/// <summary>
4747
/// Initializes a new instance of the <see cref="DiagnosticSourceTelemetryModule"/> class.
4848
/// </summary>
49-
/// <param name="onEventWrittenHandler">Action to be executed each time an event is written to format and send via the configured <see cref="TelemetryClient"/></param>
49+
/// <param name="onEventWrittenHandler">Action to be executed each time an event is written to format and send via the configured <see cref="TelemetryClient"/>.</param>
5050
public DiagnosticSourceTelemetryModule(OnEventWrittenHandler onEventWrittenHandler)
5151
{
5252
if (onEventWrittenHandler == null)

‎src/EtwCollector/AITraceEventSession.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Microsoft.ApplicationInsights.EtwCollector
88
{
99
using System;
10-
using Diagnostics.Tracing;
10+
using Microsoft.Diagnostics.Tracing;
1111
using Microsoft.Diagnostics.Tracing.Session;
1212

1313
/// <summary>

‎src/EtwCollector/EtwCollector.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
<PackageReference Include="Desktop.Analyzers" Version="1.1.0">
4040
<PrivateAssets>All</PrivateAssets>
4141
</PackageReference>
42-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1">
42+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.2">
4343
<PrivateAssets>all</PrivateAssets>
4444
</PackageReference>
45-
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
45+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
4646
<PrivateAssets>All</PrivateAssets>
4747
</PackageReference>
4848
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
@@ -51,7 +51,7 @@
5151
<PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28">
5252
<PrivateAssets>All</PrivateAssets>
5353
</PackageReference>
54-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
54+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0" />
5555
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="1.0.41" />
5656
</ItemGroup>
5757

‎src/EtwCollector/EtwTelemetryModule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private void EnableProviders()
180180
{
181181
ProviderGuid = TplActivities.TplEventSourceGuid,
182182
Level = TraceEventLevel.Always,
183-
Keywords = TplActivities.TaskFlowActivityIdsKeyword
183+
Keywords = TplActivities.TaskFlowActivityIdsKeyword,
184184
};
185185
this.EnableProvider(tplProviderRequest);
186186

0 commit comments

Comments
 (0)