merge dependencycollector tests (#1644)
This commit is contained in:
Timothy Mothra
GitHub
Родитель
f7583714f5
Коммит
fde515d53d
|
|
@ -101,10 +101,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestFramework.Shared.Base",
|
|||
EndProject
|
||||
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestFramework.Shared.Web", "WEB\Src\TestFramework\Shared\TestFramework.Shared.Web.shproj", "{9718F051-147F-4F5F-9FF3-C926430EFCF7}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DependencyCollector.Net45.Tests", "WEB\Src\DependencyCollector\Net45.Tests\DependencyCollector.Net45.Tests.csproj", "{257FCE5A-0779-45A5-B541-0CE43D79D009}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyCollector.NetCore.Tests", "WEB\Src\DependencyCollector\NetCore.Tests\DependencyCollector.NetCore.Tests.csproj", "{BF5C70AB-4DCF-499D-93B3-B6F036DE5CCE}"
|
||||
EndProject
|
||||
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DependencyCollector.Shared", "WEB\Src\DependencyCollector\Shared\DependencyCollector.Shared.shproj", "{669E7E58-072D-4B0A-A4DD-4EB2AE2EA4D4}"
|
||||
EndProject
|
||||
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DependencyCollector.Shared.Tests", "WEB\Src\DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.shproj", "{ACE58393-3419-4FCA-87CC-C33EB756C7E4}"
|
||||
|
|
@ -203,11 +199,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsTypes",
|
|||
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}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyCollector.Tests", "WEB\Src\DependencyCollector\DependencyCollector.Tests\DependencyCollector.Tests.csproj", "{FAC049E4-7011-45FF-BD06-69ACA28921E8}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{054c25dc-e545-4712-95c4-81f30cf65ce8}*SharedItemsImports = 13
|
||||
WEB\Src\DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.projitems*{257fce5a-0779-45a5-b541-0ce43d79d009}*SharedItemsImports = 4
|
||||
WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{257fce5a-0779-45a5-b541-0ce43d79d009}*SharedItemsImports = 4
|
||||
WEB\Src\PerformanceCollector\Perf.Shared.NetStandard.Stubs\Perf.Shared.NetStandard.Stubs.projitems*{30a45441-0849-48fe-ad37-5d29d0e3068a}*SharedItemsImports = 13
|
||||
WEB\Src\Web\Web.Shared.Net\Web.Shared.Net.projitems*{395e03bb-d061-4c9d-9d47-18676566444d}*SharedItemsImports = 13
|
||||
LOGGING\test\CommonTestShared\CommonTestShared.projitems*{3b9ab7fa-562d-4e4e-86e3-3348426bc0d9}*SharedItemsImports = 13
|
||||
|
|
@ -337,14 +333,6 @@ Global
|
|||
{21CB9A8A-F25B-4DEB-92CB-ACB6920EB8BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{21CB9A8A-F25B-4DEB-92CB-ACB6920EB8BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{21CB9A8A-F25B-4DEB-92CB-ACB6920EB8BC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{BF5C70AB-4DCF-499D-93B3-B6F036DE5CCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BF5C70AB-4DCF-499D-93B3-B6F036DE5CCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BF5C70AB-4DCF-499D-93B3-B6F036DE5CCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BF5C70AB-4DCF-499D-93B3-B6F036DE5CCE}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
|
|
@ -469,6 +457,10 @@ Global
|
|||
{4BAA7AF2-3C5B-4C7C-9A9C-26F561218A86}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4BAA7AF2-3C5B-4C7C-9A9C-26F561218A86}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4BAA7AF2-3C5B-4C7C-9A9C-26F561218A86}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{FAC049E4-7011-45FF-BD06-69ACA28921E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{FAC049E4-7011-45FF-BD06-69ACA28921E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{FAC049E4-7011-45FF-BD06-69ACA28921E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{FAC049E4-7011-45FF-BD06-69ACA28921E8}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -499,8 +491,6 @@ Global
|
|||
{14FA551E-886A-4D1B-B716-567EB4954C8E} = {FBAFD313-0139-4DA3-BCB3-EE54DC3B6CCD}
|
||||
{C5A3F18F-1426-4941-9D81-D21062A2B8F2} = {FBAFD313-0139-4DA3-BCB3-EE54DC3B6CCD}
|
||||
{21CB9A8A-F25B-4DEB-92CB-ACB6920EB8BC} = {FBAFD313-0139-4DA3-BCB3-EE54DC3B6CCD}
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009} = {005BD823-60AF-406E-AC20-842D7653FE60}
|
||||
{BF5C70AB-4DCF-499D-93B3-B6F036DE5CCE} = {005BD823-60AF-406E-AC20-842D7653FE60}
|
||||
{669E7E58-072D-4B0A-A4DD-4EB2AE2EA4D4} = {005BD823-60AF-406E-AC20-842D7653FE60}
|
||||
{ACE58393-3419-4FCA-87CC-C33EB756C7E4} = {005BD823-60AF-406E-AC20-842D7653FE60}
|
||||
{BECFC6B1-E04E-431C-A4D9-6F330F7DE22D} = {DFCBB4ED-976C-4239-BCAF-8AA21E684E8C}
|
||||
|
|
@ -547,6 +537,7 @@ Global
|
|||
{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}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {0E0415AF-37CC-4999-8E5B-DD36F75BFD4D}
|
||||
|
|
|
|||
|
|
@ -1,35 +1,39 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), NetCore.props))\NetCore.props" />
|
||||
|
||||
<Import Project="$(PropsRoot)\Test.props" />
|
||||
|
||||
<PropertyGroup Label="NetCore-common-properties">
|
||||
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
|
||||
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
|
||||
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp2.1</TargetFramework>
|
||||
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
|
||||
<AssemblyName>Microsoft.ApplicationInsights.DependencyCollector.NetCore.Tests</AssemblyName>
|
||||
<PackageId>Microsoft.AI.DependencyCollector.Tests</PackageId>
|
||||
|
||||
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<NoWarn>1701;1702;1705;1591</NoWarn>
|
||||
<DefineConstants>TRACE;DEBUG;NETCORE;NETCOREAPP2_1</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<NoWarn>1701;1702;1705;1591</NoWarn>
|
||||
<DefineConstants>TRACE;RELEASE;NETCORE;NETCOREAPP2_1</DefineConstants>
|
||||
<!-- This is the wrong constant. Need to use NETCOREAPP which is auto defined.-->
|
||||
<DefineConstants Condition="'$(TargetFramework)' == 'netcoreapp2.1'">$(DefineConstants);NETCORE;</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.1.2" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.1.2" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
|
||||
<ProjectReference Include="..\DependencyCollector\DependencyCollector.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
|
||||
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.2.0" />
|
||||
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
|
||||
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
|
||||
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />
|
||||
|
||||
<PackageReference Include="xunit" Version="2.4.1" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
|
|
@ -37,10 +41,33 @@
|
|||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\DependencyCollector\DependencyCollector.csproj" />
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
|
||||
|
||||
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.1.2" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.1.2" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
|
||||
<PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />
|
||||
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
|
||||
<PackageReference Include="System.Buffers" Version="4.4.0" />
|
||||
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Management" />
|
||||
<Reference Include="System.Net" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Runtime.Serialization" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.XML" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
<ItemGroup>
|
||||
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
|
||||
</ItemGroup>
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
namespace Microsoft.ApplicationInsights.Tests
|
||||
{
|
||||
#if NET45
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
|
|
@ -1053,4 +1054,5 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
namespace Microsoft.ApplicationInsights.Tests
|
||||
{
|
||||
#if NET45
|
||||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
|
|
@ -103,4 +104,5 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
namespace Microsoft.ApplicationInsights.Tests
|
||||
{
|
||||
#if NETCOREAPP
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
|
|
@ -576,4 +577,5 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
|
||||
<Import Project="$(PropsRoot)\Test.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{257FCE5A-0779-45A5-B541-0CE43D79D009}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
|
||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
||||
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
|
||||
<IsCodedUITest>False</IsCodedUITest>
|
||||
<TestProjectType>UnitTest</TestProjectType>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
|
||||
<DefineConstants>$(DefineConstants);NET45</DefineConstants>
|
||||
<TargetFrameworkProfile />
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<PropertyGroup>
|
||||
<RootNamespace>Microsoft.ApplicationInsights.DependencyCollector</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
|
||||
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net45\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Management" />
|
||||
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Net" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.Serialization" />
|
||||
<Reference Include="System.Web" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="app.config">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="packages.config">
|
||||
<SubType>Designer</SubType>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="DependencyTrackingTelemetryModuleHttpTest.cs" />
|
||||
<Compile Include="DependencyTrackingTelemetryModuleTest.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\..\BASE\src\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj">
|
||||
<Project>{e3d160e8-7f8c-416f-946f-6fdfc6787461}</Project>
|
||||
<Name>Microsoft.ApplicationInsights</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\DependencyCollector\DependencyCollector.csproj">
|
||||
<Project>{2c61ff6e-ac8e-429f-bcee-f38c129028d5}</Project>
|
||||
<Name>DependencyCollector</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="..\Shared.Tests\DependencyCollector.Shared.Tests.projitems" Label="Shared" />
|
||||
<Import Project="..\..\TestFramework\Shared\TestFramework.Shared.projitems" Label="Shared" />
|
||||
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
|
||||
<package id="System.Buffers" version="4.4.0" targetFramework="net451" />
|
||||
<package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net451" />
|
||||
<package id="System.Memory" version="4.5.3" targetFramework="net451" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net451" />
|
||||
<package id="xunit" version="2.1.0" targetFramework="net451" />
|
||||
<package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
|
||||
<package id="xunit.assert" version="2.1.0" targetFramework="net451" />
|
||||
<package id="xunit.core" version="2.1.0" targetFramework="net451" />
|
||||
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" />
|
||||
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" />
|
||||
</packages>
|
||||
|
|
@ -22,8 +22,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WindowsServer.Shared", "Win
|
|||
EndProject
|
||||
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WindowsServer.Shared.Tests", "WindowsServer\WindowsServer.Shared.Tests\WindowsServer.Shared.Tests.shproj", "{7916AE39-AE89-4886-8842-33AC9883905A}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DependencyCollector.Net45.Tests", "DependencyCollector\Net45.Tests\DependencyCollector.Net45.Tests.csproj", "{257FCE5A-0779-45A5-B541-0CE43D79D009}"
|
||||
EndProject
|
||||
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DependencyCollector.Shared", "DependencyCollector\Shared\DependencyCollector.Shared.shproj", "{669E7E58-072D-4B0A-A4DD-4EB2AE2EA4D4}"
|
||||
EndProject
|
||||
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DependencyCollector.Shared.Tests", "DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.shproj", "{ACE58393-3419-4FCA-87CC-C33EB756C7E4}"
|
||||
|
|
@ -51,8 +49,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Solution Items", ".Solutio
|
|||
EndProject
|
||||
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common.Web", "Common\Common.Web.shproj", "{CCAB7A34-8DC5-4A6F-B637-46CEBA93C687}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyCollector.NetCore.Tests", "DependencyCollector\NetCore.Tests\DependencyCollector.NetCore.Tests.csproj", "{D831194B-6283-4F53-B351-D9C72FC03629}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostingStartup", "HostingStartup", "{701D2D4F-B581-45A2-AF29-4F34EC5F047B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostingStartup.Net45.Tests", "HostingStartup\HostingStartup.Net45.Tests\HostingStartup.Net45.Tests.csproj", "{9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}"
|
||||
|
|
@ -101,11 +97,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsigh
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelemetryChannel", "..\..\BASE\src\ServerTelemetryChannel\TelemetryChannel.csproj", "{41301181-F4BE-4C36-B78D-A29C55CB0469}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyCollector.Tests", "DependencyCollector\DependencyCollector.Tests\DependencyCollector.Tests.csproj", "{9853A2A5-FD6C-4743-927E-0BFE807AD21C}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{054c25dc-e545-4712-95c4-81f30cf65ce8}*SharedItemsImports = 13
|
||||
DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.projitems*{257fce5a-0779-45a5-b541-0ce43d79d009}*SharedItemsImports = 4
|
||||
TestFramework\Shared\TestFramework.Shared.projitems*{257fce5a-0779-45a5-b541-0ce43d79d009}*SharedItemsImports = 4
|
||||
PerformanceCollector\Perf.Shared.NetStandard.Stubs\Perf.Shared.NetStandard.Stubs.projitems*{30a45441-0849-48fe-ad37-5d29d0e3068a}*SharedItemsImports = 13
|
||||
Web\Web.Shared.Net\Web.Shared.Net.projitems*{395e03bb-d061-4c9d-9d47-18676566444d}*SharedItemsImports = 13
|
||||
PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{568aeb4f-ba4c-47a5-9fa3-68f06cd11fed}*SharedItemsImports = 13
|
||||
|
|
@ -144,14 +140,6 @@ Global
|
|||
{F05EB480-B209-47DD-90E3-1DDC47EFC579}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{F05EB480-B209-47DD-90E3-1DDC47EFC579}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{F05EB480-B209-47DD-90E3-1DDC47EFC579}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{F71138BB-B3F8-4767-B394-857B0776038E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{F71138BB-B3F8-4767-B394-857B0776038E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{F71138BB-B3F8-4767-B394-857B0776038E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -176,14 +164,6 @@ Global
|
|||
{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{D831194B-6283-4F53-B351-D9C72FC03629}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D831194B-6283-4F53-B351-D9C72FC03629}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D831194B-6283-4F53-B351-D9C72FC03629}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{D831194B-6283-4F53-B351-D9C72FC03629}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{D831194B-6283-4F53-B351-D9C72FC03629}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D831194B-6283-4F53-B351-D9C72FC03629}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D831194B-6283-4F53-B351-D9C72FC03629}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{D831194B-6283-4F53-B351-D9C72FC03629}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -288,6 +268,14 @@ Global
|
|||
{41301181-F4BE-4C36-B78D-A29C55CB0469}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{41301181-F4BE-4C36-B78D-A29C55CB0469}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{41301181-F4BE-4C36-B78D-A29C55CB0469}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{9853A2A5-FD6C-4743-927E-0BFE807AD21C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9853A2A5-FD6C-4743-927E-0BFE807AD21C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9853A2A5-FD6C-4743-927E-0BFE807AD21C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{9853A2A5-FD6C-4743-927E-0BFE807AD21C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{9853A2A5-FD6C-4743-927E-0BFE807AD21C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9853A2A5-FD6C-4743-927E-0BFE807AD21C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9853A2A5-FD6C-4743-927E-0BFE807AD21C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{9853A2A5-FD6C-4743-927E-0BFE807AD21C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -297,7 +285,6 @@ Global
|
|||
{F05EB480-B209-47DD-90E3-1DDC47EFC579} = {D87119AF-CD35-46F2-84A6-ED54CC42027E}
|
||||
{579F42E8-B711-411E-BE52-4A3FD208507F} = {D87119AF-CD35-46F2-84A6-ED54CC42027E}
|
||||
{7916AE39-AE89-4886-8842-33AC9883905A} = {D87119AF-CD35-46F2-84A6-ED54CC42027E}
|
||||
{257FCE5A-0779-45A5-B541-0CE43D79D009} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB}
|
||||
{669E7E58-072D-4B0A-A4DD-4EB2AE2EA4D4} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB}
|
||||
{ACE58393-3419-4FCA-87CC-C33EB756C7E4} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB}
|
||||
{F71138BB-B3F8-4767-B394-857B0776038E} = {1A75535C-B8E5-4C31-BC6E-50456C8C4052}
|
||||
|
|
@ -305,7 +292,6 @@ Global
|
|||
{9718F051-147F-4F5F-9FF3-C926430EFCF7} = {8CA9F9C9-DA39-4159-86F3-C52F1636715E}
|
||||
{F254D4FB-428D-408E-8251-39BCA7B4B5CE} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
|
||||
{C6B569BC-6F19-42C9-A951-DA611BB0F4BE} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
|
||||
{D831194B-6283-4F53-B351-D9C72FC03629} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB}
|
||||
{9AB6BDFD-253C-4C97-8BB8-7234ADFCB601} = {701D2D4F-B581-45A2-AF29-4F34EC5F047B}
|
||||
{A78F50D4-F518-4DCB-878B-526FD54CCA35} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
|
||||
{85238238-5EF0-40FA-AD3E-BD4B12A3DD1A} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
|
||||
|
|
@ -326,6 +312,7 @@ Global
|
|||
{A8BA3BD0-19CE-488D-B2BD-0B9B677F4E03} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
|
||||
{2BB7F06B-F094-417F-8C1B-7FCCA1192E17} = {85C7566E-98C3-479D-AC4F-0D4B161B7D42}
|
||||
{41301181-F4BE-4C36-B78D-A29C55CB0469} = {85C7566E-98C3-479D-AC4F-0D4B161B7D42}
|
||||
{9853A2A5-FD6C-4743-927E-0BFE807AD21C} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {F99E0A07-C363-49BF-BFA7-C748391CE38E}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче