From ca2b8e9134916668278b80ab472bf518756d71ed Mon Sep 17 00:00:00 2001 From: Eddy Nakamura Date: Tue, 28 Apr 2020 16:47:57 -0300 Subject: [PATCH] Adding NetCoreApp - Part 02 (#1814) * Adding netcoreapp1.1, 2.1 and 3.1 to EventSourceListener.Tests * Adding netcoreapp2.1 and 3.1 to EtwCollector.Tests * Adding netcoreapp2.1 and 3.1 to HostingStartup.Tests * Adding netcoreapp2.1 and 3.1 to ILogger.Tests * Adding netcoreapp3.1 to EventCounterCollector.Tests * Updating test to pass for netcoreapp * Updating EtwCollector.Tests and HostingStartup.Tests * Suggestions --- Everything.sln | 68 +++++++------- LOGGING/Logging.sln | 78 ++++++++-------- .../EtwCollector/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../EtwCollector.Tests.csproj} | 10 +- .../EtwTelemetryModuleTests.cs | 2 +- .../EventSourceModuleDiagnosticListener.cs | 0 .../Properties/AssemblyInfo.cs | 4 +- .../TestProvider.cs | 0 .../TraceEventSessionMock.cs | 0 .../TraceTelemetryComparer.cs | 0 .../EventSourceListener.Tests.csproj} | 16 +--- .../EventSourceModuleDiagnosticListener.cs | 0 .../EventSourceTelemetryModuleTests.cs | 2 +- .../OtherTestEventSource.cs | 0 .../Properties/AssemblyInfo.cs | 4 +- .../TestEventSource.cs | 0 .../TraceTelemetryComparer.cs | 0 .../ILogger.Tests.csproj} | 4 +- .../ILoggerIntegrationTests.cs | 0 .../TestTelemetryChannel.cs | 0 .../TestTelemetryProcessor.cs | 0 .../EventCounterCollector.Tests.csproj | 2 +- .../HostingStartup.Net45.Tests.csproj | 91 ------------------- .../HostingStartup.Net45.Tests/app.config | 15 --- .../ClassWithFailingStaticConstructor.cs | 0 .../GlobalSuppressions.cs | 0 .../HostingStartup.Tests.csproj | 32 +++++++ .../Properties/AssemblyInfo.cs | 43 +++++++++ .../WebRequestTrackingModuleRegisterTest.cs | 0 .../packages.config | 0 WEB/Src/Microsoft.ApplicationInsights.Web.sln | 22 ++--- 32 files changed, 182 insertions(+), 215 deletions(-) rename LOGGING/test/{EtwCollector.Net46.Tests/EtwCollector.Net46.Tests.csproj => EtwCollector.Tests/EtwCollector.Tests.csproj} (83%) rename LOGGING/test/{EtwCollector.Net46.Tests => EtwCollector.Tests}/EtwTelemetryModuleTests.cs (99%) rename LOGGING/test/{EtwCollector.Net46.Tests => EtwCollector.Tests}/EventSourceModuleDiagnosticListener.cs (100%) rename LOGGING/test/{EtwCollector.Net46.Tests => EtwCollector.Tests}/Properties/AssemblyInfo.cs (87%) rename LOGGING/test/{EtwCollector.Net46.Tests => EtwCollector.Tests}/TestProvider.cs (100%) rename LOGGING/test/{EtwCollector.Net46.Tests => EtwCollector.Tests}/TraceEventSessionMock.cs (100%) rename LOGGING/test/{EtwCollector.Net46.Tests => EtwCollector.Tests}/TraceTelemetryComparer.cs (100%) rename LOGGING/test/{EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj => EventSourceListener.Tests/EventSourceListener.Tests.csproj} (65%) rename LOGGING/test/{EventSourceListener.netcoreapp10.Tests => EventSourceListener.Tests}/EventSourceModuleDiagnosticListener.cs (100%) rename LOGGING/test/{EventSourceListener.netcoreapp10.Tests => EventSourceListener.Tests}/EventSourceTelemetryModuleTests.cs (99%) rename LOGGING/test/{EventSourceListener.netcoreapp10.Tests => EventSourceListener.Tests}/OtherTestEventSource.cs (100%) rename LOGGING/test/{EventSourceListener.netcoreapp10.Tests => EventSourceListener.Tests}/Properties/AssemblyInfo.cs (89%) rename LOGGING/test/{EventSourceListener.netcoreapp10.Tests => EventSourceListener.Tests}/TestEventSource.cs (100%) rename LOGGING/test/{EventSourceListener.netcoreapp10.Tests => EventSourceListener.Tests}/TraceTelemetryComparer.cs (100%) rename LOGGING/test/{ILogger.NetStandard.Tests/ILogger.NetStandard.Tests.csproj => ILogger.Tests/ILogger.Tests.csproj} (89%) rename LOGGING/test/{ILogger.NetStandard.Tests => ILogger.Tests}/ILoggerIntegrationTests.cs (100%) rename LOGGING/test/{ILogger.NetStandard.Tests => ILogger.Tests}/TestTelemetryChannel.cs (100%) rename LOGGING/test/{ILogger.NetStandard.Tests => ILogger.Tests}/TestTelemetryProcessor.cs (100%) delete mode 100644 WEB/Src/HostingStartup/HostingStartup.Net45.Tests/HostingStartup.Net45.Tests.csproj delete mode 100644 WEB/Src/HostingStartup/HostingStartup.Net45.Tests/app.config rename WEB/Src/HostingStartup/{HostingStartup.Net45.Tests => HostingStartup.Tests}/ClassWithFailingStaticConstructor.cs (100%) rename WEB/Src/HostingStartup/{HostingStartup.Net45.Tests => HostingStartup.Tests}/GlobalSuppressions.cs (100%) create mode 100644 WEB/Src/HostingStartup/HostingStartup.Tests/HostingStartup.Tests.csproj create mode 100644 WEB/Src/HostingStartup/HostingStartup.Tests/Properties/AssemblyInfo.cs rename WEB/Src/HostingStartup/{HostingStartup.Net45.Tests => HostingStartup.Tests}/WebRequestTrackingModuleRegisterTest.cs (100%) rename WEB/Src/HostingStartup/{HostingStartup.Net45.Tests => HostingStartup.Tests}/packages.config (100%) diff --git a/Everything.sln b/Everything.sln index dd2b3af64..eabbbd38b 100644 --- a/Everything.sln +++ b/Everything.sln @@ -97,8 +97,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DependencyCollector.Shared. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventCounterCollector.Tests", "WEB\Src\EventCounterCollector\EventCounterCollector.Tests\EventCounterCollector.Tests\EventCounterCollector.Tests.csproj", "{BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostingStartup.Net45.Tests", "WEB\Src\HostingStartup\HostingStartup.Net45.Tests\HostingStartup.Net45.Tests.csproj", "{9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Filtering.Shared", "WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.shproj", "{568AEB4F-BA4C-47A5-9FA3-68F06CD11FED}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf.NetCore.Tests", "WEB\Src\PerformanceCollector\NetCore.Tests\Perf.NetCore.Tests.csproj", "{8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}" @@ -133,12 +131,6 @@ 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}") = "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("{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}" @@ -183,6 +175,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget.Tests", "LOGGING EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TraceListener.Tests", "LOGGING\test\TraceListener.Tests\TraceListener.Tests.csproj", "{305F1C02-F984-43E7-A07E-E2514CFE29A0}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSourceListener.Tests", "LOGGING\test\EventSourceListener.Tests\EventSourceListener.Tests.csproj", "{9AD802D5-CA3B-4367-BF52-A892FD7C3A0C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EtwCollector.Tests", "LOGGING\test\EtwCollector.Tests\EtwCollector.Tests.csproj", "{37E15186-87A4-42EB-AB59-CEDB99CA2640}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostingStartup.Tests", "WEB\Src\HostingStartup\HostingStartup.Tests\HostingStartup.Tests.csproj", "{689EF12E-3630-4559-BB83-0237C74E8EDB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILogger.Tests", "LOGGING\test\ILogger.Tests\ILogger.Tests.csproj", "{7A903ABD-D7FB-4610-AED8-32EB2CBAEEBF}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Tests", "WEB\Src\Web\Web.Tests\Web.Tests.csproj", "{D12E8759-8C23-43DC-93D6-A63A8AAB910E}" EndProject Global @@ -191,8 +191,6 @@ Global WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{054c25dc-e545-4712-95c4-81f30cf65ce8}*SharedItemsImports = 13 WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{07620299-b0e7-44bb-be85-c4d1b25104f6}*SharedItemsImports = 5 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 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 @@ -202,25 +200,25 @@ Global 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 + LOGGING\test\CommonTestShared\CommonTestShared.projitems*{37e15186-87a4-42eb-ab59-cedb99ca2640}*SharedItemsImports = 5 + LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{37e15186-87a4-42eb-ab59-cedb99ca2640}*SharedItemsImports = 5 WEB\Src\Web\Web.Shared.Net\Web.Shared.Net.projitems*{395e03bb-d061-4c9d-9d47-18676566444d}*SharedItemsImports = 13 LOGGING\test\CommonTestShared\CommonTestShared.projitems*{3b9ab7fa-562d-4e4e-86e3-3348426bc0d9}*SharedItemsImports = 13 NETCORE\src\Shared\Shared.projitems*{3cab7f66-3cc4-4b46-9b0d-765c460fe2bf}*SharedItemsImports = 5 - LOGGING\test\CommonTestShared\CommonTestShared.projitems*{46167fb8-2b4b-40b4-acb3-b20615b14682}*SharedItemsImports = 5 - 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 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 LOGGING\src\CommonShared\CommonShared.projitems*{63b8fda7-2ff5-4a20-8de7-ebb036012a54}*SharedItemsImports = 5 - LOGGING\test\CommonTestShared\CommonTestShared.projitems*{6673d8ec-04f3-491f-b3c4-5c26c1228f80}*SharedItemsImports = 5 - LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{6673d8ec-04f3-491f-b3c4-5c26c1228f80}*SharedItemsImports = 5 WEB\Src\DependencyCollector\Shared\DependencyCollector.Shared.projitems*{669e7e58-072d-4b0a-a4dd-4eb2ae2ea4d4}*SharedItemsImports = 13 LOGGING\src\CommonShared\CommonShared.projitems*{67291093-4b5f-4ca5-a811-b8a1dcbe3f1f}*SharedItemsImports = 5 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 WEB\Src\WindowsServer\WindowsServer.Shared.Tests\WindowsServer.Shared.Tests.projitems*{7916ae39-ae89-4886-8842-33ac9883905a}*SharedItemsImports = 13 + LOGGING\test\CommonTestShared\CommonTestShared.projitems*{7a903abd-d7fb-4610-aed8-32eb2cbaeebf}*SharedItemsImports = 5 + LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{7a903abd-d7fb-4610-aed8-32eb2cbaeebf}*SharedItemsImports = 5 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 WEB\Src\Common\Common.projitems*{8293bc71-7ddc-4dd1-8807-280eef7e752d}*SharedItemsImports = 5 @@ -233,6 +231,8 @@ Global 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 + LOGGING\test\CommonTestShared\CommonTestShared.projitems*{9ad802d5-ca3b-4367-bf52-a892fd7c3a0c}*SharedItemsImports = 5 + LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{9ad802d5-ca3b-4367-bf52-a892fd7c3a0c}*SharedItemsImports = 5 WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{9b524bd3-682d-4b6f-9251-d4b2911df0fd}*SharedItemsImports = 13 WEB\Src\Common\Common.projitems*{9dc5c5e5-fc37-4e54-81fd-aa42bb934e9b}*SharedItemsImports = 5 WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{9dc5c5e5-fc37-4e54-81fd-aa42bb934e9b}*SharedItemsImports = 5 @@ -353,10 +353,6 @@ Global {BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}.Debug|Any CPU.Build.0 = Debug|Any CPU {BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}.Release|Any CPU.ActiveCfg = Release|Any CPU {BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}.Release|Any CPU.Build.0 = Release|Any CPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Release|Any CPU.Build.0 = Release|Any CPU {8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}.Debug|Any CPU.Build.0 = Debug|Any CPU {8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -377,18 +373,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 - {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 - {46167FB8-2B4B-40B4-ACB3-B20615B14682}.Release|Any CPU.Build.0 = Release|Any CPU - {6673D8EC-04F3-491F-B3C4-5C26C1228F80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6673D8EC-04F3-491F-B3C4-5C26C1228F80}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6673D8EC-04F3-491F-B3C4-5C26C1228F80}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6673D8EC-04F3-491F-B3C4-5C26C1228F80}.Release|Any CPU.Build.0 = Release|Any CPU - {108411B2-F1F8-48CD-B373-44A9ECCE7FEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {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 {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 @@ -465,6 +449,22 @@ Global {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 + {9AD802D5-CA3B-4367-BF52-A892FD7C3A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9AD802D5-CA3B-4367-BF52-A892FD7C3A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9AD802D5-CA3B-4367-BF52-A892FD7C3A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9AD802D5-CA3B-4367-BF52-A892FD7C3A0C}.Release|Any CPU.Build.0 = Release|Any CPU + {37E15186-87A4-42EB-AB59-CEDB99CA2640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {37E15186-87A4-42EB-AB59-CEDB99CA2640}.Debug|Any CPU.Build.0 = Debug|Any CPU + {37E15186-87A4-42EB-AB59-CEDB99CA2640}.Release|Any CPU.ActiveCfg = Release|Any CPU + {37E15186-87A4-42EB-AB59-CEDB99CA2640}.Release|Any CPU.Build.0 = Release|Any CPU + {689EF12E-3630-4559-BB83-0237C74E8EDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {689EF12E-3630-4559-BB83-0237C74E8EDB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {689EF12E-3630-4559-BB83-0237C74E8EDB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {689EF12E-3630-4559-BB83-0237C74E8EDB}.Release|Any CPU.Build.0 = Release|Any CPU + {7A903ABD-D7FB-4610-AED8-32EB2CBAEEBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7A903ABD-D7FB-4610-AED8-32EB2CBAEEBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7A903ABD-D7FB-4610-AED8-32EB2CBAEEBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7A903ABD-D7FB-4610-AED8-32EB2CBAEEBF}.Release|Any CPU.Build.0 = Release|Any CPU {D12E8759-8C23-43DC-93D6-A63A8AAB910E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D12E8759-8C23-43DC-93D6-A63A8AAB910E}.Debug|Any CPU.Build.0 = Debug|Any CPU {D12E8759-8C23-43DC-93D6-A63A8AAB910E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -497,7 +497,6 @@ Global {669E7E58-072D-4B0A-A4DD-4EB2AE2EA4D4} = {005BD823-60AF-406E-AC20-842D7653FE60} {ACE58393-3419-4FCA-87CC-C33EB756C7E4} = {005BD823-60AF-406E-AC20-842D7653FE60} {BECFC6B1-E04E-431C-A4D9-6F330F7DE22D} = {DFCBB4ED-976C-4239-BCAF-8AA21E684E8C} - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601} = {7EC1F6B8-9F94-4947-B596-EB3726C53AE0} {568AEB4F-BA4C-47A5-9FA3-68F06CD11FED} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} {8F641C0B-A57A-43EC-B91F-4258F6DC0CD5} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} {07620299-B0E7-44BB-BE85-C4D1B25104F6} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} @@ -515,9 +514,6 @@ 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} - {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} {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} @@ -537,6 +533,10 @@ Global {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} + {9AD802D5-CA3B-4367-BF52-A892FD7C3A0C} = {DB0D10AF-7DA5-49CE-B90E-67F896BEED1C} + {37E15186-87A4-42EB-AB59-CEDB99CA2640} = {05E05465-F285-4689-BFC5-F78FC5761992} + {689EF12E-3630-4559-BB83-0237C74E8EDB} = {7EC1F6B8-9F94-4947-B596-EB3726C53AE0} + {7A903ABD-D7FB-4610-AED8-32EB2CBAEEBF} = {477A1BA0-0155-404C-A6E0-C2409C0FFE70} {D12E8759-8C23-43DC-93D6-A63A8AAB910E} = {07076842-9CAA-4B4A-8AEF-88DE88CD37AC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/LOGGING/Logging.sln b/LOGGING/Logging.sln index ba1b1500d..b29254121 100644 --- a/LOGGING/Logging.sln +++ b/LOGGING/Logging.sln @@ -29,12 +29,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common.Logging", "src\Commo EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestFramework.Shared.Logging", "test\CommonTestShared\TestFramework.Shared.Logging.shproj", "{3B9AB7FA-562D-4E4E-86E3-3348426BC0D9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSourceListener.netcoreapp10.Tests", "test\EventSourceListener.netcoreapp10.Tests\EventSourceListener.netcoreapp10.Tests.csproj", "{7030CAC6-4B94-4735-B146-C0FC3097ACA6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EtwCollector", "src\EtwCollector\EtwCollector.csproj", "{9BECFB0F-4F6D-4A84-931F-70DA3E4E2813}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EtwCollector.Net46.Tests", "test\EtwCollector.Net46.Tests\EtwCollector.Net46.Tests.csproj", "{15FA58D1-F397-4808-831C-7AE65EE640AF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSourceListener", "src\EventSourceListener\EventSourceListener.csproj", "{A539BB1D-29FF-48E8-8D6E-DFCC543DC2B4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiagnosticSourceListener", "src\DiagnosticSourceListener\DiagnosticSourceListener.csproj", "{57F41D53-A8D1-42D6-AFBE-406436CFA7DF}" @@ -45,8 +41,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common.Logging.EventSource" 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}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".DependentProjects", ".DependentProjects", "{5D78454B-607D-481D-96E5-0E9EB323B027}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights", "..\BASE\src\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj", "{ED1E83B0-8656-4E2D-BB8B-158A84C45477}" @@ -59,28 +53,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget.Tests", "test\NL EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TraceListener.Tests", "test\TraceListener.Tests\TraceListener.Tests.csproj", "{FE9B0BE5-6DDD-41A2-ADAB-FDAE3017FE47}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EtwCollector.Tests", "test\EtwCollector.Tests\EtwCollector.Tests.csproj", "{73F8757C-5FFE-4E8C-A006-B13CF32A906D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSourceListener.Tests", "test\EventSourceListener.Tests\EventSourceListener.Tests.csproj", "{BB44020B-E84D-4EA1-8E3F-B1D10F7252C9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILogger.Tests", "test\ILogger.Tests\ILogger.Tests.csproj", "{275AC345-BF54-4E4D-8D64-C53191E4110F}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - 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*{275ac345-bf54-4e4d-8d64-c53191e4110f}*SharedItemsImports = 5 + test\Shared\Adapters.Shared.Tests.projitems*{275ac345-bf54-4e4d-8d64-c53191e4110f}*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 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 + test\CommonTestShared\CommonTestShared.projitems*{73f8757c-5ffe-4e8c-a006-b13cf32a906d}*SharedItemsImports = 5 + test\Shared\Adapters.Shared.Tests.projitems*{73f8757c-5ffe-4e8c-a006-b13cf32a906d}*SharedItemsImports = 5 src\CommonShared\CommonShared.projitems*{7d942802-e85e-4c3c-b97e-67a3867b7cba}*SharedItemsImports = 5 src\CommonShared\CommonShared.projitems*{9becfb0f-4f6d-4a84-931f-70da3e4e2813}*SharedItemsImports = 5 src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{9becfb0f-4f6d-4a84-931f-70da3e4e2813}*SharedItemsImports = 5 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*{bb44020b-e84d-4ea1-8e3f-b1d10f7252c9}*SharedItemsImports = 5 + test\Shared\Adapters.Shared.Tests.projitems*{bb44020b-e84d-4ea1-8e3f-b1d10f7252c9}*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 @@ -121,14 +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 - {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 - {7030CAC6-4B94-4735-B146-C0FC3097ACA6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7030CAC6-4B94-4735-B146-C0FC3097ACA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7030CAC6-4B94-4735-B146-C0FC3097ACA6}.Release|Any CPU.Build.0 = Release|Any CPU - {7030CAC6-4B94-4735-B146-C0FC3097ACA6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7030CAC6-4B94-4735-B146-C0FC3097ACA6}.Release|Mixed Platforms.Build.0 = Release|Any CPU {9BECFB0F-4F6D-4A84-931F-70DA3E4E2813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9BECFB0F-4F6D-4A84-931F-70DA3E4E2813}.Debug|Any CPU.Build.0 = Debug|Any CPU {9BECFB0F-4F6D-4A84-931F-70DA3E4E2813}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -137,14 +129,6 @@ Global {9BECFB0F-4F6D-4A84-931F-70DA3E4E2813}.Release|Any CPU.Build.0 = Release|Any CPU {9BECFB0F-4F6D-4A84-931F-70DA3E4E2813}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {9BECFB0F-4F6D-4A84-931F-70DA3E4E2813}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {15FA58D1-F397-4808-831C-7AE65EE640AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15FA58D1-F397-4808-831C-7AE65EE640AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15FA58D1-F397-4808-831C-7AE65EE640AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {15FA58D1-F397-4808-831C-7AE65EE640AF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {15FA58D1-F397-4808-831C-7AE65EE640AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15FA58D1-F397-4808-831C-7AE65EE640AF}.Release|Any CPU.Build.0 = Release|Any CPU - {15FA58D1-F397-4808-831C-7AE65EE640AF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {15FA58D1-F397-4808-831C-7AE65EE640AF}.Release|Mixed Platforms.Build.0 = Release|Any CPU {A539BB1D-29FF-48E8-8D6E-DFCC543DC2B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A539BB1D-29FF-48E8-8D6E-DFCC543DC2B4}.Debug|Any CPU.Build.0 = Debug|Any CPU {A539BB1D-29FF-48E8-8D6E-DFCC543DC2B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -177,14 +161,6 @@ Global {7D942802-E85E-4C3C-B97E-67A3867B7CBA}.Release|Any CPU.Build.0 = Release|Any CPU {7D942802-E85E-4C3C-B97E-67A3867B7CBA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {7D942802-E85E-4C3C-B97E-67A3867B7CBA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4C1B862F-8F19-4D0F-834D-694DDE0438AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C1B862F-8F19-4D0F-834D-694DDE0438AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C1B862F-8F19-4D0F-834D-694DDE0438AE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4C1B862F-8F19-4D0F-834D-694DDE0438AE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4C1B862F-8F19-4D0F-834D-694DDE0438AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C1B862F-8F19-4D0F-834D-694DDE0438AE}.Release|Any CPU.Build.0 = Release|Any CPU - {4C1B862F-8F19-4D0F-834D-694DDE0438AE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4C1B862F-8F19-4D0F-834D-694DDE0438AE}.Release|Mixed Platforms.Build.0 = Release|Any CPU {ED1E83B0-8656-4E2D-BB8B-158A84C45477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ED1E83B0-8656-4E2D-BB8B-158A84C45477}.Debug|Any CPU.Build.0 = Debug|Any CPU {ED1E83B0-8656-4E2D-BB8B-158A84C45477}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -225,6 +201,30 @@ Global {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 + {73F8757C-5FFE-4E8C-A006-B13CF32A906D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73F8757C-5FFE-4E8C-A006-B13CF32A906D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73F8757C-5FFE-4E8C-A006-B13CF32A906D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {73F8757C-5FFE-4E8C-A006-B13CF32A906D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {73F8757C-5FFE-4E8C-A006-B13CF32A906D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73F8757C-5FFE-4E8C-A006-B13CF32A906D}.Release|Any CPU.Build.0 = Release|Any CPU + {73F8757C-5FFE-4E8C-A006-B13CF32A906D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {73F8757C-5FFE-4E8C-A006-B13CF32A906D}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {BB44020B-E84D-4EA1-8E3F-B1D10F7252C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB44020B-E84D-4EA1-8E3F-B1D10F7252C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB44020B-E84D-4EA1-8E3F-B1D10F7252C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {BB44020B-E84D-4EA1-8E3F-B1D10F7252C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {BB44020B-E84D-4EA1-8E3F-B1D10F7252C9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB44020B-E84D-4EA1-8E3F-B1D10F7252C9}.Release|Any CPU.Build.0 = Release|Any CPU + {BB44020B-E84D-4EA1-8E3F-B1D10F7252C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {BB44020B-E84D-4EA1-8E3F-B1D10F7252C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {275AC345-BF54-4E4D-8D64-C53191E4110F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {275AC345-BF54-4E4D-8D64-C53191E4110F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {275AC345-BF54-4E4D-8D64-C53191E4110F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {275AC345-BF54-4E4D-8D64-C53191E4110F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {275AC345-BF54-4E4D-8D64-C53191E4110F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {275AC345-BF54-4E4D-8D64-C53191E4110F}.Release|Any CPU.Build.0 = Release|Any CPU + {275AC345-BF54-4E4D-8D64-C53191E4110F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {275AC345-BF54-4E4D-8D64-C53191E4110F}.Release|Mixed Platforms.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -236,20 +236,20 @@ Global {6C581DDA-88AF-4A64-984D-E275F2F21100} = {EE933574-C82B-4E59-A0D1-05328197B937} {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} {9BECFB0F-4F6D-4A84-931F-70DA3E4E2813} = {EE933574-C82B-4E59-A0D1-05328197B937} - {15FA58D1-F397-4808-831C-7AE65EE640AF} = {2FCC45B3-D820-405D-87FA-467C96465BB1} {A539BB1D-29FF-48E8-8D6E-DFCC543DC2B4} = {EE933574-C82B-4E59-A0D1-05328197B937} {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} {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} + {73F8757C-5FFE-4E8C-A006-B13CF32A906D} = {2FCC45B3-D820-405D-87FA-467C96465BB1} + {BB44020B-E84D-4EA1-8E3F-B1D10F7252C9} = {2FCC45B3-D820-405D-87FA-467C96465BB1} + {275AC345-BF54-4E4D-8D64-C53191E4110F} = {2FCC45B3-D820-405D-87FA-467C96465BB1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AC8888B1-0E98-49D7-BE15-EB97A6261C0D} diff --git a/LOGGING/src/EtwCollector/Properties/AssemblyInfo.cs b/LOGGING/src/EtwCollector/Properties/AssemblyInfo.cs index 5de21e53d..8eda39505 100644 --- a/LOGGING/src/EtwCollector/Properties/AssemblyInfo.cs +++ b/LOGGING/src/EtwCollector/Properties/AssemblyInfo.cs @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("9becfb0f-4f6d-4a84-931f-70da3e4e2813")] -[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.EtwCollector.Net46.Tests, PublicKey=" + AssemblyInfo.PublicKey)] +[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.EtwCollector.Tests, PublicKey=" + AssemblyInfo.PublicKey)] internal static class AssemblyInfo { diff --git a/LOGGING/src/EventSourceListener/Properties/AssemblyInfo.cs b/LOGGING/src/EventSourceListener/Properties/AssemblyInfo.cs index 1bb5832ed..9ee764f0e 100644 --- a/LOGGING/src/EventSourceListener/Properties/AssemblyInfo.cs +++ b/LOGGING/src/EventSourceListener/Properties/AssemblyInfo.cs @@ -23,7 +23,7 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("a539bb1d-29ff-48e8-8d6e-dfcc543dc2b4")] -[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.EventSourceListener.NetCoreApp10.Tests, PublicKey=" + AssemblyInfo.PublicKey)] +[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.EventSourceListener.Tests, PublicKey=" + AssemblyInfo.PublicKey)] internal static class AssemblyInfo { diff --git a/LOGGING/test/EtwCollector.Net46.Tests/EtwCollector.Net46.Tests.csproj b/LOGGING/test/EtwCollector.Tests/EtwCollector.Tests.csproj similarity index 83% rename from LOGGING/test/EtwCollector.Net46.Tests/EtwCollector.Net46.Tests.csproj rename to LOGGING/test/EtwCollector.Tests/EtwCollector.Tests.csproj index e3e0e6142..5a3c80126 100644 --- a/LOGGING/test/EtwCollector.Net46.Tests/EtwCollector.Net46.Tests.csproj +++ b/LOGGING/test/EtwCollector.Tests/EtwCollector.Tests.csproj @@ -2,9 +2,10 @@ Microsoft.ApplicationInsights.EtwCollector.Tests - Microsoft.ApplicationInsights.EtwCollector.Net46.Tests - net46 + Microsoft.ApplicationInsights.EtwCollector.Tests + net46 false + false @@ -14,9 +15,12 @@ - + + + + diff --git a/LOGGING/test/EtwCollector.Net46.Tests/EtwTelemetryModuleTests.cs b/LOGGING/test/EtwCollector.Tests/EtwTelemetryModuleTests.cs similarity index 99% rename from LOGGING/test/EtwCollector.Net46.Tests/EtwTelemetryModuleTests.cs rename to LOGGING/test/EtwCollector.Tests/EtwTelemetryModuleTests.cs index 231be448e..0e255c497 100644 --- a/LOGGING/test/EtwCollector.Net46.Tests/EtwTelemetryModuleTests.cs +++ b/LOGGING/test/EtwCollector.Tests/EtwTelemetryModuleTests.cs @@ -528,7 +528,7 @@ namespace Microsoft.ApplicationInsights.EtwTelemetryCollector.Tests { // Timed out waiting for new events to arrive. return; - } + } } while (itemsCaptured.Value < count); } diff --git a/LOGGING/test/EtwCollector.Net46.Tests/EventSourceModuleDiagnosticListener.cs b/LOGGING/test/EtwCollector.Tests/EventSourceModuleDiagnosticListener.cs similarity index 100% rename from LOGGING/test/EtwCollector.Net46.Tests/EventSourceModuleDiagnosticListener.cs rename to LOGGING/test/EtwCollector.Tests/EventSourceModuleDiagnosticListener.cs diff --git a/LOGGING/test/EtwCollector.Net46.Tests/Properties/AssemblyInfo.cs b/LOGGING/test/EtwCollector.Tests/Properties/AssemblyInfo.cs similarity index 87% rename from LOGGING/test/EtwCollector.Net46.Tests/Properties/AssemblyInfo.cs rename to LOGGING/test/EtwCollector.Tests/Properties/AssemblyInfo.cs index ce078ca29..323353bc0 100644 --- a/LOGGING/test/EtwCollector.Net46.Tests/Properties/AssemblyInfo.cs +++ b/LOGGING/test/EtwCollector.Tests/Properties/AssemblyInfo.cs @@ -5,8 +5,8 @@ using System.Runtime.InteropServices; // 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("Etw.Net451.Tests")] -[assembly: AssemblyProduct("Etw.Net451.Tests")] +[assembly: AssemblyTitle("Microsoft.ApplicationInsights.EtwCollector.Tests")] +[assembly: AssemblyProduct("Microsoft.ApplicationInsights.EtwCollector.Tests")] [assembly: AssemblyCopyright("Copyright © 2017")] // Setting ComVisible to false makes the types in this assembly not visible diff --git a/LOGGING/test/EtwCollector.Net46.Tests/TestProvider.cs b/LOGGING/test/EtwCollector.Tests/TestProvider.cs similarity index 100% rename from LOGGING/test/EtwCollector.Net46.Tests/TestProvider.cs rename to LOGGING/test/EtwCollector.Tests/TestProvider.cs diff --git a/LOGGING/test/EtwCollector.Net46.Tests/TraceEventSessionMock.cs b/LOGGING/test/EtwCollector.Tests/TraceEventSessionMock.cs similarity index 100% rename from LOGGING/test/EtwCollector.Net46.Tests/TraceEventSessionMock.cs rename to LOGGING/test/EtwCollector.Tests/TraceEventSessionMock.cs diff --git a/LOGGING/test/EtwCollector.Net46.Tests/TraceTelemetryComparer.cs b/LOGGING/test/EtwCollector.Tests/TraceTelemetryComparer.cs similarity index 100% rename from LOGGING/test/EtwCollector.Net46.Tests/TraceTelemetryComparer.cs rename to LOGGING/test/EtwCollector.Tests/TraceTelemetryComparer.cs diff --git a/LOGGING/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj b/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj similarity index 65% rename from LOGGING/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj rename to LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj index 6f46e64da..461b7f882 100644 --- a/LOGGING/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj +++ b/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj @@ -1,17 +1,11 @@ - - - + + - Debug - AnyCPU - Properties Microsoft.ApplicationInsights.EventSourceListener.Tests - Microsoft.ApplicationInsights.EventSourceListener.NetCoreApp10.Tests - netcoreapp1.0 - 512 + Microsoft.ApplicationInsights.EventSourceListener.Tests + netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 false - pdbonly - true + false diff --git a/LOGGING/test/EventSourceListener.netcoreapp10.Tests/EventSourceModuleDiagnosticListener.cs b/LOGGING/test/EventSourceListener.Tests/EventSourceModuleDiagnosticListener.cs similarity index 100% rename from LOGGING/test/EventSourceListener.netcoreapp10.Tests/EventSourceModuleDiagnosticListener.cs rename to LOGGING/test/EventSourceListener.Tests/EventSourceModuleDiagnosticListener.cs diff --git a/LOGGING/test/EventSourceListener.netcoreapp10.Tests/EventSourceTelemetryModuleTests.cs b/LOGGING/test/EventSourceListener.Tests/EventSourceTelemetryModuleTests.cs similarity index 99% rename from LOGGING/test/EventSourceListener.netcoreapp10.Tests/EventSourceTelemetryModuleTests.cs rename to LOGGING/test/EventSourceListener.Tests/EventSourceTelemetryModuleTests.cs index 43dc2bf17..25302f1b4 100644 --- a/LOGGING/test/EventSourceListener.netcoreapp10.Tests/EventSourceTelemetryModuleTests.cs +++ b/LOGGING/test/EventSourceListener.Tests/EventSourceTelemetryModuleTests.cs @@ -294,7 +294,7 @@ namespace Microsoft.ApplicationInsights.EventSourceListener.Tests expected.Properties.Add("EventId", TestEventSource.ComplexEventId.ToString(InvariantCulture)); expected.Properties.Add("EventName", nameof(TestEventSource.ComplexEvent)); expected.Properties.Add("ActivityId", activityId.ToString()); - expected.Properties.Add("Keywords", "0x8000F00000000001"); + expected.Properties.Add("Keywords", "0x0000F00000000001"); expected.Properties.Add("Channel", "Debug"); expected.Properties.Add("Opcode", "Extension"); expected.Properties.Add("Tags", "0x00000011"); diff --git a/LOGGING/test/EventSourceListener.netcoreapp10.Tests/OtherTestEventSource.cs b/LOGGING/test/EventSourceListener.Tests/OtherTestEventSource.cs similarity index 100% rename from LOGGING/test/EventSourceListener.netcoreapp10.Tests/OtherTestEventSource.cs rename to LOGGING/test/EventSourceListener.Tests/OtherTestEventSource.cs diff --git a/LOGGING/test/EventSourceListener.netcoreapp10.Tests/Properties/AssemblyInfo.cs b/LOGGING/test/EventSourceListener.Tests/Properties/AssemblyInfo.cs similarity index 89% rename from LOGGING/test/EventSourceListener.netcoreapp10.Tests/Properties/AssemblyInfo.cs rename to LOGGING/test/EventSourceListener.Tests/Properties/AssemblyInfo.cs index 94470b97d..6f0f41b8f 100644 --- a/LOGGING/test/EventSourceListener.netcoreapp10.Tests/Properties/AssemblyInfo.cs +++ b/LOGGING/test/EventSourceListener.Tests/Properties/AssemblyInfo.cs @@ -11,8 +11,8 @@ using System.Runtime.InteropServices; // 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("EventSource.Net46.Tests")] -[assembly: AssemblyProduct("EventSource.Net46.Tests")] +[assembly: AssemblyTitle("Microsoft.ApplicationInsights.EventSourceListener.Tests")] +[assembly: AssemblyProduct("Microsoft.ApplicationInsights.EventSourceListener.Tests")] [assembly: AssemblyCopyright("Copyright © 2017")] // Setting ComVisible to false makes the types in this assembly not visible diff --git a/LOGGING/test/EventSourceListener.netcoreapp10.Tests/TestEventSource.cs b/LOGGING/test/EventSourceListener.Tests/TestEventSource.cs similarity index 100% rename from LOGGING/test/EventSourceListener.netcoreapp10.Tests/TestEventSource.cs rename to LOGGING/test/EventSourceListener.Tests/TestEventSource.cs diff --git a/LOGGING/test/EventSourceListener.netcoreapp10.Tests/TraceTelemetryComparer.cs b/LOGGING/test/EventSourceListener.Tests/TraceTelemetryComparer.cs similarity index 100% rename from LOGGING/test/EventSourceListener.netcoreapp10.Tests/TraceTelemetryComparer.cs rename to LOGGING/test/EventSourceListener.Tests/TraceTelemetryComparer.cs diff --git a/LOGGING/test/ILogger.NetStandard.Tests/ILogger.NetStandard.Tests.csproj b/LOGGING/test/ILogger.Tests/ILogger.Tests.csproj similarity index 89% rename from LOGGING/test/ILogger.NetStandard.Tests/ILogger.NetStandard.Tests.csproj rename to LOGGING/test/ILogger.Tests/ILogger.Tests.csproj index a58f8aaa9..2404a77c0 100644 --- a/LOGGING/test/ILogger.NetStandard.Tests/ILogger.NetStandard.Tests.csproj +++ b/LOGGING/test/ILogger.Tests/ILogger.Tests.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.1 + netcoreapp2.1;netcoreapp3.1 false false diff --git a/LOGGING/test/ILogger.NetStandard.Tests/ILoggerIntegrationTests.cs b/LOGGING/test/ILogger.Tests/ILoggerIntegrationTests.cs similarity index 100% rename from LOGGING/test/ILogger.NetStandard.Tests/ILoggerIntegrationTests.cs rename to LOGGING/test/ILogger.Tests/ILoggerIntegrationTests.cs diff --git a/LOGGING/test/ILogger.NetStandard.Tests/TestTelemetryChannel.cs b/LOGGING/test/ILogger.Tests/TestTelemetryChannel.cs similarity index 100% rename from LOGGING/test/ILogger.NetStandard.Tests/TestTelemetryChannel.cs rename to LOGGING/test/ILogger.Tests/TestTelemetryChannel.cs diff --git a/LOGGING/test/ILogger.NetStandard.Tests/TestTelemetryProcessor.cs b/LOGGING/test/ILogger.Tests/TestTelemetryProcessor.cs similarity index 100% rename from LOGGING/test/ILogger.NetStandard.Tests/TestTelemetryProcessor.cs rename to LOGGING/test/ILogger.Tests/TestTelemetryProcessor.cs 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 633cce60f..9e6d9e0cb 100644 --- a/WEB/Src/EventCounterCollector/EventCounterCollector.Tests/EventCounterCollector.Tests/EventCounterCollector.Tests.csproj +++ b/WEB/Src/EventCounterCollector/EventCounterCollector.Tests/EventCounterCollector.Tests/EventCounterCollector.Tests.csproj @@ -5,7 +5,7 @@ - netcoreapp2.1 + netcoreapp2.1;netcoreapp3.1 Microsoft.AI.EventCounterCollector.Tests false diff --git a/WEB/Src/HostingStartup/HostingStartup.Net45.Tests/HostingStartup.Net45.Tests.csproj b/WEB/Src/HostingStartup/HostingStartup.Net45.Tests/HostingStartup.Net45.Tests.csproj deleted file mode 100644 index 6887c30e3..000000000 --- a/WEB/Src/HostingStartup/HostingStartup.Net45.Tests/HostingStartup.Net45.Tests.csproj +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - Debug - AnyCPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601} - Library - Properties - Microsoft.ApplicationInsights.HostingStartup.Net45.Tests - Microsoft.ApplicationInsights.HostingStartup.Net45.Tests - v4.5 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - ..\..\ - - - - $(DefineConstants);NET45 - - - - fakesAssemblyForBuild\Microsoft.QualityTools.Testing.Fakes.dll - - - - - ..\..\..\..\..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll - - - ..\..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net45\System.Diagnostics.DiagnosticSource.dll - - - ..\..\..\..\..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll - - - - ..\..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll - - - - - - - - - Designer - - - - - - - - - - {e3d160e8-7f8c-416f-946f-6fdfc6787461} - Microsoft.ApplicationInsights - - - {80f0481a-66c7-4442-96d3-5fd841132c4b} - HostingStartup - - - - - - - False - - - False - - - False - - - False - - - - - - - \ No newline at end of file diff --git a/WEB/Src/HostingStartup/HostingStartup.Net45.Tests/app.config b/WEB/Src/HostingStartup/HostingStartup.Net45.Tests/app.config deleted file mode 100644 index 249e3239f..000000000 --- a/WEB/Src/HostingStartup/HostingStartup.Net45.Tests/app.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/WEB/Src/HostingStartup/HostingStartup.Net45.Tests/ClassWithFailingStaticConstructor.cs b/WEB/Src/HostingStartup/HostingStartup.Tests/ClassWithFailingStaticConstructor.cs similarity index 100% rename from WEB/Src/HostingStartup/HostingStartup.Net45.Tests/ClassWithFailingStaticConstructor.cs rename to WEB/Src/HostingStartup/HostingStartup.Tests/ClassWithFailingStaticConstructor.cs diff --git a/WEB/Src/HostingStartup/HostingStartup.Net45.Tests/GlobalSuppressions.cs b/WEB/Src/HostingStartup/HostingStartup.Tests/GlobalSuppressions.cs similarity index 100% rename from WEB/Src/HostingStartup/HostingStartup.Net45.Tests/GlobalSuppressions.cs rename to WEB/Src/HostingStartup/HostingStartup.Tests/GlobalSuppressions.cs diff --git a/WEB/Src/HostingStartup/HostingStartup.Tests/HostingStartup.Tests.csproj b/WEB/Src/HostingStartup/HostingStartup.Tests/HostingStartup.Tests.csproj new file mode 100644 index 000000000..ebc419167 --- /dev/null +++ b/WEB/Src/HostingStartup/HostingStartup.Tests/HostingStartup.Tests.csproj @@ -0,0 +1,32 @@ + + + + Microsoft.ApplicationInsights.HostingStartup.Tests + Microsoft.ApplicationInsights.HostingStartup.Tests + net45 + false + false + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WEB/Src/HostingStartup/HostingStartup.Tests/Properties/AssemblyInfo.cs b/WEB/Src/HostingStartup/HostingStartup.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..305bc43c4 --- /dev/null +++ b/WEB/Src/HostingStartup/HostingStartup.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,43 @@ +// ----------------------------------------------------------------------- +// +// Copyright (c) Microsoft Corporation. +// All rights reserved. 2013 +// +// ----------------------------------------------------------------------- + +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 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("HostingStartup.Tests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("HostingStartup.Tests")] +[assembly: AssemblyCopyright("Copyright © 2015")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("8e16d10d-0483-429c-bbf1-3627e8ccc43b")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +// [assembly: AssemblyVersion("1.0.0.0")] +// [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/WEB/Src/HostingStartup/HostingStartup.Net45.Tests/WebRequestTrackingModuleRegisterTest.cs b/WEB/Src/HostingStartup/HostingStartup.Tests/WebRequestTrackingModuleRegisterTest.cs similarity index 100% rename from WEB/Src/HostingStartup/HostingStartup.Net45.Tests/WebRequestTrackingModuleRegisterTest.cs rename to WEB/Src/HostingStartup/HostingStartup.Tests/WebRequestTrackingModuleRegisterTest.cs diff --git a/WEB/Src/HostingStartup/HostingStartup.Net45.Tests/packages.config b/WEB/Src/HostingStartup/HostingStartup.Tests/packages.config similarity index 100% rename from WEB/Src/HostingStartup/HostingStartup.Net45.Tests/packages.config rename to WEB/Src/HostingStartup/HostingStartup.Tests/packages.config diff --git a/WEB/Src/Microsoft.ApplicationInsights.Web.sln b/WEB/Src/Microsoft.ApplicationInsights.Web.sln index e2becae50..3e314513a 100644 --- a/WEB/Src/Microsoft.ApplicationInsights.Web.sln +++ b/WEB/Src/Microsoft.ApplicationInsights.Web.sln @@ -47,8 +47,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common.Web", "Common\Common EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostingStartup", "HostingStartup", "{701D2D4F-B581-45A2-AF29-4F34EC5F047B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostingStartup.Net45.Tests", "HostingStartup\HostingStartup.Net45.Tests\HostingStartup.Net45.Tests.csproj", "{9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared", "PerformanceCollector\Perf.Shared\Perf.Shared.shproj", "{A78F50D4-F518-4DCB-878B-526FD54CCA35}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Filtering.Shared", "PerformanceCollector\Filtering.Shared\Filtering.Shared.shproj", "{568AEB4F-BA4C-47A5-9FA3-68F06CD11FED}" @@ -95,6 +93,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyCollector.Tests", EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetFull", "PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.shproj", "{0196259C-3582-4F4E-A01F-A8F9AE83B0F3}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostingStartup.Tests", "HostingStartup\HostingStartup.Tests\HostingStartup.Tests.csproj", "{7592A20A-1775-4479-B624-7275173E9821}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Tests", "Web\Web.Tests\Web.Tests.csproj", "{1231D63B-E7FA-4BA7-9916-FA7325DB936D}" EndProject Global @@ -175,14 +175,6 @@ Global {C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Release|Any CPU.Build.0 = Release|Any CPU {C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Release|Any CPU.Build.0 = Release|Any CPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Release|Mixed Platforms.Build.0 = Release|Any CPU {D5EFA02A-971E-477C-896B-C3AA93093267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D5EFA02A-971E-477C-896B-C3AA93093267}.Debug|Any CPU.Build.0 = Debug|Any CPU {D5EFA02A-971E-477C-896B-C3AA93093267}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -287,6 +279,14 @@ Global {9853A2A5-FD6C-4743-927E-0BFE807AD21C}.Release|Any CPU.Build.0 = Release|Any CPU {9853A2A5-FD6C-4743-927E-0BFE807AD21C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {9853A2A5-FD6C-4743-927E-0BFE807AD21C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7592A20A-1775-4479-B624-7275173E9821}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7592A20A-1775-4479-B624-7275173E9821}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7592A20A-1775-4479-B624-7275173E9821}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7592A20A-1775-4479-B624-7275173E9821}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7592A20A-1775-4479-B624-7275173E9821}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7592A20A-1775-4479-B624-7275173E9821}.Release|Any CPU.Build.0 = Release|Any CPU + {7592A20A-1775-4479-B624-7275173E9821}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7592A20A-1775-4479-B624-7275173E9821}.Release|Mixed Platforms.Build.0 = Release|Any CPU {1231D63B-E7FA-4BA7-9916-FA7325DB936D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1231D63B-E7FA-4BA7-9916-FA7325DB936D}.Debug|Any CPU.Build.0 = Debug|Any CPU {1231D63B-E7FA-4BA7-9916-FA7325DB936D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -309,7 +309,6 @@ Global {9718F051-147F-4F5F-9FF3-C926430EFCF7} = {8CA9F9C9-DA39-4159-86F3-C52F1636715E} {F254D4FB-428D-408E-8251-39BCA7B4B5CE} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} {C6B569BC-6F19-42C9-A951-DA611BB0F4BE} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} - {9AB6BDFD-253C-4C97-8BB8-7234ADFCB601} = {701D2D4F-B581-45A2-AF29-4F34EC5F047B} {A78F50D4-F518-4DCB-878B-526FD54CCA35} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} {568AEB4F-BA4C-47A5-9FA3-68F06CD11FED} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} {D5EFA02A-971E-477C-896B-C3AA93093267} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} @@ -330,6 +329,7 @@ Global {41301181-F4BE-4C36-B78D-A29C55CB0469} = {85C7566E-98C3-479D-AC4F-0D4B161B7D42} {9853A2A5-FD6C-4743-927E-0BFE807AD21C} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB} {0196259C-3582-4F4E-A01F-A8F9AE83B0F3} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} + {7592A20A-1775-4479-B624-7275173E9821} = {701D2D4F-B581-45A2-AF29-4F34EC5F047B} {1231D63B-E7FA-4BA7-9916-FA7325DB936D} = {1A75535C-B8E5-4C31-BC6E-50456C8C4052} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution