Updated project names to easily filter 20 vs 11 tests.
Build yml modified to run 1.1 and 2.0 tests separately
This commit is contained in:
Родитель
dac4695beb
Коммит
f9b3f2f3b6
|
@ -17,16 +17,16 @@ steps:
|
|||
displayName: build all projects
|
||||
inputs:
|
||||
command: "build"
|
||||
projects: "**/**/**.csproj"
|
||||
projects: "src/**/**.csproj"
|
||||
arguments: "--configuration Release"
|
||||
|
||||
- task: DotNetCoreCLI@1
|
||||
displayName: Test All Before 1.1.5
|
||||
displayName: Test 2.0
|
||||
continueOnError: true
|
||||
inputs:
|
||||
command: "test"
|
||||
projects: "test/**/*Tests.csproj"
|
||||
arguments: "--configuration Release --no-build -l trx"
|
||||
projects: "test/**/*Tests20.csproj"
|
||||
arguments: "--configuration Release -l trx"
|
||||
|
||||
- task: DotNetCoreInstaller@0
|
||||
displayName: install dotnet core 1.1.5
|
||||
|
@ -34,12 +34,12 @@ steps:
|
|||
version: "1.1.5"
|
||||
|
||||
- task: DotNetCoreCLI@1
|
||||
displayName: Test All After 1.1.5
|
||||
displayName: Test 1.1.5
|
||||
continueOnError: true
|
||||
inputs:
|
||||
command: "test"
|
||||
projects: "test/**/*Tests.csproj"
|
||||
arguments: "--configuration Release --no-build -l trx"
|
||||
arguments: "--configuration Release -l trx"
|
||||
|
||||
|
||||
- task: PublishTestResults@2
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26730.12
|
||||
VisualStudioVersion = 15.0.27004.2008
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF}"
|
||||
EndProject
|
||||
|
@ -34,17 +34,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTestUtils", "test
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp.FunctionalTests", "test\EmptyApp.FunctionalTests\EmptyApp.FunctionalTests.csproj", "{71CE2DB2-C7AA-4454-B5F2-774BC575E321}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp20.FunctionalTests", "test\EmptyApp20.FunctionalTests\EmptyApp20.FunctionalTests.csproj", "{C47AFD8A-3326-4391-8115-69349C04C3DA}"
|
||||
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}") = "MVCFramework.FunctionalTests", "test\MVCFramework.FunctionalTests\MVCFramework.FunctionalTests.csproj", "{1D5825CC-2EC9-43A1-BE32-778EFF5EAC80}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework20.FunctionalTests", "test\MVCFramework20.FunctionalTests\MVCFramework20.FunctionalTests.csproj", "{51198C41-CD4A-4006-84D4-DE20A0A44363}"
|
||||
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}") = "WebApi.FunctionalTests", "test\WebApi.FunctionalTests\WebApi.FunctionalTests.csproj", "{325C4ECE-BD4A-4CF2-BC80-FBD1024B5935}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi20.FunctionalTests", "test\WebApi20.FunctionalTests\WebApi20.FunctionalTests.csproj", "{C3B3F515-0305-4809-A9A8-37FD80428F74}"
|
||||
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
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net461' ">win7-x86</RuntimeIdentifier>
|
||||
<DelaySign Condition=" '$(OS)' == 'Windows_NT' ">true</DelaySign>
|
||||
<PreserveCompilationContext>true</PreserveCompilationContext>
|
||||
<AssemblyName>EmptyApp20.FunctionalTests</AssemblyName>
|
||||
<AssemblyName>EmptyApp20.FunctionalTests20</AssemblyName>
|
||||
<AssemblyOriginatorKeyFile>../../keys/35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
|
|
@ -11,7 +11,7 @@ namespace EmptyApp20.FunctionalTests.FunctionalTest
|
|||
|
||||
public class ExceptionTelemetryEmptyAppTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "EmptyApp20.FunctionalTests";
|
||||
private const string assemblyName = "EmptyApp20.FunctionalTests20";
|
||||
public ExceptionTelemetryEmptyAppTests(ITestOutputHelper output) : base (output)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
public class RequestTelemetryEmptyAppTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "EmptyApp20.FunctionalTests";
|
||||
private const string assemblyName = "EmptyApp20.FunctionalTests20";
|
||||
|
||||
public RequestTelemetryEmptyAppTests(ITestOutputHelper output) : base (output)
|
||||
{
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
public class TelemetryModuleWorkingEmptyAppTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "EmptyApp20.FunctionalTests";
|
||||
private const string assemblyName = "EmptyApp20.FunctionalTests20";
|
||||
public TelemetryModuleWorkingEmptyAppTests(ITestOutputHelper output) : base (output)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
public class CorrelationMvcTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "MVCFramework20.FunctionalTests";
|
||||
private const string assemblyName = "MVCFramework20.FunctionalTests20";
|
||||
|
||||
public CorrelationMvcTests(ITestOutputHelper output) : base(output)
|
||||
{
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
public class DependencyTelemetryMvcTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "MVCFramework20.FunctionalTests";
|
||||
private const string assemblyName = "MVCFramework20.FunctionalTests20";
|
||||
public DependencyTelemetryMvcTests(ITestOutputHelper output) : base(output)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ namespace MVCFramework20.FunctionalTests.FunctionalTest
|
|||
|
||||
public class ExceptionTelemetryMvcTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "MVCFramework20.FunctionalTests";
|
||||
private const string assemblyName = "MVCFramework20.FunctionalTests20";
|
||||
|
||||
public ExceptionTelemetryMvcTests(ITestOutputHelper output) : base(output)
|
||||
{
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
public class RequestTelemetryMvcTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "MVCFramework20.FunctionalTests";
|
||||
private const string assemblyName = "MVCFramework20.FunctionalTests20";
|
||||
|
||||
public RequestTelemetryMvcTests(ITestOutputHelper output) : base(output)
|
||||
{
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
public class TelemetryModuleWorkingMvcTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "MVCFramework20.FunctionalTests";
|
||||
private const string assemblyName = "MVCFramework20.FunctionalTests20";
|
||||
|
||||
public TelemetryModuleWorkingMvcTests(ITestOutputHelper output) : base(output)
|
||||
{
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net461' ">win7-x86</RuntimeIdentifier>
|
||||
<DelaySign Condition=" '$(OS)' == 'Windows_NT' ">true</DelaySign>
|
||||
<PreserveCompilationContext>true</PreserveCompilationContext>
|
||||
<AssemblyName>MVCFramework20.FunctionalTests</AssemblyName>
|
||||
<AssemblyName>MVCFramework20.FunctionalTests20</AssemblyName>
|
||||
<AssemblyOriginatorKeyFile>../../keys/35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
|
||||
|
@ -21,6 +21,9 @@
|
|||
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<ApplicationIcon />
|
||||
<OutputType>Library</OutputType>
|
||||
<StartupObject />
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
|
@ -12,7 +12,7 @@
|
|||
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
|
||||
<PackageId>Microsoft.ApplicationInsights.AspNetCore.Tests</PackageId>
|
||||
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
||||
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.1.1</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.1.5</RuntimeFrameworkVersion>
|
||||
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\test\$(MSBuildProjectName)</OutputPath>
|
||||
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)'=='' ">..\..\artifacts\obj\test\$(MSBuildProjectName)</IntermediateOutputPath>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
|
|
|
@ -10,7 +10,7 @@ namespace WebApi20.FunctionalTests.FunctionalTest
|
|||
|
||||
public class ExceptionTelemetryWebApiTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "WebApi20.FunctionalTests";
|
||||
private const string assemblyName = "WebApi20.FunctionalTests20";
|
||||
|
||||
|
||||
public ExceptionTelemetryWebApiTests(ITestOutputHelper output) : base (output)
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
public class RequestTelemetryWebApiTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "WebApi20.FunctionalTests";
|
||||
private const string assemblyName = "WebApi20.FunctionalTests20";
|
||||
public RequestTelemetryWebApiTests(ITestOutputHelper output) : base (output)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
public class TelemetryModuleWorkingWebApiTests : TelemetryTestsBase
|
||||
{
|
||||
private const string assemblyName = "WebApi20.FunctionalTests";
|
||||
private const string assemblyName = "WebApi20.FunctionalTests20";
|
||||
public TelemetryModuleWorkingWebApiTests(ITestOutputHelper output) : base (output)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net461' ">win7-x86</RuntimeIdentifier>
|
||||
<DelaySign Condition=" '$(OS)' == 'Windows_NT' ">true</DelaySign>
|
||||
<PreserveCompilationContext>true</PreserveCompilationContext>
|
||||
<AssemblyName>WebApi20.FunctionalTests</AssemblyName>
|
||||
<AssemblyName>WebApi20.FunctionalTests20</AssemblyName>
|
||||
<AssemblyOriginatorKeyFile>../../keys/35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
|
||||
|
@ -18,6 +18,9 @@
|
|||
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)'=='' ">..\..\artifacts\obj\test\$(MSBuildProjectName)</IntermediateOutputPath>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<ApplicationIcon />
|
||||
<OutputType>Library</OutputType>
|
||||
<StartupObject />
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
Загрузка…
Ссылка в новой задаче