microsoft
/
ApplicationInsights-dotnet
зеркало из https://github.com/microsoft/ApplicationInsights-dotnet.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Feature/renaming functional tests projects (#1835) 

* renaming EmptyApp20.FunctionalTests to FunctionalTests.EmptyApp.Tests

* renaming FunctionalTests.Utils project

* updating reference to compile

* renaming WebApi.Tests

* Adding support for netcoreapp2.1 and 3.1 for WebApi.Tests

* Adding netcoreapp2.1 and 3.1 to MVC.Tests

* adding netcoreapp2.1 and 3.1 to EmptyApp.Tests

* updating sln

* updating version of functionaltests.utils

Co-authored-by: Timothy Mothra <tilee@microsoft.com>
This commit is contained in:
Eddy Nakamura 2020-04-30 20:01:18 -03:00 коммит произвёл GitHub
Родитель be4ae18e4f
Коммит 75f3744b9f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
67 изменённых файлов: 225 добавлений и 217 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

56
Everything.sln
Просмотреть файл

@ -131,14 +131,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsigh
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights.WorkerService.Tests", "NETCORE\test\Microsoft.ApplicationInsights.WorkerService.Tests\Microsoft.ApplicationInsights.WorkerService.Tests.csproj", "{B90EDEA5-3CC8-4282-80A0-7116905E2427}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp20.FunctionalTests20", "NETCORE\test\EmptyApp20.FunctionalTests\EmptyApp20.FunctionalTests20.csproj", "{8C764C9F-1078-47AF-87B8-AF62C7CD6447}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTestUtils20", "NETCORE\test\FunctionalTestUtils20\FunctionalTestUtils20.csproj", "{CF1818F5-CB8E-41A2-B3A8-344A80B79CEC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework20.FunctionalTests20", "NETCORE\test\MVCFramework20.FunctionalTests\MVCFramework20.FunctionalTests20.csproj", "{BCF933FA-3E6A-41C2-874A-E25195D6D0E8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi20.FunctionalTests20", "NETCORE\test\WebApi20.FunctionalTests\WebApi20.FunctionalTests20.csproj", "{4871B8AC-FB79-4D3D-940D-80E796110359}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsTypes", "NETCORE\test\ApplicationInsightsTypes\ApplicationInsightsTypes.csproj", "{3D7258E3-5DDC-45A4-A457-9AA3BCC92DE7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights.Tests", "BASE\Test\Microsoft.ApplicationInsights.Test\Microsoft.ApplicationInsights.Tests\Microsoft.ApplicationInsights.Tests.csproj", "{4BAA7AF2-3C5B-4C7C-9A9C-26F561218A86}"
@ -167,6 +159,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Tests", "WEB\Src\Web\We
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsServer.Tests", "WEB\Src\WindowsServer\WindowsServer.Tests\WindowsServer.Tests.csproj", "{5F40F661-DE59-4489-ABAC-BE6F2D730D9A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.WebApi.Tests", "NETCORE\test\FunctionalTests.WebApi.Tests\FunctionalTests.WebApi.Tests.csproj", "{BB89365D-FFAA-4515-A277-D478A678D4B3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.Utils", "NETCORE\test\FunctionalTests.Utils\FunctionalTests.Utils.csproj", "{F677DF78-A630-464C-BEA9-3BBAEA97412F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.MVC.Tests", "NETCORE\test\FunctionalTests.MVC.Tests\FunctionalTests.MVC.Tests.csproj", "{43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.EmptyApp.Tests", "NETCORE\test\FunctionalTests.EmptyApp.Tests\FunctionalTests.EmptyApp.Tests.csproj", "{00FC8932-554B-455F-9E02-E8A4B0DBFAA8}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{0196259c-3582-4f4e-a01f-a8f9ae83b0f3}*SharedItemsImports = 13
@ -349,22 +349,6 @@ Global
{B90EDEA5-3CC8-4282-80A0-7116905E2427}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B90EDEA5-3CC8-4282-80A0-7116905E2427}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B90EDEA5-3CC8-4282-80A0-7116905E2427}.Release|Any CPU.Build.0 = Release|Any CPU
{8C764C9F-1078-47AF-87B8-AF62C7CD6447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8C764C9F-1078-47AF-87B8-AF62C7CD6447}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8C764C9F-1078-47AF-87B8-AF62C7CD6447}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8C764C9F-1078-47AF-87B8-AF62C7CD6447}.Release|Any CPU.Build.0 = Release|Any CPU
{CF1818F5-CB8E-41A2-B3A8-344A80B79CEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CF1818F5-CB8E-41A2-B3A8-344A80B79CEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CF1818F5-CB8E-41A2-B3A8-344A80B79CEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CF1818F5-CB8E-41A2-B3A8-344A80B79CEC}.Release|Any CPU.Build.0 = Release|Any CPU
{BCF933FA-3E6A-41C2-874A-E25195D6D0E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BCF933FA-3E6A-41C2-874A-E25195D6D0E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BCF933FA-3E6A-41C2-874A-E25195D6D0E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BCF933FA-3E6A-41C2-874A-E25195D6D0E8}.Release|Any CPU.Build.0 = Release|Any CPU
{4871B8AC-FB79-4D3D-940D-80E796110359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4871B8AC-FB79-4D3D-940D-80E796110359}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4871B8AC-FB79-4D3D-940D-80E796110359}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4871B8AC-FB79-4D3D-940D-80E796110359}.Release|Any CPU.Build.0 = Release|Any CPU
{3D7258E3-5DDC-45A4-A457-9AA3BCC92DE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3D7258E3-5DDC-45A4-A457-9AA3BCC92DE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D7258E3-5DDC-45A4-A457-9AA3BCC92DE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -421,6 +405,22 @@ Global
{5F40F661-DE59-4489-ABAC-BE6F2D730D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F40F661-DE59-4489-ABAC-BE6F2D730D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F40F661-DE59-4489-ABAC-BE6F2D730D9A}.Release|Any CPU.Build.0 = Release|Any CPU
{BB89365D-FFAA-4515-A277-D478A678D4B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BB89365D-FFAA-4515-A277-D478A678D4B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BB89365D-FFAA-4515-A277-D478A678D4B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BB89365D-FFAA-4515-A277-D478A678D4B3}.Release|Any CPU.Build.0 = Release|Any CPU
{F677DF78-A630-464C-BEA9-3BBAEA97412F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F677DF78-A630-464C-BEA9-3BBAEA97412F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F677DF78-A630-464C-BEA9-3BBAEA97412F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F677DF78-A630-464C-BEA9-3BBAEA97412F}.Release|Any CPU.Build.0 = Release|Any CPU
{43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF}.Release|Any CPU.Build.0 = Release|Any CPU
{00FC8932-554B-455F-9E02-E8A4B0DBFAA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{00FC8932-554B-455F-9E02-E8A4B0DBFAA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{00FC8932-554B-455F-9E02-E8A4B0DBFAA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{00FC8932-554B-455F-9E02-E8A4B0DBFAA8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -463,10 +463,6 @@ Global
{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}
{8C764C9F-1078-47AF-87B8-AF62C7CD6447} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}
{CF1818F5-CB8E-41A2-B3A8-344A80B79CEC} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}
{BCF933FA-3E6A-41C2-874A-E25195D6D0E8} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}
{4871B8AC-FB79-4D3D-940D-80E796110359} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}
{3D7258E3-5DDC-45A4-A457-9AA3BCC92DE7} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}
{4BAA7AF2-3C5B-4C7C-9A9C-26F561218A86} = {632FB9CE-540D-4451-9FF2-12E89C1492BD}
{FAC049E4-7011-45FF-BD06-69ACA28921E8} = {005BD823-60AF-406E-AC20-842D7653FE60}
@ -481,6 +477,10 @@ Global
{7A903ABD-D7FB-4610-AED8-32EB2CBAEEBF} = {477A1BA0-0155-404C-A6E0-C2409C0FFE70}
{D12E8759-8C23-43DC-93D6-A63A8AAB910E} = {07076842-9CAA-4B4A-8AEF-88DE88CD37AC}
{5F40F661-DE59-4489-ABAC-BE6F2D730D9A} = {11AC7235-167E-40B5-B2E3-9CBF08700064}
{BB89365D-FFAA-4515-A277-D478A678D4B3} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}
{F677DF78-A630-464C-BEA9-3BBAEA97412F} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}
{43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}
{00FC8932-554B-455F-9E02-E8A4B0DBFAA8} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0E0415AF-37CC-4999-8E5B-DD36F75BFD4D}

56
NETCORE/ApplicationInsights.AspNetCore.sln
Просмотреть файл

@ -28,14 +28,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsigh
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights.AspNetCore.Tests", "test\Microsoft.ApplicationInsights.AspNetCore.Tests\Microsoft.ApplicationInsights.AspNetCore.Tests.csproj", "{2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp20.FunctionalTests20", "test\EmptyApp20.FunctionalTests\EmptyApp20.FunctionalTests20.csproj", "{C47AFD8A-3326-4391-8115-69349C04C3DA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTestUtils20", "test\FunctionalTestUtils20\FunctionalTestUtils20.csproj", "{937AF006-898E-43FD-80A6-B20D7E3A1944}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework20.FunctionalTests20", "test\MVCFramework20.FunctionalTests\MVCFramework20.FunctionalTests20.csproj", "{51198C41-CD4A-4006-84D4-DE20A0A44363}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi20.FunctionalTests20", "test\WebApi20.FunctionalTests\WebApi20.FunctionalTests20.csproj", "{C3B3F515-0305-4809-A9A8-37FD80428F74}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsTypes", "test\ApplicationInsightsTypes\ApplicationInsightsTypes.csproj", "{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.WebApp", "test\IntegrationTests.WebApp\IntegrationTests.WebApp.csproj", "{8E71FECF-E090-409E-8551-C597F9DFB91C}"
@ -64,6 +56,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelemetryChannel", "..\BASE
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights", "..\BASE\src\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj", "{2C7CEEDD-BB15-48DF-B12A-B268E9D74859}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.EmptyApp.Tests", "test\FunctionalTests.EmptyApp.Tests\FunctionalTests.EmptyApp.Tests.csproj", "{C7A8D822-CA6C-497D-AA26-C36F25BA61FD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.Utils", "test\FunctionalTests.Utils\FunctionalTests.Utils.csproj", "{63F64005-CDC7-4062-8CBC-A40B049E342A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.MVC.Tests", "test\FunctionalTests.MVC.Tests\FunctionalTests.MVC.Tests.csproj", "{9693CC30-A3E6-48A7-A68E-6E0DD098D779}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.WebApi.Tests", "test\FunctionalTests.WebApi.Tests\FunctionalTests.WebApi.Tests.csproj", "{E78404EA-CBAA-4366-B659-C3A46BC9DF15}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\BASE\src\Common\Common\Common.projitems*{0c91d961-b21e-4760-a192-14193f10b831}*SharedItemsImports = 5
@ -94,22 +94,6 @@ Global
{2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0}.Release|Any CPU.Build.0 = Release|Any CPU
{C47AFD8A-3326-4391-8115-69349C04C3DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C47AFD8A-3326-4391-8115-69349C04C3DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C47AFD8A-3326-4391-8115-69349C04C3DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C47AFD8A-3326-4391-8115-69349C04C3DA}.Release|Any CPU.Build.0 = Release|Any CPU
{937AF006-898E-43FD-80A6-B20D7E3A1944}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{937AF006-898E-43FD-80A6-B20D7E3A1944}.Debug|Any CPU.Build.0 = Debug|Any CPU
{937AF006-898E-43FD-80A6-B20D7E3A1944}.Release|Any CPU.ActiveCfg = Release|Any CPU
{937AF006-898E-43FD-80A6-B20D7E3A1944}.Release|Any CPU.Build.0 = Release|Any CPU
{51198C41-CD4A-4006-84D4-DE20A0A44363}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{51198C41-CD4A-4006-84D4-DE20A0A44363}.Debug|Any CPU.Build.0 = Debug|Any CPU
{51198C41-CD4A-4006-84D4-DE20A0A44363}.Release|Any CPU.ActiveCfg = Release|Any CPU
{51198C41-CD4A-4006-84D4-DE20A0A44363}.Release|Any CPU.Build.0 = Release|Any CPU
{C3B3F515-0305-4809-A9A8-37FD80428F74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C3B3F515-0305-4809-A9A8-37FD80428F74}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3B3F515-0305-4809-A9A8-37FD80428F74}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3B3F515-0305-4809-A9A8-37FD80428F74}.Release|Any CPU.Build.0 = Release|Any CPU
{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -158,6 +142,22 @@ Global
{2C7CEEDD-BB15-48DF-B12A-B268E9D74859}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C7CEEDD-BB15-48DF-B12A-B268E9D74859}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C7CEEDD-BB15-48DF-B12A-B268E9D74859}.Release|Any CPU.Build.0 = Release|Any CPU
{C7A8D822-CA6C-497D-AA26-C36F25BA61FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C7A8D822-CA6C-497D-AA26-C36F25BA61FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C7A8D822-CA6C-497D-AA26-C36F25BA61FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C7A8D822-CA6C-497D-AA26-C36F25BA61FD}.Release|Any CPU.Build.0 = Release|Any CPU
{63F64005-CDC7-4062-8CBC-A40B049E342A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{63F64005-CDC7-4062-8CBC-A40B049E342A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{63F64005-CDC7-4062-8CBC-A40B049E342A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{63F64005-CDC7-4062-8CBC-A40B049E342A}.Release|Any CPU.Build.0 = Release|Any CPU
{9693CC30-A3E6-48A7-A68E-6E0DD098D779}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9693CC30-A3E6-48A7-A68E-6E0DD098D779}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9693CC30-A3E6-48A7-A68E-6E0DD098D779}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9693CC30-A3E6-48A7-A68E-6E0DD098D779}.Release|Any CPU.Build.0 = Release|Any CPU
{E78404EA-CBAA-4366-B659-C3A46BC9DF15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E78404EA-CBAA-4366-B659-C3A46BC9DF15}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E78404EA-CBAA-4366-B659-C3A46BC9DF15}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E78404EA-CBAA-4366-B659-C3A46BC9DF15}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -166,10 +166,6 @@ Global
{16B44D67-6214-4DDE-B419-93EF073E2E69} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
{95EC3635-22E4-4C3A-A066-F5823A0648DA} = {2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF}
{2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
{C47AFD8A-3326-4391-8115-69349C04C3DA} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
{937AF006-898E-43FD-80A6-B20D7E3A1944} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
{51198C41-CD4A-4006-84D4-DE20A0A44363} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
{C3B3F515-0305-4809-A9A8-37FD80428F74} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
{8E71FECF-E090-409E-8551-C597F9DFB91C} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
{FE9DB9A7-D9AE-4188-945C-393D70022D9A} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
@ -183,6 +179,10 @@ Global
{8D13F3C8-D938-44FD-A0D8-B5D1712C95DB} = {042C2916-4BB7-4CCB-BD61-A8BAAB0129B9}
{0C91D961-B21E-4760-A192-14193F10B831} = {042C2916-4BB7-4CCB-BD61-A8BAAB0129B9}
{2C7CEEDD-BB15-48DF-B12A-B268E9D74859} = {042C2916-4BB7-4CCB-BD61-A8BAAB0129B9}
{C7A8D822-CA6C-497D-AA26-C36F25BA61FD} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
{63F64005-CDC7-4062-8CBC-A40B049E342A} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
{9693CC30-A3E6-48A7-A68E-6E0DD098D779} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
{E78404EA-CBAA-4366-B659-C3A46BC9DF15} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {047855A4-470F-43B1-8B74-69651DD6B8A6}

46
NETCORE/test/EmptyApp20.FunctionalTests/EmptyApp20.FunctionalTests20.csproj
Просмотреть файл

@ -1,46 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<VersionPrefix>2.0.0</VersionPrefix>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net461' ">win7-x86</RuntimeIdentifier>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>EmptyApp20.FunctionalTests20.Tests</AssemblyName>
<PackageId>EmptyApp20.FunctionalTests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">2.0.0</RuntimeFrameworkVersion>
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>
<DependsOnNETStandard Condition=" '$(TargetFramework)' == 'net461'">true</DependsOnNETStandard>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\FunctionalTestUtils20\FunctionalTestUtils20.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="xunit" Version="2.3.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<None Update="App.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Generator>SettingsSingleFileGenerator</Generator>
</None>
</ItemGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
</Project>

26
NETCORE/test/FunctionalTests.EmptyApp.Tests/App.Designer.cs сгенерированный Normal file
Просмотреть файл

@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace FunctionalTests.EmptyApp.Tests {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")]
internal sealed partial class App : global::System.Configuration.ApplicationSettingsBase {
private static App defaultInstance = ((App)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new App())));
public static App Default {
get {
return defaultInstance;
}
}
}
}

0
NETCORE/test/EmptyApp20.FunctionalTests/App.config → NETCORE/test/FunctionalTests.EmptyApp.Tests/App.config
Просмотреть файл

4
NETCORE/test/EmptyApp20.FunctionalTests/FunctionalTest/ExceptionTelemetryEmptyAppTests.cs → NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTest/ExceptionTelemetryEmptyAppTests.cs
Просмотреть файл

@ -3,11 +3,11 @@ using Xunit;
using Xunit.Abstractions;
[assembly: CollectionBehavior(DisableTestParallelization = true)]
namespace EmptyApp20.FunctionalTests.FunctionalTest
namespace FunctionalTests.EmptyApp.Tests.FunctionalTest
{
using System;
using System.Reflection;
using FunctionalTestUtils;
using FunctionalTests.Utils;
using Microsoft.ApplicationInsights.DataContracts;
public class ExceptionTelemetryEmptyAppTests : TelemetryTestsBase

4
NETCORE/test/EmptyApp20.FunctionalTests/FunctionalTest/RequestTelemetryEmptyAppTests.cs → NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTest/RequestTelemetryEmptyAppTests.cs
Просмотреть файл

@ -1,11 +1,11 @@
namespace EmptyApp20.FunctionalTests.FunctionalTest
namespace FunctionalTests.EmptyApp.Tests.FunctionalTest
{
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Reflection;
using AI;
using FunctionalTestUtils;
using FunctionalTests.Utils;
using Microsoft.ApplicationInsights.DataContracts;
using Xunit;
using Xunit.Abstractions;

4
NETCORE/test/EmptyApp20.FunctionalTests/FunctionalTest/TelemetryModuleWorkingEmptyAppTests.cs → NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTest/TelemetryModuleWorkingEmptyAppTests.cs
Просмотреть файл

@ -1,7 +1,7 @@
namespace EmptyApp20.FunctionalTests.FunctionalTest
namespace FunctionalTests.EmptyApp.Tests.FunctionalTest
{
using System.Reflection;
using FunctionalTestUtils;
using FunctionalTests.Utils;
using Microsoft.ApplicationInsights.DataContracts;
using Xunit;
using Xunit.Abstractions;

54
NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTests.EmptyApp.Tests.csproj Normal file
Просмотреть файл

@ -0,0 +1,54 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net461</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net461' ">win7-x86</RuntimeIdentifier>
<AssemblyName>FunctionalTests.EmptyApp.Tests</AssemblyName>
<PackageId>FunctionalTests.EmptyApp.Tests</PackageId>
<DependsOnNETStandard Condition=" '$(TargetFramework)' == 'net461'">true</DependsOnNETStandard>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="xunit" Version="2.3.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FunctionalTests.Utils\FunctionalTests.Utils.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="App.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>App.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<ItemGroup>
<Compile Update="App.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>App.config</DependentUpon>
</Compile>
</ItemGroup>
</Project>

0
NETCORE/test/EmptyApp20.FunctionalTests/Properties/launchSettings.json → NETCORE/test/FunctionalTests.EmptyApp.Tests/Properties/launchSettings.json
Просмотреть файл

4
NETCORE/test/EmptyApp20.FunctionalTests/Startup.cs → NETCORE/test/FunctionalTests.EmptyApp.Tests/Startup.cs
Просмотреть файл

@ -1,8 +1,8 @@
namespace EmptyApp.FunctionalTests
namespace FunctionalTests.EmptyApp.Tests
{
using System;
using FunctionalTestUtils;
using FunctionalTests.Utils;
using Microsoft.ApplicationInsights;
using Microsoft.ApplicationInsights.AspNetCore.Extensions;
using Microsoft.ApplicationInsights.Channel;

0
NETCORE/test/MVCFramework20.FunctionalTests/.bowerrc → NETCORE/test/FunctionalTests.MVC.Tests/.bowerrc
Просмотреть файл

7
NETCORE/test/MVCFramework20.FunctionalTests/Controllers/HomeController.cs → NETCORE/test/FunctionalTests.MVC.Tests/Controllers/HomeController.cs
Просмотреть файл

@ -1,14 +1,11 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using MVCFramework20.FunctionalTests.Models;
using Microsoft.ApplicationInsights;
using Microsoft.ApplicationInsights.DataContracts;
using FunctionalTests.MVC.Tests.Models;
namespace MVCFramework20.FunctionalTests.Controllers
namespace FunctionalTests.MVC.Tests.Controllers
{
public class HomeController : Controller
{

6
NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/CorrelationMvcTests.cs → NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/CorrelationMvcTests.cs
Просмотреть файл

@ -1,6 +1,6 @@
namespace MVC20.FuncTests
namespace FunctionalTests.MVC.Tests.FunctionalTest
{
using FunctionalTestUtils;
using FunctionalTests.Utils;
using Microsoft.ApplicationInsights.DataContracts;
using System;
using System.Linq;
@ -11,7 +11,7 @@
public class CorrelationMvcTests : TelemetryTestsBase
{
private const string assemblyName = "MVCFramework20.FunctionalTests20";
private const string assemblyName = "FunctionalTests.MVC.Tests";
public CorrelationMvcTests(ITestOutputHelper output) : base(output)
{

4
NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/DependencyTelemetryMvcTests.cs → NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/DependencyTelemetryMvcTests.cs
Просмотреть файл

@ -1,4 +1,4 @@
namespace MVC20.FuncTests
namespace FunctionalTests.MVC.Tests.FunctionalTest
{
using System;
using System.Linq;
@ -7,7 +7,7 @@
using System.Text;
using AI;
using FunctionalTestUtils;
using FunctionalTests.Utils;
using Microsoft.ApplicationInsights.DependencyCollector;
using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.Extensions.DependencyInjection;

4
NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/ExceptionTelemetryMvcTests.cs → NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/ExceptionTelemetryMvcTests.cs
Просмотреть файл

@ -1,11 +1,11 @@
using Xunit;
[assembly: CollectionBehavior(DisableTestParallelization = true)]
namespace MVC20.FuncTests
namespace FunctionalTests.MVC.Tests.FunctionalTest
{
using System;
using System.Reflection;
using FunctionalTestUtils;
using FunctionalTests.Utils;
using Microsoft.ApplicationInsights.DataContracts;
using Xunit;
using Xunit.Abstractions;

4
NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/RequestTelemetryMvcTests.cs → NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/RequestTelemetryMvcTests.cs
Просмотреть файл

@ -1,11 +1,11 @@
namespace MVC20.FuncTests
namespace FunctionalTests.MVC.Tests.FunctionalTest
{
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Reflection;
using AI;
using FunctionalTestUtils;
using FunctionalTests.Utils;
using Microsoft.ApplicationInsights.DataContracts;
using Xunit;
using Xunit.Abstractions;

4
NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/TelemetryModuleWorkingMvcTests.cs → NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/TelemetryModuleWorkingMvcTests.cs
Просмотреть файл

@ -1,7 +1,7 @@
namespace MVC20.FuncTests
namespace FunctionalTests.MVC.Tests.FunctionalTest
{
using System.Reflection;
using FunctionalTestUtils;
using FunctionalTests.Utils;
using Microsoft.ApplicationInsights.DataContracts;
using Xunit;
using Xunit.Abstractions;

27
NETCORE/test/MVCFramework20.FunctionalTests/MVCFramework20.FunctionalTests20.csproj → NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj
Просмотреть файл

@ -2,25 +2,18 @@
<PropertyGroup>
<VersionPrefix>2.0.0</VersionPrefix>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net461' ">win7-x86</RuntimeIdentifier>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net461</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net461' ">win7-x86</RuntimeIdentifier>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>MVCFramework20.FunctionalTests20.Tests</AssemblyName>
<PackageId>MVCFramework.FunctionalTests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<AssemblyName>FunctionalTests.MVC.Tests</AssemblyName>
<PackageId>FunctionalTests.MVC.Tests</PackageId>
<UserSecretsId>aspnet-MVCFramework45.FunctionalTests-60cfc765-2dc9-454c-bb34-dc379ed92cd0</UserSecretsId>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">2.0.0</RuntimeFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>
<ApplicationIcon />
<OutputType>Library</OutputType>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<ItemGroup>
<None Update="App.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Generator>SettingsSingleFileGenerator</Generator>
@ -37,12 +30,12 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FunctionalTestUtils20\FunctionalTestUtils20.csproj" />
<ProjectReference Include="..\..\src\Microsoft.ApplicationInsights.AspNetCore\Microsoft.ApplicationInsights.AspNetCore.csproj" />
<ProjectReference Include="..\FunctionalTests.Utils\FunctionalTests.Utils.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.0.0" />

2
NETCORE/test/MVCFramework20.FunctionalTests/Models/ErrorViewModel.cs → NETCORE/test/FunctionalTests.MVC.Tests/Models/ErrorViewModel.cs
Просмотреть файл

@ -1,6 +1,6 @@
using System;
namespace MVCFramework20.FunctionalTests.Models
namespace FunctionalTests.MVC.Tests.Models
{
public class ErrorViewModel
{

2
NETCORE/test/MVCFramework20.FunctionalTests/Properties/launchSettings.json → NETCORE/test/FunctionalTests.MVC.Tests/Properties/launchSettings.json
Просмотреть файл

@ -15,7 +15,7 @@
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"MVCFramework20.FunctionalTests": {
"FunctionalTests.MVC.Tests": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {

4
NETCORE/test/MVCFramework20.FunctionalTests/Startup.cs → NETCORE/test/FunctionalTests.MVC.Tests/Startup.cs
Просмотреть файл

@ -7,10 +7,10 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.ApplicationInsights.Channel;
using FunctionalTestUtils;
using FunctionalTests.Utils;
using Microsoft.ApplicationInsights.AspNetCore.Extensions;
namespace MVCFramework20.FunctionalTests
namespace FunctionalTests.MVC.Tests
{
public class Startup
{

0
NETCORE/test/MVCFramework20.FunctionalTests/Views/Home/About.cshtml → NETCORE/test/FunctionalTests.MVC.Tests/Views/Home/About.cshtml
Просмотреть файл

0
NETCORE/test/MVCFramework20.FunctionalTests/Views/Home/Contact.cshtml → NETCORE/test/FunctionalTests.MVC.Tests/Views/Home/Contact.cshtml
Просмотреть файл

0
NETCORE/test/MVCFramework20.FunctionalTests/Views/Home/Index.cshtml → NETCORE/test/FunctionalTests.MVC.Tests/Views/Home/Index.cshtml
Просмотреть файл

0
NETCORE/test/MVCFramework20.FunctionalTests/Views/Shared/Error.cshtml → NETCORE/test/FunctionalTests.MVC.Tests/Views/Shared/Error.cshtml
Просмотреть файл

6
NETCORE/test/MVCFramework20.FunctionalTests/Views/Shared/_Layout.cshtml → NETCORE/test/FunctionalTests.MVC.Tests/Views/Shared/_Layout.cshtml
Просмотреть файл

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"] - MVCFramework20.FunctionalTests</title>
<title>@ViewData["Title"] - FunctionalTests.MVC.Tests</title>
<environment include="Development">
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
@ -26,7 +26,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">MVCFramework20.FunctionalTests</a>
<a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">FunctionalTests.MVC.Tests</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
@ -41,7 +41,7 @@
@RenderBody()
<hr />
<footer>
<p>&copy; 2017 - MVCFramework20.FunctionalTests</p>
<p>&copy; 2017 - FunctionalTests.MVC.Tests</p>
</footer>
</div>

0
NETCORE/test/MVCFramework20.FunctionalTests/Views/Shared/_ValidationScriptsPartial.cshtml → NETCORE/test/FunctionalTests.MVC.Tests/Views/Shared/_ValidationScriptsPartial.cshtml
Просмотреть файл

3
NETCORE/test/FunctionalTests.MVC.Tests/Views/_ViewImports.cshtml Normal file
Просмотреть файл

@ -0,0 +1,3 @@
@using FunctionalTests.MVC.Tests.FunctionalTest
@using FunctionalTests.MVC.Tests.Models
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

0
NETCORE/test/MVCFramework20.FunctionalTests/Views/_ViewStart.cshtml → NETCORE/test/FunctionalTests.MVC.Tests/Views/_ViewStart.cshtml
Просмотреть файл

0
NETCORE/test/MVCFramework20.FunctionalTests/appsettings.Development.json → NETCORE/test/FunctionalTests.MVC.Tests/appsettings.Development.json
Просмотреть файл

0
NETCORE/test/MVCFramework20.FunctionalTests/appsettings.json → NETCORE/test/FunctionalTests.MVC.Tests/appsettings.json
Просмотреть файл

0
NETCORE/test/MVCFramework20.FunctionalTests/bower.json → NETCORE/test/FunctionalTests.MVC.Tests/bower.json
Просмотреть файл

0
NETCORE/test/MVCFramework20.FunctionalTests/bundleconfig.json → NETCORE/test/FunctionalTests.MVC.Tests/bundleconfig.json
Просмотреть файл

0
NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/css/site.css → NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/css/site.css
Просмотреть файл

0
NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/css/site.min.css → NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/css/site.min.css поставляемый
Просмотреть файл

0
NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/favicon.ico → NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/favicon.ico
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 31 KiB

После

Ширина:  |  Высота:  |  Размер: 31 KiB

0
NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/images/banner1.svg → NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/images/banner1.svg
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 9.5 KiB

После

Ширина:  |  Высота:  |  Размер: 9.5 KiB

0
NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/images/banner2.svg → NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/images/banner2.svg
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 8.2 KiB

После

Ширина:  |  Высота:  |  Размер: 8.2 KiB

0
NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/images/banner3.svg → NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/images/banner3.svg
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 11 KiB

После

Ширина:  |  Высота:  |  Размер: 11 KiB

0
NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/images/banner4.svg → NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/images/banner4.svg
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 12 KiB

После

Ширина:  |  Высота:  |  Размер: 12 KiB

0
NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/js/site.js → NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/js/site.js
Просмотреть файл

0
NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/js/site.min.js → NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/js/site.min.js поставляемый
Просмотреть файл

0
NETCORE/test/MVCFramework20.FunctionalTests/xunit.runner.json → NETCORE/test/FunctionalTests.MVC.Tests/xunit.runner.json
Просмотреть файл

21
NETCORE/test/FunctionalTestUtils20/FunctionalTestUtils20.csproj → NETCORE/test/FunctionalTests.Utils/FunctionalTests.Utils.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<VersionPrefix>1.0.2</VersionPrefix>
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>FunctionalTestUtils20</AssemblyName>
<PackageId>FunctionalTestUtils</PackageId>
<NetStandardImplicitPackageVersion>2.0.0</NetStandardImplicitPackageVersion>
<AssemblyName>FunctionalTests.Utils</AssemblyName>
<PackageId>FunctionalTests.Utils</PackageId>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
@ -16,11 +16,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
<PackageReference Include="System.Reactive.Linq" Version="3.1.1" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
<PackageReference Include="System.Reactive.Linq" Version="3.1.1" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="xunit" Version="2.3.1" />
@ -30,6 +28,7 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
</ItemGroup>
</Project>

2
NETCORE/test/FunctionalTestUtils20/HttpListenerObservableBase.cs → NETCORE/test/FunctionalTests.Utils/HttpListenerObservableBase.cs
Просмотреть файл

@ -1,4 +1,4 @@
namespace FunctionalTestUtils
namespace FunctionalTests.Utils
{
using System;
using System.Collections.Generic;

2
NETCORE/test/FunctionalTestUtils20/InProcessServer.cs → NETCORE/test/FunctionalTests.Utils/InProcessServer.cs
Просмотреть файл

@ -2,7 +2,7 @@
using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.ApplicationInsights.Extensibility.Implementation.ApplicationId;
namespace FunctionalTestUtils
namespace FunctionalTests.Utils
{
using System;
using System.IO;

0
NETCORE/test/FunctionalTestUtils20/Properties/launchSettings.json → NETCORE/test/FunctionalTests.Utils/Properties/launchSettings.json
Просмотреть файл

2
NETCORE/test/FunctionalTestUtils20/TelemetryExtensions.cs → NETCORE/test/FunctionalTests.Utils/TelemetryExtensions.cs
Просмотреть файл

@ -4,7 +4,7 @@
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
namespace FunctionalTestUtils
namespace FunctionalTests.Utils
{
using System;
using System.IO;

6
NETCORE/test/FunctionalTestUtils20/TelemetryHttpListenerObservable.cs → NETCORE/test/FunctionalTests.Utils/TelemetryHttpListenerObservable.cs
Просмотреть файл

@ -1,4 +1,4 @@
namespace FunctionalTestUtils
namespace FunctionalTests.Utils
{
using System;
using System.Collections.Generic;
@ -6,10 +6,8 @@
using System.IO;
using System.IO.Compression;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using AI;
using FunctionalTests.Utils;
using Xunit.Abstractions;
public class TelemetryHttpListenerObservable : HttpListenerObservableBase<Envelope>

2
NETCORE/test/FunctionalTestUtils20/TelemetryItemFactory.cs → NETCORE/test/FunctionalTests.Utils/TelemetryItemFactory.cs
Просмотреть файл

@ -1,4 +1,4 @@
namespace FunctionalTestUtils
namespace FunctionalTests.Utils
{
using System;
using System.Collections.Generic;

2
NETCORE/test/FunctionalTestUtils20/TelemetryTestsBase.cs → NETCORE/test/FunctionalTests.Utils/TelemetryTestsBase.cs
Просмотреть файл

@ -1,4 +1,4 @@
namespace FunctionalTestUtils
namespace FunctionalTests.Utils
{
using System;
using System.Diagnostics;

2
NETCORE/test/WebApi20.FunctionalTests/Controllers/DependencyController.cs → NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/DependencyController.cs
Просмотреть файл

@ -5,7 +5,7 @@ using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
namespace WebApi20.FunctionalTests.Controllers
namespace FunctionalTests.WebApi.Tests.Controllers
{
[Route("api/[controller]")]
public class DependencyController : Controller

2
NETCORE/test/WebApi20.FunctionalTests/Controllers/ExceptionController.cs → NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/ExceptionController.cs
Просмотреть файл

@ -2,7 +2,7 @@
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
namespace WebApi20.FunctionalTests.Controllers
namespace FunctionalTests.WebApi.Tests.Controllers
{
[Route("api/[controller]")]
public class ExceptionController : Controller

2
NETCORE/test/WebApi20.FunctionalTests/Controllers/ValuesController.cs → NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/ValuesController.cs
Просмотреть файл

@ -5,7 +5,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
namespace WebApi20.FunctionalTests.Controllers
namespace FunctionalTests.WebApi.Tests.Controllers
{
[Route("api/[controller]")]
public class ValuesController : Controller

15
NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/LoggerTests.cs → NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/LoggerTests.cs
Просмотреть файл

@ -1,4 +1,4 @@
namespace WebApi20.FuncTests
namespace FunctionalTests.WebApi.Tests.FunctionalTest
{
using System;
using System.Collections.Generic;
@ -6,7 +6,6 @@
using System.Linq;
using System.Text.RegularExpressions;
using FunctionalTestUtils;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.ApplicationInsights.DataContracts;
@ -16,6 +15,7 @@
using AI;
using Microsoft.Extensions.Logging;
using System.Reflection;
using global::FunctionalTests.Utils;
/// <summary>
/// These are Functional Tests validating E2E ILogger integration. Though filtering mechanism is done by the ILogger framework itself, we
@ -35,8 +35,6 @@
[Fact]
public void TestIloggerWarningOrAboveIsCapturedByDefault()
{
#if NETCOREAPP2_0 || NET461
using (var server = new InProcessServer(assemblyName, this.output))
{
// Make request to this path, which sents one log of each severity Error, Warning, Information, Trace
@ -52,14 +50,11 @@
ValidateMessage(actual[0], new string[] {"error", "warning" });
ValidateMessage(actual[1], new string[] { "error", "warning" });
}
#endif
}
[Fact]
public void TestIloggerDefaultsCanBeOverridenByUserForAllCategories()
{
#if NETCOREAPP2_0 || NET461
void ConfigureServices(IServiceCollection services)
{
// ARRANGE
@ -81,19 +76,16 @@
ValidateMessage(actual[0], new string[] { "error"});
}
#endif
}
[Fact]
public void TestIloggerDefaultsCanBeOverridenByUserForSpecificCategory()
{
#if NETCOREAPP2_0 || NET461
void ConfigureServices(IServiceCollection services)
{
// ARRANGE
// AddFilter to capture Trace or above for user category. This is expected to override default behavior.
services.AddLogging(builder => builder.AddFilter<Microsoft.Extensions.Logging.ApplicationInsights.ApplicationInsightsLoggerProvider>("WebApi20.FunctionalTests.Controllers", LogLevel.Trace));
services.AddLogging(builder => builder.AddFilter<Microsoft.Extensions.Logging.ApplicationInsights.ApplicationInsightsLoggerProvider>("FunctionalTests.WebApi.Tests.Controllers", LogLevel.Trace));
}
using (var server = new InProcessServer(assemblyName, this.output, null, ConfigureServices))
@ -114,7 +106,6 @@
ValidateMessage(actual[2], new string[] { "information" });
ValidateMessage(actual[3], new string[] { "trace" });
}
#endif
}

4
NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/MultipleWebHostsTests.cs → NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/MultipleWebHostsTests.cs
Просмотреть файл

@ -2,13 +2,13 @@
using System.Reflection;
using System.Runtime.InteropServices;
using AI;
using FunctionalTestUtils;
using FunctionalTests.Utils;
using Microsoft.ApplicationInsights;
using Microsoft.ApplicationInsights.Extensibility;
using Xunit;
using Xunit.Abstractions;
namespace WebApi20.FuncTests
namespace FunctionalTests.WebApi.Tests.FunctionalTest
{
public class MultipleWebHostsTests : TelemetryTestsBase
{

4
NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestCollectionTests.cs → NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestCollectionTests.cs
Просмотреть файл

@ -1,15 +1,15 @@
namespace WebApi20.FuncTests
namespace FunctionalTests.WebApi.Tests.FunctionalTest
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using FunctionalTestUtils;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.ApplicationInsights.DataContracts;
using Xunit;
using Xunit.Abstractions;
using System.Reflection;
using global::FunctionalTests.Utils;
public class RequestCollectionTests : TelemetryTestsBase
{

4
NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestCorrelationTests.cs → NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestCorrelationTests.cs
Просмотреть файл

@ -1,9 +1,8 @@
namespace WebApi20.FuncTests
namespace FunctionalTests.WebApi.Tests.FunctionalTest
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using FunctionalTestUtils;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.ApplicationInsights.DataContracts;
@ -14,6 +13,7 @@
using System.Text.RegularExpressions;
using Microsoft.ApplicationInsights.AspNetCore.Extensions;
using System.Reflection;
using global::FunctionalTests.Utils;
public class RequestCorrelationTests : TelemetryTestsBase
{

4
NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestDependencyCorrelationTests.cs → NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestDependencyCorrelationTests.cs
Просмотреть файл

@ -1,6 +1,5 @@
namespace WebApi20.FuncTests
namespace FunctionalTests.WebApi.Tests.FunctionalTest
{
using FunctionalTestUtils;
using System;
using System.Diagnostics;
using System.Linq;
@ -11,6 +10,7 @@
using Xunit;
using Xunit.Abstractions;
using System.Reflection;
using global::FunctionalTests.Utils;
public class RequestDependencyCorrelationTests : TelemetryTestsBase, IDisposable
{

32
NETCORE/test/WebApi20.FunctionalTests/WebApi20.FunctionalTests20.csproj → NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj
Просмотреть файл

@ -1,17 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<VersionPrefix>2.0.0</VersionPrefix>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net461' ">win7-x86</RuntimeIdentifier>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>WebApi20.FunctionalTests20.Tests</AssemblyName>
<PackageId>WebApi20.FunctionalTests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">2.0.0</RuntimeFrameworkVersion>
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net461</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net461' ">win7-x86</RuntimeIdentifier>
<AssemblyName>FunctionalTests.WebApi.Tests</AssemblyName>
<PackageId>FunctionalTests.WebApi.Tests</PackageId>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
@ -23,19 +19,19 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FunctionalTestUtils20\FunctionalTestUtils20.csproj" />
<ProjectReference Include="..\..\src\Microsoft.ApplicationInsights.AspNetCore\Microsoft.ApplicationInsights.AspNetCore.csproj" />
<ProjectReference Include="..\FunctionalTests.Utils\FunctionalTests.Utils.csproj" />
</ItemGroup>
<ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="xunit" Version="2.3.1" />
@ -43,7 +39,7 @@
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
</ItemGroup>
<ItemGroup>

2
NETCORE/test/WebApi20.FunctionalTests/Properties/launchSettings.json → NETCORE/test/FunctionalTests.WebApi.Tests/Properties/launchSettings.json
Просмотреть файл

@ -16,7 +16,7 @@
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"WebApi20.FunctionalTests": {
"FunctionalTests.WebApi.Tests": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "api/values",

4
NETCORE/test/WebApi20.FunctionalTests/Startup.cs → NETCORE/test/FunctionalTests.WebApi.Tests/Startup.cs
Просмотреть файл

@ -2,10 +2,10 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using FunctionalTestUtils;
using Microsoft.ApplicationInsights.Channel;
using FunctionalTests.Utils;
namespace WebApi20.FunctionalTests
namespace FunctionalTests.WebApi.Tests
{
public class Startup
{

0
NETCORE/test/WebApi20.FunctionalTests/appsettings.Development.json → NETCORE/test/FunctionalTests.WebApi.Tests/appsettings.Development.json
Просмотреть файл

0
NETCORE/test/WebApi20.FunctionalTests/appsettings.json → NETCORE/test/FunctionalTests.WebApi.Tests/appsettings.json
Просмотреть файл

0
NETCORE/test/WebApi20.FunctionalTests/xunit.runner.json → NETCORE/test/FunctionalTests.WebApi.Tests/xunit.runner.json
Просмотреть файл

3
NETCORE/test/MVCFramework20.FunctionalTests/Views/_ViewImports.cshtml
Просмотреть файл

@ -1,3 +0,0 @@
@using MVCFramework20.FunctionalTests
@using MVCFramework20.FunctionalTests.Models
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers