|
14 | 14 | <FailOnTestFailure>true</FailOnTestFailure>
|
15 | 15 | <EnableXUnitReporter>true</EnableXUnitReporter>
|
16 | 16 | <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
|
| 17 | + <SqlServerTests>$(RepoRoot)/test/EFCore.SqlServer.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.OData.FunctionalTests/*.csproj</SqlServerTests> |
17 | 18 | </PropertyGroup>
|
18 | 19 |
|
19 | 20 | <PropertyGroup Condition = "'$(SYSTEM_ACCESSTOKEN)' == ''">
|
20 | 21 | <!-- Local build outside of Azure Pipeline -->
|
21 |
| - <HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">Windows.10.Amd64.Open;Ubuntu.1804.Amd64.Open;OSX.1014.Amd64.Open</HelixTargetQueues> |
| 22 | + < HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">Windows.10.Amd64.Open;Ubuntu.1804.Amd64.Open;OSX.1014.Amd64.Open ;[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64-20201109180804-3069967</ HelixTargetQueues> |
22 | 23 | <EnableAzurePipelinesReporter>false</EnableAzurePipelinesReporter>
|
23 | 24 | <FailOnMissionControlTestFailure>false</FailOnMissionControlTestFailure>
|
24 | 25 | <HelixSource>efcore/localbuild/</HelixSource>
|
|
33 | 34 |
|
34 | 35 | <!-- Start LocalDb instance for test projects which uses SqlServer on windows -->
|
35 | 36 | <ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`Windows`))'">
|
36 |
| - <XUnitProject Update="$(RepoRoot)/test/EFCore.SqlServer.FunctionalTests/*.csproj"> |
| 37 | + <XUnitProject Update="$(SqlServerTests);$(RepoRoot)/test/EFCore.CrossStore.FunctionalTests/*.csproj"> |
37 | 38 | <PreCommands>$(PreCommands); SqlLocalDB start</PreCommands>
|
38 | 39 | </XUnitProject>
|
39 |
| - <XUnitProject Update="$(RepoRoot)/test/EFCore.CrossStore.FunctionalTests/*.csproj"> |
40 |
| - <PreCommands>$(PreCommands); SqlLocalDB start</PreCommands> |
41 |
| - </XUnitProject> |
42 |
| - <XUnitProject Update="$(RepoRoot)/test/EFCore.OData.FunctionalTests/*.csproj"> |
43 |
| - <PreCommands>$(PreCommands); SqlLocalDB start</PreCommands> |
| 40 | + </ItemGroup> |
| 41 | + |
| 42 | + <!-- Start SqlServer instance for test projects which uses SqlServer on docker. Also remove other projects as they will be run outside of docker. --> |
| 43 | + <ItemGroup Condition = "'$(HelixTargetQueue.Contains(`ubuntu-18.04-helix-sqlserver-amd64`))'"> |
| 44 | + <XUnitProject Remove="$(RepoRoot)/test/**/*.csproj"/> |
| 45 | + <XUnitProject Include="$(SqlServerTests);$(RepoRoot)/test/EFCore.CrossStore.FunctionalTests/*.csproj"> |
| 46 | + <PreCommands>$(PreCommands); export MSSQL_SA_PASSWORD=$(MSSQL_SA_PASSWORD); /opt/mssql/bin/sqlservr --accept-eula &; export Test__SqlServer__DefaultConnection="Data Source=localhost;;Database=master;;User=sa;;Password=$(MSSQL_SA_PASSWORD);;Connect Timeout=60;;ConnectRetryCount=0"; sleep 120</PreCommands> |
44 | 47 | </XUnitProject>
|
45 | 48 | </ItemGroup>
|
46 | 49 |
|
| 50 | + <!-- Remove test projects which requires SqlServer from Ubuntu/OSX. --> |
| 51 | + <ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`OSX`))' OR '$(HelixTargetQueue)' == 'Ubuntu.1804.Amd64.Open' OR '$(HelixTargetQueue)' == 'Ubuntu.1804.Amd64'"> |
| 52 | + <XUnitProject Remove="$(SqlServerTests)"/> |
| 53 | + </ItemGroup> |
| 54 | + |
47 | 55 | <PropertyGroup>
|
48 | 56 | <XUnitPublishTargetFramework>net5.0</XUnitPublishTargetFramework>
|
49 | 57 | <XUnitRuntimeTargetFramework>netcoreapp2.0</XUnitRuntimeTargetFramework>
|
|
0 commit comments