diff --git a/CHANGELOG.md b/CHANGELOG.md index de51a33cc7..fd0cdf0389 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,12 @@ 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.0.0 +## Version 2.1.0-beta1 + +- Upgraded to depend on EventSource.Redist nuget version 1.1.28 +- Upgraded to depend on Microsoft.Bcl nuget version 1.1.10 + +## Version 2.0.0 (stable) - Disallow Nan, +-Infinity measurements. Value will be replaced on 0. - Disallow Nan, +-Infinity metrics (Value, Min, Max and StandardDeviation). Values will be replaced on 0. diff --git a/CodeCov.ps1 b/CodeCov.ps1 index e1d9c6b675..ddb85d2ab3 100644 --- a/CodeCov.ps1 +++ b/CodeCov.ps1 @@ -1,5 +1,5 @@ #Run code coverage tests to generate report -..\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user "-target:C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" "-targetargs:..\bin\Release\Test\CoreSDK.Test\Net40\Microsoft.ApplicationInsights.Core.Net40.Tests.dll ..\bin\Release\Test\CoreSDK.Test\Net45\Microsoft.ApplicationInsights.Core.Net45.Tests.dll ..\bin\Release\Test\CoreSDK.Test\Net46\Microsoft.ApplicationInsights.Core.Net46.Tests.dll ..\bin\Release\Test\ServerTelemetryChannel.Test\TelemetryChannel.Nuget.Tests\TelemetryChannel.Nuget.Tests.dll /logger:trx" "-filter:+[Microsoft.ApplicationInsights*]* +[Microsoft.AI*]* -[*Tests]* -[*TestFramework*]* -[Microsoft.AI.ServerTelemetryChannel]*" -hideskipped:All -output:.\coverage.xml +..\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user "-target:C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" "-targetargs:..\bin\Release\Test\CoreSDK.Test\Net40\Microsoft.ApplicationInsights.Core.Net40.Tests.dll ..\bin\Release\Test\CoreSDK.Test\Net45\Microsoft.ApplicationInsights.Core.Net45.Tests.dll ..\bin\Release\Test\CoreSDK.Test\Net46\Microsoft.ApplicationInsights.Core.Net46.Tests.dll ..\bin\Release\Test\ServerTelemetryChannel.Test\TelemetryChannel.Nuget.Tests\TelemetryChannel.Nuget.Tests.dll ..\bin\Release\Test\ServerTelemetryChannel.Test\Net40.Tests\Microsoft.ApplicationInsights.TelemetryChannel.Net40.Tests.dll ..\bin\Release\Test\ServerTelemetryChannel.Test\Net45.Tests\Microsoft.ApplicationInsights.TelemetryChannel.Net45.Tests.dll /logger:trx" "-filter:+[Microsoft.ApplicationInsights*]* +[Microsoft.AI*]* -[*Tests]* -[*TestFramework*]*" -hideskipped:All -output:.\coverage.xml #Download report uploader (New-Object System.Net.WebClient).DownloadFile("https://codecov.io/bash", ".\CodecovUploader.sh") diff --git a/GlobalStaticVersion.props b/GlobalStaticVersion.props index 43fb5f187c..f98949365f 100644 --- a/GlobalStaticVersion.props +++ b/GlobalStaticVersion.props @@ -18,4 +18,4 @@ .PreReleaseVersion $(MSBuildThisFileDirectory)$(PreReleaseVersionFileName) - + \ No newline at end of file diff --git a/Microsoft.ApplicationInsights.sln b/Microsoft.ApplicationInsights.sln index 59b8cb4d17..aaabca3709 100644 --- a/Microsoft.ApplicationInsights.sln +++ b/Microsoft.ApplicationInsights.sln @@ -70,8 +70,8 @@ Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Core\Managed\Shared\Shared.projitems*{412659ca-49b0-4834-bfbf-8183055083c8}*SharedItemsImports = 4 src\Core\Managed\Operation.CC.Shared\Operation.CC.Shared.projitems*{412659ca-49b0-4834-bfbf-8183055083c8}*SharedItemsImports = 4 - Test\CoreSDK.Test\Shared\Core.Shared.Tests.projitems*{0927e682-4a56-46b6-8125-94fa066b2f57}*SharedItemsImports = 4 Test\CoreSDK.Test\Operation.AL.Shared.Tests\Operation.AL.Tests.Shared.projitems*{0927e682-4a56-46b6-8125-94fa066b2f57}*SharedItemsImports = 4 + Test\CoreSDK.Test\Shared\Core.Shared.Tests.projitems*{0927e682-4a56-46b6-8125-94fa066b2f57}*SharedItemsImports = 4 Test\CoreSDK.Test\Shared\Core.Shared.Tests.projitems*{0927e682-4a56-45b6-8125-94fa066b2f57}*SharedItemsImports = 4 Test\CoreSDK.Test\Operation.CC.Shared.Tests\Operation.CC.Tests.Shared.projitems*{0927e682-4a56-45b6-8125-94fa066b2f57}*SharedItemsImports = 4 Test\CoreSDK.Test\Operation.CC.Shared.Tests\Operation.CC.Tests.Shared.projitems*{4dc2927f-bb78-4363-8428-0f02955064bc}*SharedItemsImports = 13 diff --git a/README.md b/README.md index 5231310402..07d7fb72e4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ ![Build Status](https://mseng.visualstudio.com/DefaultCollection/_apis/public/build/definitions/96a62c4a-58c2-4dbb-94b6-5979ebc7f2af/1822/badge) [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights/) +[![codecov.io](https://codecov.io/github/Microsoft/ApplicationInsights-dotnet/coverage.svg?branch=develop)](https://codecov.io/github/Microsoft/ApplicationInsights-dotnet?branch=develop) # Application Insights for .NET diff --git a/Test/CoreSDK.Test/Net40/Core.Net40.Tests.csproj b/Test/CoreSDK.Test/Net40/Core.Net40.Tests.csproj index 2a156dffa2..f07f1d6971 100644 --- a/Test/CoreSDK.Test/Net40/Core.Net40.Tests.csproj +++ b/Test/CoreSDK.Test/Net40/Core.Net40.Tests.csproj @@ -17,7 +17,8 @@ UnitTest ..\..\..\ $(DefineConstants);NET40 - 08fc5715 + + @@ -37,9 +38,10 @@ True - + False - ..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.24\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll + ..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll + True False @@ -96,6 +98,13 @@ - - + + + + 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}. + + + + + \ No newline at end of file diff --git a/Test/CoreSDK.Test/Net40/packages.config b/Test/CoreSDK.Test/Net40/packages.config index d85ae7869f..39bccfd597 100644 --- a/Test/CoreSDK.Test/Net40/packages.config +++ b/Test/CoreSDK.Test/Net40/packages.config @@ -1,12 +1,12 @@  + - + - - + + - + - \ No newline at end of file diff --git a/Test/CoreSDK.Test/TestFramework/Net40/TestFramework.Net40.csproj b/Test/CoreSDK.Test/TestFramework/Net40/TestFramework.Net40.csproj index dfe6a8a150..727e07c74a 100644 --- a/Test/CoreSDK.Test/TestFramework/Net40/TestFramework.Net40.csproj +++ b/Test/CoreSDK.Test/TestFramework/Net40/TestFramework.Net40.csproj @@ -13,6 +13,8 @@ $(DefineConstants);NET40 ..\..\..\ + + false @@ -35,9 +37,10 @@ - + False - ..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.24\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll + ..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll + True False @@ -58,8 +61,15 @@ - - - + + + + + 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}. + + + + + \ No newline at end of file diff --git a/Test/CoreSDK.Test/TestFramework/Net40/packages.config b/Test/CoreSDK.Test/TestFramework/Net40/packages.config index ba4a0ba026..3e1e15c190 100644 --- a/Test/CoreSDK.Test/TestFramework/Net40/packages.config +++ b/Test/CoreSDK.Test/TestFramework/Net40/packages.config @@ -1,8 +1,8 @@  - + - - - + + + \ No newline at end of file diff --git a/Test/CoreSDK.Test/TestFramework/Net45/TestFramework.Net45.csproj b/Test/CoreSDK.Test/TestFramework/Net45/TestFramework.Net45.csproj index 70d81aaf14..213f0c06b4 100644 --- a/Test/CoreSDK.Test/TestFramework/Net45/TestFramework.Net45.csproj +++ b/Test/CoreSDK.Test/TestFramework/Net45/TestFramework.Net45.csproj @@ -14,6 +14,8 @@ 512 $(DefineConstants);NET45 ..\..\..\ + + @@ -32,8 +34,18 @@ Core.Net45 + + + - + + + + + 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}. + + + \ No newline at end of file diff --git a/Test/CoreSDK.Test/TestFramework/Net45/packages.config b/Test/CoreSDK.Test/TestFramework/Net45/packages.config index 7d6cdd0b62..8d53ba135e 100644 --- a/Test/CoreSDK.Test/TestFramework/Net45/packages.config +++ b/Test/CoreSDK.Test/TestFramework/Net45/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Test/CoreSDK.Test/TestFramework/Net46/TestFramework.Net46.csproj b/Test/CoreSDK.Test/TestFramework/Net46/TestFramework.Net46.csproj index 5cf04637e5..1fc61bd5c3 100644 --- a/Test/CoreSDK.Test/TestFramework/Net46/TestFramework.Net46.csproj +++ b/Test/CoreSDK.Test/TestFramework/Net46/TestFramework.Net46.csproj @@ -14,6 +14,8 @@ 512 $(DefineConstants);NET46 ..\..\..\ + + @@ -32,8 +34,18 @@ Core.Net46 + + + + + + + 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}. + + + \ No newline at end of file diff --git a/Test/CoreSDK.Test/TestFramework/Net46/packages.config b/Test/CoreSDK.Test/TestFramework/Net46/packages.config index 7d6cdd0b62..380e7f7326 100644 --- a/Test/CoreSDK.Test/TestFramework/Net46/packages.config +++ b/Test/CoreSDK.Test/TestFramework/Net46/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Test/ServerTelemetryChannel.Test/Net40.Tests/TelemetryChannel.Net40.Tests.csproj b/Test/ServerTelemetryChannel.Test/Net40.Tests/TelemetryChannel.Net40.Tests.csproj index 6e13b428c8..703f7c96e9 100644 --- a/Test/ServerTelemetryChannel.Test/Net40.Tests/TelemetryChannel.Net40.Tests.csproj +++ b/Test/ServerTelemetryChannel.Test/Net40.Tests/TelemetryChannel.Net40.Tests.csproj @@ -18,7 +18,8 @@ ..\..\ $(DefineConstants);NET40 - 974d9743 + + Microsoft.ApplicationInsights.TelemetryChannel.Net40.Tests @@ -26,9 +27,10 @@ - + False - ..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.24\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll + ..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll + True ..\..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll @@ -46,14 +48,17 @@ - ..\..\..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll + ..\..\..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll + True - ..\..\..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll + ..\..\..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll + True - ..\..\..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll + ..\..\..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll + True @@ -86,17 +91,14 @@ - - - - - - + + - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + 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}. - + + - + \ No newline at end of file diff --git a/Test/ServerTelemetryChannel.Test/Net40.Tests/app.config b/Test/ServerTelemetryChannel.Test/Net40.Tests/app.config index 486818ff4d..5e37ab3e7d 100644 --- a/Test/ServerTelemetryChannel.Test/Net40.Tests/app.config +++ b/Test/ServerTelemetryChannel.Test/Net40.Tests/app.config @@ -8,11 +8,11 @@ - + - + diff --git a/Test/ServerTelemetryChannel.Test/Net40.Tests/packages.config b/Test/ServerTelemetryChannel.Test/Net40.Tests/packages.config index 9744216301..a5cdb9beb3 100644 --- a/Test/ServerTelemetryChannel.Test/Net40.Tests/packages.config +++ b/Test/ServerTelemetryChannel.Test/Net40.Tests/packages.config @@ -1,10 +1,10 @@  - + - - + + - + \ No newline at end of file diff --git a/Test/ServerTelemetryChannel.Test/Net45.Tests/TelemetryChannel.Net45.Tests.csproj b/Test/ServerTelemetryChannel.Test/Net45.Tests/TelemetryChannel.Net45.Tests.csproj index e7a3baee2c..78e998d809 100644 --- a/Test/ServerTelemetryChannel.Test/Net45.Tests/TelemetryChannel.Net45.Tests.csproj +++ b/Test/ServerTelemetryChannel.Test/Net45.Tests/TelemetryChannel.Net45.Tests.csproj @@ -18,7 +18,8 @@ ..\..\ $(DefineConstants);NET45 - 4e9d912a + + Microsoft.ApplicationInsights.TelemetryChannel.Net45.Tests @@ -59,12 +60,12 @@ - + + - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + 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}. - + - \ No newline at end of file diff --git a/Test/ServerTelemetryChannel.Test/Net45.Tests/packages.config b/Test/ServerTelemetryChannel.Test/Net45.Tests/packages.config index 5e569395ec..d280601a3f 100644 --- a/Test/ServerTelemetryChannel.Test/Net45.Tests/packages.config +++ b/Test/ServerTelemetryChannel.Test/Net45.Tests/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Test/ServerTelemetryChannel.Test/Shared.Tests/Implementation/TelemetryBufferTest.cs b/Test/ServerTelemetryChannel.Test/Shared.Tests/Implementation/TelemetryBufferTest.cs index 07c930fc6d..c0a361b2a6 100644 --- a/Test/ServerTelemetryChannel.Test/Shared.Tests/Implementation/TelemetryBufferTest.cs +++ b/Test/ServerTelemetryChannel.Test/Shared.Tests/Implementation/TelemetryBufferTest.cs @@ -197,7 +197,7 @@ public void DoesNotCancelPreviousFlush() public class FlushAsync : TelemetryBufferTest { [TestMethod] - [Timeout(5000)] + [Timeout(10000)] public void DoesntSerializeTelemetryIfBufferIsEmpty() { bool telemetrySerialized = false; @@ -214,7 +214,7 @@ public void DoesntSerializeTelemetryIfBufferIsEmpty() } [TestMethod] - [Timeout(5000)] + [Timeout(10000)] public void SerializesTelemetryIfBufferIsNotEmpty() { List serializedTelemetry = null; @@ -256,7 +256,7 @@ public void SerializesBufferOnThreadPoolToFreeUpCustomersThread() } [TestMethod] - [Timeout(5000)] + [Timeout(10000)] public void EmptiesBufferAfterSerialization() { var buffer = new TelemetryBuffer(new StubTelemetrySerializer(), new StubApplicationLifecycle()); @@ -285,7 +285,7 @@ public void WaitsUntilTelemetryBufferIsSafeToModify() } [TestMethod] - [Timeout(5000)] + [Timeout(10000)] public void CancelsPreviouslyStartedAutomaticFlushToPreventPreventPrematureTransmission() { var serializer = new StubTelemetrySerializer(); @@ -308,7 +308,7 @@ public void CancelsPreviouslyStartedAutomaticFlushToPreventPreventPrematureTrans } [TestMethod] - [Timeout(5000)] + [Timeout(10000)] public void DoesNotContinueOnCapturedSynchronizationContextToImprovePerformance() { var buffer = new TelemetryBuffer(new StubTelemetrySerializer(), new StubApplicationLifecycle()); diff --git a/Test/ServerTelemetryChannel.Test/Shared.Tests/Implementation/TransmissionBufferTest.cs b/Test/ServerTelemetryChannel.Test/Shared.Tests/Implementation/TransmissionBufferTest.cs index 2410050e11..ac8473d9e9 100644 --- a/Test/ServerTelemetryChannel.Test/Shared.Tests/Implementation/TransmissionBufferTest.cs +++ b/Test/ServerTelemetryChannel.Test/Shared.Tests/Implementation/TransmissionBufferTest.cs @@ -16,7 +16,7 @@ public class TransmissionBufferTest public class Class : TransmissionBufferTest { [TestMethod] - [Timeout(5000)] + [Timeout(10000)] public void EnqueueAndDequeueMethodsAreThreadSafe() { var buffer = new TransmissionBuffer(); diff --git a/Test/ServerTelemetryChannel.Test/TestFramework/Net40/TestFramework.Net40.csproj b/Test/ServerTelemetryChannel.Test/TestFramework/Net40/TestFramework.Net40.csproj index 40b6622111..10b6e40b77 100644 --- a/Test/ServerTelemetryChannel.Test/TestFramework/Net40/TestFramework.Net40.csproj +++ b/Test/ServerTelemetryChannel.Test/TestFramework/Net40/TestFramework.Net40.csproj @@ -13,7 +13,8 @@ $(DefineConstants);NET40 ..\..\..\ - 2476c2f4 + + @@ -34,9 +35,10 @@ - + False - ..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.24\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll + ..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll + True False @@ -50,31 +52,31 @@ ..\..\..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll True + - ..\..\..\..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll + ..\..\..\..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll + True + - ..\..\..\..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll + ..\..\..\..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll + True - ..\..\..\..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll + ..\..\..\..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll + True - - - - - - - - + + - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + 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}. - + + - + \ No newline at end of file diff --git a/Test/ServerTelemetryChannel.Test/TestFramework/Net40/app.config b/Test/ServerTelemetryChannel.Test/TestFramework/Net40/app.config index 69c47e516b..5c93b8e5a7 100644 --- a/Test/ServerTelemetryChannel.Test/TestFramework/Net40/app.config +++ b/Test/ServerTelemetryChannel.Test/TestFramework/Net40/app.config @@ -4,11 +4,11 @@ - + - + diff --git a/Test/ServerTelemetryChannel.Test/TestFramework/Net40/packages.config b/Test/ServerTelemetryChannel.Test/TestFramework/Net40/packages.config index f8b70f2419..c5f6b0655d 100644 --- a/Test/ServerTelemetryChannel.Test/TestFramework/Net40/packages.config +++ b/Test/ServerTelemetryChannel.Test/TestFramework/Net40/packages.config @@ -1,8 +1,8 @@  - + - - - + + + \ No newline at end of file diff --git a/Test/ServerTelemetryChannel.Test/TestFramework/Net45/TestFramework.Net45.csproj b/Test/ServerTelemetryChannel.Test/TestFramework/Net45/TestFramework.Net45.csproj index 7d5a9878c4..4e0fbce579 100644 --- a/Test/ServerTelemetryChannel.Test/TestFramework/Net45/TestFramework.Net45.csproj +++ b/Test/ServerTelemetryChannel.Test/TestFramework/Net45/TestFramework.Net45.csproj @@ -12,7 +12,8 @@ 512 ..\..\..\ - a86e0b66 + + $(DefineConstants);NET45 @@ -35,9 +36,7 @@ Designer - - Designer - + @@ -45,12 +44,12 @@ - + + - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + 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}. - + - \ No newline at end of file diff --git a/Test/ServerTelemetryChannel.Test/TestFramework/Net45/packages.config b/Test/ServerTelemetryChannel.Test/TestFramework/Net45/packages.config index 818b649ac0..051f93a5de 100644 --- a/Test/ServerTelemetryChannel.Test/TestFramework/Net45/packages.config +++ b/Test/ServerTelemetryChannel.Test/TestFramework/Net45/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/Core/Managed/Net40/Core.Net40.csproj b/src/Core/Managed/Net40/Core.Net40.csproj index 395b91c23b..72f48a99ca 100644 --- a/src/Core/Managed/Net40/Core.Net40.csproj +++ b/src/Core/Managed/Net40/Core.Net40.csproj @@ -20,8 +20,9 @@ - - ..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.24\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll + + False + ..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll True @@ -39,16 +40,19 @@ - ..\..\..\..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll + ..\..\..\..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll + True - ..\..\..\..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll + ..\..\..\..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll + True - ..\..\..\..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll + ..\..\..\..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll + True @@ -72,17 +76,19 @@ - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + + + + + \ No newline at end of file diff --git a/src/Core/Managed/Net40/app.config b/src/Core/Managed/Net40/app.config index 3c73782929..e03ea0a5f0 100644 --- a/src/Core/Managed/Net40/app.config +++ b/src/Core/Managed/Net40/app.config @@ -4,11 +4,11 @@ - + - + diff --git a/src/Core/Managed/Net40/packages.config b/src/Core/Managed/Net40/packages.config index 0afc963b46..a0e403be05 100644 --- a/src/Core/Managed/Net40/packages.config +++ b/src/Core/Managed/Net40/packages.config @@ -1,10 +1,10 @@  - + - - - - + + + + \ No newline at end of file diff --git a/src/Core/Managed/Net45/Core.Net45.csproj b/src/Core/Managed/Net45/Core.Net45.csproj index 4c0df915d8..3f410448b1 100644 --- a/src/Core/Managed/Net45/Core.Net45.csproj +++ b/src/Core/Managed/Net45/Core.Net45.csproj @@ -43,15 +43,15 @@ - 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}. - + + \ No newline at end of file diff --git a/src/Core/Managed/Net45/packages.config b/src/Core/Managed/Net45/packages.config index bba07855f5..88f4751f06 100644 --- a/src/Core/Managed/Net45/packages.config +++ b/src/Core/Managed/Net45/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Core/Managed/Net46/Core.Net46.csproj b/src/Core/Managed/Net46/Core.Net46.csproj index 0abddf9c01..8dffe18ebd 100644 --- a/src/Core/Managed/Net46/Core.Net46.csproj +++ b/src/Core/Managed/Net46/Core.Net46.csproj @@ -58,15 +58,15 @@ - 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}. - + + \ No newline at end of file diff --git a/src/Core/Managed/Net46/packages.config b/src/Core/Managed/Net46/packages.config index b7587f5046..5b2ead812e 100644 --- a/src/Core/Managed/Net46/packages.config +++ b/src/Core/Managed/Net46/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Core/Managed/PCL/Core.PCL.csproj b/src/Core/Managed/PCL/Core.PCL.csproj index f5c56f48fe..39fa8bca60 100644 --- a/src/Core/Managed/PCL/Core.PCL.csproj +++ b/src/Core/Managed/PCL/Core.PCL.csproj @@ -33,15 +33,15 @@ - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + \ No newline at end of file diff --git a/src/Core/Managed/PCL/packages.config b/src/Core/Managed/PCL/packages.config index 6c7ef18d02..7aec0a0e5b 100644 --- a/src/Core/Managed/PCL/packages.config +++ b/src/Core/Managed/PCL/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottling.cs b/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottling.cs index a0b4277e57..74c3ede475 100644 --- a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottling.cs +++ b/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottling.cs @@ -13,7 +13,7 @@ internal class DiagnoisticsEventThrottling : IDiagnoisticsEventThrottling internal DiagnoisticsEventThrottling(int throttleAfterCount) { - if (false == throttleAfterCount.IsInRangeThrottleAfterCount()) + if (!throttleAfterCount.IsInRangeThrottleAfterCount()) { throw new ArgumentOutOfRangeException("throttleAfterCount"); } @@ -28,7 +28,7 @@ internal int ThrottleAfterCount public bool ThrottleEvent(int eventId, long keywords, out bool justExceededThreshold) { - if (false == IsExcludedFromThrottling(keywords)) + if (!IsExcludedFromThrottling(keywords)) { var counter = this.InternalGetEventCounter(eventId); @@ -57,7 +57,7 @@ public IDictionary CollectSnapshot() private static bool IsExcludedFromThrottling(long keywords) { - return 0 != (keywords & DiagnoisticsEventThrottlingDefaults.KeywordsExcludedFromEventThrottling); + return (keywords & DiagnoisticsEventThrottlingDefaults.KeywordsExcludedFromEventThrottling) != 0; } private DiagnoisticsEventCounters InternalGetEventCounter( @@ -67,7 +67,7 @@ private DiagnoisticsEventCounters InternalGetEventCounter( this.syncRoot.ExecuteSpinWaitLock( () => { - if (false == this.counters.TryGetValue(eventId, out result)) + if (!this.counters.TryGetValue(eventId, out result)) { result = new DiagnoisticsEventCounters(); this.counters.Add(eventId, result); diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingManager.cs b/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingManager.cs index a23294d862..c2c2ddc1f8 100644 --- a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingManager.cs +++ b/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingManager.cs @@ -13,17 +13,17 @@ internal DiagnoisticsEventThrottlingManager( IDiagnoisticsEventThrottlingScheduler scheduler, uint throttlingRecycleIntervalInMinutes) { - if (null == snapshotContainer) + if (snapshotContainer == null) { throw new ArgumentNullException("snapshotContainer"); } - if (null == scheduler) + if (scheduler == null) { throw new ArgumentNullException("scheduler"); } - if (false == throttlingRecycleIntervalInMinutes.IsInRangeThrottlingRecycleInterval()) + if (!throttlingRecycleIntervalInMinutes.IsInRangeThrottlingRecycleInterval()) { throw new ArgumentOutOfRangeException("throttlingRecycleIntervalInMinutes"); } diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingScheduler.cs b/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingScheduler.cs index ddfb0c4f9c..fd72f0f2f0 100644 --- a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingScheduler.cs +++ b/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingScheduler.cs @@ -41,7 +41,7 @@ public object ScheduleToRunEveryTimeIntervalInMilliseconds( throw new ArgumentOutOfRangeException("interval"); } - if (null == actionToExecute) + if (actionToExecute == null) { throw new ArgumentNullException("actionToExecute"); } @@ -56,18 +56,18 @@ public object ScheduleToRunEveryTimeIntervalInMilliseconds( public void RemoveScheduledRoutine(object token) { - if (null == token) + if (token == null) { throw new ArgumentNullException("token"); } var timer = token as TaskTimer; - if (null == timer) + if (timer == null) { throw new ArgumentException("token"); } - if (true == this.timers.Remove(timer)) + if (this.timers.Remove(timer)) { DisposeTimer(timer); @@ -117,7 +117,7 @@ private static TaskTimer InternalCreateAndStartTimer( private void Dispose(bool managed) { - if (true == managed && false == this.disposed) + if (managed && !this.disposed) { this.DisposeAllTimers(); diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnosticsTelemetryModule.cs b/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnosticsTelemetryModule.cs index 26028851b2..d7d9f6d9f3 100644 --- a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnosticsTelemetryModule.cs +++ b/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnosticsTelemetryModule.cs @@ -154,7 +154,7 @@ public void Dispose() private void Dispose(bool managed) { - if (true == managed && false == this.disposed) + if (managed && !this.disposed) { this.EventListener.Dispose(); (this.throttlingScheduler as IDisposable).Dispose(); diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/PortalDiagnosticsSender.cs b/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/PortalDiagnosticsSender.cs index c14394c5a8..af4600c79e 100644 --- a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/PortalDiagnosticsSender.cs +++ b/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/PortalDiagnosticsSender.cs @@ -32,12 +32,12 @@ public PortalDiagnosticsSender( TelemetryConfiguration configuration, IDiagnoisticsEventThrottlingManager throttlingManager) { - if (null == configuration) + if (configuration == null) { throw new ArgumentNullException("configuration"); } - if (null == throttlingManager) + if (throttlingManager == null) { throw new ArgumentNullException("throttlingManager"); } diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/SpinWait.cs b/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/SpinWait.cs index f5f01023cb..3164d85a35 100644 --- a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/SpinWait.cs +++ b/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/SpinWait.cs @@ -15,7 +15,7 @@ internal static class SpinWait { internal static void ExecuteSpinWaitLock(this object syncRoot, Action action) { - while (false == Monitor.TryEnter(syncRoot, 0)) + while (!Monitor.TryEnter(syncRoot, 0)) { } diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/TypeExtensions.cs b/src/Core/Managed/Shared/Extensibility/Implementation/TypeExtensions.cs index 2c7a711ad3..cdab4100fd 100644 --- a/src/Core/Managed/Shared/Extensibility/Implementation/TypeExtensions.cs +++ b/src/Core/Managed/Shared/Extensibility/Implementation/TypeExtensions.cs @@ -50,7 +50,7 @@ public static PropertyInfo[] GetProperties(this Type type) var properties = new List(); properties.AddRange(type.GetTypeInfo().DeclaredProperties); var baseType = type.GetTypeInfo().BaseType; - if (null != baseType) + if (baseType != null) { properties.AddRange(baseType.GetProperties()); } diff --git a/src/Core/NuGet/Core/Core.NuGet.csproj b/src/Core/NuGet/Core/Core.NuGet.csproj index 501c3dc314..ede7ed7a5f 100644 --- a/src/Core/NuGet/Core/Core.NuGet.csproj +++ b/src/Core/NuGet/Core/Core.NuGet.csproj @@ -1,13 +1,13 @@  - + Debug AnyCPU {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B} Library - $(BinRoot)\$(Configuration)\Core\NuGet\Core + $(BinRoot)\$(Configuration)\Core\NuGet\Core Microsoft.ApplicationInsights.NuGet Microsoft.ApplicationInsights.NuGet v4.5 @@ -17,7 +17,8 @@ ..\..\..\..\ $(MSBuildProjectDirectory)\Package.nuspec $(BinRoot)\$(Configuration)\Core\Managed\Net40\Microsoft.ApplicationInsights.dll - dad8833d + + @@ -29,12 +30,12 @@ - + + - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + 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}. - + - \ No newline at end of file diff --git a/src/Core/NuGet/Core/Package.nuspec b/src/Core/NuGet/Core/Package.nuspec index 8ec9c457b9..6cfffdaef2 100644 --- a/src/Core/NuGet/Core/Package.nuspec +++ b/src/Core/NuGet/Core/Package.nuspec @@ -16,8 +16,9 @@ Analytics ApplicationInsights Telemetry AppInsights + - + diff --git a/src/Core/NuGet/Core/packages.config b/src/Core/NuGet/Core/packages.config index 6e34c13739..051f93a5de 100644 --- a/src/Core/NuGet/Core/packages.config +++ b/src/Core/NuGet/Core/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/TelemetryChannels/ServerTelemetryChannel/Net40/TelemetryChannel.Net40.csproj b/src/TelemetryChannels/ServerTelemetryChannel/Net40/TelemetryChannel.Net40.csproj index 42e5016071..e4f5dae3ca 100644 --- a/src/TelemetryChannels/ServerTelemetryChannel/Net40/TelemetryChannel.Net40.csproj +++ b/src/TelemetryChannels/ServerTelemetryChannel/Net40/TelemetryChannel.Net40.csproj @@ -22,8 +22,10 @@ - - ..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.24\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll + + False + ..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll + True False @@ -39,14 +41,17 @@ - ..\..\..\..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll + ..\..\..\..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll + True - ..\..\..\..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll + ..\..\..\..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll + True - ..\..\..\..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll + ..\..\..\..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll + True @@ -67,12 +72,6 @@ - - - - - - @@ -80,8 +79,12 @@ - + + + - + + + \ No newline at end of file diff --git a/src/TelemetryChannels/ServerTelemetryChannel/Net40/app.config b/src/TelemetryChannels/ServerTelemetryChannel/Net40/app.config index 3c73782929..e03ea0a5f0 100644 --- a/src/TelemetryChannels/ServerTelemetryChannel/Net40/app.config +++ b/src/TelemetryChannels/ServerTelemetryChannel/Net40/app.config @@ -4,11 +4,11 @@ - + - + diff --git a/src/TelemetryChannels/ServerTelemetryChannel/Net40/packages.config b/src/TelemetryChannels/ServerTelemetryChannel/Net40/packages.config index 2c5316f522..6081e3f0a4 100644 --- a/src/TelemetryChannels/ServerTelemetryChannel/Net40/packages.config +++ b/src/TelemetryChannels/ServerTelemetryChannel/Net40/packages.config @@ -1,10 +1,10 @@  - + - - - - + + + + \ No newline at end of file diff --git a/src/TelemetryChannels/ServerTelemetryChannel/Net45/TelemetryChannel.Net45.csproj b/src/TelemetryChannels/ServerTelemetryChannel/Net45/TelemetryChannel.Net45.csproj index f79d4c9512..27681f67cf 100644 --- a/src/TelemetryChannels/ServerTelemetryChannel/Net45/TelemetryChannel.Net45.csproj +++ b/src/TelemetryChannels/ServerTelemetryChannel/Net45/TelemetryChannel.Net45.csproj @@ -48,6 +48,8 @@ + + \ No newline at end of file diff --git a/src/TelemetryChannels/ServerTelemetryChannel/Net45/packages.config b/src/TelemetryChannels/ServerTelemetryChannel/Net45/packages.config index 8fb1f8d51f..a7600b8cbb 100644 --- a/src/TelemetryChannels/ServerTelemetryChannel/Net45/packages.config +++ b/src/TelemetryChannels/ServerTelemetryChannel/Net45/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/TelemetryChannels/ServerTelemetryChannel/NuGet/Package.nuspec b/src/TelemetryChannels/ServerTelemetryChannel/NuGet/Package.nuspec index fbfbf7f4a4..c553c1060a 100644 --- a/src/TelemetryChannels/ServerTelemetryChannel/NuGet/Package.nuspec +++ b/src/TelemetryChannels/ServerTelemetryChannel/NuGet/Package.nuspec @@ -17,7 +17,9 @@ - + + + diff --git a/src/TelemetryChannels/ServerTelemetryChannel/Shared/Implementation/ErrorHandlingTransmissionPolicy.cs b/src/TelemetryChannels/ServerTelemetryChannel/Shared/Implementation/ErrorHandlingTransmissionPolicy.cs index c7641cd54f..4586d76229 100644 --- a/src/TelemetryChannels/ServerTelemetryChannel/Shared/Implementation/ErrorHandlingTransmissionPolicy.cs +++ b/src/TelemetryChannels/ServerTelemetryChannel/Shared/Implementation/ErrorHandlingTransmissionPolicy.cs @@ -98,7 +98,7 @@ private void HandleTransmissionSentEvent(object sender, TransmissionProcessedEve else { var theException = e.Exception as Exception; - if (null != theException) + if (theException != null) { TelemetryChannelEventSource.Log.TransmissionSendingFailedWarning(e.Transmission.Id, theException.Message); }