diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj index 013b623644..7838946c2e 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj @@ -36,10 +36,10 @@ - + - - + + diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Standalone/Microsoft.ApplicationInsights.Isolated.Tests.csproj b/BASE/Test/Microsoft.ApplicationInsights.Test/Standalone/Microsoft.ApplicationInsights.Isolated.Tests.csproj index 68d97f947c..8f18f21a57 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/Standalone/Microsoft.ApplicationInsights.Isolated.Tests.csproj +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Standalone/Microsoft.ApplicationInsights.Isolated.Tests.csproj @@ -32,9 +32,9 @@ - - - + + + diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj index 9a5048cd2d..02aaf56a47 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj @@ -28,9 +28,9 @@ - - - + + + diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Helpers/LocalInProcHttpServer.cs b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Helpers/LocalInProcHttpServer.cs index 56ef2eb48c..e739b96d19 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Helpers/LocalInProcHttpServer.cs +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Helpers/LocalInProcHttpServer.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using System; diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/TransmissionStorageTest.cs b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/TransmissionStorageTest.cs index 54c7593efb..90a2913339 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/TransmissionStorageTest.cs +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/TransmissionStorageTest.cs @@ -61,7 +61,7 @@ public void InitializeThrowsArgumentNullExceptionToPreventUsageErrors() // [TestMethod] public void IsThreadSafe() { -#if (!NETCOREAPP1_1 && !NETCOREAPP2_0) +#if (!NETCOREAPP1_1 && !NETCOREAPP2_1) const int NumberOfThreads = 16; const int NumberOfFilesPerThread = 64; var storage = new TransmissionStorage(); diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/ServerTelemetryChannelE2ETests.cs b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/ServerTelemetryChannelE2ETests.cs index eafa4d5219..0ba08e31e5 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/ServerTelemetryChannelE2ETests.cs +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/ServerTelemetryChannelE2ETests.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 namespace Microsoft.ApplicationInsights.WindowsServer.Channel { using System.Collections.Generic; diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj index ece0511161..a48364f22b 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj @@ -15,8 +15,8 @@ - net45;netcoreapp1.1;netcoreapp2.0;netcoreapp3.0 - netcoreapp1.1;netcoreapp2.0;netcoreapp3.0 + net45;netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 + netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 Microsoft.ApplicationInsights.TelemetryChannel.Tests @@ -33,10 +33,10 @@ - + - - + + @@ -45,7 +45,7 @@ - + diff --git a/Everything.sln b/Everything.sln index 34a1275b81..1f39981d08 100644 --- a/Everything.sln +++ b/Everything.sln @@ -137,26 +137,12 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WindowsServer.Shared", "WEB EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WindowsServer.Shared.Tests", "WEB\Src\WindowsServer\WindowsServer.Shared.Tests\WindowsServer.Shared.Tests.shproj", "{7916AE39-AE89-4886-8842-33AC9883905A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiagnosticSourceListener.netcoreapp1.Tests", "LOGGING\test\DiagnosticSourceListener.netcoreapp10.Tests\DiagnosticSourceListener.netcoreapp1.Tests.csproj", "{7CBC11F0-9D80-458F-A8DA-BF45EA648917}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EtwCollector.Net46.Tests", "LOGGING\test\EtwCollector.Net46.Tests\EtwCollector.Net46.Tests.csproj", "{46167FB8-2B4B-40B4-ACB3-B20615B14682}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSourceListener.netcoreapp10.Tests", "LOGGING\test\EventSourceListener.netcoreapp10.Tests\EventSourceListener.netcoreapp10.Tests.csproj", "{6673D8EC-04F3-491F-B3C4-5C26C1228F80}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILogger.NetStandard.Tests", "LOGGING\test\ILogger.NetStandard.Tests\ILogger.NetStandard.Tests.csproj", "{108411B2-F1F8-48CD-B373-44A9ECCE7FEE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Log4NetAppender.Net45.Tests", "LOGGING\test\Log4NetAppender.Net45.Tests\Log4NetAppender.Net45.Tests.csproj", "{547AFF05-FB87-41FB-ACDA-B5429F89727C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Log4NetAppender.NetCoreApp10.Tests", "LOGGING\test\Log4NetAppender.NetCoreApp10.Tests\Log4NetAppender.NetCoreApp10.Tests.csproj", "{AC88FC19-68DC-41E5-8AE7-2567C5D7B58D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget.Net45.Tests", "LOGGING\test\NLogTarget.Net45.Tests\NLogTarget.Net45.Tests.csproj", "{782C7465-F521-42AA-A4DE-9ADD727CBC05}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget.NetCoreApp10.Tests", "LOGGING\test\NLogTarget.NetCoreApp10.Tests\NLogTarget.NetCoreApp10.Tests.csproj", "{CFD15B50-0555-49FD-8B3E-87D97074A251}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TraceListener.Net45.Tests", "LOGGING\test\TraceListener.Net45.Tests\TraceListener.Net45.Tests.csproj", "{D57AD915-7C54-405A-BC0B-299983089C7C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TraceListener.netcoreapp10.Tests", "LOGGING\test\TraceListener.netcoreapp10.Tests\TraceListener.netcoreapp10.Tests.csproj", "{11CF7798-376B-477F-B160-9A226E8E9E19}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "L) GenericTests", "L) GenericTests", "{D2A0AA36-57F7-436C-A7AF-7322927F1734}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xdt.Tests", "LOGGING\test\Xdt.Tests\Xdt.Tests.csproj", "{262792BF-31A8-4FCD-BBC7-341EB29FAE96}" @@ -193,6 +179,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyCollector.Tests", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelemetryChannel.Tests", "BASE\Test\ServerTelemetryChannel.Test\TelemetryChannel.Tests\TelemetryChannel.Tests.csproj", "{D3E44A53-6998-4C85-AD8F-E52C2B3843EA}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiagnosticSourceListener.Tests", "LOGGING\test\DiagnosticSourceListener.Tests\DiagnosticSourceListener.Tests.csproj", "{CA21ED5E-AB4E-4277-A28D-E8840E92833F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Log4NetAppender.Tests", "LOGGING\test\Log4NetAppender.Tests\Log4NetAppender.Tests.csproj", "{B1650E9B-6764-4DC0-8C71-96F0FF335C80}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget.Tests", "LOGGING\test\NLogTarget.Tests\NLogTarget.Tests.csproj", "{93A35062-6AA4-4778-9769-428A942ADCF9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TraceListener.Tests", "LOGGING\test\TraceListener.Tests\TraceListener.Tests.csproj", "{305F1C02-F984-43E7-A07E-E2514CFE29A0}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{0196259c-3582-4f4e-a01f-a8f9ae83b0f3}*SharedItemsImports = 13 @@ -201,13 +195,13 @@ Global WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{07620299-b0e7-44bb-be85-c4d1b25104f6}*SharedItemsImports = 5 LOGGING\test\CommonTestShared\CommonTestShared.projitems*{108411b2-f1f8-48cd-b373-44a9ecce7fee}*SharedItemsImports = 5 LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{108411b2-f1f8-48cd-b373-44a9ecce7fee}*SharedItemsImports = 5 - LOGGING\test\CommonTestShared\CommonTestShared.projitems*{11cf7798-376b-477f-b160-9a226e8e9e19}*SharedItemsImports = 5 - LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{11cf7798-376b-477f-b160-9a226e8e9e19}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{13335eb8-3936-407a-9363-1c428318bea8}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{1b0f54bf-078a-421c-9708-2d817d4bce30}*SharedItemsImports = 5 LOGGING\src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{1b0f54bf-078a-421c-9708-2d817d4bce30}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{2612ac44-5ff3-4533-b5a5-e5dbf96f5c83}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{2e283031-425b-421f-9e81-34abfefab618}*SharedItemsImports = 5 + LOGGING\test\CommonTestShared\CommonTestShared.projitems*{305f1c02-f984-43e7-a07e-e2514cfe29a0}*SharedItemsImports = 5 + LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{305f1c02-f984-43e7-a07e-e2514cfe29a0}*SharedItemsImports = 5 WEB\Src\PerformanceCollector\Perf.Shared.NetStandard.Stubs\Perf.Shared.NetStandard.Stubs.projitems*{30a45441-0849-48fe-ad37-5d29d0e3068a}*SharedItemsImports = 13 LOGGING\src\CommonShared\CommonShared.projitems*{3774003c-91fd-4d79-99c7-9beac5b9a48e}*SharedItemsImports = 5 WEB\Src\Web\Web.Shared.Net\Web.Shared.Net.projitems*{395e03bb-d061-4c9d-9d47-18676566444d}*SharedItemsImports = 13 @@ -217,8 +211,6 @@ Global LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{46167fb8-2b4b-40b4-acb3-b20615b14682}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{52b3c054-c686-4bb8-a4b7-9e8d6c49491f}*SharedItemsImports = 5 LOGGING\src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{52b3c054-c686-4bb8-a4b7-9e8d6c49491f}*SharedItemsImports = 5 - LOGGING\test\CommonTestShared\CommonTestShared.projitems*{547aff05-fb87-41fb-acda-b5429f89727c}*SharedItemsImports = 5 - LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{547aff05-fb87-41fb-acda-b5429f89727c}*SharedItemsImports = 5 WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{568aeb4f-ba4c-47a5-9fa3-68f06cd11fed}*SharedItemsImports = 13 WEB\Src\WindowsServer\WindowsServer.Shared\WindowsServer.Shared.projitems*{579f42e8-b711-411e-be52-4a3fd208507f}*SharedItemsImports = 13 LOGGING\src\CommonShared\CommonShared.projitems*{587b624b-8c64-498e-93d7-a2d2abc17eab}*SharedItemsImports = 13 @@ -230,18 +222,16 @@ Global WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{74051bfb-87ed-4d99-927f-c40e7717e4e5}*SharedItemsImports = 5 WEB\Src\WindowsServer\WindowsServer.Shared.Tests\WindowsServer.Shared.Tests.projitems*{74051bfb-87ed-4d99-927f-c40e7717e4e5}*SharedItemsImports = 5 WEB\Src\PerformanceCollector\Perf.Shared.NetStandard16.Stubs\Perf.Shared.NetStandard16.Stubs.projitems*{76b21faa-270d-47de-b14b-bec87edc34f1}*SharedItemsImports = 13 - LOGGING\test\CommonTestShared\CommonTestShared.projitems*{782c7465-f521-42aa-a4de-9add727cbc05}*SharedItemsImports = 5 - LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{782c7465-f521-42aa-a4de-9add727cbc05}*SharedItemsImports = 5 WEB\Src\WindowsServer\WindowsServer.Shared.Tests\WindowsServer.Shared.Tests.projitems*{7916ae39-ae89-4886-8842-33ac9883905a}*SharedItemsImports = 13 WEB\Src\Common\Common.projitems*{7b5d95ee-50ee-4222-a03c-fae5905b3dfd}*SharedItemsImports = 5 WEB\Src\WindowsServer\WindowsServer.Shared\WindowsServer.Shared.projitems*{7b5d95ee-50ee-4222-a03c-fae5905b3dfd}*SharedItemsImports = 5 - LOGGING\test\CommonTestShared\CommonTestShared.projitems*{7cbc11f0-9d80-458f-a8da-bf45ea648917}*SharedItemsImports = 5 - LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{7cbc11f0-9d80-458f-a8da-bf45ea648917}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{8293bc71-7ddc-4dd1-8807-280eef7e752d}*SharedItemsImports = 5 WEB\Src\Web\Web.Shared.Net\Web.Shared.Net.projitems*{8293bc71-7ddc-4dd1-8807-280eef7e752d}*SharedItemsImports = 5 WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{8f641c0b-a57a-43ec-b91f-4258f6dc0cd5}*SharedItemsImports = 5 WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{8f641c0b-a57a-43ec-b91f-4258f6dc0cd5}*SharedItemsImports = 5 BASE\src\Common\Common\Common.projitems*{936af739-4297-4016-9d70-4280042709be}*SharedItemsImports = 13 + LOGGING\test\CommonTestShared\CommonTestShared.projitems*{93a35062-6aa4-4778-9769-428a942adcf9}*SharedItemsImports = 5 + LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{93a35062-6aa4-4778-9769-428a942adcf9}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{96a6e04e-ceda-4c30-8eca-48113382afba}*SharedItemsImports = 5 WEB\Src\DependencyCollector\Shared\DependencyCollector.Shared.projitems*{96a6e04e-ceda-4c30-8eca-48113382afba}*SharedItemsImports = 5 WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{9718f051-147f-4f5f-9ff3-c926430efcf7}*SharedItemsImports = 13 @@ -256,17 +246,15 @@ Global LOGGING\src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{a964de6d-9750-4013-8be2-79c2afc056e5}*SharedItemsImports = 13 WEB\Src\Web\Web.Shared.Net.Tests\Web.Shared.Net.Tests.projitems*{ac2e85bb-05f7-43cb-b966-3611ccf47156}*SharedItemsImports = 13 NETCORE\src\Shared\Shared.projitems*{ac399f09-b465-4cfd-8d82-f1d1c5c9347e}*SharedItemsImports = 5 - LOGGING\test\CommonTestShared\CommonTestShared.projitems*{ac88fc19-68dc-41e5-8ae7-2567c5d7b58d}*SharedItemsImports = 5 - LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{ac88fc19-68dc-41e5-8ae7-2567c5d7b58d}*SharedItemsImports = 5 WEB\Src\DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.projitems*{ace58393-3419-4fca-87cc-c33eb756c7e4}*SharedItemsImports = 13 + LOGGING\test\CommonTestShared\CommonTestShared.projitems*{b1650e9b-6764-4dc0-8c71-96f0ff335c80}*SharedItemsImports = 5 + LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{b1650e9b-6764-4dc0-8c71-96f0ff335c80}*SharedItemsImports = 5 BASE\src\Common\Common\Common.projitems*{c30a7eb8-a86c-49ee-927e-7d9e03572e82}*SharedItemsImports = 5 + LOGGING\test\CommonTestShared\CommonTestShared.projitems*{ca21ed5e-ab4e-4277-a28d-e8840e92833f}*SharedItemsImports = 5 + LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{ca21ed5e-ab4e-4277-a28d-e8840e92833f}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{ccab7a34-8dc5-4a6f-b637-46ceba93c687}*SharedItemsImports = 13 - LOGGING\test\CommonTestShared\CommonTestShared.projitems*{cfd15b50-0555-49fd-8b3e-87d97074a251}*SharedItemsImports = 5 - LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{cfd15b50-0555-49fd-8b3e-87d97074a251}*SharedItemsImports = 5 WEB\Src\PerformanceCollector\Perf.Shared.NetStandard\Perf.Shared.NetStandard.projitems*{d13c3ec7-b300-4158-9054-216156b203be}*SharedItemsImports = 13 NETCORE\src\Shared\Shared.projitems*{d56f2979-d6bc-4ef2-bb9b-4077b3290599}*SharedItemsImports = 13 - LOGGING\test\CommonTestShared\CommonTestShared.projitems*{d57ad915-7c54-405a-bc0b-299983089c7c}*SharedItemsImports = 5 - LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{d57ad915-7c54-405a-bc0b-299983089c7c}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{deeaf599-83f9-4a05-add6-f612cdabe570}*SharedItemsImports = 5 BASE\src\Common\Common\Common.projitems*{e3d160e8-7f8c-416f-946f-6fdfc6787461}*SharedItemsImports = 5 WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{f05eb480-b209-47dd-90e3-1ddc47efc579}*SharedItemsImports = 4 @@ -397,10 +385,6 @@ Global {74051BFB-87ED-4D99-927F-C40E7717E4E5}.Debug|Any CPU.Build.0 = Debug|Any CPU {74051BFB-87ED-4D99-927F-C40E7717E4E5}.Release|Any CPU.ActiveCfg = Release|Any CPU {74051BFB-87ED-4D99-927F-C40E7717E4E5}.Release|Any CPU.Build.0 = Release|Any CPU - {7CBC11F0-9D80-458F-A8DA-BF45EA648917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CBC11F0-9D80-458F-A8DA-BF45EA648917}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CBC11F0-9D80-458F-A8DA-BF45EA648917}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CBC11F0-9D80-458F-A8DA-BF45EA648917}.Release|Any CPU.Build.0 = Release|Any CPU {46167FB8-2B4B-40B4-ACB3-B20615B14682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {46167FB8-2B4B-40B4-ACB3-B20615B14682}.Debug|Any CPU.Build.0 = Debug|Any CPU {46167FB8-2B4B-40B4-ACB3-B20615B14682}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -413,30 +397,6 @@ Global {108411B2-F1F8-48CD-B373-44A9ECCE7FEE}.Debug|Any CPU.Build.0 = Debug|Any CPU {108411B2-F1F8-48CD-B373-44A9ECCE7FEE}.Release|Any CPU.ActiveCfg = Release|Any CPU {108411B2-F1F8-48CD-B373-44A9ECCE7FEE}.Release|Any CPU.Build.0 = Release|Any CPU - {547AFF05-FB87-41FB-ACDA-B5429F89727C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {547AFF05-FB87-41FB-ACDA-B5429F89727C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {547AFF05-FB87-41FB-ACDA-B5429F89727C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {547AFF05-FB87-41FB-ACDA-B5429F89727C}.Release|Any CPU.Build.0 = Release|Any CPU - {AC88FC19-68DC-41E5-8AE7-2567C5D7B58D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC88FC19-68DC-41E5-8AE7-2567C5D7B58D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC88FC19-68DC-41E5-8AE7-2567C5D7B58D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC88FC19-68DC-41E5-8AE7-2567C5D7B58D}.Release|Any CPU.Build.0 = Release|Any CPU - {782C7465-F521-42AA-A4DE-9ADD727CBC05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {782C7465-F521-42AA-A4DE-9ADD727CBC05}.Debug|Any CPU.Build.0 = Debug|Any CPU - {782C7465-F521-42AA-A4DE-9ADD727CBC05}.Release|Any CPU.ActiveCfg = Release|Any CPU - {782C7465-F521-42AA-A4DE-9ADD727CBC05}.Release|Any CPU.Build.0 = Release|Any CPU - {CFD15B50-0555-49FD-8B3E-87D97074A251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFD15B50-0555-49FD-8B3E-87D97074A251}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFD15B50-0555-49FD-8B3E-87D97074A251}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFD15B50-0555-49FD-8B3E-87D97074A251}.Release|Any CPU.Build.0 = Release|Any CPU - {D57AD915-7C54-405A-BC0B-299983089C7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D57AD915-7C54-405A-BC0B-299983089C7C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D57AD915-7C54-405A-BC0B-299983089C7C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D57AD915-7C54-405A-BC0B-299983089C7C}.Release|Any CPU.Build.0 = Release|Any CPU - {11CF7798-376B-477F-B160-9A226E8E9E19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11CF7798-376B-477F-B160-9A226E8E9E19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11CF7798-376B-477F-B160-9A226E8E9E19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11CF7798-376B-477F-B160-9A226E8E9E19}.Release|Any CPU.Build.0 = Release|Any CPU {262792BF-31A8-4FCD-BBC7-341EB29FAE96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {262792BF-31A8-4FCD-BBC7-341EB29FAE96}.Debug|Any CPU.Build.0 = Debug|Any CPU {262792BF-31A8-4FCD-BBC7-341EB29FAE96}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -497,6 +457,22 @@ Global {D3E44A53-6998-4C85-AD8F-E52C2B3843EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3E44A53-6998-4C85-AD8F-E52C2B3843EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {D3E44A53-6998-4C85-AD8F-E52C2B3843EA}.Release|Any CPU.Build.0 = Release|Any CPU + {CA21ED5E-AB4E-4277-A28D-E8840E92833F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CA21ED5E-AB4E-4277-A28D-E8840E92833F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CA21ED5E-AB4E-4277-A28D-E8840E92833F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CA21ED5E-AB4E-4277-A28D-E8840E92833F}.Release|Any CPU.Build.0 = Release|Any CPU + {B1650E9B-6764-4DC0-8C71-96F0FF335C80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1650E9B-6764-4DC0-8C71-96F0FF335C80}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1650E9B-6764-4DC0-8C71-96F0FF335C80}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1650E9B-6764-4DC0-8C71-96F0FF335C80}.Release|Any CPU.Build.0 = Release|Any CPU + {93A35062-6AA4-4778-9769-428A942ADCF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93A35062-6AA4-4778-9769-428A942ADCF9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93A35062-6AA4-4778-9769-428A942ADCF9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93A35062-6AA4-4778-9769-428A942ADCF9}.Release|Any CPU.Build.0 = Release|Any CPU + {305F1C02-F984-43E7-A07E-E2514CFE29A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {305F1C02-F984-43E7-A07E-E2514CFE29A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {305F1C02-F984-43E7-A07E-E2514CFE29A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {305F1C02-F984-43E7-A07E-E2514CFE29A0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -545,16 +521,9 @@ Global {74051BFB-87ED-4D99-927F-C40E7717E4E5} = {11AC7235-167E-40B5-B2E3-9CBF08700064} {579F42E8-B711-411E-BE52-4A3FD208507F} = {11AC7235-167E-40B5-B2E3-9CBF08700064} {7916AE39-AE89-4886-8842-33AC9883905A} = {11AC7235-167E-40B5-B2E3-9CBF08700064} - {7CBC11F0-9D80-458F-A8DA-BF45EA648917} = {60CDB555-C5FE-4010-A37B-014B04C5EAC3} {46167FB8-2B4B-40B4-ACB3-B20615B14682} = {05E05465-F285-4689-BFC5-F78FC5761992} {6673D8EC-04F3-491F-B3C4-5C26C1228F80} = {DB0D10AF-7DA5-49CE-B90E-67F896BEED1C} {108411B2-F1F8-48CD-B373-44A9ECCE7FEE} = {477A1BA0-0155-404C-A6E0-C2409C0FFE70} - {547AFF05-FB87-41FB-ACDA-B5429F89727C} = {DDA01098-8272-4C5A-BB97-BCB4FA65CFE6} - {AC88FC19-68DC-41E5-8AE7-2567C5D7B58D} = {DDA01098-8272-4C5A-BB97-BCB4FA65CFE6} - {782C7465-F521-42AA-A4DE-9ADD727CBC05} = {39474EE1-28E8-456E-889F-553F129411C8} - {CFD15B50-0555-49FD-8B3E-87D97074A251} = {39474EE1-28E8-456E-889F-553F129411C8} - {D57AD915-7C54-405A-BC0B-299983089C7C} = {AFEB7CAA-A8BF-4D03-A5CB-BFC5AE378201} - {11CF7798-376B-477F-B160-9A226E8E9E19} = {AFEB7CAA-A8BF-4D03-A5CB-BFC5AE378201} {262792BF-31A8-4FCD-BBC7-341EB29FAE96} = {D2A0AA36-57F7-436C-A7AF-7322927F1734} {058A0843-A95F-4B0D-91DB-33B9D3FD7324} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0} {B90EDEA5-3CC8-4282-80A0-7116905E2427} = {D8483C3E-C386-48AD-B935-700A54FDCF31} @@ -570,6 +539,10 @@ Global {4BAA7AF2-3C5B-4C7C-9A9C-26F561218A86} = {632FB9CE-540D-4451-9FF2-12E89C1492BD} {FAC049E4-7011-45FF-BD06-69ACA28921E8} = {005BD823-60AF-406E-AC20-842D7653FE60} {D3E44A53-6998-4C85-AD8F-E52C2B3843EA} = {FBAFD313-0139-4DA3-BCB3-EE54DC3B6CCD} + {CA21ED5E-AB4E-4277-A28D-E8840E92833F} = {60CDB555-C5FE-4010-A37B-014B04C5EAC3} + {B1650E9B-6764-4DC0-8C71-96F0FF335C80} = {DDA01098-8272-4C5A-BB97-BCB4FA65CFE6} + {93A35062-6AA4-4778-9769-428A942ADCF9} = {39474EE1-28E8-456E-889F-553F129411C8} + {305F1C02-F984-43E7-A07E-E2514CFE29A0} = {AFEB7CAA-A8BF-4D03-A5CB-BFC5AE378201} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0E0415AF-37CC-4999-8E5B-DD36F75BFD4D} diff --git a/LOGGING/Logging.sln b/LOGGING/Logging.sln index 6daa2d8b30..ba1b1500d1 100644 --- a/LOGGING/Logging.sln +++ b/LOGGING/Logging.sln @@ -25,12 +25,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Log4NetAppender", "src\Log4 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget", "src\NLogTarget\NLogTarget.csproj", "{6C581DDA-88AF-4A64-984D-E275F2F21100}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Log4NetAppender.Net45.Tests", "test\Log4NetAppender.Net45.Tests\Log4NetAppender.Net45.Tests.csproj", "{C537553E-C7D0-42E4-884F-10A9C6063D4A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget.Net45.Tests", "test\NLogTarget.Net45.Tests\NLogTarget.Net45.Tests.csproj", "{BE1D6405-1930-4A19-A24C-027B008C5011}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TraceListener.Net45.Tests", "test\TraceListener.Net45.Tests\TraceListener.Net45.Tests.csproj", "{E6F03762-6BD6-4B38-8798-42C189AAB18C}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common.Logging", "src\CommonShared\Common.Logging.shproj", "{587B624B-8C64-498E-93D7-A2D2ABC17EAB}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestFramework.Shared.Logging", "test\CommonTestShared\TestFramework.Shared.Logging.shproj", "{3B9AB7FA-562D-4E4E-86E3-3348426BC0D9}" @@ -49,14 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TraceListener", "src\TraceL EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common.Logging.EventSource", "src\EventSource.Shared\EventSource.Shared\Common.Logging.EventSource.shproj", "{A964DE6D-9750-4013-8BE2-79C2AFC056E5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiagnosticSourceListener.netcoreapp1.Tests", "test\DiagnosticSourceListener.netcoreapp10.Tests\DiagnosticSourceListener.netcoreapp1.Tests.csproj", "{625DABF6-C4AD-41A9-B2C0-04C9FEC2ADCF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TraceListener.netcoreapp10.Tests", "test\TraceListener.netcoreapp10.Tests\TraceListener.netcoreapp10.Tests.csproj", "{11E4A92F-154E-450B-8508-437C28744BC2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget.NetCoreApp10.Tests", "test\NLogTarget.NetCoreApp10.Tests\NLogTarget.NetCoreApp10.Tests.csproj", "{B24CB3C6-A3A0-4190-97E4-E847C7B1A691}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Log4NetAppender.NetCoreApp10.Tests", "test\Log4NetAppender.NetCoreApp10.Tests\Log4NetAppender.NetCoreApp10.Tests.csproj", "{F74826DB-53B1-4588-BD02-4DD25DCBF292}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILogger", "src\ILogger\ILogger.csproj", "{7D942802-E85E-4C3C-B97E-67A3867B7CBA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILogger.NetStandard.Tests", "test\ILogger.NetStandard.Tests\ILogger.NetStandard.Tests.csproj", "{4C1B862F-8F19-4D0F-834D-694DDE0438AE}" @@ -65,19 +51,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".DependentProjects", ".Depe EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights", "..\BASE\src\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj", "{ED1E83B0-8656-4E2D-BB8B-158A84C45477}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiagnosticSourceListener.Tests", "test\DiagnosticSourceListener.Tests\DiagnosticSourceListener.Tests.csproj", "{38CBF9FA-5223-40C4-AEE3-84B5E489DAB0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Log4NetAppender.Tests", "test\Log4NetAppender.Tests\Log4NetAppender.Tests.csproj", "{D46FDAB7-289D-4990-8289-C0B0FDB3B8AB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget.Tests", "test\NLogTarget.Tests\NLogTarget.Tests.csproj", "{446A21E3-71DB-40ED-B7A5-86E761EC9907}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TraceListener.Tests", "test\TraceListener.Tests\TraceListener.Tests.csproj", "{FE9B0BE5-6DDD-41A2-ADAB-FDAE3017FE47}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - test\CommonTestShared\CommonTestShared.projitems*{11e4a92f-154e-450b-8508-437c28744bc2}*SharedItemsImports = 5 - test\Shared\Adapters.Shared.Tests.projitems*{11e4a92f-154e-450b-8508-437c28744bc2}*SharedItemsImports = 5 test\CommonTestShared\CommonTestShared.projitems*{15fa58d1-f397-4808-831c-7ae65ee640af}*SharedItemsImports = 5 test\Shared\Adapters.Shared.Tests.projitems*{15fa58d1-f397-4808-831c-7ae65ee640af}*SharedItemsImports = 5 + test\CommonTestShared\CommonTestShared.projitems*{38cbf9fa-5223-40c4-aee3-84b5e489dab0}*SharedItemsImports = 5 + test\Shared\Adapters.Shared.Tests.projitems*{38cbf9fa-5223-40c4-aee3-84b5e489dab0}*SharedItemsImports = 5 test\CommonTestShared\CommonTestShared.projitems*{3b9ab7fa-562d-4e4e-86e3-3348426bc0d9}*SharedItemsImports = 13 + test\CommonTestShared\CommonTestShared.projitems*{446a21e3-71db-40ed-b7a5-86e761ec9907}*SharedItemsImports = 5 + test\Shared\Adapters.Shared.Tests.projitems*{446a21e3-71db-40ed-b7a5-86e761ec9907}*SharedItemsImports = 5 test\CommonTestShared\CommonTestShared.projitems*{4c1b862f-8f19-4d0f-834d-694dde0438ae}*SharedItemsImports = 5 test\Shared\Adapters.Shared.Tests.projitems*{4c1b862f-8f19-4d0f-834d-694dde0438ae}*SharedItemsImports = 5 src\CommonShared\CommonShared.projitems*{57f41d53-a8d1-42d6-afbe-406436cfa7df}*SharedItemsImports = 5 src\CommonShared\CommonShared.projitems*{587b624b-8c64-498e-93d7-a2d2abc17eab}*SharedItemsImports = 13 - test\CommonTestShared\CommonTestShared.projitems*{625dabf6-c4ad-41a9-b2c0-04c9fec2adcf}*SharedItemsImports = 5 - test\Shared\Adapters.Shared.Tests.projitems*{625dabf6-c4ad-41a9-b2c0-04c9fec2adcf}*SharedItemsImports = 5 src\CommonShared\CommonShared.projitems*{6c581dda-88af-4a64-984d-e275f2f21100}*SharedItemsImports = 5 test\CommonTestShared\CommonTestShared.projitems*{7030cac6-4b94-4735-b146-c0fc3097aca6}*SharedItemsImports = 5 test\Shared\Adapters.Shared.Tests.projitems*{7030cac6-4b94-4735-b146-c0fc3097aca6}*SharedItemsImports = 5 @@ -87,20 +81,14 @@ Global src\CommonShared\CommonShared.projitems*{a539bb1d-29ff-48e8-8d6e-dfcc543dc2b4}*SharedItemsImports = 5 src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{a539bb1d-29ff-48e8-8d6e-dfcc543dc2b4}*SharedItemsImports = 5 src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{a964de6d-9750-4013-8be2-79c2afc056e5}*SharedItemsImports = 13 - test\CommonTestShared\CommonTestShared.projitems*{b24cb3c6-a3a0-4190-97e4-e847c7b1a691}*SharedItemsImports = 5 - test\Shared\Adapters.Shared.Tests.projitems*{b24cb3c6-a3a0-4190-97e4-e847c7b1a691}*SharedItemsImports = 5 - test\CommonTestShared\CommonTestShared.projitems*{be1d6405-1930-4a19-a24c-027b008c5011}*SharedItemsImports = 5 - test\Shared\Adapters.Shared.Tests.projitems*{be1d6405-1930-4a19-a24c-027b008c5011}*SharedItemsImports = 5 - test\CommonTestShared\CommonTestShared.projitems*{c537553e-c7d0-42e4-884f-10a9c6063d4a}*SharedItemsImports = 5 - test\Shared\Adapters.Shared.Tests.projitems*{c537553e-c7d0-42e4-884f-10a9c6063d4a}*SharedItemsImports = 5 src\CommonShared\CommonShared.projitems*{cb555b89-94d7-4b38-92d9-9f497a796966}*SharedItemsImports = 5 + test\CommonTestShared\CommonTestShared.projitems*{d46fdab7-289d-4990-8289-c0b0fdb3b8ab}*SharedItemsImports = 5 + test\Shared\Adapters.Shared.Tests.projitems*{d46fdab7-289d-4990-8289-c0b0fdb3b8ab}*SharedItemsImports = 5 src\CommonShared\CommonShared.projitems*{e3766dd1-f376-43f8-b242-6cf06e186179}*SharedItemsImports = 5 - test\CommonTestShared\CommonTestShared.projitems*{e6f03762-6bd6-4b38-8798-42c189aab18c}*SharedItemsImports = 5 - test\Shared\Adapters.Shared.Tests.projitems*{e6f03762-6bd6-4b38-8798-42c189aab18c}*SharedItemsImports = 5 ..\BASE\src\Common\Common\Common.projitems*{ed1e83b0-8656-4e2d-bb8b-158a84c45477}*SharedItemsImports = 5 - test\CommonTestShared\CommonTestShared.projitems*{f74826db-53b1-4588-bd02-4dd25dcbf292}*SharedItemsImports = 5 - test\Shared\Adapters.Shared.Tests.projitems*{f74826db-53b1-4588-bd02-4dd25dcbf292}*SharedItemsImports = 5 test\Shared\Adapters.Shared.Tests.projitems*{fa775630-7917-4a99-a78c-fba46edf685c}*SharedItemsImports = 13 + test\CommonTestShared\CommonTestShared.projitems*{fe9b0be5-6ddd-41a2-adab-fdae3017fe47}*SharedItemsImports = 5 + test\Shared\Adapters.Shared.Tests.projitems*{fe9b0be5-6ddd-41a2-adab-fdae3017fe47}*SharedItemsImports = 5 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -133,30 +121,6 @@ Global {6C581DDA-88AF-4A64-984D-E275F2F21100}.Release|Any CPU.Build.0 = Release|Any CPU {6C581DDA-88AF-4A64-984D-E275F2F21100}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {6C581DDA-88AF-4A64-984D-E275F2F21100}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C537553E-C7D0-42E4-884F-10A9C6063D4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C537553E-C7D0-42E4-884F-10A9C6063D4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C537553E-C7D0-42E4-884F-10A9C6063D4A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C537553E-C7D0-42E4-884F-10A9C6063D4A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C537553E-C7D0-42E4-884F-10A9C6063D4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C537553E-C7D0-42E4-884F-10A9C6063D4A}.Release|Any CPU.Build.0 = Release|Any CPU - {C537553E-C7D0-42E4-884F-10A9C6063D4A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C537553E-C7D0-42E4-884F-10A9C6063D4A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {BE1D6405-1930-4A19-A24C-027B008C5011}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE1D6405-1930-4A19-A24C-027B008C5011}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE1D6405-1930-4A19-A24C-027B008C5011}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {BE1D6405-1930-4A19-A24C-027B008C5011}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {BE1D6405-1930-4A19-A24C-027B008C5011}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE1D6405-1930-4A19-A24C-027B008C5011}.Release|Any CPU.Build.0 = Release|Any CPU - {BE1D6405-1930-4A19-A24C-027B008C5011}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {BE1D6405-1930-4A19-A24C-027B008C5011}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {E6F03762-6BD6-4B38-8798-42C189AAB18C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6F03762-6BD6-4B38-8798-42C189AAB18C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6F03762-6BD6-4B38-8798-42C189AAB18C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {E6F03762-6BD6-4B38-8798-42C189AAB18C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {E6F03762-6BD6-4B38-8798-42C189AAB18C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6F03762-6BD6-4B38-8798-42C189AAB18C}.Release|Any CPU.Build.0 = Release|Any CPU - {E6F03762-6BD6-4B38-8798-42C189AAB18C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {E6F03762-6BD6-4B38-8798-42C189AAB18C}.Release|Mixed Platforms.Build.0 = Release|Any CPU {7030CAC6-4B94-4735-B146-C0FC3097ACA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7030CAC6-4B94-4735-B146-C0FC3097ACA6}.Debug|Any CPU.Build.0 = Debug|Any CPU {7030CAC6-4B94-4735-B146-C0FC3097ACA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -205,38 +169,6 @@ Global {E3766DD1-F376-43F8-B242-6CF06E186179}.Release|Any CPU.Build.0 = Release|Any CPU {E3766DD1-F376-43F8-B242-6CF06E186179}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {E3766DD1-F376-43F8-B242-6CF06E186179}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {625DABF6-C4AD-41A9-B2C0-04C9FEC2ADCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {625DABF6-C4AD-41A9-B2C0-04C9FEC2ADCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {625DABF6-C4AD-41A9-B2C0-04C9FEC2ADCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {625DABF6-C4AD-41A9-B2C0-04C9FEC2ADCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {625DABF6-C4AD-41A9-B2C0-04C9FEC2ADCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {625DABF6-C4AD-41A9-B2C0-04C9FEC2ADCF}.Release|Any CPU.Build.0 = Release|Any CPU - {625DABF6-C4AD-41A9-B2C0-04C9FEC2ADCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {625DABF6-C4AD-41A9-B2C0-04C9FEC2ADCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {11E4A92F-154E-450B-8508-437C28744BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11E4A92F-154E-450B-8508-437C28744BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11E4A92F-154E-450B-8508-437C28744BC2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {11E4A92F-154E-450B-8508-437C28744BC2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {11E4A92F-154E-450B-8508-437C28744BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11E4A92F-154E-450B-8508-437C28744BC2}.Release|Any CPU.Build.0 = Release|Any CPU - {11E4A92F-154E-450B-8508-437C28744BC2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {11E4A92F-154E-450B-8508-437C28744BC2}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B24CB3C6-A3A0-4190-97E4-E847C7B1A691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B24CB3C6-A3A0-4190-97E4-E847C7B1A691}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B24CB3C6-A3A0-4190-97E4-E847C7B1A691}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B24CB3C6-A3A0-4190-97E4-E847C7B1A691}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B24CB3C6-A3A0-4190-97E4-E847C7B1A691}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B24CB3C6-A3A0-4190-97E4-E847C7B1A691}.Release|Any CPU.Build.0 = Release|Any CPU - {B24CB3C6-A3A0-4190-97E4-E847C7B1A691}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B24CB3C6-A3A0-4190-97E4-E847C7B1A691}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F74826DB-53B1-4588-BD02-4DD25DCBF292}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F74826DB-53B1-4588-BD02-4DD25DCBF292}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F74826DB-53B1-4588-BD02-4DD25DCBF292}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F74826DB-53B1-4588-BD02-4DD25DCBF292}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F74826DB-53B1-4588-BD02-4DD25DCBF292}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F74826DB-53B1-4588-BD02-4DD25DCBF292}.Release|Any CPU.Build.0 = Release|Any CPU - {F74826DB-53B1-4588-BD02-4DD25DCBF292}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F74826DB-53B1-4588-BD02-4DD25DCBF292}.Release|Mixed Platforms.Build.0 = Release|Any CPU {7D942802-E85E-4C3C-B97E-67A3867B7CBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7D942802-E85E-4C3C-B97E-67A3867B7CBA}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D942802-E85E-4C3C-B97E-67A3867B7CBA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -261,6 +193,38 @@ Global {ED1E83B0-8656-4E2D-BB8B-158A84C45477}.Release|Any CPU.Build.0 = Release|Any CPU {ED1E83B0-8656-4E2D-BB8B-158A84C45477}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {ED1E83B0-8656-4E2D-BB8B-158A84C45477}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {38CBF9FA-5223-40C4-AEE3-84B5E489DAB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {38CBF9FA-5223-40C4-AEE3-84B5E489DAB0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {38CBF9FA-5223-40C4-AEE3-84B5E489DAB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {38CBF9FA-5223-40C4-AEE3-84B5E489DAB0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {38CBF9FA-5223-40C4-AEE3-84B5E489DAB0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {38CBF9FA-5223-40C4-AEE3-84B5E489DAB0}.Release|Any CPU.Build.0 = Release|Any CPU + {38CBF9FA-5223-40C4-AEE3-84B5E489DAB0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {38CBF9FA-5223-40C4-AEE3-84B5E489DAB0}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D46FDAB7-289D-4990-8289-C0B0FDB3B8AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D46FDAB7-289D-4990-8289-C0B0FDB3B8AB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D46FDAB7-289D-4990-8289-C0B0FDB3B8AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D46FDAB7-289D-4990-8289-C0B0FDB3B8AB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D46FDAB7-289D-4990-8289-C0B0FDB3B8AB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D46FDAB7-289D-4990-8289-C0B0FDB3B8AB}.Release|Any CPU.Build.0 = Release|Any CPU + {D46FDAB7-289D-4990-8289-C0B0FDB3B8AB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D46FDAB7-289D-4990-8289-C0B0FDB3B8AB}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {446A21E3-71DB-40ED-B7A5-86E761EC9907}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {446A21E3-71DB-40ED-B7A5-86E761EC9907}.Debug|Any CPU.Build.0 = Debug|Any CPU + {446A21E3-71DB-40ED-B7A5-86E761EC9907}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {446A21E3-71DB-40ED-B7A5-86E761EC9907}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {446A21E3-71DB-40ED-B7A5-86E761EC9907}.Release|Any CPU.ActiveCfg = Release|Any CPU + {446A21E3-71DB-40ED-B7A5-86E761EC9907}.Release|Any CPU.Build.0 = Release|Any CPU + {446A21E3-71DB-40ED-B7A5-86E761EC9907}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {446A21E3-71DB-40ED-B7A5-86E761EC9907}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {FE9B0BE5-6DDD-41A2-ADAB-FDAE3017FE47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE9B0BE5-6DDD-41A2-ADAB-FDAE3017FE47}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE9B0BE5-6DDD-41A2-ADAB-FDAE3017FE47}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {FE9B0BE5-6DDD-41A2-ADAB-FDAE3017FE47}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {FE9B0BE5-6DDD-41A2-ADAB-FDAE3017FE47}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE9B0BE5-6DDD-41A2-ADAB-FDAE3017FE47}.Release|Any CPU.Build.0 = Release|Any CPU + {FE9B0BE5-6DDD-41A2-ADAB-FDAE3017FE47}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {FE9B0BE5-6DDD-41A2-ADAB-FDAE3017FE47}.Release|Mixed Platforms.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -270,9 +234,6 @@ Global {C6B569BC-6F19-42C9-A951-DA611BB0F4BE} = {2FCC45B3-D820-405D-87FA-467C96465BB1} {CB555B89-94D7-4B38-92D9-9F497A796966} = {EE933574-C82B-4E59-A0D1-05328197B937} {6C581DDA-88AF-4A64-984D-E275F2F21100} = {EE933574-C82B-4E59-A0D1-05328197B937} - {C537553E-C7D0-42E4-884F-10A9C6063D4A} = {2FCC45B3-D820-405D-87FA-467C96465BB1} - {BE1D6405-1930-4A19-A24C-027B008C5011} = {2FCC45B3-D820-405D-87FA-467C96465BB1} - {E6F03762-6BD6-4B38-8798-42C189AAB18C} = {2FCC45B3-D820-405D-87FA-467C96465BB1} {587B624B-8C64-498E-93D7-A2D2ABC17EAB} = {EE933574-C82B-4E59-A0D1-05328197B937} {3B9AB7FA-562D-4E4E-86E3-3348426BC0D9} = {2FCC45B3-D820-405D-87FA-467C96465BB1} {7030CAC6-4B94-4735-B146-C0FC3097ACA6} = {2FCC45B3-D820-405D-87FA-467C96465BB1} @@ -282,13 +243,13 @@ Global {57F41D53-A8D1-42D6-AFBE-406436CFA7DF} = {EE933574-C82B-4E59-A0D1-05328197B937} {E3766DD1-F376-43F8-B242-6CF06E186179} = {EE933574-C82B-4E59-A0D1-05328197B937} {A964DE6D-9750-4013-8BE2-79C2AFC056E5} = {EE933574-C82B-4E59-A0D1-05328197B937} - {625DABF6-C4AD-41A9-B2C0-04C9FEC2ADCF} = {2FCC45B3-D820-405D-87FA-467C96465BB1} - {11E4A92F-154E-450B-8508-437C28744BC2} = {2FCC45B3-D820-405D-87FA-467C96465BB1} - {B24CB3C6-A3A0-4190-97E4-E847C7B1A691} = {2FCC45B3-D820-405D-87FA-467C96465BB1} - {F74826DB-53B1-4588-BD02-4DD25DCBF292} = {2FCC45B3-D820-405D-87FA-467C96465BB1} {7D942802-E85E-4C3C-B97E-67A3867B7CBA} = {EE933574-C82B-4E59-A0D1-05328197B937} {4C1B862F-8F19-4D0F-834D-694DDE0438AE} = {2FCC45B3-D820-405D-87FA-467C96465BB1} {ED1E83B0-8656-4E2D-BB8B-158A84C45477} = {5D78454B-607D-481D-96E5-0E9EB323B027} + {38CBF9FA-5223-40C4-AEE3-84B5E489DAB0} = {2FCC45B3-D820-405D-87FA-467C96465BB1} + {D46FDAB7-289D-4990-8289-C0B0FDB3B8AB} = {2FCC45B3-D820-405D-87FA-467C96465BB1} + {446A21E3-71DB-40ED-B7A5-86E761EC9907} = {2FCC45B3-D820-405D-87FA-467C96465BB1} + {FE9B0BE5-6DDD-41A2-ADAB-FDAE3017FE47} = {2FCC45B3-D820-405D-87FA-467C96465BB1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AC8888B1-0E98-49D7-BE15-EB97A6261C0D} diff --git a/LOGGING/src/Log4NetAppender/AssemblyInfo.cs b/LOGGING/src/Log4NetAppender/AssemblyInfo.cs index b09d65f1da..a2cf8e16bc 100644 --- a/LOGGING/src/Log4NetAppender/AssemblyInfo.cs +++ b/LOGGING/src/Log4NetAppender/AssemblyInfo.cs @@ -30,8 +30,7 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("599daa99-7d0b-4cae-81b8-3a73509f2efa")] -[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.Log4NetAppender.Net45.Tests, PublicKey=" + AssemblyInfo.PublicKey)] -[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.Log4NetAppender.NetCoreApp10.Tests, PublicKey=" + AssemblyInfo.PublicKey)] +[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.Log4NetAppender.Tests, PublicKey=" + AssemblyInfo.PublicKey)] internal static class AssemblyInfo { diff --git a/LOGGING/src/NLogTarget/AssemblyInfo.cs b/LOGGING/src/NLogTarget/AssemblyInfo.cs index 030dfdea9c..58502d58ea 100644 --- a/LOGGING/src/NLogTarget/AssemblyInfo.cs +++ b/LOGGING/src/NLogTarget/AssemblyInfo.cs @@ -30,8 +30,7 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("44abc834-bd19-449f-ad64-f8c83ca078ed")] -[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.NLogTarget.Net45.Tests, PublicKey=" + AssemblyInfo.PublicKey)] -[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.NLogTarget.NetCoreApp10.Tests, PublicKey=" + AssemblyInfo.PublicKey)] +[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.NLogTarget.Tests, PublicKey=" + AssemblyInfo.PublicKey)] internal static class AssemblyInfo { diff --git a/LOGGING/src/TraceListener/AssemblyInfo.cs b/LOGGING/src/TraceListener/AssemblyInfo.cs index b53a90796a..a5f2c5589d 100644 --- a/LOGGING/src/TraceListener/AssemblyInfo.cs +++ b/LOGGING/src/TraceListener/AssemblyInfo.cs @@ -30,8 +30,7 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("3aada9bf-fc15-42fd-ace5-4cb2f11c1f2a")] -[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.TraceListener.Net45.Tests, PublicKey=" + AssemblyInfo.PublicKey)] -[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.TraceListener.NetCoreApp10.Tests, PublicKey=" + AssemblyInfo.PublicKey)] +[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.TraceListener.Tests, PublicKey=" + AssemblyInfo.PublicKey)] internal static class AssemblyInfo { diff --git a/LOGGING/test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceListener.netcoreapp1.Tests.csproj b/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj similarity index 80% rename from LOGGING/test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceListener.netcoreapp1.Tests.csproj rename to LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj index 8d52fc35f2..cd9cef2b3f 100644 --- a/LOGGING/test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceListener.netcoreapp1.Tests.csproj +++ b/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj @@ -2,15 +2,15 @@ Microsoft.ApplicationInsights.DiagnosticSourceListener.Tests - Microsoft.ApplicationInsights.DiagnosticSourceListener.NetCoreApp10.Tests - netcoreapp1.0 + Microsoft.ApplicationInsights.DiagnosticSourceListener.Tests + netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 false - - + + diff --git a/LOGGING/test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceTelemetryModuleTests.cs b/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceTelemetryModuleTests.cs similarity index 100% rename from LOGGING/test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceTelemetryModuleTests.cs rename to LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceTelemetryModuleTests.cs diff --git a/LOGGING/test/DiagnosticSourceListener.netcoreapp10.Tests/TestDiagnosticSource.cs b/LOGGING/test/DiagnosticSourceListener.Tests/TestDiagnosticSource.cs similarity index 100% rename from LOGGING/test/DiagnosticSourceListener.netcoreapp10.Tests/TestDiagnosticSource.cs rename to LOGGING/test/DiagnosticSourceListener.Tests/TestDiagnosticSource.cs diff --git a/LOGGING/test/EtwCollector.Net46.Tests/EtwCollector.Net46.Tests.csproj b/LOGGING/test/EtwCollector.Net46.Tests/EtwCollector.Net46.Tests.csproj index b04b1c8a17..e3e0e61421 100644 --- a/LOGGING/test/EtwCollector.Net46.Tests/EtwCollector.Net46.Tests.csproj +++ b/LOGGING/test/EtwCollector.Net46.Tests/EtwCollector.Net46.Tests.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/LOGGING/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj b/LOGGING/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj index afe09640a1..6f46e64da4 100644 --- a/LOGGING/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj +++ b/LOGGING/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/LOGGING/test/ILogger.NetStandard.Tests/ILogger.NetStandard.Tests.csproj b/LOGGING/test/ILogger.NetStandard.Tests/ILogger.NetStandard.Tests.csproj index ea09ded47b..a58f8aaa90 100644 --- a/LOGGING/test/ILogger.NetStandard.Tests/ILogger.NetStandard.Tests.csproj +++ b/LOGGING/test/ILogger.NetStandard.Tests/ILogger.NetStandard.Tests.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/LOGGING/test/Log4NetAppender.NetCoreApp10.Tests/Log4NetAppender.NetCoreApp10.Tests.csproj b/LOGGING/test/Log4NetAppender.NetCoreApp10.Tests/Log4NetAppender.NetCoreApp10.Tests.csproj deleted file mode 100644 index f8ee07ad58..0000000000 --- a/LOGGING/test/Log4NetAppender.NetCoreApp10.Tests/Log4NetAppender.NetCoreApp10.Tests.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - Microsoft.ApplicationInsights.Log4NetAppender.Tests - Microsoft.ApplicationInsights.Log4NetAppender.NetCoreApp10.Tests - netcoreapp1.0 - false - false - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/LOGGING/test/Log4NetAppender.Net45.Tests/ApplicationInsightsAppenderTests.cs b/LOGGING/test/Log4NetAppender.Tests/ApplicationInsightsAppenderTests.cs similarity index 99% rename from LOGGING/test/Log4NetAppender.Net45.Tests/ApplicationInsightsAppenderTests.cs rename to LOGGING/test/Log4NetAppender.Tests/ApplicationInsightsAppenderTests.cs index 09def85892..fab4faf7c7 100644 --- a/LOGGING/test/Log4NetAppender.Net45.Tests/ApplicationInsightsAppenderTests.cs +++ b/LOGGING/test/Log4NetAppender.Tests/ApplicationInsightsAppenderTests.cs @@ -108,7 +108,7 @@ public void ValidateLoggingIsWorking() { logger.Debug("Trace Debug" + i + DateTime.Now); } - + Assert.AreEqual(instrumentationKey, aiAppender.TelemetryClient.Context.InstrumentationKey); Assert.IsNull(errorHandler.Exception); } diff --git a/LOGGING/test/Log4NetAppender.Net45.Tests/GlobalSuppressions.cs b/LOGGING/test/Log4NetAppender.Tests/GlobalSuppressions.cs similarity index 100% rename from LOGGING/test/Log4NetAppender.Net45.Tests/GlobalSuppressions.cs rename to LOGGING/test/Log4NetAppender.Tests/GlobalSuppressions.cs diff --git a/LOGGING/test/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj b/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj similarity index 76% rename from LOGGING/test/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj rename to LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj index a4040d6dfc..1e9a0f4bf4 100644 --- a/LOGGING/test/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj +++ b/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj @@ -2,20 +2,23 @@ Microsoft.ApplicationInsights.Log4NetAppender.Tests - Microsoft.ApplicationInsights.Log4NetAppender.Net45.Tests - net45 + Microsoft.ApplicationInsights.Log4NetAppender.Tests + net45;netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 false + false - - + + - + + + diff --git a/LOGGING/test/Log4NetAppender.Net45.Tests/Properties/AssemblyInfo.cs b/LOGGING/test/Log4NetAppender.Tests/Properties/AssemblyInfo.cs similarity index 93% rename from LOGGING/test/Log4NetAppender.Net45.Tests/Properties/AssemblyInfo.cs rename to LOGGING/test/Log4NetAppender.Tests/Properties/AssemblyInfo.cs index 5fccfa640a..93b9728076 100644 --- a/LOGGING/test/Log4NetAppender.Net45.Tests/Properties/AssemblyInfo.cs +++ b/LOGGING/test/Log4NetAppender.Tests/Properties/AssemblyInfo.cs @@ -12,11 +12,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Log4NetAppender.Net45.Tests")] +[assembly: AssemblyTitle("Log4NetAppender.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Log4NetAppender.Net45.Tests")] +[assembly: AssemblyProduct("Log4NetAppender.Tests")] [assembly: AssemblyCopyright("Copyright © 2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/LOGGING/test/NLogTarget.NetCoreApp10.Tests/NLogTarget.NetCoreApp10.Tests.csproj b/LOGGING/test/NLogTarget.NetCoreApp10.Tests/NLogTarget.NetCoreApp10.Tests.csproj deleted file mode 100644 index b4b031b49c..0000000000 --- a/LOGGING/test/NLogTarget.NetCoreApp10.Tests/NLogTarget.NetCoreApp10.Tests.csproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - Microsoft.ApplicationInsights.NLogTarget.Tests - Microsoft.ApplicationInsights.NLogTarget.NetCoreApp10.Tests - netcoreapp1.0 - false - false - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/LOGGING/test/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj b/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj similarity index 72% rename from LOGGING/test/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj rename to LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj index b610cb92a7..090616488c 100644 --- a/LOGGING/test/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj +++ b/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj @@ -2,18 +2,22 @@ Microsoft.ApplicationInsights.NLogTarget.Tests - Microsoft.ApplicationInsights.NLogTarget.Net45.Tests - net45 + Microsoft.ApplicationInsights.NLogTarget.Tests + net45;netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 false + false - - + + + + + diff --git a/LOGGING/test/NLogTarget.Net45.Tests/NLogTargetTests.cs b/LOGGING/test/NLogTarget.Tests/NLogTargetTests.cs similarity index 100% rename from LOGGING/test/NLogTarget.Net45.Tests/NLogTargetTests.cs rename to LOGGING/test/NLogTarget.Tests/NLogTargetTests.cs diff --git a/LOGGING/test/NLogTarget.Net45.Tests/Properties/AssemblyInfo.cs b/LOGGING/test/NLogTarget.Tests/Properties/AssemblyInfo.cs similarity index 93% rename from LOGGING/test/NLogTarget.Net45.Tests/Properties/AssemblyInfo.cs rename to LOGGING/test/NLogTarget.Tests/Properties/AssemblyInfo.cs index 756aca27d7..abb8b02f13 100644 --- a/LOGGING/test/NLogTarget.Net45.Tests/Properties/AssemblyInfo.cs +++ b/LOGGING/test/NLogTarget.Tests/Properties/AssemblyInfo.cs @@ -12,11 +12,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NLogTarget.Net45.Tests")] +[assembly: AssemblyTitle("NLogTarget.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NLogTarget.Net45.Tests")] +[assembly: AssemblyProduct("NLogTarget.Tests")] [assembly: AssemblyCopyright("Copyright © 2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/LOGGING/test/Shared/ApplicationInsightsTraceFilterTests.cs b/LOGGING/test/TraceListener.Tests/ApplicationInsightsTraceFilterTests.cs similarity index 100% rename from LOGGING/test/Shared/ApplicationInsightsTraceFilterTests.cs rename to LOGGING/test/TraceListener.Tests/ApplicationInsightsTraceFilterTests.cs diff --git a/LOGGING/test/Shared/ApplicationInsightsTraceListenerTests.cs b/LOGGING/test/TraceListener.Tests/ApplicationInsightsTraceListenerTests.cs similarity index 100% rename from LOGGING/test/Shared/ApplicationInsightsTraceListenerTests.cs rename to LOGGING/test/TraceListener.Tests/ApplicationInsightsTraceListenerTests.cs diff --git a/LOGGING/test/TraceListener.Net45.Tests/Properties/AssemblyInfo.cs b/LOGGING/test/TraceListener.Tests/Properties/AssemblyInfo.cs similarity index 93% rename from LOGGING/test/TraceListener.Net45.Tests/Properties/AssemblyInfo.cs rename to LOGGING/test/TraceListener.Tests/Properties/AssemblyInfo.cs index 3ed8efd821..408b30adb7 100644 --- a/LOGGING/test/TraceListener.Net45.Tests/Properties/AssemblyInfo.cs +++ b/LOGGING/test/TraceListener.Tests/Properties/AssemblyInfo.cs @@ -12,11 +12,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("TraceListener.Net45.Tests")] +[assembly: AssemblyTitle("TraceListener.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("TraceListener.Net45.Tests")] +[assembly: AssemblyProduct("TraceListener.Tests")] [assembly: AssemblyCopyright("Copyright © 2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/LOGGING/test/TraceListener.Net45.Tests/TraceEventOptionsMatrix.xml b/LOGGING/test/TraceListener.Tests/TraceEventOptionsMatrix.xml similarity index 100% rename from LOGGING/test/TraceListener.Net45.Tests/TraceEventOptionsMatrix.xml rename to LOGGING/test/TraceListener.Tests/TraceEventOptionsMatrix.xml diff --git a/LOGGING/test/TraceListener.Net45.Tests/TraceFilterMatrix.xml b/LOGGING/test/TraceListener.Tests/TraceFilterMatrix.xml similarity index 100% rename from LOGGING/test/TraceListener.Net45.Tests/TraceFilterMatrix.xml rename to LOGGING/test/TraceListener.Tests/TraceFilterMatrix.xml diff --git a/LOGGING/test/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj b/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj similarity index 67% rename from LOGGING/test/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj rename to LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj index 2818d25c06..43d943b5a9 100644 --- a/LOGGING/test/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj +++ b/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj @@ -2,27 +2,25 @@ Microsoft.ApplicationInsights.TraceListener.Tests - Microsoft.ApplicationInsights.TraceListener.Net45.Tests - net45 + Microsoft.ApplicationInsights.TraceListener.Tests + net45;netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 false + false - - - - - - - + + - - + + + + diff --git a/LOGGING/test/TraceListener.netcoreapp10.Tests/TraceListener.netcoreapp10.Tests.csproj b/LOGGING/test/TraceListener.netcoreapp10.Tests/TraceListener.netcoreapp10.Tests.csproj deleted file mode 100644 index 70f55bb37e..0000000000 --- a/LOGGING/test/TraceListener.netcoreapp10.Tests/TraceListener.netcoreapp10.Tests.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - Microsoft.ApplicationInsights.TraceListener.Tests - Microsoft.ApplicationInsights.TraceListener.NetCoreApp10.Tests - netcoreapp1.0 - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LOGGING/test/Xdt.Tests/Xdt.Tests.csproj b/LOGGING/test/Xdt.Tests/Xdt.Tests.csproj index 38325123f0..28dd650864 100644 --- a/LOGGING/test/Xdt.Tests/Xdt.Tests.csproj +++ b/LOGGING/test/Xdt.Tests/Xdt.Tests.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/NETCORE/.vsts/linux-build.yml b/NETCORE/.vsts/linux-build.yml index 1e96495132..88edc93429 100644 --- a/NETCORE/.vsts/linux-build.yml +++ b/NETCORE/.vsts/linux-build.yml @@ -2,20 +2,22 @@ pool: vmImage: 'ubuntu-16.04' steps: -- task: DotNetCoreInstaller@2 - displayName: install dotnet core 3.0.100-preview8-013656 +## Install NetCore 3.1, Restore Solution, Build Solution, Test NetCore 3.1 + +- task: DotNetCoreInstaller@1 + displayName: install dotnet core 3.1 inputs: - version: "3.0.100-preview8-013656" + version: 3.1.x - task: DotNetCoreCLI@1 - displayName: Restore solutions + displayName: DotNetCoreCLI - Restore Solution inputs: command: "restore" projects: "NETCORE/*.sln" continueOnError: true - task: DotNetCoreCLI@1 - displayName: build all projects + displayName: DotNetCoreCLI - Build Solution inputs: command: "build" projects: "NETCORE/*.sln" @@ -29,10 +31,28 @@ steps: projects: "NETCORE/test/**/TestApp30.Tests30.csproj" arguments: "--configuration Release -l trx" -- task: DotNetCoreInstaller@2 - displayName: install dotnet core 2.2.104 +- task: DotNetCoreCLI@1 + displayName: Unit Tests for AspNetCore 3.1 + continueOnError: true + inputs: + command: "test" + projects: "NETCORE/test/**/*AspNetCore.Tests.csproj" + arguments: "--configuration Release --framework netcoreapp3.1 -l trx" + +- task: DotNetCoreCLI@1 + displayName: Unit Tests + Func Tests for WorkerService for AspNetCore 3.1 + continueOnError: true + inputs: + command: "test" + projects: "NETCORE/test/**/*WorkerService.Tests.csproj" + arguments: "--configuration Release --framework netcoreapp3.1 -l trx" + +## Install and Test NetCore 2.2 + +- task: DotNetCoreInstaller@1 + displayName: install dotnet core 2.2 inputs: - version: "2.2.104" + version: 2.2.x - task: DotNetCoreCLI@1 displayName: Functional Tests 2.0 @@ -43,36 +63,39 @@ steps: arguments: "--configuration Release -l trx" - task: DotNetCoreCLI@1 - displayName: Unit Tests for AspNetCore + displayName: Unit Tests for AspNetCore 2.1 continueOnError: true inputs: command: "test" projects: "NETCORE/test/**/*AspNetCore.Tests.csproj" - arguments: "--configuration Release -l trx" - + arguments: "--configuration Release --framework netcoreapp2.1 -l trx" + - task: DotNetCoreCLI@1 - displayName: Unit Tests + Func Tests for WorkerService + displayName: Unit Tests + Func Tests for WorkerService for AspNetCore 2.1 continueOnError: true inputs: command: "test" projects: "NETCORE/test/**/*WorkerService.Tests.csproj" - arguments: "--configuration Release -l trx" + arguments: "--configuration Release --framework netcoreapp2.1 -l trx" + +## Publish Test results - task: PublishTestResults@2 + condition: always() inputs: testRunner: "VSTest" testResultsFiles: "**/*.trx" -- task: DotNetCoreCLI@1 - displayName: Package Nuget - inputs: - command: "pack" - projects: "NETCORE/src/**/**.csproj" - arguments: "--configuration Release --include-symbols --output $(build.artifactstagingdirectory)" +#- task: DotNetCoreCLI@1 +# displayName: Package Nuget +# inputs: +# command: "pack" +# projects: "NETCORE/src/**/**.csproj" +# arguments: "--configuration Release --include-symbols --output $(build.artifactstagingdirectory)" -- task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: "$(build.artifactstagingdirectory)" - ArtifactName: "drop" - ArtifactType: "Container" \ No newline at end of file +#- task: PublishBuildArtifacts@1 +# inputs: +# PathtoPublish: "$(build.artifactstagingdirectory)" +# ArtifactName: "drop" +# ArtifactType: "Container" diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests.cs index 9499fd40c6..236915a5a4 100644 --- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests.cs +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests.cs @@ -21,7 +21,7 @@ namespace Microsoft.Extensions.DependencyInjection.Test using Microsoft.ApplicationInsights.DataContracts; using Microsoft.ApplicationInsights.DependencyCollector; using Microsoft.ApplicationInsights.Extensibility; -#if NETCOREAPP2_0 +#if NETCOREAPP using Microsoft.ApplicationInsights.Extensibility.EventCounterCollector; #endif using Microsoft.ApplicationInsights.Extensibility.Implementation; @@ -584,7 +584,7 @@ public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesItWi var modules = serviceProvider.GetServices(); Assert.NotNull(modules); -#if NETCOREAPP2_0 +#if NETCOREAPP Assert.Equal(7, modules.Count()); #else Assert.Equal(6, modules.Count()); @@ -593,7 +593,7 @@ public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesItWi var perfCounterModule = modules.OfType().Single(); Assert.NotNull(perfCounterModule); -#if NETCOREAPP2_0 +#if NETCOREAPP var eventCounterModule = modules.OfType().Single(); Assert.NotNull(eventCounterModule); #endif @@ -615,7 +615,7 @@ public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesItWi Assert.NotNull(quickPulseModuleDescriptor); } -#if NETCOREAPP2_0 +#if NETCOREAPP [Fact] public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesEventCounterCollectorWithDefaultListOfCounters() { @@ -663,7 +663,7 @@ public static void UserCanDisablePerfCollectorModule() // to this test project } -#if NETCOREAPP2_0 +#if NETCOREAPP [Fact] public static void UserCanDisableEventCounterCollectorModule() { @@ -983,7 +983,7 @@ public static void ConfigureRequestTrackingTelemetryDefaultOptions() == typeof(RequestTrackingTelemetryModule)); Assert.True(requestTrackingModule.CollectionOptions.InjectResponseHeaders); -#if NETCOREAPP2_0 || NET461 +#if NETCOREAPP || NET461 Assert.False(requestTrackingModule.CollectionOptions.TrackExceptions); #else Assert.True(requestTrackingModule.CollectionOptions.TrackExceptions); diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj index c6065ab442..b75959ff46 100644 --- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj @@ -1,11 +1,11 @@  - + 2.0.0 - netcoreapp2.0;net46;net461 - netcoreapp2.0 + netcoreapp2.1;netcoreapp3.1;net46;net461 + netcoreapp2.1;netcoreapp3.1 true true Microsoft.ApplicationInsights.AspNetCore.Tests @@ -39,12 +39,12 @@ - + - + @@ -55,6 +55,17 @@ + + + + + + + + + + + diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/Microsoft.ApplicationInsights.WorkerService.Tests.csproj b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/Microsoft.ApplicationInsights.WorkerService.Tests.csproj index 2388bd1700..2b03d67c9c 100644 --- a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/Microsoft.ApplicationInsights.WorkerService.Tests.csproj +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/Microsoft.ApplicationInsights.WorkerService.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp2.1;netcoreapp3.1 diff --git a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj index 76180fcaa3..5c3157b90a 100644 --- a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/WEB/Src/EventCounterCollector/EventCounterCollector.Tests/EventCounterCollector.Tests/EventCounterCollector.Tests.csproj b/WEB/Src/EventCounterCollector/EventCounterCollector.Tests/EventCounterCollector.Tests/EventCounterCollector.Tests.csproj index 2b22c3bfc7..633cce60f3 100644 --- a/WEB/Src/EventCounterCollector/EventCounterCollector.Tests/EventCounterCollector.Tests/EventCounterCollector.Tests.csproj +++ b/WEB/Src/EventCounterCollector/EventCounterCollector.Tests/EventCounterCollector.Tests/EventCounterCollector.Tests.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/WEB/Src/PerformanceCollector/NetCore.Tests/Perf.NetCore.Tests.csproj b/WEB/Src/PerformanceCollector/NetCore.Tests/Perf.NetCore.Tests.csproj index 19f452a812..200a807306 100644 --- a/WEB/Src/PerformanceCollector/NetCore.Tests/Perf.NetCore.Tests.csproj +++ b/WEB/Src/PerformanceCollector/NetCore.Tests/Perf.NetCore.Tests.csproj @@ -25,8 +25,8 @@ - - + + diff --git a/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/Perf-NetCore20.Tests.csproj b/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/Perf-NetCore20.Tests.csproj index 9f6e846041..d620cbb5eb 100644 --- a/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/Perf-NetCore20.Tests.csproj +++ b/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/Perf-NetCore20.Tests.csproj @@ -24,8 +24,8 @@ - - + + diff --git a/WEB/Src/WindowsServer/WindowsServer.NetCore.Tests/WindowsServer.NetCore.Tests.csproj b/WEB/Src/WindowsServer/WindowsServer.NetCore.Tests/WindowsServer.NetCore.Tests.csproj index 6bf8b6af55..d6216b721b 100644 --- a/WEB/Src/WindowsServer/WindowsServer.NetCore.Tests/WindowsServer.NetCore.Tests.csproj +++ b/WEB/Src/WindowsServer/WindowsServer.NetCore.Tests/WindowsServer.NetCore.Tests.csproj @@ -28,8 +28,8 @@ - - + +