From e4adb69a6f7667db6cb32b8b8e6b3fc76bb82e95 Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Tue, 1 Nov 2022 18:19:31 -0700 Subject: [PATCH 01/22] fix orderby for null int types --- ConfigGenerators/MsSqlCommands.txt | 3 ++- ConfigGenerators/MySqlCommands.txt | 3 ++- ConfigGenerators/PostgreSqlCommands.txt | 3 ++- .../SqlTests/RestApiTests/Find/FindApiTestBase.cs | 15 +++++++++++++++ .../RestApiTests/Find/MsSqlFindApiTests.cs | 6 ++++++ .../RestApiTests/Find/MySqlFindApiTests.cs | 11 +++++++++++ .../RestApiTests/Find/PostgreSqlFindApiTests.cs | 10 ++++++++++ .../SqlTests/RestApiTests/RestApiTestBase.cs | 2 ++ src/Service/Resolvers/BaseSqlQueryBuilder.cs | 9 +++++++-- .../Sql Query Structures/SqlQueryStructure.cs | 5 +++-- src/Service/Resolvers/SqlPaginationUtil.cs | 3 ++- 11 files changed, 62 insertions(+), 8 deletions(-) diff --git a/ConfigGenerators/MsSqlCommands.txt b/ConfigGenerators/MsSqlCommands.txt index b9101408b5..41a507c4c9 100644 --- a/ConfigGenerators/MsSqlCommands.txt +++ b/ConfigGenerators/MsSqlCommands.txt @@ -1,4 +1,4 @@ -init --config "dab-config.MsSql.json" --database-type mssql --connection-string "Server=tcp:127.0.0.1,1433;Persist Security Info=False;User ID=sa;Password=REPLACEME;MultipleActiveResultSets=False;Connection Timeout=5;" --host-mode Development --authenticate-devmode-requests false --cors-origin "http://localhost:5000" +init --config "dab-config.MsSql.json" --database-type mssql --connection-string "Server=tcp:127.0.0.1,1433;Persist Security Info=False;User ID=sa;Password=REPLACEME;MultipleActiveResultSets=False;Connection Timeout=5;" --host-mode Development --authenticate-devmode-requests false --cors-origin "http://localhost:5000" add Publisher --config "dab-config.MsSql.json" --source publishers --permissions "anonymous:read" add Stock --config "dab-config.MsSql.json" --source stocks --permissions "anonymous:create,read,update" add Book --config "dab-config.MsSql.json" --source books --permissions "anonymous:create,read,update,delete" --graphql "book:books" @@ -23,6 +23,7 @@ add ArtOfWar --config "dab-config.MsSql.json" --source "aow" --rest true --permi add series --config "dab-config.MsSql.json" --source "series" --permissions "anonymous:*" add GetBooks --config "dab-config.MsSql.json" --source "get_books" --source.type "stored-procedure" --permissions "anonymous:read" --rest true --graphql false add GetBook --config "dab-config.MsSql.json" --source "get_book_by_id" --source.type "stored-procedure" --permissions "anonymous:read" --rest true --graphql false +add TypeTable --config "dab-config.MsSql.json" --source "type_table" --source.type "table" --permissions "anonymous:read" --rest true --graphql true update Publisher --config "dab-config.MsSql.json" --permissions "authenticated:create,read,update,delete" --rest true --graphql true --relationship books --target.entity Book --cardinality many update Publisher --config "dab-config.MsSql.json" --permissions "policy_tester_01:create,delete" update Publisher --config "dab-config.MsSql.json" --permissions "policy_tester_01:update" --fields.include "*" diff --git a/ConfigGenerators/MySqlCommands.txt b/ConfigGenerators/MySqlCommands.txt index d8c0012975..d86d967fdd 100644 --- a/ConfigGenerators/MySqlCommands.txt +++ b/ConfigGenerators/MySqlCommands.txt @@ -1,4 +1,4 @@ -init --config "dab-config.MySql.json" --database-type mysql --connection-string "server=localhost;database=datagatewaytest;Allow User Variables=true;uid=root;pwd=REPLACEME" --host-mode Development --authenticate-devmode-requests false --cors-origin "http://localhost:5000" +init --config "dab-config.MySql.json" --database-type mysql --connection-string "server=localhost;database=datagatewaytest;Allow User Variables=true;uid=root;pwd=REPLACEME" --host-mode Development --authenticate-devmode-requests false --cors-origin "http://localhost:5000" add Publisher --config "dab-config.MySql.json" --source publishers --permissions "anonymous:read" add Stock --config "dab-config.MySql.json" --source stocks --permissions "anonymous:create,read,update" add Book --config "dab-config.MySql.json" --source books --permissions "anonymous:create,read,update,delete" --graphql "book:books" @@ -21,6 +21,7 @@ add Notebook --config "dab-config.MySql.json" --source "notebooks" --permissions add Journal --config "dab-config.MySql.json" --source "journals" --rest true --graphql true --permissions "policy_tester_noupdate:create,delete" add ArtOfWar --config "dab-config.MySql.json" --source "aow" --rest true --permissions "anonymous:*" add series --config "dab-config.MySql.json" --source "series" --permissions "anonymous:*" +add TypeTable --config "dab-config.MySql.json" --source "type_table" --source.type "table" --permissions "anonymous:read" --rest true --graphql true update Publisher --config "dab-config.MySql.json" --permissions "authenticated:create,read,update,delete" --rest true --graphql true --relationship books --target.entity Book --cardinality many update Publisher --config "dab-config.MySql.json" --permissions "policy_tester_01:create,delete" update Publisher --config "dab-config.MySql.json" --permissions "policy_tester_01:update" --fields.include "*" diff --git a/ConfigGenerators/PostgreSqlCommands.txt b/ConfigGenerators/PostgreSqlCommands.txt index 08475bf737..329bc0ca79 100644 --- a/ConfigGenerators/PostgreSqlCommands.txt +++ b/ConfigGenerators/PostgreSqlCommands.txt @@ -1,4 +1,4 @@ -init --config "dab-config.PostgreSql.json" --database-type postgresql --connection-string "Host=localhost;Database=datagatewaytest;username=REPLACEME;password=REPLACEME" --host-mode Development --authenticate-devmode-requests false --cors-origin "http://localhost:5000" +init --config "dab-config.PostgreSql.json" --database-type postgresql --connection-string "Host=localhost;Database=datagatewaytest;username=REPLACEME;password=REPLACEME" --host-mode Development --authenticate-devmode-requests false --cors-origin "http://localhost:5000" add Publisher --config "dab-config.PostgreSql.json" --source publishers --permissions "anonymous:read" add Stock --config "dab-config.PostgreSql.json" --source stocks --permissions "anonymous:create,read,update" add Book --config "dab-config.PostgreSql.json" --source books --permissions "anonymous:create,read,update,delete" --graphql "book:books" @@ -18,6 +18,7 @@ add Notebook --config "dab-config.PostgreSql.json" --source "notebooks" --permis add Journal --config "dab-config.PostgreSql.json" --source "journals" --rest true --graphql true --permissions "policy_tester_noupdate:create,delete" add ArtOfWar --config "dab-config.PostgreSql.json" --source "aow" --rest true --permissions "anonymous:*" add series --config "dab-config.PostgreSql.json" --source "series" --permissions "anonymous:*" +add TypeTable --config "dab-config.PostgreSql.json" --source "type_table" --source.type "table" --permissions "anonymous:read" --rest true --graphql true update Publisher --config "dab-config.PostgreSql.json" --permissions "authenticated:create,read,update,delete" --rest true --graphql true --relationship books --target.entity Book --cardinality many update Publisher --config "dab-config.PostgreSql.json" --permissions "policy_tester_01:create,delete" update Publisher --config "dab-config.PostgreSql.json" --permissions "policy_tester_01:update" --fields.include "*" diff --git a/src/Service.Tests/SqlTests/RestApiTests/Find/FindApiTestBase.cs b/src/Service.Tests/SqlTests/RestApiTests/Find/FindApiTestBase.cs index 52fa3eb162..7727171488 100644 --- a/src/Service.Tests/SqlTests/RestApiTests/Find/FindApiTestBase.cs +++ b/src/Service.Tests/SqlTests/RestApiTests/Find/FindApiTestBase.cs @@ -525,6 +525,21 @@ await SetupAndRunRestApiTest( ); } + /// + /// Tests the REST Api for Find operation using sorting + /// with integer type and null values. + /// + [TestMethod] + public async Task FindTestWithIntTypeNullValuesOrderByAsc() + { + await SetupAndRunRestApiTest( + primaryKeyRoute: string.Empty, + queryString: "?$orderby=int_types", + entityNameOrPath: _integrationTypeEntity, + sqlQuery: GetQuery(nameof(FindTestWithIntTypeNullValuesOrderByAsc)) + ); + } + /// /// Tests the REST Api for Find operation for all records. /// order by title in ascending order. diff --git a/src/Service.Tests/SqlTests/RestApiTests/Find/MsSqlFindApiTests.cs b/src/Service.Tests/SqlTests/RestApiTests/Find/MsSqlFindApiTests.cs index f2d4c2c2b8..dfdb816cce 100644 --- a/src/Service.Tests/SqlTests/RestApiTests/Find/MsSqlFindApiTests.cs +++ b/src/Service.Tests/SqlTests/RestApiTests/Find/MsSqlFindApiTests.cs @@ -254,6 +254,12 @@ public class MsSqlFindApiTests : FindApiTestBase $"ORDER BY book_id asc, id asc " + $"FOR JSON PATH, INCLUDE_NULL_VALUES" }, + { + "FindTestWithIntTypeNullValuesOrderByAsc", + $"SELECT * FROM type_table " + + $"ORDER BY int_types asc, id asc " + + $"FOR JSON PATH, INCLUDE_NULL_VALUES" + }, { "FindTestWithQueryStringAllFieldsOrderByAsc", $"SELECT * FROM { _integrationTableName } " + diff --git a/src/Service.Tests/SqlTests/RestApiTests/Find/MySqlFindApiTests.cs b/src/Service.Tests/SqlTests/RestApiTests/Find/MySqlFindApiTests.cs index 1d56a294ee..396c5802f7 100644 --- a/src/Service.Tests/SqlTests/RestApiTests/Find/MySqlFindApiTests.cs +++ b/src/Service.Tests/SqlTests/RestApiTests/Find/MySqlFindApiTests.cs @@ -478,6 +478,17 @@ SELECT JSON_ARRAYAGG(JSON_OBJECT('id', id, 'content', content, 'book_id', book_i LIMIT 1 ) AS subq" }, + { + "FindTestWithIntTypeNullValuesOrderByAsc", + @" + SELECT JSON_ARRAYAGG(JSON_OBJECT('id', id, 'title', title, 'publisher_id', publisher_id)) AS data + FROM ( + SELECT * + FROM " + _integrationTypeTable + @" + ORDER BY int_types asc, id asc + LIMIT 100 + ) AS subq" + }, { "FindTestWithQueryStringAllFieldsOrderByAsc", @" diff --git a/src/Service.Tests/SqlTests/RestApiTests/Find/PostgreSqlFindApiTests.cs b/src/Service.Tests/SqlTests/RestApiTests/Find/PostgreSqlFindApiTests.cs index 34f0697d47..93e5f35401 100644 --- a/src/Service.Tests/SqlTests/RestApiTests/Find/PostgreSqlFindApiTests.cs +++ b/src/Service.Tests/SqlTests/RestApiTests/Find/PostgreSqlFindApiTests.cs @@ -371,6 +371,16 @@ LIMIT 1 ) AS subq " }, + { + "FindTestWithIntTypeNullValuesOrderByAsc", + @" + SELECT json_agg(to_jsonb(subq)) AS data + FROM ( + SELECT * + FROM " + _integrationTypeTable + @" + ORDER BY int_types asc, id asc + ) AS subq" + }, { "FindTestWithQueryStringAllFieldsOrderByAsc", @" diff --git a/src/Service.Tests/SqlTests/RestApiTests/RestApiTestBase.cs b/src/Service.Tests/SqlTests/RestApiTests/RestApiTestBase.cs index b180aebe58..6f8a5d9df1 100644 --- a/src/Service.Tests/SqlTests/RestApiTests/RestApiTestBase.cs +++ b/src/Service.Tests/SqlTests/RestApiTests/RestApiTestBase.cs @@ -42,6 +42,8 @@ public abstract class RestApiTestBase : SqlTestBase protected static readonly string _integrationProcedureFindOne_ProcName = "get_book_by_id"; protected static readonly string _integrationMappingDifferentEntityPath = "plants"; protected static readonly string _Composite_NonAutoGenPK_EntityPath = "commodities"; + protected static readonly string _integrationTypeEntity = "TypeTable"; + protected static readonly string _integrationTypeTable = "type_table"; public abstract string GetQuery(string key); } diff --git a/src/Service/Resolvers/BaseSqlQueryBuilder.cs b/src/Service/Resolvers/BaseSqlQueryBuilder.cs index cf1b567829..3eb87d9195 100644 --- a/src/Service/Resolvers/BaseSqlQueryBuilder.cs +++ b/src/Service/Resolvers/BaseSqlQueryBuilder.cs @@ -72,8 +72,13 @@ private string MakePaginationInequality(List columns, int unti StringBuilder result = new(); for (int i = 0; i <= untilIndex; i++) { - string op = i == untilIndex ? GetComparisonFromDirection(columns[i].Direction) : "="; - result.Append($"{Build(columns[i], printDirection: false)} {op} {columns[i].ParamName}"); + // Combine op and param to accomodate "is NULL" which is used for + // params that have value of NULL. + string opAndParam = i == untilIndex ? + $"{GetComparisonFromDirection(columns[i].Direction)} {columns[i].ParamName}" : + columns[i].Value is not null ? + $"= {columns[i].ParamName}" : "is NULL"; + result.Append($"{Build(columns[i], printDirection: false)} {opAndParam}"); if (i < untilIndex) { diff --git a/src/Service/Resolvers/Sql Query Structures/SqlQueryStructure.cs b/src/Service/Resolvers/Sql Query Structures/SqlQueryStructure.cs index adf02230bd..9b46bc5ed3 100644 --- a/src/Service/Resolvers/Sql Query Structures/SqlQueryStructure.cs +++ b/src/Service/Resolvers/Sql Query Structures/SqlQueryStructure.cs @@ -513,8 +513,9 @@ public void AddPaginationPredicate(IEnumerable afterJsonValues foreach (PaginationColumn column in afterJsonValues) { column.TableAlias = TableAlias; - column.ParamName = "@" + MakeParamWithValue( - GetParamAsColumnSystemType(column.Value!.ToString()!, column.ColumnName)); + column.ParamName = column.Value is not null ? + "@" + MakeParamWithValue(GetParamAsColumnSystemType(column.Value!.ToString()!, column.ColumnName)) : + "@" + MakeParamWithValue(null); } } catch (ArgumentException ex) diff --git a/src/Service/Resolvers/SqlPaginationUtil.cs b/src/Service/Resolvers/SqlPaginationUtil.cs index 2a6745c034..d597d3883b 100644 --- a/src/Service/Resolvers/SqlPaginationUtil.cs +++ b/src/Service/Resolvers/SqlPaginationUtil.cs @@ -374,10 +374,11 @@ private static string GetExposedColumnName(string entityName, string backingColu /// Resolves a JsonElement representing a variable to the appropriate type /// /// - public static object ResolveJsonElementToScalarVariable(JsonElement element) => element.ValueKind switch + public static object? ResolveJsonElementToScalarVariable(JsonElement element) => element.ValueKind switch { JsonValueKind.String => element.GetString()!, JsonValueKind.Number => element.GetInt64(), + JsonValueKind.Null => null, JsonValueKind.True => true, JsonValueKind.False => false, _ => throw new ArgumentException("Unexpected JsonElement value"), From 9ec7c9d356a722748010eff77945ff1790adbe95 Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Fri, 17 Feb 2023 10:04:47 -0800 Subject: [PATCH 02/22] improving folder structure --- create_manifest_file.ps1 => scripts/create_manifest_file.ps1 | 0 dab-smoke-test-script.ps1 => scripts/dab-smoke-test-script.ps1 | 0 publish.ps1 => scripts/publish.ps1 | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename create_manifest_file.ps1 => scripts/create_manifest_file.ps1 (100%) rename dab-smoke-test-script.ps1 => scripts/dab-smoke-test-script.ps1 (100%) rename publish.ps1 => scripts/publish.ps1 (100%) diff --git a/create_manifest_file.ps1 b/scripts/create_manifest_file.ps1 similarity index 100% rename from create_manifest_file.ps1 rename to scripts/create_manifest_file.ps1 diff --git a/dab-smoke-test-script.ps1 b/scripts/dab-smoke-test-script.ps1 similarity index 100% rename from dab-smoke-test-script.ps1 rename to scripts/dab-smoke-test-script.ps1 diff --git a/publish.ps1 b/scripts/publish.ps1 similarity index 100% rename from publish.ps1 rename to scripts/publish.ps1 From 04669bb39289a74de3be93f01c5a3ce4be63957c Mon Sep 17 00:00:00 2001 From: aaronburtle <93220300+aaronburtle@users.noreply.github.com> Date: Fri, 17 Feb 2023 10:09:01 -0800 Subject: [PATCH 03/22] Update MsSqlCommands.txt --- ConfigGenerators/MsSqlCommands.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConfigGenerators/MsSqlCommands.txt b/ConfigGenerators/MsSqlCommands.txt index 2d463d9439..6b98568b63 100644 --- a/ConfigGenerators/MsSqlCommands.txt +++ b/ConfigGenerators/MsSqlCommands.txt @@ -1,4 +1,4 @@ -init --config "dab-config.MsSql.json" --database-type mssql --set-session-context true --connection-string "Server=tcp:127.0.0.1,1433;Persist Security Info=False;User ID=sa;Password=REPLACEME;MultipleActiveResultSets=False;Connection Timeout=5;" --host-mode Development --cors-origin "http://localhost:5000" +init --config "dab-config.MsSql.json" --database-type mssql --set-session-context true --connection-string "Server=tcp:127.0.0.1,1433;Persist Security Info=False;User ID=sa;Password=REPLACEME;MultipleActiveResultSets=False;Connection Timeout=5;" --host-mode Development --cors-origin "http://localhost:5000" add Publisher --config "dab-config.MsSql.json" --source publishers --permissions "anonymous:read" add Stock --config "dab-config.MsSql.json" --source stocks --permissions "anonymous:create,read,update" add Book --config "dab-config.MsSql.json" --source books --permissions "anonymous:create,read,update,delete" --graphql "book:books" From 278142e9882c671b67b64e28c385f6f3cfe50c05 Mon Sep 17 00:00:00 2001 From: aaronburtle <93220300+aaronburtle@users.noreply.github.com> Date: Fri, 17 Feb 2023 10:09:14 -0800 Subject: [PATCH 04/22] Update MySqlCommands.txt --- ConfigGenerators/MySqlCommands.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConfigGenerators/MySqlCommands.txt b/ConfigGenerators/MySqlCommands.txt index 05005370cc..19363e96d7 100644 --- a/ConfigGenerators/MySqlCommands.txt +++ b/ConfigGenerators/MySqlCommands.txt @@ -1,4 +1,4 @@ -init --config "dab-config.MySql.json" --database-type mysql --connection-string "server=localhost;database=datagatewaytest;Allow User Variables=true;uid=root;pwd=REPLACEME" --host-mode Development --cors-origin "http://localhost:5000" +init --config "dab-config.MySql.json" --database-type mysql --connection-string "server=localhost;database=datagatewaytest;Allow User Variables=true;uid=root;pwd=REPLACEME" --host-mode Development --cors-origin "http://localhost:5000" add Publisher --config "dab-config.MySql.json" --source publishers --permissions "anonymous:read" add Stock --config "dab-config.MySql.json" --source stocks --permissions "anonymous:create,read,update" add Book --config "dab-config.MySql.json" --source books --permissions "anonymous:create,read,update,delete" --graphql "book:books" From 82b500db59ba25e9148bcaed1936afd1abe7ece1 Mon Sep 17 00:00:00 2001 From: aaronburtle <93220300+aaronburtle@users.noreply.github.com> Date: Fri, 17 Feb 2023 10:09:29 -0800 Subject: [PATCH 05/22] Update PostgreSqlCommands.txt --- ConfigGenerators/PostgreSqlCommands.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConfigGenerators/PostgreSqlCommands.txt b/ConfigGenerators/PostgreSqlCommands.txt index c684dedc3e..85b1ae89c1 100644 --- a/ConfigGenerators/PostgreSqlCommands.txt +++ b/ConfigGenerators/PostgreSqlCommands.txt @@ -1,4 +1,4 @@ -init --config "dab-config.PostgreSql.json" --database-type postgresql --connection-string "Host=localhost;Database=datagatewaytest;username=REPLACEME;password=REPLACEME" --host-mode Development --cors-origin "http://localhost:5000" +init --config "dab-config.PostgreSql.json" --database-type postgresql --connection-string "Host=localhost;Database=datagatewaytest;username=REPLACEME;password=REPLACEME" --host-mode Development --cors-origin "http://localhost:5000" add Publisher --config "dab-config.PostgreSql.json" --source publishers --permissions "anonymous:read" add Stock --config "dab-config.PostgreSql.json" --source stocks --permissions "anonymous:create,read,update" add Book --config "dab-config.PostgreSql.json" --source books --permissions "anonymous:create,read,update,delete" --graphql "book:books" From cad4ee005ea3910131a79f8a498a2dac221129f9 Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Fri, 17 Feb 2023 10:33:52 -0800 Subject: [PATCH 06/22] renaming folders --- {ConfigGenerators => configGenerators}/CosmosCommands.txt | 0 {ConfigGenerators => configGenerators}/MsSqlCommands.txt | 0 {ConfigGenerators => configGenerators}/MySqlCommands.txt | 0 {ConfigGenerators => configGenerators}/PostgreSqlCommands.txt | 0 {ConfigGenerators => configGenerators}/configGenerator.ps1 | 0 {ConfigGenerators => configGenerators}/configGenerator.sh | 0 .../dab-config.cosmosdb_nosql.reference.json | 0 .../dab-config.mssql.reference.json | 0 .../dab-config.sql.reference.json | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename {ConfigGenerators => configGenerators}/CosmosCommands.txt (100%) rename {ConfigGenerators => configGenerators}/MsSqlCommands.txt (100%) rename {ConfigGenerators => configGenerators}/MySqlCommands.txt (100%) rename {ConfigGenerators => configGenerators}/PostgreSqlCommands.txt (100%) rename {ConfigGenerators => configGenerators}/configGenerator.ps1 (100%) rename {ConfigGenerators => configGenerators}/configGenerator.sh (100%) rename {ConfigGenerators => configGenerators}/dab-config.cosmosdb_nosql.reference.json (100%) rename {ConfigGenerators => configGenerators}/dab-config.mssql.reference.json (100%) rename {ConfigGenerators => configGenerators}/dab-config.sql.reference.json (100%) diff --git a/ConfigGenerators/CosmosCommands.txt b/configGenerators/CosmosCommands.txt similarity index 100% rename from ConfigGenerators/CosmosCommands.txt rename to configGenerators/CosmosCommands.txt diff --git a/ConfigGenerators/MsSqlCommands.txt b/configGenerators/MsSqlCommands.txt similarity index 100% rename from ConfigGenerators/MsSqlCommands.txt rename to configGenerators/MsSqlCommands.txt diff --git a/ConfigGenerators/MySqlCommands.txt b/configGenerators/MySqlCommands.txt similarity index 100% rename from ConfigGenerators/MySqlCommands.txt rename to configGenerators/MySqlCommands.txt diff --git a/ConfigGenerators/PostgreSqlCommands.txt b/configGenerators/PostgreSqlCommands.txt similarity index 100% rename from ConfigGenerators/PostgreSqlCommands.txt rename to configGenerators/PostgreSqlCommands.txt diff --git a/ConfigGenerators/configGenerator.ps1 b/configGenerators/configGenerator.ps1 similarity index 100% rename from ConfigGenerators/configGenerator.ps1 rename to configGenerators/configGenerator.ps1 diff --git a/ConfigGenerators/configGenerator.sh b/configGenerators/configGenerator.sh similarity index 100% rename from ConfigGenerators/configGenerator.sh rename to configGenerators/configGenerator.sh diff --git a/ConfigGenerators/dab-config.cosmosdb_nosql.reference.json b/configGenerators/dab-config.cosmosdb_nosql.reference.json similarity index 100% rename from ConfigGenerators/dab-config.cosmosdb_nosql.reference.json rename to configGenerators/dab-config.cosmosdb_nosql.reference.json diff --git a/ConfigGenerators/dab-config.mssql.reference.json b/configGenerators/dab-config.mssql.reference.json similarity index 100% rename from ConfigGenerators/dab-config.mssql.reference.json rename to configGenerators/dab-config.mssql.reference.json diff --git a/ConfigGenerators/dab-config.sql.reference.json b/configGenerators/dab-config.sql.reference.json similarity index 100% rename from ConfigGenerators/dab-config.sql.reference.json rename to configGenerators/dab-config.sql.reference.json From b141e7bd32899d1c7616505cdce8f10040e7bd1f Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Fri, 17 Feb 2023 10:42:33 -0800 Subject: [PATCH 07/22] fix reference to new name --- src/Cli/src/Cli.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cli/src/Cli.csproj b/src/Cli/src/Cli.csproj index 37291231d0..7c88ead299 100644 --- a/src/Cli/src/Cli.csproj +++ b/src/Cli/src/Cli.csproj @@ -70,8 +70,8 @@ - - + + From 1bb0ca15cbe1b519aef8820012581923dae17643 Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Fri, 17 Feb 2023 10:51:12 -0800 Subject: [PATCH 08/22] fixed address in pipeline --- .pipelines/build-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pipelines/build-pipelines.yml b/.pipelines/build-pipelines.yml index c3cd8936d5..71330abc6e 100644 --- a/.pipelines/build-pipelines.yml +++ b/.pipelines/build-pipelines.yml @@ -129,14 +129,14 @@ steps: displayName: "Package DAB to multiple platforms" inputs: targetType: 'filePath' - filePath: $(System.DefaultWorkingDirectory)/publish.ps1 + filePath: $(System.DefaultWorkingDirectory)/scripts/publish.ps1 arguments: $(buildConfiguration) $(Build.ArtifactStagingDirectory) $(dabVersion) -Package - task: PowerShell@2 displayName: "Smoke Test for DAB CLI" inputs: targetType: 'filePath' - filePath: $(System.DefaultWorkingDirectory)/dab-smoke-test-script.ps1 + filePath: $(System.DefaultWorkingDirectory)/scripts/dab-smoke-test-script.ps1 arguments: $(buildConfiguration) $(Build.ArtifactStagingDirectory) $(Agent.OS) $(dabVersion) # Sign the binaries that were generated per platform @@ -149,7 +149,7 @@ steps: displayName: "Zip the binaries after signing" inputs: targetType: 'filePath' - filePath: $(System.DefaultWorkingDirectory)/publish.ps1 + filePath: $(System.DefaultWorkingDirectory)/scripts/publish.ps1 arguments: $(buildConfiguration) $(Build.ArtifactStagingDirectory) $(dabVersion) -CreateZip # Generating SBOM manifest for Dab files @@ -163,7 +163,7 @@ steps: displayName: "Generate Manifest File" inputs: targetType: 'filePath' - filePath: $(System.DefaultWorkingDirectory)/create_manifest_file.ps1 + filePath: $(System.DefaultWorkingDirectory)/scripts/create_manifest_file.ps1 arguments: $(buildConfiguration) $(Build.ArtifactStagingDirectory) $(dabVersion) $(isReleaseBuild) # This code takes all the files in $(Build.ArtifactStagingDirectory) and uploads them as an artifact of your build. From 5def10867b2135160796913964ab86124fb1240f Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Fri, 17 Feb 2023 11:04:41 -0800 Subject: [PATCH 09/22] adjust address in script --- scripts/publish.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/publish.ps1 b/scripts/publish.ps1 index 64cb887ce2..851d942d06 100644 --- a/scripts/publish.ps1 +++ b/scripts/publish.ps1 @@ -13,7 +13,7 @@ $RIDs = "win-x64", "linux-x64", "osx-x64" if ($Package) { foreach ($RID in $RIDs) { - $cmd = "dotnet publish --configuration $BuildConfiguration --output $BuildOutputDir/publish/$BuildConfiguration/$RID/dab --runtime $RID --self-contained true -p:Version=$DabVersion $BuildRoot/src/Cli/src/Cli.csproj" + $cmd = "dotnet publish --configuration $BuildConfiguration --output $BuildOutputDir/publish/$BuildConfiguration/$RID/dab --runtime $RID --self-contained true -p:Version=$DabVersion ../$BuildRoot/src/Cli/src/Cli.csproj" Write-Host $cmd Invoke-Expression $cmd } From dec57e6aa2aa2a1314aad267cdab1a87df4be792 Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Fri, 17 Feb 2023 11:15:59 -0800 Subject: [PATCH 10/22] adjust address in script --- scripts/publish.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/publish.ps1 b/scripts/publish.ps1 index 851d942d06..025b7be2b3 100644 --- a/scripts/publish.ps1 +++ b/scripts/publish.ps1 @@ -6,14 +6,14 @@ param ( [Parameter (Mandatory=$false)][switch] $CreateZip ) -$BuildRoot = $PSScriptRoot +$BuildRoot = Split-Path $PSScriptRoot -Parent $RIDs = "win-x64", "linux-x64", "osx-x64" if ($Package) { foreach ($RID in $RIDs) { - $cmd = "dotnet publish --configuration $BuildConfiguration --output $BuildOutputDir/publish/$BuildConfiguration/$RID/dab --runtime $RID --self-contained true -p:Version=$DabVersion ../$BuildRoot/src/Cli/src/Cli.csproj" + $cmd = "dotnet publish --configuration $BuildConfiguration --output $BuildOutputDir/publish/$BuildConfiguration/$RID/dab --runtime $RID --self-contained true -p:Version=$DabVersion $BuildRoot/src/Cli/src/Cli.csproj" Write-Host $cmd Invoke-Expression $cmd } From fcce4c9bcd9d8253ab5daca523c0101c202b0acb Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Wed, 22 Feb 2023 07:48:50 -0800 Subject: [PATCH 11/22] renaming to match correct casing --- .../configGenerator.sh => config-generators/config-generator.sh | 0 {configGenerators => config-generators}/configGenerator.ps1 | 0 .../cosmos_nosql-commands.txt | 0 .../dab-config.cosmosdb_nosql.reference.json | 0 .../dab-config.mssql.reference.json | 0 .../dab-config.sql.reference.json | 0 .../MsSqlCommands.txt => config-generators/mssql-commands.txt | 0 .../MySqlCommands.txt => config-generators/mysql-commands.txt | 0 .../postgresql-commands.txt | 0 scripts/{create_manifest_file.ps1 => create-manifest-file.ps1} | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename configGenerators/configGenerator.sh => config-generators/config-generator.sh (100%) rename {configGenerators => config-generators}/configGenerator.ps1 (100%) rename configGenerators/CosmosCommands.txt => config-generators/cosmos_nosql-commands.txt (100%) rename {configGenerators => config-generators}/dab-config.cosmosdb_nosql.reference.json (100%) rename {configGenerators => config-generators}/dab-config.mssql.reference.json (100%) rename {configGenerators => config-generators}/dab-config.sql.reference.json (100%) rename configGenerators/MsSqlCommands.txt => config-generators/mssql-commands.txt (100%) rename configGenerators/MySqlCommands.txt => config-generators/mysql-commands.txt (100%) rename configGenerators/PostgreSqlCommands.txt => config-generators/postgresql-commands.txt (100%) rename scripts/{create_manifest_file.ps1 => create-manifest-file.ps1} (100%) diff --git a/configGenerators/configGenerator.sh b/config-generators/config-generator.sh similarity index 100% rename from configGenerators/configGenerator.sh rename to config-generators/config-generator.sh diff --git a/configGenerators/configGenerator.ps1 b/config-generators/configGenerator.ps1 similarity index 100% rename from configGenerators/configGenerator.ps1 rename to config-generators/configGenerator.ps1 diff --git a/configGenerators/CosmosCommands.txt b/config-generators/cosmos_nosql-commands.txt similarity index 100% rename from configGenerators/CosmosCommands.txt rename to config-generators/cosmos_nosql-commands.txt diff --git a/configGenerators/dab-config.cosmosdb_nosql.reference.json b/config-generators/dab-config.cosmosdb_nosql.reference.json similarity index 100% rename from configGenerators/dab-config.cosmosdb_nosql.reference.json rename to config-generators/dab-config.cosmosdb_nosql.reference.json diff --git a/configGenerators/dab-config.mssql.reference.json b/config-generators/dab-config.mssql.reference.json similarity index 100% rename from configGenerators/dab-config.mssql.reference.json rename to config-generators/dab-config.mssql.reference.json diff --git a/configGenerators/dab-config.sql.reference.json b/config-generators/dab-config.sql.reference.json similarity index 100% rename from configGenerators/dab-config.sql.reference.json rename to config-generators/dab-config.sql.reference.json diff --git a/configGenerators/MsSqlCommands.txt b/config-generators/mssql-commands.txt similarity index 100% rename from configGenerators/MsSqlCommands.txt rename to config-generators/mssql-commands.txt diff --git a/configGenerators/MySqlCommands.txt b/config-generators/mysql-commands.txt similarity index 100% rename from configGenerators/MySqlCommands.txt rename to config-generators/mysql-commands.txt diff --git a/configGenerators/PostgreSqlCommands.txt b/config-generators/postgresql-commands.txt similarity index 100% rename from configGenerators/PostgreSqlCommands.txt rename to config-generators/postgresql-commands.txt diff --git a/scripts/create_manifest_file.ps1 b/scripts/create-manifest-file.ps1 similarity index 100% rename from scripts/create_manifest_file.ps1 rename to scripts/create-manifest-file.ps1 From df67a7f57403860f80166730e4ab431b1ff0aad9 Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Wed, 22 Feb 2023 07:56:21 -0800 Subject: [PATCH 12/22] rename --- config-generators/{configGenerator.ps1 => config-generator.ps1} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config-generators/{configGenerator.ps1 => config-generator.ps1} (100%) diff --git a/config-generators/configGenerator.ps1 b/config-generators/config-generator.ps1 similarity index 100% rename from config-generators/configGenerator.ps1 rename to config-generators/config-generator.ps1 From d7fe0190ba200fbb5fb007af96ac33293cf3b6ac Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Wed, 22 Feb 2023 08:02:42 -0800 Subject: [PATCH 13/22] update name in pipeline --- .pipelines/build-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/build-pipelines.yml b/.pipelines/build-pipelines.yml index 470fbdfd04..9643473162 100644 --- a/.pipelines/build-pipelines.yml +++ b/.pipelines/build-pipelines.yml @@ -179,7 +179,7 @@ steps: displayName: "Generate Manifest File" inputs: targetType: 'filePath' - filePath: $(System.DefaultWorkingDirectory)/scripts/create_manifest_file.ps1 + filePath: $(System.DefaultWorkingDirectory)/scripts/create-manifest-file.ps1 arguments: $(buildConfiguration) $(Build.ArtifactStagingDirectory) $(dabVersion) $(isReleaseBuild) # This code takes all the files in $(Build.ArtifactStagingDirectory) and uploads them as an artifact of your build. From ab7ad00b5c0a68e442515199305926d90c28b91e Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Wed, 22 Feb 2023 08:16:18 -0800 Subject: [PATCH 14/22] renaming proj file --- src/Cli/src/Cli.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cli/src/Cli.csproj b/src/Cli/src/Cli.csproj index 660328e904..17f6a7144b 100644 --- a/src/Cli/src/Cli.csproj +++ b/src/Cli/src/Cli.csproj @@ -71,8 +71,8 @@ - - + + From a074175fe80e4b6fb9d2bfd89f083670e90d67c1 Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Wed, 22 Feb 2023 08:29:33 -0800 Subject: [PATCH 15/22] rename within scripts' --- config-generators/config-generator.ps1 | 8 ++++---- config-generators/config-generator.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config-generators/config-generator.ps1 b/config-generators/config-generator.ps1 index d1090d0aaa..a35f7588df 100644 --- a/config-generators/config-generator.ps1 +++ b/config-generators/config-generator.ps1 @@ -36,19 +36,19 @@ Set-Location $workingDirectory; #Generates the config files for the selected database types. foreach($databaseType in $databaseTypes){ if($databaseType -eq "mssql"){ - $commandFile = "MsSqlCommands.txt"; + $commandFile = "mssql-commands.txt"; $configFile = "dab-config.MsSql.json"; } elseif($databaseType -eq "mysql"){ - $commandFile = "MySqlCommands.txt"; + $commandFile = "mysql-commands.txt"; $configFile = "dab-config.MySql.json"; } elseif($databaseType -eq "postgresql"){ - $commandFile = "PostgreSqlCommands.txt"; + $commandFile = "postgresql-commands.txt"; $configFile = "dab-config.PostgreSql.json"; } else{ - $commandFile = "CosmosCommands.txt"; + $commandFile = "cosmos_nosql-commands.txt"; $configFile = "dab-config.CosmosDb_NoSql.json"; } diff --git a/config-generators/config-generator.sh b/config-generators/config-generator.sh index d61fedbd25..e94d852e5e 100755 --- a/config-generators/config-generator.sh +++ b/config-generators/config-generator.sh @@ -39,16 +39,16 @@ cd $workingDirectory; for databaseType in ${databaseTypes[@]} do if [[ $databaseType == "mssql" ]]; then - commandFile="MsSqlCommands.txt"; + commandFile="mssql-commands.txt"; configFile="dab-config.MsSql.json"; elif [[ $databaseType == "mysql" ]]; then - commandFile="MySqlCommands.txt"; + commandFile="mysql-commands.txt"; configFile="dab-config.MySql.json"; elif [[ $databaseType == "postgresql" ]]; then - commandFile="PostgreSqlCommands.txt"; + commandFile="postgresql-commands.txt"; configFile="dab-config.PostgreSql.json"; else - commandFile="CosmosCommands.txt"; + commandFile="cosmos_nosql-commands.txt"; configFile="dab-config.CosmosDb_NoSql.json"; fi From 9c9916f6d7b25d2d938e1007282d2db513c64058 Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Fri, 24 Feb 2023 09:07:49 -0800 Subject: [PATCH 16/22] flatten src/Cli --- src/{Cli/test => Cli.Tests}/AddEntityTests.cs | 0 src/{Cli/test => Cli.Tests}/Cli.Tests.csproj | 0 src/{Cli/test => Cli.Tests}/EndToEndTests.cs | 0 src/{Cli/test => Cli.Tests}/InitTests.cs | 0 src/{Cli/test => Cli.Tests}/TestHelper.cs | 0 src/{Cli/test => Cli.Tests}/UpdateEntityTests.cs | 0 src/{Cli/test => Cli.Tests}/Usings.cs | 0 src/{Cli/test => Cli.Tests}/UtilsTests.cs | 0 src/Cli/{src => }/Cli.csproj | 0 src/Cli/{src => }/CommandLineOptions.cs | 0 src/Cli/{src => }/ConfigGenerator.cs | 0 src/Cli/{src => }/CustomLoggerProvider.cs | 0 src/Cli/{src => }/Program.cs | 0 src/Cli/{src => }/Utils.cs | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename src/{Cli/test => Cli.Tests}/AddEntityTests.cs (100%) rename src/{Cli/test => Cli.Tests}/Cli.Tests.csproj (100%) rename src/{Cli/test => Cli.Tests}/EndToEndTests.cs (100%) rename src/{Cli/test => Cli.Tests}/InitTests.cs (100%) rename src/{Cli/test => Cli.Tests}/TestHelper.cs (100%) rename src/{Cli/test => Cli.Tests}/UpdateEntityTests.cs (100%) rename src/{Cli/test => Cli.Tests}/Usings.cs (100%) rename src/{Cli/test => Cli.Tests}/UtilsTests.cs (100%) rename src/Cli/{src => }/Cli.csproj (100%) rename src/Cli/{src => }/CommandLineOptions.cs (100%) rename src/Cli/{src => }/ConfigGenerator.cs (100%) rename src/Cli/{src => }/CustomLoggerProvider.cs (100%) rename src/Cli/{src => }/Program.cs (100%) rename src/Cli/{src => }/Utils.cs (100%) diff --git a/src/Cli/test/AddEntityTests.cs b/src/Cli.Tests/AddEntityTests.cs similarity index 100% rename from src/Cli/test/AddEntityTests.cs rename to src/Cli.Tests/AddEntityTests.cs diff --git a/src/Cli/test/Cli.Tests.csproj b/src/Cli.Tests/Cli.Tests.csproj similarity index 100% rename from src/Cli/test/Cli.Tests.csproj rename to src/Cli.Tests/Cli.Tests.csproj diff --git a/src/Cli/test/EndToEndTests.cs b/src/Cli.Tests/EndToEndTests.cs similarity index 100% rename from src/Cli/test/EndToEndTests.cs rename to src/Cli.Tests/EndToEndTests.cs diff --git a/src/Cli/test/InitTests.cs b/src/Cli.Tests/InitTests.cs similarity index 100% rename from src/Cli/test/InitTests.cs rename to src/Cli.Tests/InitTests.cs diff --git a/src/Cli/test/TestHelper.cs b/src/Cli.Tests/TestHelper.cs similarity index 100% rename from src/Cli/test/TestHelper.cs rename to src/Cli.Tests/TestHelper.cs diff --git a/src/Cli/test/UpdateEntityTests.cs b/src/Cli.Tests/UpdateEntityTests.cs similarity index 100% rename from src/Cli/test/UpdateEntityTests.cs rename to src/Cli.Tests/UpdateEntityTests.cs diff --git a/src/Cli/test/Usings.cs b/src/Cli.Tests/Usings.cs similarity index 100% rename from src/Cli/test/Usings.cs rename to src/Cli.Tests/Usings.cs diff --git a/src/Cli/test/UtilsTests.cs b/src/Cli.Tests/UtilsTests.cs similarity index 100% rename from src/Cli/test/UtilsTests.cs rename to src/Cli.Tests/UtilsTests.cs diff --git a/src/Cli/src/Cli.csproj b/src/Cli/Cli.csproj similarity index 100% rename from src/Cli/src/Cli.csproj rename to src/Cli/Cli.csproj diff --git a/src/Cli/src/CommandLineOptions.cs b/src/Cli/CommandLineOptions.cs similarity index 100% rename from src/Cli/src/CommandLineOptions.cs rename to src/Cli/CommandLineOptions.cs diff --git a/src/Cli/src/ConfigGenerator.cs b/src/Cli/ConfigGenerator.cs similarity index 100% rename from src/Cli/src/ConfigGenerator.cs rename to src/Cli/ConfigGenerator.cs diff --git a/src/Cli/src/CustomLoggerProvider.cs b/src/Cli/CustomLoggerProvider.cs similarity index 100% rename from src/Cli/src/CustomLoggerProvider.cs rename to src/Cli/CustomLoggerProvider.cs diff --git a/src/Cli/src/Program.cs b/src/Cli/Program.cs similarity index 100% rename from src/Cli/src/Program.cs rename to src/Cli/Program.cs diff --git a/src/Cli/src/Utils.cs b/src/Cli/Utils.cs similarity index 100% rename from src/Cli/src/Utils.cs rename to src/Cli/Utils.cs From abd63507c9d40ab281b2eec44aa0617be02de6ec Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Fri, 24 Feb 2023 09:15:58 -0800 Subject: [PATCH 17/22] cosmos to comsmosdb --- config-generators/config-generator.ps1 | 2 +- config-generators/config-generator.sh | 2 +- .../{cosmos_nosql-commands.txt => cosmosdb_nosql-commands.txt} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename config-generators/{cosmos_nosql-commands.txt => cosmosdb_nosql-commands.txt} (100%) diff --git a/config-generators/config-generator.ps1 b/config-generators/config-generator.ps1 index a35f7588df..ed9c6b51cf 100644 --- a/config-generators/config-generator.ps1 +++ b/config-generators/config-generator.ps1 @@ -48,7 +48,7 @@ foreach($databaseType in $databaseTypes){ $configFile = "dab-config.PostgreSql.json"; } else{ - $commandFile = "cosmos_nosql-commands.txt"; + $commandFile = "cosmosdb_nosql-commands.txt"; $configFile = "dab-config.CosmosDb_NoSql.json"; } diff --git a/config-generators/config-generator.sh b/config-generators/config-generator.sh index e94d852e5e..9b0bfee11d 100755 --- a/config-generators/config-generator.sh +++ b/config-generators/config-generator.sh @@ -48,7 +48,7 @@ do commandFile="postgresql-commands.txt"; configFile="dab-config.PostgreSql.json"; else - commandFile="cosmos_nosql-commands.txt"; + commandFile="cosmosdb_nosql-commands.txt"; configFile="dab-config.CosmosDb_NoSql.json"; fi diff --git a/config-generators/cosmos_nosql-commands.txt b/config-generators/cosmosdb_nosql-commands.txt similarity index 100% rename from config-generators/cosmos_nosql-commands.txt rename to config-generators/cosmosdb_nosql-commands.txt From 275fe194bd1140a4691fb04ac41977a26cdceacd Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Fri, 24 Feb 2023 09:33:44 -0800 Subject: [PATCH 18/22] update .sln --- src/Azure.DataApiBuilder.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Azure.DataApiBuilder.sln b/src/Azure.DataApiBuilder.sln index 6293bc9e59..6c6399c271 100644 --- a/src/Azure.DataApiBuilder.sln +++ b/src/Azure.DataApiBuilder.sln @@ -17,9 +17,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.DataApiBuilder.Servic EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.DataApiBuilder.Auth", "Auth\Azure.DataApiBuilder.Auth.csproj", "{249FF898-AD6E-46F2-B441-F6926BCD5179}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cli", "Cli\src\Cli.csproj", "{55528027-AC5E-4B3A-901A-BAE649C44C07}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cli", "Cli\Cli.csproj", "{55528027-AC5E-4B3A-901A-BAE649C44C07}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cli.Tests", "Cli\test\Cli.Tests.csproj", "{2D9D5A56-2025-43BA-97D6-47385C2890FE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cli.Tests", "Cli.Tests\Cli.Tests.csproj", "{2D9D5A56-2025-43BA-97D6-47385C2890FE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FBA18E2E-32A2-437C-AA5D-F9EF358874DC}" ProjectSection(SolutionItems) = preProject From dd49219753568bdc18c76d3ccadf7acb6dd39aa6 Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Fri, 24 Feb 2023 09:41:04 -0800 Subject: [PATCH 19/22] update proj file paths --- src/Cli.Tests/Cli.Tests.csproj | 2 +- src/Cli/Cli.csproj | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Cli.Tests/Cli.Tests.csproj b/src/Cli.Tests/Cli.Tests.csproj index 6849a1ff7b..89a52decde 100644 --- a/src/Cli.Tests/Cli.Tests.csproj +++ b/src/Cli.Tests/Cli.Tests.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/Cli/Cli.csproj b/src/Cli/Cli.csproj index 17f6a7144b..dac11fd056 100644 --- a/src/Cli/Cli.csproj +++ b/src/Cli/Cli.csproj @@ -46,11 +46,11 @@ - + - + @@ -58,22 +58,22 @@ - - - - + + + + - + PreserveNewest - - - + + + From ad1ef5d319e14c1258c0415c83deba74eaad462e Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Fri, 24 Feb 2023 10:10:26 -0800 Subject: [PATCH 20/22] fix ath in publsh script --- scripts/publish.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/publish.ps1 b/scripts/publish.ps1 index 2b42c68a55..8a747e485c 100644 --- a/scripts/publish.ps1 +++ b/scripts/publish.ps1 @@ -16,7 +16,7 @@ $RIDs = "win-x64", "linux-x64", "osx-x64" if ($Package) { foreach ($RID in $RIDs) { - $cmd = "dotnet publish --configuration $BuildConfiguration --output $BuildOutputDir/publish/$BuildConfiguration/$RID/dab --runtime $RID --self-contained true -p:Version=$DabVersion $BuildRoot/src/Cli/src/Cli.csproj" + $cmd = "dotnet publish --configuration $BuildConfiguration --output $BuildOutputDir/publish/$BuildConfiguration/$RID/dab --runtime $RID --self-contained true -p:Version=$DabVersion $BuildRoot/src/Cli/Cli.csproj" Write-Host $cmd Invoke-Expression $cmd } From ce5018438935e80ebec941697a832559bdda7184 Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Mon, 27 Feb 2023 08:11:49 -0800 Subject: [PATCH 21/22] add output path to cli proj file --- src/Cli/Cli.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Cli/Cli.csproj b/src/Cli/Cli.csproj index dac11fd056..353320ddec 100644 --- a/src/Cli/Cli.csproj +++ b/src/Cli/Cli.csproj @@ -10,6 +10,7 @@ dab ./nupkg ..\..\out\cli + $(BaseOutputPath)\cli win-x64;linux-x64;osx-x64 Microsoft.DataApiBuilder Microsoft.DataApiBuilder From 681611443db31cbf65882d3c8cad2c73052347d6 Mon Sep 17 00:00:00 2001 From: aaron burtle Date: Mon, 27 Feb 2023 08:14:20 -0800 Subject: [PATCH 22/22] add output path to cli.test proj --- src/Cli.Tests/Cli.Tests.csproj | 2 +- src/Cli/Cli.csproj | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Cli.Tests/Cli.Tests.csproj b/src/Cli.Tests/Cli.Tests.csproj index 89a52decde..88bdea4ac2 100644 --- a/src/Cli.Tests/Cli.Tests.csproj +++ b/src/Cli.Tests/Cli.Tests.csproj @@ -5,7 +5,7 @@ enable enable false - ..\..\out\tests + $(BaseOutputPath)\tests diff --git a/src/Cli/Cli.csproj b/src/Cli/Cli.csproj index 353320ddec..15f8533737 100644 --- a/src/Cli/Cli.csproj +++ b/src/Cli/Cli.csproj @@ -9,7 +9,6 @@ true dab ./nupkg - ..\..\out\cli $(BaseOutputPath)\cli win-x64;linux-x64;osx-x64 Microsoft.DataApiBuilder