diff --git a/CodeCov.ps1 b/CodeCov.ps1 index f5ce86c3..248e94b0 100644 --- a/CodeCov.ps1 +++ b/CodeCov.ps1 @@ -1,7 +1,7 @@ Param([String]$binRoot='..\bin', [String]$configuration='Release') #Run code coverage tests to generate report -..\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user "-target:C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" "-targetargs:$binRoot\$configuration\src\Adapters.Tests\Log4NetAppender.Net40.Tests\Microsoft.ApplicationInsights.Log4NetAppender.Net40.Tests.dll $binRoot\$configuration\src\Adapters.Tests\Log4NetAppender.Net45.Tests\Microsoft.ApplicationInsights.Log4NetAppender.Net45.Tests.dll $binRoot\$configuration\src\Adapters.Tests\NLogTarget.Net40.Tests\Microsoft.ApplicationInsights.NLogTarget.Net40.Tests.dll $binRoot\$configuration\src\Adapters.Tests\NLogTarget.Net45.Tests\Microsoft.ApplicationInsights.NLogTarget.Net45.Tests.dll $binRoot\$configuration\src\Adapters.Tests\TraceListener.Net40.Tests\Microsoft.ApplicationInsights.TraceListener.Net40.Tests.dll $binRoot\$configuration\src\Adapters.Tests\TraceListener.Net45.Tests\Microsoft.ApplicationInsights.TraceListener.Net45.Tests.dll $binRoot\$configuration\src\NuGet.Tests\Xdt.Tests\Xdt.Tests.dll /logger:trx" "-filter:+[Microsoft.ApplicationInsights*]* -[*Tests]*" -hideskipped:All -output:.\coverage.xml +..\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user "-target:C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" $binRoot\$configuration\src\Adapters.Tests\Log4NetAppender.Net45.Tests\Microsoft.ApplicationInsights.Log4NetAppender.Net45.Tests.dll $binRoot\$configuration\src\Adapters.Tests\NLogTarget.Net45.Tests\Microsoft.ApplicationInsights.NLogTarget.Net45.Tests.dll $binRoot\$configuration\src\Adapters.Tests\TraceListener.Net45.Tests\Microsoft.ApplicationInsights.TraceListener.Net45.Tests.dll $binRoot\$configuration\src\NuGet.Tests\Xdt.Tests\Xdt.Tests.dll /logger:trx" "-filter:+[Microsoft.ApplicationInsights*]* -[*Tests]*" -hideskipped:All -output:.\coverage.xml #Download report uploader (New-Object System.Net.WebClient).DownloadFile("https://codecov.io/bash", ".\CodecovUploader.sh") diff --git a/Logging.sln b/Logging.sln index 11393920..4b37ee3d 100644 --- a/Logging.sln +++ b/Logging.sln @@ -3,76 +3,73 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27110.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Adapters", "Adapters", "{EE933574-C82B-4E59-A0D1-05328197B937}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EE933574-C82B-4E59-A0D1-05328197B937}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Adapters.Tests", "Adapters.Tests", "{2FCC45B3-D820-405D-87FA-467C96465BB1}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2FCC45B3-D820-405D-87FA-467C96465BB1}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Adapters.Shared.Tests", "src\Adapters.Tests\Shared\Adapters.Shared.Tests.shproj", "{FA775630-7917-4A99-A78C-FBA46EDF685C}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Adapters.Shared.Tests", "test\Shared\Adapters.Shared.Tests.shproj", "{FA775630-7917-4A99-A78C-FBA46EDF685C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet.Tests", "NuGet.Tests", "{F8C8CF80-83DB-4E2F-9C27-51D43D7B1E25}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xdt.Tests", "src\NuGet.Tests\Xdt.Tests\Xdt.Tests.csproj", "{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xdt.Tests", "test\Xdt.Tests\Xdt.Tests.csproj", "{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{117E14CF-5656-42BD-B64E-93142160B6FA}" ProjectSection(SolutionItems) = preProject + CodeCov.ps1 = CodeCov.ps1 Common.props = Common.props Common.targets = Common.targets Directory.Build.props = Directory.Build.props GlobalStaticVersion.props = GlobalStaticVersion.props NuGet.Config = NuGet.Config - src\Adapters\Product.props = src\Adapters\Product.props + src\Product.props = src\Product.props Signing.targets = Signing.targets Test.props = Test.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Log4NetAppender.Net45", "src\Adapters\Log4NetAppender.Net45\Log4NetAppender.Net45.csproj", "{CB555B89-94D7-4B38-92D9-9F497A796966}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget.Net45", "src\Adapters\NLogTarget.Net45\NLogTarget.Net45.csproj", "{6C581DDA-88AF-4A64-984D-E275F2F21100}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Log4NetAppender", "src\Log4NetAppender\Log4NetAppender.csproj", "{CB555B89-94D7-4B38-92D9-9F497A796966}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Log4NetAppender.Net45.Tests", "src\Adapters.Tests\Log4NetAppender.Net45.Tests\Log4NetAppender.Net45.Tests.csproj", "{C537553E-C7D0-42E4-884F-10A9C6063D4A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget", "src\NLogTarget\NLogTarget.csproj", "{6C581DDA-88AF-4A64-984D-E275F2F21100}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget.Net45.Tests", "src\Adapters.Tests\NLogTarget.Net45.Tests\NLogTarget.Net45.Tests.csproj", "{BE1D6405-1930-4A19-A24C-027B008C5011}" +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}") = "TraceListener.Net45.Tests", "src\Adapters.Tests\TraceListener.Net45.Tests\TraceListener.Net45.Tests.csproj", "{E6F03762-6BD6-4B38-8798-42C189AAB18C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLogTarget.Net45.Tests", "test\NLogTarget.Net45.Tests\NLogTarget.Net45.Tests.csproj", "{BE1D6405-1930-4A19-A24C-027B008C5011}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CommonShared", "src\Adapters\CommonShared\CommonShared.shproj", "{587B624B-8C64-498E-93D7-A2D2ABC17EAB}" +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}") = "CommonTestShared", "src\Adapters.Tests\CommonTestShared\CommonTestShared.shproj", "{3B9AB7FA-562D-4E4E-86E3-3348426BC0D9}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CommonShared", "src\CommonShared\CommonShared.shproj", "{587B624B-8C64-498E-93D7-A2D2ABC17EAB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSource.Netstandard13.Tests", "src\Adapters.Tests\EventSource.Netstandard13.Tests\EventSource.Netstandard13.Tests.csproj", "{7030CAC6-4B94-4735-B146-C0FC3097ACA6}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CommonTestShared", "test\CommonTestShared\CommonTestShared.shproj", "{3B9AB7FA-562D-4E4E-86E3-3348426BC0D9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Etw.Net451", "src\Adapters\Etw.Net451\Etw.Net451.csproj", "{9BECFB0F-4F6D-4A84-931F-70DA3E4E2813}" +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}") = "Etw.Net451.Tests", "src\Adapters.Tests\Etw.Net451.Tests\Etw.Net451.Tests.csproj", "{15FA58D1-F397-4808-831C-7AE65EE640AF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EtwCollector", "src\EtwCollector\EtwCollector.csproj", "{9BECFB0F-4F6D-4A84-931F-70DA3E4E2813}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSource.Netstandard13", "src\Adapters\EventSource.Netstandard13\EventSource.Netstandard13.csproj", "{A539BB1D-29FF-48E8-8D6E-DFCC543DC2B4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EtwCollector.Net451.Tests", "test\EtwCollector.Net451.Tests\EtwCollector.Net451.Tests.csproj", "{15FA58D1-F397-4808-831C-7AE65EE640AF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiagnosticSourceListener", "src\Adapters\DiagnosticSource\DiagnosticSourceListener.csproj", "{57F41D53-A8D1-42D6-AFBE-406436CFA7DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSourceListener", "src\EventSourceListener\EventSourceListener.csproj", "{A539BB1D-29FF-48E8-8D6E-DFCC543DC2B4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiagnosticSourceListener.Tests", "src\Adapters.Tests\DiagnosticSource.Tests\DiagnosticSourceListener.Tests.csproj", "{A716D37C-B736-4CF0-8DF5-36BDE57DA2A5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiagnosticSourceListener", "src\DiagnosticSourceListener\DiagnosticSourceListener.csproj", "{57F41D53-A8D1-42D6-AFBE-406436CFA7DF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TraceListener.Net45", "src\Adapters\TraceListener.Net45\TraceListener.Net45.csproj", "{E3766DD1-F376-43F8-B242-6CF06E186179}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TraceListener", "src\TraceListener\TraceListener.csproj", "{E3766DD1-F376-43F8-B242-6CF06E186179}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "EventSource.Shared", "src\Adapters\EventSource.Shared\EventSource.Shared\EventSource.Shared.shproj", "{A964DE6D-9750-4013-8BE2-79C2AFC056E5}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "EventSource.Shared", "src\EventSource.Shared\EventSource.Shared\EventSource.Shared.shproj", "{A964DE6D-9750-4013-8BE2-79C2AFC056E5}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - src\Adapters.Tests\CommonTestShared\CommonTestShared.projitems*{3b9ab7fa-562d-4e4e-86e3-3348426bc0d9}*SharedItemsImports = 13 - src\Adapters\CommonShared\CommonShared.projitems*{587b624b-8c64-498e-93d7-a2d2abc17eab}*SharedItemsImports = 13 - src\Adapters\CommonShared\CommonShared.projitems*{6c581dda-88af-4a64-984d-e275f2f21100}*SharedItemsImports = 4 - src\Adapters\NLogTarget.Shared\NLogTarget.Shared.projitems*{6c581dda-88af-4a64-984d-e275f2f21100}*SharedItemsImports = 4 - src\Adapters.Tests\CommonTestShared\CommonTestShared.projitems*{7030cac6-4b94-4735-b146-c0fc3097aca6}*SharedItemsImports = 4 - src\Adapters.Tests\Shared\Adapters.Shared.Tests.projitems*{7030cac6-4b94-4735-b146-c0fc3097aca6}*SharedItemsImports = 4 - src\Adapters\CommonShared\CommonShared.projitems*{9becfb0f-4f6d-4a84-931f-70da3e4e2813}*SharedItemsImports = 4 - src\Adapters\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{9becfb0f-4f6d-4a84-931f-70da3e4e2813}*SharedItemsImports = 4 - src\Adapters\CommonShared\CommonShared.projitems*{a539bb1d-29ff-48e8-8d6e-dfcc543dc2b4}*SharedItemsImports = 4 - src\Adapters\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{a539bb1d-29ff-48e8-8d6e-dfcc543dc2b4}*SharedItemsImports = 4 - src\Adapters\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{a964de6d-9750-4013-8be2-79c2afc056e5}*SharedItemsImports = 13 - src\Adapters\CommonShared\CommonShared.projitems*{cb555b89-94d7-4b38-92d9-9f497a796966}*SharedItemsImports = 4 - src\Adapters\Log4NetAppender.Shared\Log4NetAppender.Shared.projitems*{cb555b89-94d7-4b38-92d9-9f497a796966}*SharedItemsImports = 4 - src\Adapters\CommonShared\CommonShared.projitems*{e3766dd1-f376-43f8-b242-6cf06e186179}*SharedItemsImports = 4 - src\Adapters\TraceListener.Shared\TraceListener.Shared.projitems*{e3766dd1-f376-43f8-b242-6cf06e186179}*SharedItemsImports = 4 - src\Adapters.Tests\Shared\Adapters.Shared.Tests.projitems*{fa775630-7917-4a99-a78c-fba46edf685c}*SharedItemsImports = 13 + test\CommonTestShared\CommonTestShared.projitems*{3b9ab7fa-562d-4e4e-86e3-3348426bc0d9}*SharedItemsImports = 13 + src\CommonShared\CommonShared.projitems*{587b624b-8c64-498e-93d7-a2d2abc17eab}*SharedItemsImports = 13 + src\CommonShared\CommonShared.projitems*{6c581dda-88af-4a64-984d-e275f2f21100}*SharedItemsImports = 4 + src\NLogTarget.Shared\NLogTarget.Shared.projitems*{6c581dda-88af-4a64-984d-e275f2f21100}*SharedItemsImports = 4 + test\CommonTestShared\CommonTestShared.projitems*{7030cac6-4b94-4735-b146-c0fc3097aca6}*SharedItemsImports = 4 + test\Shared\Adapters.Shared.Tests.projitems*{7030cac6-4b94-4735-b146-c0fc3097aca6}*SharedItemsImports = 4 + src\CommonShared\CommonShared.projitems*{9becfb0f-4f6d-4a84-931f-70da3e4e2813}*SharedItemsImports = 4 + src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{9becfb0f-4f6d-4a84-931f-70da3e4e2813}*SharedItemsImports = 4 + src\CommonShared\CommonShared.projitems*{a539bb1d-29ff-48e8-8d6e-dfcc543dc2b4}*SharedItemsImports = 4 + src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{a539bb1d-29ff-48e8-8d6e-dfcc543dc2b4}*SharedItemsImports = 4 + src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{a964de6d-9750-4013-8be2-79c2afc056e5}*SharedItemsImports = 13 + src\CommonShared\CommonShared.projitems*{cb555b89-94d7-4b38-92d9-9f497a796966}*SharedItemsImports = 4 + src\Log4NetAppender.Shared\Log4NetAppender.Shared.projitems*{cb555b89-94d7-4b38-92d9-9f497a796966}*SharedItemsImports = 4 + src\CommonShared\CommonShared.projitems*{e3766dd1-f376-43f8-b242-6cf06e186179}*SharedItemsImports = 4 + src\TraceListener.Shared\TraceListener.Shared.projitems*{e3766dd1-f376-43f8-b242-6cf06e186179}*SharedItemsImports = 4 + test\Shared\Adapters.Shared.Tests.projitems*{fa775630-7917-4a99-a78c-fba46edf685c}*SharedItemsImports = 13 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -169,14 +166,6 @@ Global {57F41D53-A8D1-42D6-AFBE-406436CFA7DF}.Release|Any CPU.Build.0 = Release|Any CPU {57F41D53-A8D1-42D6-AFBE-406436CFA7DF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {57F41D53-A8D1-42D6-AFBE-406436CFA7DF}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A716D37C-B736-4CF0-8DF5-36BDE57DA2A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A716D37C-B736-4CF0-8DF5-36BDE57DA2A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A716D37C-B736-4CF0-8DF5-36BDE57DA2A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A716D37C-B736-4CF0-8DF5-36BDE57DA2A5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A716D37C-B736-4CF0-8DF5-36BDE57DA2A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A716D37C-B736-4CF0-8DF5-36BDE57DA2A5}.Release|Any CPU.Build.0 = Release|Any CPU - {A716D37C-B736-4CF0-8DF5-36BDE57DA2A5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A716D37C-B736-4CF0-8DF5-36BDE57DA2A5}.Release|Mixed Platforms.Build.0 = Release|Any CPU {E3766DD1-F376-43F8-B242-6CF06E186179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E3766DD1-F376-43F8-B242-6CF06E186179}.Debug|Any CPU.Build.0 = Debug|Any CPU {E3766DD1-F376-43F8-B242-6CF06E186179}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -191,7 +180,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {FA775630-7917-4A99-A78C-FBA46EDF685C} = {2FCC45B3-D820-405D-87FA-467C96465BB1} - {C6B569BC-6F19-42C9-A951-DA611BB0F4BE} = {F8C8CF80-83DB-4E2F-9C27-51D43D7B1E25} + {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} @@ -204,7 +193,6 @@ Global {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} - {A716D37C-B736-4CF0-8DF5-36BDE57DA2A5} = {2FCC45B3-D820-405D-87FA-467C96465BB1} {E3766DD1-F376-43F8-B242-6CF06E186179} = {EE933574-C82B-4E59-A0D1-05328197B937} {A964DE6D-9750-4013-8BE2-79C2AFC056E5} = {EE933574-C82B-4E59-A0D1-05328197B937} EndGlobalSection diff --git a/src/Adapters/CommonShared/CommonShared.projitems b/src/CommonShared/CommonShared.projitems similarity index 100% rename from src/Adapters/CommonShared/CommonShared.projitems rename to src/CommonShared/CommonShared.projitems diff --git a/src/Adapters/CommonShared/CommonShared.shproj b/src/CommonShared/CommonShared.shproj similarity index 100% rename from src/Adapters/CommonShared/CommonShared.shproj rename to src/CommonShared/CommonShared.shproj diff --git a/src/Adapters/CommonShared/SdkVersionUtils.cs b/src/CommonShared/SdkVersionUtils.cs similarity index 100% rename from src/Adapters/CommonShared/SdkVersionUtils.cs rename to src/CommonShared/SdkVersionUtils.cs diff --git a/src/Adapters/DiagnosticSource/ApplicationInsights.config.install.xdt b/src/DiagnosticSourceListener/ApplicationInsights.config.install.xdt similarity index 100% rename from src/Adapters/DiagnosticSource/ApplicationInsights.config.install.xdt rename to src/DiagnosticSourceListener/ApplicationInsights.config.install.xdt diff --git a/src/Adapters/DiagnosticSource/ApplicationInsights.config.uninstall.xdt b/src/DiagnosticSourceListener/ApplicationInsights.config.uninstall.xdt similarity index 100% rename from src/Adapters/DiagnosticSource/ApplicationInsights.config.uninstall.xdt rename to src/DiagnosticSourceListener/ApplicationInsights.config.uninstall.xdt diff --git a/src/Adapters/DiagnosticSource/DeclaredPropertiesCache.cs b/src/DiagnosticSourceListener/DeclaredPropertiesCache.cs similarity index 100% rename from src/Adapters/DiagnosticSource/DeclaredPropertiesCache.cs rename to src/DiagnosticSourceListener/DeclaredPropertiesCache.cs diff --git a/src/Adapters/DiagnosticSource/DiagnosticSourceListener.csproj b/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj similarity index 100% rename from src/Adapters/DiagnosticSource/DiagnosticSourceListener.csproj rename to src/DiagnosticSourceListener/DiagnosticSourceListener.csproj diff --git a/src/Adapters/DiagnosticSource/DiagnosticSourceListenerSubscription.cs b/src/DiagnosticSourceListener/DiagnosticSourceListenerSubscription.cs similarity index 100% rename from src/Adapters/DiagnosticSource/DiagnosticSourceListenerSubscription.cs rename to src/DiagnosticSourceListener/DiagnosticSourceListenerSubscription.cs diff --git a/src/Adapters/DiagnosticSource/DiagnosticSourceListeningRequest.cs b/src/DiagnosticSourceListener/DiagnosticSourceListeningRequest.cs similarity index 100% rename from src/Adapters/DiagnosticSource/DiagnosticSourceListeningRequest.cs rename to src/DiagnosticSourceListener/DiagnosticSourceListeningRequest.cs diff --git a/src/Adapters/DiagnosticSource/DiagnosticSourceTelemetryModule.cs b/src/DiagnosticSourceListener/DiagnosticSourceTelemetryModule.cs similarity index 100% rename from src/Adapters/DiagnosticSource/DiagnosticSourceTelemetryModule.cs rename to src/DiagnosticSourceListener/DiagnosticSourceTelemetryModule.cs diff --git a/src/Adapters/Etw.Net451/AITraceEventSession.cs b/src/EtwCollector/AITraceEventSession.cs similarity index 100% rename from src/Adapters/Etw.Net451/AITraceEventSession.cs rename to src/EtwCollector/AITraceEventSession.cs diff --git a/src/Adapters/Etw.Net451/ApplicationInsights.config.install.xdt b/src/EtwCollector/ApplicationInsights.config.install.xdt similarity index 100% rename from src/Adapters/Etw.Net451/ApplicationInsights.config.install.xdt rename to src/EtwCollector/ApplicationInsights.config.install.xdt diff --git a/src/Adapters/Etw.Net451/ApplicationInsights.config.uninstall.xdt b/src/EtwCollector/ApplicationInsights.config.uninstall.xdt similarity index 100% rename from src/Adapters/Etw.Net451/ApplicationInsights.config.uninstall.xdt rename to src/EtwCollector/ApplicationInsights.config.uninstall.xdt diff --git a/src/Adapters/Etw.Net451/Etw.Net451.csproj b/src/EtwCollector/EtwCollector.csproj similarity index 100% rename from src/Adapters/Etw.Net451/Etw.Net451.csproj rename to src/EtwCollector/EtwCollector.csproj diff --git a/src/Adapters/Etw.Net451/EtwListeningRequest.cs b/src/EtwCollector/EtwListeningRequest.cs similarity index 100% rename from src/Adapters/Etw.Net451/EtwListeningRequest.cs rename to src/EtwCollector/EtwListeningRequest.cs diff --git a/src/Adapters/Etw.Net451/EtwTelemetryModule.cs b/src/EtwCollector/EtwTelemetryModule.cs similarity index 100% rename from src/Adapters/Etw.Net451/EtwTelemetryModule.cs rename to src/EtwCollector/EtwTelemetryModule.cs diff --git a/src/Adapters/Etw.Net451/ITraceEventSession.cs b/src/EtwCollector/ITraceEventSession.cs similarity index 100% rename from src/Adapters/Etw.Net451/ITraceEventSession.cs rename to src/EtwCollector/ITraceEventSession.cs diff --git a/src/Adapters/Etw.Net451/Implemenetation/TraceEventExtensions.cs b/src/EtwCollector/Implemenetation/TraceEventExtensions.cs similarity index 100% rename from src/Adapters/Etw.Net451/Implemenetation/TraceEventExtensions.cs rename to src/EtwCollector/Implemenetation/TraceEventExtensions.cs diff --git a/src/Adapters/Etw.Net451/Properties/AssemblyInfo.cs b/src/EtwCollector/Properties/AssemblyInfo.cs similarity index 100% rename from src/Adapters/Etw.Net451/Properties/AssemblyInfo.cs rename to src/EtwCollector/Properties/AssemblyInfo.cs diff --git a/src/Adapters/EventSource.Shared/EventSource.Shared/EventSource.Shared.projitems b/src/EventSource.Shared/EventSource.Shared/EventSource.Shared.projitems similarity index 100% rename from src/Adapters/EventSource.Shared/EventSource.Shared/EventSource.Shared.projitems rename to src/EventSource.Shared/EventSource.Shared/EventSource.Shared.projitems diff --git a/src/Adapters/EventSource.Shared/EventSource.Shared/EventSource.Shared.shproj b/src/EventSource.Shared/EventSource.Shared/EventSource.Shared.shproj similarity index 100% rename from src/Adapters/EventSource.Shared/EventSource.Shared/EventSource.Shared.shproj rename to src/EventSource.Shared/EventSource.Shared/EventSource.Shared.shproj diff --git a/src/Adapters/EventSource.Shared/EventSource.Shared/Implementation/EventSourceListenerEventSource.cs b/src/EventSource.Shared/EventSource.Shared/Implementation/EventSourceListenerEventSource.cs similarity index 100% rename from src/Adapters/EventSource.Shared/EventSource.Shared/Implementation/EventSourceListenerEventSource.cs rename to src/EventSource.Shared/EventSource.Shared/Implementation/EventSourceListenerEventSource.cs diff --git a/src/Adapters/EventSource.Shared/EventSource.Shared/Utilities/ActivityPathDecoder.cs b/src/EventSource.Shared/EventSource.Shared/Utilities/ActivityPathDecoder.cs similarity index 100% rename from src/Adapters/EventSource.Shared/EventSource.Shared/Utilities/ActivityPathDecoder.cs rename to src/EventSource.Shared/EventSource.Shared/Utilities/ActivityPathDecoder.cs diff --git a/src/Adapters/EventSource.Shared/EventSource.Shared/Utilities/StringBuilderCache.cs b/src/EventSource.Shared/EventSource.Shared/Utilities/StringBuilderCache.cs similarity index 100% rename from src/Adapters/EventSource.Shared/EventSource.Shared/Utilities/StringBuilderCache.cs rename to src/EventSource.Shared/EventSource.Shared/Utilities/StringBuilderCache.cs diff --git a/src/Adapters/EventSource.Shared/EventSource.Shared/Utilities/TplActivities.cs b/src/EventSource.Shared/EventSource.Shared/Utilities/TplActivities.cs similarity index 100% rename from src/Adapters/EventSource.Shared/EventSource.Shared/Utilities/TplActivities.cs rename to src/EventSource.Shared/EventSource.Shared/Utilities/TplActivities.cs diff --git a/src/Adapters/EventSource.Netstandard13/ApplicationInsights.config.install.xdt b/src/EventSourceListener/ApplicationInsights.config.install.xdt similarity index 100% rename from src/Adapters/EventSource.Netstandard13/ApplicationInsights.config.install.xdt rename to src/EventSourceListener/ApplicationInsights.config.install.xdt diff --git a/src/Adapters/EventSource.Netstandard13/ApplicationInsights.config.uninstall.xdt b/src/EventSourceListener/ApplicationInsights.config.uninstall.xdt similarity index 100% rename from src/Adapters/EventSource.Netstandard13/ApplicationInsights.config.uninstall.xdt rename to src/EventSourceListener/ApplicationInsights.config.uninstall.xdt diff --git a/src/Adapters/EventSource.Netstandard13/DisableEventSourceRequest.cs b/src/EventSourceListener/DisableEventSourceRequest.cs similarity index 100% rename from src/Adapters/EventSource.Netstandard13/DisableEventSourceRequest.cs rename to src/EventSourceListener/DisableEventSourceRequest.cs diff --git a/src/Adapters/EventSource.Netstandard13/EventSource.Netstandard13.csproj b/src/EventSourceListener/EventSourceListener.csproj similarity index 100% rename from src/Adapters/EventSource.Netstandard13/EventSource.Netstandard13.csproj rename to src/EventSourceListener/EventSourceListener.csproj diff --git a/src/Adapters/EventSource.Netstandard13/EventSourceListeningRequest.cs b/src/EventSourceListener/EventSourceListeningRequest.cs similarity index 100% rename from src/Adapters/EventSource.Netstandard13/EventSourceListeningRequest.cs rename to src/EventSourceListener/EventSourceListeningRequest.cs diff --git a/src/Adapters/EventSource.Netstandard13/EventSourceListeningRequestBase.cs b/src/EventSourceListener/EventSourceListeningRequestBase.cs similarity index 100% rename from src/Adapters/EventSource.Netstandard13/EventSourceListeningRequestBase.cs rename to src/EventSourceListener/EventSourceListeningRequestBase.cs diff --git a/src/Adapters/EventSource.Netstandard13/EventSourceTelemetryModule.cs b/src/EventSourceListener/EventSourceTelemetryModule.cs similarity index 100% rename from src/Adapters/EventSource.Netstandard13/EventSourceTelemetryModule.cs rename to src/EventSourceListener/EventSourceTelemetryModule.cs diff --git a/src/Adapters/EventSource.Netstandard13/Implementation/EventDataExtensions.cs b/src/EventSourceListener/Implementation/EventDataExtensions.cs similarity index 100% rename from src/Adapters/EventSource.Netstandard13/Implementation/EventDataExtensions.cs rename to src/EventSourceListener/Implementation/EventDataExtensions.cs diff --git a/src/Adapters/EventSource.Netstandard13/Properties/AssemblyInfo.cs b/src/EventSourceListener/Properties/AssemblyInfo.cs similarity index 100% rename from src/Adapters/EventSource.Netstandard13/Properties/AssemblyInfo.cs rename to src/EventSourceListener/Properties/AssemblyInfo.cs diff --git a/src/Adapters/Log4NetAppender.Net45/ApplicationInsightsAppender.cs b/src/Log4NetAppender/ApplicationInsightsAppender.cs similarity index 100% rename from src/Adapters/Log4NetAppender.Net45/ApplicationInsightsAppender.cs rename to src/Log4NetAppender/ApplicationInsightsAppender.cs diff --git a/src/Adapters/Log4NetAppender.Net45/AssemblyInfo.cs b/src/Log4NetAppender/AssemblyInfo.cs similarity index 100% rename from src/Adapters/Log4NetAppender.Net45/AssemblyInfo.cs rename to src/Log4NetAppender/AssemblyInfo.cs diff --git a/src/Adapters.Tests/Log4NetAppender.Net45.Tests/GlobalSuppressions.cs b/src/Log4NetAppender/GlobalSuppressions.cs similarity index 100% rename from src/Adapters.Tests/Log4NetAppender.Net45.Tests/GlobalSuppressions.cs rename to src/Log4NetAppender/GlobalSuppressions.cs diff --git a/src/Adapters/Log4NetAppender.Net45/Log4NetAppender.Net45.csproj b/src/Log4NetAppender/Log4NetAppender.csproj similarity index 100% rename from src/Adapters/Log4NetAppender.Net45/Log4NetAppender.Net45.csproj rename to src/Log4NetAppender/Log4NetAppender.csproj diff --git a/src/Adapters/Log4NetAppender.Net45/app.config.install.xdt b/src/Log4NetAppender/app.config.install.xdt similarity index 100% rename from src/Adapters/Log4NetAppender.Net45/app.config.install.xdt rename to src/Log4NetAppender/app.config.install.xdt diff --git a/src/Adapters/Log4NetAppender.Net45/app.config.uninstall.xdt b/src/Log4NetAppender/app.config.uninstall.xdt similarity index 100% rename from src/Adapters/Log4NetAppender.Net45/app.config.uninstall.xdt rename to src/Log4NetAppender/app.config.uninstall.xdt diff --git a/src/Adapters/Log4NetAppender.Net45/web.config.install.xdt b/src/Log4NetAppender/web.config.install.xdt similarity index 100% rename from src/Adapters/Log4NetAppender.Net45/web.config.install.xdt rename to src/Log4NetAppender/web.config.install.xdt diff --git a/src/Adapters/Log4NetAppender.Net45/web.config.uninstall.xdt b/src/Log4NetAppender/web.config.uninstall.xdt similarity index 100% rename from src/Adapters/Log4NetAppender.Net45/web.config.uninstall.xdt rename to src/Log4NetAppender/web.config.uninstall.xdt diff --git a/src/Adapters/NLogTarget.Net45/ApplicationInsightsTarget.cs b/src/NLogTarget/ApplicationInsightsTarget.cs similarity index 100% rename from src/Adapters/NLogTarget.Net45/ApplicationInsightsTarget.cs rename to src/NLogTarget/ApplicationInsightsTarget.cs diff --git a/src/Adapters/NLogTarget.Net45/AssemblyInfo.cs b/src/NLogTarget/AssemblyInfo.cs similarity index 100% rename from src/Adapters/NLogTarget.Net45/AssemblyInfo.cs rename to src/NLogTarget/AssemblyInfo.cs diff --git a/src/Adapters/NLogTarget.Net45/NLogTarget.Net45.csproj b/src/NLogTarget/NLogTarget.csproj similarity index 100% rename from src/Adapters/NLogTarget.Net45/NLogTarget.Net45.csproj rename to src/NLogTarget/NLogTarget.csproj diff --git a/src/Adapters/NLogTarget.Net45/app.config.install.xdt b/src/NLogTarget/app.config.install.xdt similarity index 100% rename from src/Adapters/NLogTarget.Net45/app.config.install.xdt rename to src/NLogTarget/app.config.install.xdt diff --git a/src/Adapters/NLogTarget.Net45/app.config.uninstall.xdt b/src/NLogTarget/app.config.uninstall.xdt similarity index 100% rename from src/Adapters/NLogTarget.Net45/app.config.uninstall.xdt rename to src/NLogTarget/app.config.uninstall.xdt diff --git a/src/Adapters/NLogTarget.Net45/web.config.install.xdt b/src/NLogTarget/web.config.install.xdt similarity index 100% rename from src/Adapters/NLogTarget.Net45/web.config.install.xdt rename to src/NLogTarget/web.config.install.xdt diff --git a/src/Adapters/NLogTarget.Net45/web.config.uninstall.xdt b/src/NLogTarget/web.config.uninstall.xdt similarity index 100% rename from src/Adapters/NLogTarget.Net45/web.config.uninstall.xdt rename to src/NLogTarget/web.config.uninstall.xdt diff --git a/src/Adapters/Product.props b/src/Product.props similarity index 100% rename from src/Adapters/Product.props rename to src/Product.props diff --git a/src/Adapters/TraceListener.Net45/ApplicationInsightsTraceListener.cs b/src/TraceListener/ApplicationInsightsTraceListener.cs similarity index 100% rename from src/Adapters/TraceListener.Net45/ApplicationInsightsTraceListener.cs rename to src/TraceListener/ApplicationInsightsTraceListener.cs diff --git a/src/Adapters/TraceListener.Net45/AssemblyInfo.cs b/src/TraceListener/AssemblyInfo.cs similarity index 100% rename from src/Adapters/TraceListener.Net45/AssemblyInfo.cs rename to src/TraceListener/AssemblyInfo.cs diff --git a/src/Adapters/TraceListener.Net45/TraceListener.Net45.csproj b/src/TraceListener/TraceListener.csproj similarity index 100% rename from src/Adapters/TraceListener.Net45/TraceListener.Net45.csproj rename to src/TraceListener/TraceListener.csproj diff --git a/src/Adapters/TraceListener.Net45/app.config.install.xdt b/src/TraceListener/app.config.install.xdt similarity index 100% rename from src/Adapters/TraceListener.Net45/app.config.install.xdt rename to src/TraceListener/app.config.install.xdt diff --git a/src/Adapters/TraceListener.Net45/app.config.uninstall.xdt b/src/TraceListener/app.config.uninstall.xdt similarity index 100% rename from src/Adapters/TraceListener.Net45/app.config.uninstall.xdt rename to src/TraceListener/app.config.uninstall.xdt diff --git a/src/Adapters/TraceListener.Net45/web.config.install.xdt b/src/TraceListener/web.config.install.xdt similarity index 100% rename from src/Adapters/TraceListener.Net45/web.config.install.xdt rename to src/TraceListener/web.config.install.xdt diff --git a/src/Adapters/TraceListener.Net45/web.config.uninstall.xdt b/src/TraceListener/web.config.uninstall.xdt similarity index 100% rename from src/Adapters/TraceListener.Net45/web.config.uninstall.xdt rename to src/TraceListener/web.config.uninstall.xdt diff --git a/src/Adapters.Tests/CommonTestShared/CommonTestShared.projitems b/test/CommonTestShared/CommonTestShared.projitems similarity index 100% rename from src/Adapters.Tests/CommonTestShared/CommonTestShared.projitems rename to test/CommonTestShared/CommonTestShared.projitems diff --git a/src/Adapters.Tests/CommonTestShared/CommonTestShared.shproj b/test/CommonTestShared/CommonTestShared.shproj similarity index 100% rename from src/Adapters.Tests/CommonTestShared/CommonTestShared.shproj rename to test/CommonTestShared/CommonTestShared.shproj diff --git a/src/Adapters.Tests/CommonTestShared/SdkVersionHelper.cs b/test/CommonTestShared/SdkVersionHelper.cs similarity index 100% rename from src/Adapters.Tests/CommonTestShared/SdkVersionHelper.cs rename to test/CommonTestShared/SdkVersionHelper.cs diff --git a/src/Adapters.Tests/CommonTestShared/TelemetrySender.cs b/test/CommonTestShared/TelemetrySender.cs similarity index 100% rename from src/Adapters.Tests/CommonTestShared/TelemetrySender.cs rename to test/CommonTestShared/TelemetrySender.cs diff --git a/src/Adapters.Tests/DiagnosticSource.Tests/DiagnosticSourceListener.Tests.csproj b/test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceListener.netcoreapp1.Tests.csproj similarity index 93% rename from src/Adapters.Tests/DiagnosticSource.Tests/DiagnosticSourceListener.Tests.csproj rename to test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceListener.netcoreapp1.Tests.csproj index dfcda1c0..e77e14e4 100644 --- a/src/Adapters.Tests/DiagnosticSource.Tests/DiagnosticSourceListener.Tests.csproj +++ b/test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceListener.netcoreapp1.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Adapters.Tests/DiagnosticSource.Tests/DiagnosticSourceTelemetryModuleTests.cs b/test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceTelemetryModuleTests.cs similarity index 100% rename from src/Adapters.Tests/DiagnosticSource.Tests/DiagnosticSourceTelemetryModuleTests.cs rename to test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceTelemetryModuleTests.cs diff --git a/src/Adapters.Tests/DiagnosticSource.Tests/TestDiagnosticSource.cs b/test/DiagnosticSourceListener.netcoreapp10.Tests/TestDiagnosticSource.cs similarity index 100% rename from src/Adapters.Tests/DiagnosticSource.Tests/TestDiagnosticSource.cs rename to test/DiagnosticSourceListener.netcoreapp10.Tests/TestDiagnosticSource.cs diff --git a/src/Adapters.Tests/Etw.Net451.Tests/Etw.Net451.Tests.csproj b/test/EtwCollector.Net451.Tests/EtwCollector.Net451.Tests.csproj similarity index 93% rename from src/Adapters.Tests/Etw.Net451.Tests/Etw.Net451.Tests.csproj rename to test/EtwCollector.Net451.Tests/EtwCollector.Net451.Tests.csproj index 6e97af9e..aaa24725 100644 --- a/src/Adapters.Tests/Etw.Net451.Tests/Etw.Net451.Tests.csproj +++ b/test/EtwCollector.Net451.Tests/EtwCollector.Net451.Tests.csproj @@ -16,13 +16,10 @@ All + - - - - diff --git a/src/Adapters.Tests/Etw.Net451.Tests/EtwTelemetryModuleTests.cs b/test/EtwCollector.Net451.Tests/EtwTelemetryModuleTests.cs similarity index 100% rename from src/Adapters.Tests/Etw.Net451.Tests/EtwTelemetryModuleTests.cs rename to test/EtwCollector.Net451.Tests/EtwTelemetryModuleTests.cs diff --git a/src/Adapters.Tests/Etw.Net451.Tests/EventSourceModuleDiagnosticListener.cs b/test/EtwCollector.Net451.Tests/EventSourceModuleDiagnosticListener.cs similarity index 100% rename from src/Adapters.Tests/Etw.Net451.Tests/EventSourceModuleDiagnosticListener.cs rename to test/EtwCollector.Net451.Tests/EventSourceModuleDiagnosticListener.cs diff --git a/src/Adapters.Tests/Etw.Net451.Tests/Properties/AssemblyInfo.cs b/test/EtwCollector.Net451.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from src/Adapters.Tests/Etw.Net451.Tests/Properties/AssemblyInfo.cs rename to test/EtwCollector.Net451.Tests/Properties/AssemblyInfo.cs diff --git a/src/Adapters.Tests/Etw.Net451.Tests/TestProvider.cs b/test/EtwCollector.Net451.Tests/TestProvider.cs similarity index 100% rename from src/Adapters.Tests/Etw.Net451.Tests/TestProvider.cs rename to test/EtwCollector.Net451.Tests/TestProvider.cs diff --git a/src/Adapters.Tests/Etw.Net451.Tests/TraceEventSessionMock.cs b/test/EtwCollector.Net451.Tests/TraceEventSessionMock.cs similarity index 100% rename from src/Adapters.Tests/Etw.Net451.Tests/TraceEventSessionMock.cs rename to test/EtwCollector.Net451.Tests/TraceEventSessionMock.cs diff --git a/src/Adapters.Tests/Etw.Net451.Tests/TraceTelemetryComparer.cs b/test/EtwCollector.Net451.Tests/TraceTelemetryComparer.cs similarity index 100% rename from src/Adapters.Tests/Etw.Net451.Tests/TraceTelemetryComparer.cs rename to test/EtwCollector.Net451.Tests/TraceTelemetryComparer.cs diff --git a/src/Adapters.Tests/EventSource.Netstandard13.Tests/EventSource.Netstandard13.Tests.csproj b/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj similarity index 94% rename from src/Adapters.Tests/EventSource.Netstandard13.Tests/EventSource.Netstandard13.Tests.csproj rename to test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj index ac3747b2..ac3f74a0 100644 --- a/src/Adapters.Tests/EventSource.Netstandard13.Tests/EventSource.Netstandard13.Tests.csproj +++ b/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj @@ -22,6 +22,10 @@ + + + + @@ -29,10 +33,6 @@ - - - - diff --git a/src/Adapters.Tests/EventSource.Netstandard13.Tests/EventSourceModuleDiagnosticListener.cs b/test/EventSourceListener.netcoreapp10.Tests/EventSourceModuleDiagnosticListener.cs similarity index 100% rename from src/Adapters.Tests/EventSource.Netstandard13.Tests/EventSourceModuleDiagnosticListener.cs rename to test/EventSourceListener.netcoreapp10.Tests/EventSourceModuleDiagnosticListener.cs diff --git a/src/Adapters.Tests/EventSource.Netstandard13.Tests/EventSourceTelemetryModuleTests.cs b/test/EventSourceListener.netcoreapp10.Tests/EventSourceTelemetryModuleTests.cs similarity index 100% rename from src/Adapters.Tests/EventSource.Netstandard13.Tests/EventSourceTelemetryModuleTests.cs rename to test/EventSourceListener.netcoreapp10.Tests/EventSourceTelemetryModuleTests.cs diff --git a/src/Adapters.Tests/EventSource.Netstandard13.Tests/OtherTestEventSource.cs b/test/EventSourceListener.netcoreapp10.Tests/OtherTestEventSource.cs similarity index 100% rename from src/Adapters.Tests/EventSource.Netstandard13.Tests/OtherTestEventSource.cs rename to test/EventSourceListener.netcoreapp10.Tests/OtherTestEventSource.cs diff --git a/src/Adapters.Tests/EventSource.Netstandard13.Tests/Properties/AssemblyInfo.cs b/test/EventSourceListener.netcoreapp10.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from src/Adapters.Tests/EventSource.Netstandard13.Tests/Properties/AssemblyInfo.cs rename to test/EventSourceListener.netcoreapp10.Tests/Properties/AssemblyInfo.cs diff --git a/src/Adapters.Tests/EventSource.Netstandard13.Tests/TestEventSource.cs b/test/EventSourceListener.netcoreapp10.Tests/TestEventSource.cs similarity index 100% rename from src/Adapters.Tests/EventSource.Netstandard13.Tests/TestEventSource.cs rename to test/EventSourceListener.netcoreapp10.Tests/TestEventSource.cs diff --git a/src/Adapters.Tests/EventSource.Netstandard13.Tests/TraceTelemetryComparer.cs b/test/EventSourceListener.netcoreapp10.Tests/TraceTelemetryComparer.cs similarity index 100% rename from src/Adapters.Tests/EventSource.Netstandard13.Tests/TraceTelemetryComparer.cs rename to test/EventSourceListener.netcoreapp10.Tests/TraceTelemetryComparer.cs diff --git a/src/Adapters.Tests/Log4NetAppender.Net45.Tests/ApplicationInsightsAppenderTests.cs b/test/Log4NetAppender.Net45.Tests/ApplicationInsightsAppenderTests.cs similarity index 100% rename from src/Adapters.Tests/Log4NetAppender.Net45.Tests/ApplicationInsightsAppenderTests.cs rename to test/Log4NetAppender.Net45.Tests/ApplicationInsightsAppenderTests.cs diff --git a/src/Adapters/Log4NetAppender.Net45/GlobalSuppressions.cs b/test/Log4NetAppender.Net45.Tests/GlobalSuppressions.cs similarity index 100% rename from src/Adapters/Log4NetAppender.Net45/GlobalSuppressions.cs rename to test/Log4NetAppender.Net45.Tests/GlobalSuppressions.cs diff --git a/src/Adapters.Tests/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj b/test/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj similarity index 92% rename from src/Adapters.Tests/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj rename to test/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj index cf05c7e1..31a92f44 100644 --- a/src/Adapters.Tests/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj +++ b/test/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj @@ -16,14 +16,11 @@ All + - - - - diff --git a/src/Adapters.Tests/Log4NetAppender.Net45.Tests/Properties/AssemblyInfo.cs b/test/Log4NetAppender.Net45.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from src/Adapters.Tests/Log4NetAppender.Net45.Tests/Properties/AssemblyInfo.cs rename to test/Log4NetAppender.Net45.Tests/Properties/AssemblyInfo.cs diff --git a/src/Adapters.Tests/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj b/test/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj similarity index 93% rename from src/Adapters.Tests/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj rename to test/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj index 927ff848..0b1946ce 100644 --- a/src/Adapters.Tests/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj +++ b/test/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj @@ -16,13 +16,10 @@ All + - - - - diff --git a/src/Adapters.Tests/NLogTarget.Net45.Tests/NLogTargetTests.cs b/test/NLogTarget.Net45.Tests/NLogTargetTests.cs similarity index 100% rename from src/Adapters.Tests/NLogTarget.Net45.Tests/NLogTargetTests.cs rename to test/NLogTarget.Net45.Tests/NLogTargetTests.cs diff --git a/src/Adapters.Tests/NLogTarget.Net45.Tests/Properties/AssemblyInfo.cs b/test/NLogTarget.Net45.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from src/Adapters.Tests/NLogTarget.Net45.Tests/Properties/AssemblyInfo.cs rename to test/NLogTarget.Net45.Tests/Properties/AssemblyInfo.cs diff --git a/src/Adapters.Tests/Shared/AdapterHelper.cs b/test/Shared/AdapterHelper.cs similarity index 100% rename from src/Adapters.Tests/Shared/AdapterHelper.cs rename to test/Shared/AdapterHelper.cs diff --git a/src/Adapters.Tests/Shared/Adapters.Shared.Tests.projitems b/test/Shared/Adapters.Shared.Tests.projitems similarity index 100% rename from src/Adapters.Tests/Shared/Adapters.Shared.Tests.projitems rename to test/Shared/Adapters.Shared.Tests.projitems diff --git a/src/Adapters.Tests/Shared/Adapters.Shared.Tests.shproj b/test/Shared/Adapters.Shared.Tests.shproj similarity index 100% rename from src/Adapters.Tests/Shared/Adapters.Shared.Tests.shproj rename to test/Shared/Adapters.Shared.Tests.shproj diff --git a/src/Adapters.Tests/Shared/CustomTelemetryChannel.cs b/test/Shared/CustomTelemetryChannel.cs similarity index 100% rename from src/Adapters.Tests/Shared/CustomTelemetryChannel.cs rename to test/Shared/CustomTelemetryChannel.cs diff --git a/src/Adapters.Tests/Shared/ExceptionAssert.cs b/test/Shared/ExceptionAssert.cs similarity index 100% rename from src/Adapters.Tests/Shared/ExceptionAssert.cs rename to test/Shared/ExceptionAssert.cs diff --git a/src/Adapters.Tests/TraceListener.Net45.Tests/ApplicationInsightsTraceFilterTests.cs b/test/TraceListener.Net45.Tests/ApplicationInsightsTraceFilterTests.cs similarity index 100% rename from src/Adapters.Tests/TraceListener.Net45.Tests/ApplicationInsightsTraceFilterTests.cs rename to test/TraceListener.Net45.Tests/ApplicationInsightsTraceFilterTests.cs diff --git a/src/Adapters.Tests/TraceListener.Net45.Tests/ApplicationInsightsTraceListenerTests.cs b/test/TraceListener.Net45.Tests/ApplicationInsightsTraceListenerTests.cs similarity index 100% rename from src/Adapters.Tests/TraceListener.Net45.Tests/ApplicationInsightsTraceListenerTests.cs rename to test/TraceListener.Net45.Tests/ApplicationInsightsTraceListenerTests.cs diff --git a/src/Adapters.Tests/TraceListener.Net45.Tests/Properties/AssemblyInfo.cs b/test/TraceListener.Net45.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from src/Adapters.Tests/TraceListener.Net45.Tests/Properties/AssemblyInfo.cs rename to test/TraceListener.Net45.Tests/Properties/AssemblyInfo.cs diff --git a/src/Adapters.Tests/TraceListener.Net45.Tests/TraceEventOptionsMatrix.xml b/test/TraceListener.Net45.Tests/TraceEventOptionsMatrix.xml similarity index 100% rename from src/Adapters.Tests/TraceListener.Net45.Tests/TraceEventOptionsMatrix.xml rename to test/TraceListener.Net45.Tests/TraceEventOptionsMatrix.xml diff --git a/src/Adapters.Tests/TraceListener.Net45.Tests/TraceFilterMatrix.xml b/test/TraceListener.Net45.Tests/TraceFilterMatrix.xml similarity index 100% rename from src/Adapters.Tests/TraceListener.Net45.Tests/TraceFilterMatrix.xml rename to test/TraceListener.Net45.Tests/TraceFilterMatrix.xml diff --git a/src/Adapters.Tests/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj b/test/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj similarity index 92% rename from src/Adapters.Tests/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj rename to test/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj index 25b97480..f5b632ae 100644 --- a/src/Adapters.Tests/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj +++ b/test/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj @@ -16,14 +16,11 @@ All + - - - - diff --git a/src/Adapters.Tests/TraceListener.Net45.Tests/packages.config b/test/TraceListener.Net45.Tests/packages.config similarity index 100% rename from src/Adapters.Tests/TraceListener.Net45.Tests/packages.config rename to test/TraceListener.Net45.Tests/packages.config diff --git a/src/NuGet.Tests/Xdt.Tests/Properties/AssemblyInfo.cs b/test/Xdt.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from src/NuGet.Tests/Xdt.Tests/Properties/AssemblyInfo.cs rename to test/Xdt.Tests/Properties/AssemblyInfo.cs diff --git a/src/NuGet.Tests/Xdt.Tests/Resources/DiagnosticSourceListener/TestDataSet.xml b/test/Xdt.Tests/Resources/DiagnosticSourceListener/TestDataSet.xml similarity index 100% rename from src/NuGet.Tests/Xdt.Tests/Resources/DiagnosticSourceListener/TestDataSet.xml rename to test/Xdt.Tests/Resources/DiagnosticSourceListener/TestDataSet.xml diff --git a/src/NuGet.Tests/Xdt.Tests/Resources/EtwCollector/TestDataSet.xml b/test/Xdt.Tests/Resources/EtwCollector/TestDataSet.xml similarity index 100% rename from src/NuGet.Tests/Xdt.Tests/Resources/EtwCollector/TestDataSet.xml rename to test/Xdt.Tests/Resources/EtwCollector/TestDataSet.xml diff --git a/src/NuGet.Tests/Xdt.Tests/Resources/EventSourceListener/TestDataSet.xml b/test/Xdt.Tests/Resources/EventSourceListener/TestDataSet.xml similarity index 100% rename from src/NuGet.Tests/Xdt.Tests/Resources/EventSourceListener/TestDataSet.xml rename to test/Xdt.Tests/Resources/EventSourceListener/TestDataSet.xml diff --git a/src/NuGet.Tests/Xdt.Tests/Resources/Log4Net/TestDataSet.xml b/test/Xdt.Tests/Resources/Log4Net/TestDataSet.xml similarity index 100% rename from src/NuGet.Tests/Xdt.Tests/Resources/Log4Net/TestDataSet.xml rename to test/Xdt.Tests/Resources/Log4Net/TestDataSet.xml diff --git a/src/NuGet.Tests/Xdt.Tests/Resources/NLog/TestDataSet.xml b/test/Xdt.Tests/Resources/NLog/TestDataSet.xml similarity index 100% rename from src/NuGet.Tests/Xdt.Tests/Resources/NLog/TestDataSet.xml rename to test/Xdt.Tests/Resources/NLog/TestDataSet.xml diff --git a/src/NuGet.Tests/Xdt.Tests/Resources/TraceListener/TestDataSet.xml b/test/Xdt.Tests/Resources/TraceListener/TestDataSet.xml similarity index 100% rename from src/NuGet.Tests/Xdt.Tests/Resources/TraceListener/TestDataSet.xml rename to test/Xdt.Tests/Resources/TraceListener/TestDataSet.xml diff --git a/src/NuGet.Tests/Xdt.Tests/Xdt.Tests.csproj b/test/Xdt.Tests/Xdt.Tests.csproj similarity index 67% rename from src/NuGet.Tests/Xdt.Tests/Xdt.Tests.csproj rename to test/Xdt.Tests/Xdt.Tests.csproj index fa12045c..244b6821 100644 --- a/src/NuGet.Tests/Xdt.Tests/Xdt.Tests.csproj +++ b/test/Xdt.Tests/Xdt.Tests.csproj @@ -26,58 +26,58 @@ - + Resources\TraceListener\app.config.install.xdt - + Resources\TraceListener\app.config.uninstall.xdt - + Resources\TraceListener\web.config.install.xdt - + Resources\TraceListener\web.config.uninstall.xdt - + Resources\Log4Net\web.config.install.xdt - + Resources\Log4Net\web.config.uninstall.xdt - + Resources\Log4Net\app.config.install.xdt - + Resources\Log4Net\app.config.uninstall.xdt - + Resources\NLog\app.config.install.xdt - + Resources\NLog\app.config.uninstall.xdt - + Resources\NLog\web.config.install.xdt - + Resources\NLog\web.config.uninstall.xdt - + Resources\DiagnosticSourceListener\ApplicationInsights.config.install.xdt - + Resources\DiagnosticSourceListener\ApplicationInsights.config.uninstall.xdt - + Resources\EventSourceListener\ApplicationInsights.config.install.xdt - + Resources\EventSourceListener\ApplicationInsights.config.uninstall.xdt - + Resources\EtwCollector\ApplicationInsights.config.install.xdt - + Resources\EtwCollector\ApplicationInsights.config.uninstall.xdt diff --git a/src/NuGet.Tests/Xdt.Tests/XdtTests.cs b/test/Xdt.Tests/XdtTests.cs similarity index 100% rename from src/NuGet.Tests/Xdt.Tests/XdtTests.cs rename to test/Xdt.Tests/XdtTests.cs