diff --git a/appveyor.yml b/appveyor.yml index 41a9913..d80cc62 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,6 +3,7 @@ pull_requests: do_not_increment_build_number: true skip_tags: true image: Visual Studio 2019 +#image: Ubuntu2004 #Sql server (2017) is uncontactable with the connectionstring below (it works on other build environments), issue raised: https://github.com/appveyor/website/issues/786 configuration: Release shallow_clone: true dotnet_csproj: diff --git a/vcdb.IntegrationTests/Execution/Vcdb.cs b/vcdb.IntegrationTests/Execution/Vcdb.cs index 17b4852..06cafce 100644 --- a/vcdb.IntegrationTests/Execution/Vcdb.cs +++ b/vcdb.IntegrationTests/Execution/Vcdb.cs @@ -102,7 +102,7 @@ private Options GetOptions(Scenario scenario, ScenarioSettings settings, string var options = new Options { WorkingDirectory = workingDirectory, - AssemblySearchPaths = new[] { Path.GetFullPath(Path.Combine(typeof(Vcdb).Assembly.Location, $@"..\..\..\..\..\vcdb\bin\{BuildConfiguration.Current}\netcoreapp3.1")) }, + AssemblySearchPaths = new[] { Path.GetFullPath(Path.Combine(typeof(Vcdb).Assembly.Location, "..", "..", "..", "..", "..", "vcdb", "bin", BuildConfiguration.Current, "netcoreapp3.1")) }, InputFile = settings.Mode == ExecutionMode.Deploy ? GetInputFileName(scenario) : null diff --git a/vcdb.IntegrationTests/IntegrationTestBase.cs b/vcdb.IntegrationTests/IntegrationTestBase.cs index a1da123..b9bb61e 100644 --- a/vcdb.IntegrationTests/IntegrationTestBase.cs +++ b/vcdb.IntegrationTests/IntegrationTestBase.cs @@ -68,7 +68,7 @@ private IntegrationTestOptions GetOptions(string scenarioName) ConnectionString = EnvironmentVariable.Get($"Vcdb_{databaseProduct.Name}_ConnectionString") ?? databaseProduct.FallbackConnectionString, ScenarioName = scenarioName, MaxConcurrency = 10, - ScenariosPath = Path.GetFullPath("..\\..\\..\\..\\TestScenarios"), + ScenariosPath = Path.Combine("..", "..", "..", "..", "TestScenarios"), MinLogLevel = LogLevel.Information, UseLocalDatabase = EnvironmentVariable.Get($"Vcdb_{databaseProduct.Name}_UseLocalDatabase") ?? EnvironmentVariable.Get($"Vcdb_UseLocalDatabase") ?? false, DatabaseProduct = databaseProduct diff --git a/vcdb.IntegrationTests/IntegrationTestScenarios.cs b/vcdb.IntegrationTests/IntegrationTestScenarios.cs index 5863e8c..e685e53 100644 --- a/vcdb.IntegrationTests/IntegrationTestScenarios.cs +++ b/vcdb.IntegrationTests/IntegrationTestScenarios.cs @@ -21,7 +21,7 @@ protected IntegrationTestScenarios(string mode) private IEnumerable GetScenarioNames() { - var testScenarios = Path.GetFullPath("..\\..\\..\\..\\TestScenarios"); + var testScenarios = Path.GetFullPath(Path.Combine("..", "..", "..", "..", "TestScenarios")); var filter = new ScenarioFilter(DatabaseProduct); foreach (var directory in Directory.GetDirectories(testScenarios))