From 0dd2f74f5c30ed17ba04ee629b6613ec123422e4 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 26 Jun 2024 12:06:07 -0700 Subject: [PATCH 01/29] add ci testing for yaml validation --- .github/workflows/CI.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 94d6b357..d9d5e61f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -43,6 +43,9 @@ jobs: - name: Test - Persistence run: dotnet bin/Debug/Persistence.Tests/Persistence.Tests.dll + - name: Test - YamlValidator + run: dotnet bin/Debug/YamlValidator.Tests/YamlValidator.Tests.dll + - name: Test - PAModel run: dotnet bin/Debug/PAModelTests/PAModelTests.dll From 5cff03b278df2ae7a3b5a62869cb9f1dd24bed7c Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 26 Jun 2024 17:03:57 -0700 Subject: [PATCH 02/29] modifications to ci to run yaml validator on persistence tests. Also run yaml validator tests --- .github/workflows/CI.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d9d5e61f..a6894ac3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -16,6 +16,7 @@ jobs: os: [windows-latest, macos-latest, ubuntu-latest] env: DOTNET_NOLOGO: true + PERSISTENCE_TEST_YAML_FILES: "src/Persistence.Tests/_TestData/" steps: - uses: actions/checkout@v4 @@ -49,6 +50,16 @@ jobs: - name: Test - PAModel run: dotnet bin/Debug/PAModelTests/PAModelTests.dll + - name: Test - Persistence Test Yaml Files (ubuntu & macos) + run: | + result=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll -validate ${{ env.PERSISTENCE_TEST_YAML_FILES }}) + echo "$result" + if [ "$result" == *"Validation Failed"* ]; then + echo "Invalid yaml files found" + exit 1 + fi + if: ${{ runner.os != 'Windows' }} + - name: Restore workloads for samples run: dotnet workload restore samples/MauiMsApp/MauiMsApp.csproj From b0be73bc828a6f33b7026ab30f9a088329cf8997 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Thu, 27 Jun 2024 15:26:40 -0700 Subject: [PATCH 03/29] test CI validator update --- .github/workflows/CI.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a6894ac3..25c9b3ae 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -16,7 +16,8 @@ jobs: os: [windows-latest, macos-latest, ubuntu-latest] env: DOTNET_NOLOGO: true - PERSISTENCE_TEST_YAML_FILES: "src/Persistence.Tests/_TestData/" + PERSISTENCE_TEST_YAML_APP_VALID: "src/Persistence.Tests/_TestData/AppsWithYaml/Src" + PERSISTENCE_TEST_YAML_FILES_VALID: "src/Persistence.Tests/_TestData/ValidYaml-CI" steps: - uses: actions/checkout@v4 @@ -52,10 +53,16 @@ jobs: - name: Test - Persistence Test Yaml Files (ubuntu & macos) run: | - result=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll -validate ${{ env.PERSISTENCE_TEST_YAML_FILES }}) - echo "$result" - if [ "$result" == *"Validation Failed"* ]; then - echo "Invalid yaml files found" + resultApp=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path ${{ env.PERSISTENCE_TEST_YAML_APP_VALID }}) + echo "$resultApp" + if [ "$resultApp" == *"Validation Failed"* ]; then + echo "Invalid Yaml Files found in ${{ env.PERSISTENCE_TEST_YAML_APP_VALID }}" + exit 1 + fi + resultFiles=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path ${{ env.PERSISTENCE_TEST_YAML_FILES_VALID }}) + echo "$resultFiles" + if [ "$resultFiles" == *"Validation Failed"* ]; then + echo "Invalid Yaml Files found in ${{ env.PERSISTENCE_TEST_YAML_FILES_VALID }}" exit 1 fi if: ${{ runner.os != 'Windows' }} From df36869f2eeb4837fad419599806f8d669be5114 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Fri, 28 Jun 2024 09:36:16 -0700 Subject: [PATCH 04/29] add test runner, update CI filepaths --- .github/workflows/CI.yml | 4 ++-- src/YamlValidator.Tests/YamlValidator.Tests.csproj | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 25c9b3ae..8a517963 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -16,8 +16,8 @@ jobs: os: [windows-latest, macos-latest, ubuntu-latest] env: DOTNET_NOLOGO: true - PERSISTENCE_TEST_YAML_APP_VALID: "src/Persistence.Tests/_TestData/AppsWithYaml/Src" - PERSISTENCE_TEST_YAML_FILES_VALID: "src/Persistence.Tests/_TestData/ValidYaml-CI" + PERSISTENCE_TEST_YAML_APP_VALID: "../../src/Persistence.Tests/_TestData/AppsWithYaml/Src" + PERSISTENCE_TEST_YAML_FILES_VALID: "../../src/Persistence.Tests/_TestData/ValidYaml-CI" steps: - uses: actions/checkout@v4 diff --git a/src/YamlValidator.Tests/YamlValidator.Tests.csproj b/src/YamlValidator.Tests/YamlValidator.Tests.csproj index d77e2bc4..e7f23ef3 100644 --- a/src/YamlValidator.Tests/YamlValidator.Tests.csproj +++ b/src/YamlValidator.Tests/YamlValidator.Tests.csproj @@ -4,6 +4,8 @@ net8.0 enable enable + true + Exe false true @@ -18,8 +20,8 @@ - - + + From de229306d966fd0ea319ba3084a3970a632de1ac Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Tue, 2 Jul 2024 15:42:48 -0700 Subject: [PATCH 05/29] update ci script and add changes from master to test ci --- .github/workflows/CI.yml | 10 ++++------ src/YamlValidator/YamlLoader.cs | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8a517963..7bbeba49 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -16,8 +16,6 @@ jobs: os: [windows-latest, macos-latest, ubuntu-latest] env: DOTNET_NOLOGO: true - PERSISTENCE_TEST_YAML_APP_VALID: "../../src/Persistence.Tests/_TestData/AppsWithYaml/Src" - PERSISTENCE_TEST_YAML_FILES_VALID: "../../src/Persistence.Tests/_TestData/ValidYaml-CI" steps: - uses: actions/checkout@v4 @@ -53,16 +51,16 @@ jobs: - name: Test - Persistence Test Yaml Files (ubuntu & macos) run: | - resultApp=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path ${{ env.PERSISTENCE_TEST_YAML_APP_VALID }}) + resultApp=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "../Persistence.Tests/_TestData/AppsWithYaml") echo "$resultApp" if [ "$resultApp" == *"Validation Failed"* ]; then - echo "Invalid Yaml Files found in ${{ env.PERSISTENCE_TEST_YAML_APP_VALID }}" + echo "Invalid Yaml Files found in ../../src/Persistence.Tests/_TestData/AppsWithYaml" exit 1 fi - resultFiles=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path ${{ env.PERSISTENCE_TEST_YAML_FILES_VALID }}) + resultFiles=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "../Persistence.Tests/_TestData/ValidYaml-CI") echo "$resultFiles" if [ "$resultFiles" == *"Validation Failed"* ]; then - echo "Invalid Yaml Files found in ${{ env.PERSISTENCE_TEST_YAML_FILES_VALID }}" + echo "Invalid Yaml Files found in ../../src/Persistence.Tests/_TestData/ValidYaml-CI" exit 1 fi if: ${{ runner.os != 'Windows' }} diff --git a/src/YamlValidator/YamlLoader.cs b/src/YamlValidator/YamlLoader.cs index 48bf81d2..035ead51 100644 --- a/src/YamlValidator/YamlLoader.cs +++ b/src/YamlValidator/YamlLoader.cs @@ -25,7 +25,7 @@ public IReadOnlyDictionary Load(string filePath, string pathType var yamlFiles = Directory.EnumerateFiles(filePath, "*" + Constants.YamlFileExtension, SearchOption.AllDirectories); foreach (var filename in yamlFiles) { - var fileName = Path.GetFileName(filename); + var fileName = Path.GetRelativePath(filePath, filename); var yamlText = Utility.ReadFileData(filename); deserializedYaml.Add(fileName, yamlText); } From 6591461a791cdf8c065ac76334dce844e682800e Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Tue, 2 Jul 2024 15:50:22 -0700 Subject: [PATCH 06/29] use absolute paths for ci script to work --- .github/workflows/CI.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7bbeba49..30eead58 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,16 +51,16 @@ jobs: - name: Test - Persistence Test Yaml Files (ubuntu & macos) run: | - resultApp=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "../Persistence.Tests/_TestData/AppsWithYaml") + resultApp=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/AppsWithYaml") echo "$resultApp" if [ "$resultApp" == *"Validation Failed"* ]; then - echo "Invalid Yaml Files found in ../../src/Persistence.Tests/_TestData/AppsWithYaml" + echo "Invalid Yaml Files found in AppsWithYaml" exit 1 fi - resultFiles=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "../Persistence.Tests/_TestData/ValidYaml-CI") + resultFiles=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/ValidYaml-CI") echo "$resultFiles" if [ "$resultFiles" == *"Validation Failed"* ]; then - echo "Invalid Yaml Files found in ../../src/Persistence.Tests/_TestData/ValidYaml-CI" + echo "Invalid Yaml Files found in ValidYaml-CI" exit 1 fi if: ${{ runner.os != 'Windows' }} From 4b74b557daaba8da56831fae6819496ee22bf930 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Tue, 2 Jul 2024 16:07:23 -0700 Subject: [PATCH 07/29] file unable to access give sudo perms --- .github/workflows/CI.yml | 4 ++-- src/YamlValidator/InputProcessor.cs | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 30eead58..7379ba07 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,13 +51,13 @@ jobs: - name: Test - Persistence Test Yaml Files (ubuntu & macos) run: | - resultApp=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/AppsWithYaml") + resultApp=$(sudo dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/AppsWithYaml") echo "$resultApp" if [ "$resultApp" == *"Validation Failed"* ]; then echo "Invalid Yaml Files found in AppsWithYaml" exit 1 fi - resultFiles=$(dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/ValidYaml-CI") + resultFiles=$(sudo dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/ValidYaml-CI") echo "$resultFiles" if [ "$resultFiles" == *"Validation Failed"* ]; then echo "Invalid Yaml Files found in ValidYaml-CI" diff --git a/src/YamlValidator/InputProcessor.cs b/src/YamlValidator/InputProcessor.cs index a8b3fd7a..2045643f 100644 --- a/src/YamlValidator/InputProcessor.cs +++ b/src/YamlValidator/InputProcessor.cs @@ -43,13 +43,6 @@ public static RootCommand GetRootCommand() { result.ErrorMessage = $"The path '{inputFilePath}' does not exist"; } - else if (Directory.Exists(inputFilePath)) - { - if (Directory.GetFiles(inputFilePath, $"*{Constants.YamlFileExtension}").Length == 0) - { - result.ErrorMessage = $"The folder '{inputFilePath}' does not contain any yaml files"; - } - } else if (File.Exists(inputFilePath)) { if (!inputFilePath.EndsWith(Constants.YamlFileExtension, StringComparison.OrdinalIgnoreCase)) From ae653cbcf0f7e325752d1809fc3ef830d6e9413f Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Tue, 2 Jul 2024 16:20:47 -0700 Subject: [PATCH 08/29] debug output --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7379ba07..1263fb6f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,6 +51,7 @@ jobs: - name: Test - Persistence Test Yaml Files (ubuntu & macos) run: | + echo $(ls -d bin/Debug/YamlValidator) resultApp=$(sudo dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/AppsWithYaml") echo "$resultApp" if [ "$resultApp" == *"Validation Failed"* ]; then From 78a15ae71cb5557ab4da6d1a8243488d7b5a8a26 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Tue, 2 Jul 2024 16:26:16 -0700 Subject: [PATCH 09/29] show all files in yamlValidator dir --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1263fb6f..d9ae3b4e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,7 +51,7 @@ jobs: - name: Test - Persistence Test Yaml Files (ubuntu & macos) run: | - echo $(ls -d bin/Debug/YamlValidator) + echo $(ls bin/Debug/YamlValidator) resultApp=$(sudo dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/AppsWithYaml") echo "$resultApp" if [ "$resultApp" == *"Validation Failed"* ]; then From b48df2938c3c020e316597a89bb066aa52126220 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Tue, 2 Jul 2024 16:32:12 -0700 Subject: [PATCH 10/29] add schema folder to ls echo. Comment out thins that consume CI minutes --- .github/workflows/CI.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d9ae3b4e..9aa00cd3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -40,18 +40,18 @@ jobs: run: ./build ci if: ${{ runner.os != 'Windows' }} - - name: Test - Persistence - run: dotnet bin/Debug/Persistence.Tests/Persistence.Tests.dll + #- name: Test - Persistence + # run: dotnet bin/Debug/Persistence.Tests/Persistence.Tests.dll - name: Test - YamlValidator run: dotnet bin/Debug/YamlValidator.Tests/YamlValidator.Tests.dll - - name: Test - PAModel - run: dotnet bin/Debug/PAModelTests/PAModelTests.dll + #- name: Test - PAModel + # run: dotnet bin/Debug/PAModelTests/PAModelTests.dll - name: Test - Persistence Test Yaml Files (ubuntu & macos) run: | - echo $(ls bin/Debug/YamlValidator) + echo $(ls bin/Debug/YamlValidator/schema) resultApp=$(sudo dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/AppsWithYaml") echo "$resultApp" if [ "$resultApp" == *"Validation Failed"* ]; then @@ -66,12 +66,12 @@ jobs: fi if: ${{ runner.os != 'Windows' }} - - name: Restore workloads for samples - run: dotnet workload restore samples/MauiMsApp/MauiMsApp.csproj + #- name: Restore workloads for samples + # run: dotnet workload restore samples/MauiMsApp/MauiMsApp.csproj - - name: Install maui-tizen workload - run: dotnet workload install maui-tizen + #- name: Install maui-tizen workload + # run: dotnet workload install maui-tizen - - name: Build samples - run: dotnet build samples/samples.sln - if: ${{ runner.os == 'Windows' }} + #- name: Build samples + # run: dotnet build samples/samples.sln + # if: ${{ runner.os == 'Windows' }} From eeb40f3ec1b96728a14a5fc4f1238cb74128b46e Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Tue, 2 Jul 2024 16:37:40 -0700 Subject: [PATCH 11/29] cat file --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9aa00cd3..846c0359 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,7 +51,7 @@ jobs: - name: Test - Persistence Test Yaml Files (ubuntu & macos) run: | - echo $(ls bin/Debug/YamlValidator/schema) + echo $(cat bin/Debug/YamlValidator/schema/pa.yaml-schema.json) resultApp=$(sudo dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/AppsWithYaml") echo "$resultApp" if [ "$resultApp" == *"Validation Failed"* ]; then From 177c300a02c1b49e7802b071541e05709e48cbf3 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Tue, 2 Jul 2024 16:40:46 -0700 Subject: [PATCH 12/29] change file format --- src/YamlValidator/Constants.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/YamlValidator/Constants.cs b/src/YamlValidator/Constants.cs index c750ab6a..1a7b4825 100644 --- a/src/YamlValidator/Constants.cs +++ b/src/YamlValidator/Constants.cs @@ -14,5 +14,5 @@ public static class Constants // runtime constants // default schema path - public static readonly string DefaultSchemaPath = Path.Combine(".", "schema", "pa.yaml-schema.json"); + public static readonly string DefaultSchemaPath = Path.Combine("schema", "pa.yaml-schema.json"); } From 2487b095ee0502b696b1136962a1d4925afef182 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Tue, 2 Jul 2024 16:46:28 -0700 Subject: [PATCH 13/29] see if file inacessible due to permissions --- .github/workflows/CI.yml | 2 +- src/YamlValidator/Constants.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 846c0359..ac8a7132 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,7 +51,7 @@ jobs: - name: Test - Persistence Test Yaml Files (ubuntu & macos) run: | - echo $(cat bin/Debug/YamlValidator/schema/pa.yaml-schema.json) + echo $(ls -l bin/Debug/YamlValidator/schema) resultApp=$(sudo dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/AppsWithYaml") echo "$resultApp" if [ "$resultApp" == *"Validation Failed"* ]; then diff --git a/src/YamlValidator/Constants.cs b/src/YamlValidator/Constants.cs index 1a7b4825..c750ab6a 100644 --- a/src/YamlValidator/Constants.cs +++ b/src/YamlValidator/Constants.cs @@ -14,5 +14,5 @@ public static class Constants // runtime constants // default schema path - public static readonly string DefaultSchemaPath = Path.Combine("schema", "pa.yaml-schema.json"); + public static readonly string DefaultSchemaPath = Path.Combine(".", "schema", "pa.yaml-schema.json"); } From 9bb1754c54fb6f4a86ca90342557fa1ce77959db Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 09:38:55 -0700 Subject: [PATCH 14/29] check if ci docker container doesn't have perms to access file --- src/YamlValidator/InputProcessor.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/YamlValidator/InputProcessor.cs b/src/YamlValidator/InputProcessor.cs index 2045643f..c3909653 100644 --- a/src/YamlValidator/InputProcessor.cs +++ b/src/YamlValidator/InputProcessor.cs @@ -70,10 +70,10 @@ public static RootCommand GetRootCommand() { result.ErrorMessage = "The schema file must be a json file"; } - else if (!File.Exists(schemaPath)) - { - result.ErrorMessage = $"The schema file '{schemaPath}' does not exist"; - } + //else if (!File.Exists(schemaPath)) + //{ + // result.ErrorMessage = $"The schema file '{schemaPath}' does not exist"; + //} }); // define root From b8e88cfbc6210abd357e99c7fdc5b786998bf983 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 09:48:21 -0700 Subject: [PATCH 15/29] test ci with debug print statements --- src/YamlValidator/InputProcessor.cs | 17 ++++++++++++----- src/YamlValidator/SchemaLoader.cs | 2 ++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/YamlValidator/InputProcessor.cs b/src/YamlValidator/InputProcessor.cs index c3909653..ad9b6e5f 100644 --- a/src/YamlValidator/InputProcessor.cs +++ b/src/YamlValidator/InputProcessor.cs @@ -43,13 +43,20 @@ public static RootCommand GetRootCommand() { result.ErrorMessage = $"The path '{inputFilePath}' does not exist"; } + /*else if (Directory.Exists(inputFilePath)) + { + if (Directory.GetFiles(inputFilePath, $"*{Constants.YamlFileExtension}").Length == 0) + { + result.ErrorMessage = $"The folder '{inputFilePath}' does not contain any yaml files"; + } + } else if (File.Exists(inputFilePath)) { if (!inputFilePath.EndsWith(Constants.YamlFileExtension, StringComparison.OrdinalIgnoreCase)) { result.ErrorMessage = $"The file '{inputFilePath}' must be a '{Constants.YamlFileExtension}' file"; } - } + }*/ }); // assume local schema file exists in NuGet package, use relative filepath for now @@ -70,10 +77,10 @@ public static RootCommand GetRootCommand() { result.ErrorMessage = "The schema file must be a json file"; } - //else if (!File.Exists(schemaPath)) - //{ - // result.ErrorMessage = $"The schema file '{schemaPath}' does not exist"; - //} + else if (!File.Exists(schemaPath)) + { + result.ErrorMessage = $"The schema file '{schemaPath}' does not exist"; + } }); // define root diff --git a/src/YamlValidator/SchemaLoader.cs b/src/YamlValidator/SchemaLoader.cs index 05e93e21..403005c8 100644 --- a/src/YamlValidator/SchemaLoader.cs +++ b/src/YamlValidator/SchemaLoader.cs @@ -11,6 +11,8 @@ public class SchemaLoader public JsonSchema Load(string schemaPath) { + Console.WriteLine(Environment.CurrentDirectory); + Console.WriteLine(schemaPath); var node = JsonSchema.FromFile(schemaPath); var schemaFolder = Path.GetDirectoryName(schemaPath); var subschemaPaths = Directory.GetFiles($@"{schemaFolder}{Path.DirectorySeparatorChar}{_schemaFolderPath}", From 669c4f03ae49d21baa9ec8dd036b6752031d5e41 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 09:51:58 -0700 Subject: [PATCH 16/29] =( ci file check again --- src/YamlValidator/InputProcessor.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/YamlValidator/InputProcessor.cs b/src/YamlValidator/InputProcessor.cs index ad9b6e5f..952c0f30 100644 --- a/src/YamlValidator/InputProcessor.cs +++ b/src/YamlValidator/InputProcessor.cs @@ -49,14 +49,14 @@ public static RootCommand GetRootCommand() { result.ErrorMessage = $"The folder '{inputFilePath}' does not contain any yaml files"; } - } + }*/ else if (File.Exists(inputFilePath)) { if (!inputFilePath.EndsWith(Constants.YamlFileExtension, StringComparison.OrdinalIgnoreCase)) { result.ErrorMessage = $"The file '{inputFilePath}' must be a '{Constants.YamlFileExtension}' file"; } - }*/ + } }); // assume local schema file exists in NuGet package, use relative filepath for now @@ -77,10 +77,10 @@ public static RootCommand GetRootCommand() { result.ErrorMessage = "The schema file must be a json file"; } - else if (!File.Exists(schemaPath)) + /*else if (!File.Exists(schemaPath)) { result.ErrorMessage = $"The schema file '{schemaPath}' does not exist"; - } + }*/ }); // define root From ad5c4cc32f312644e7672838ee498f8f0f282655 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 10:27:58 -0700 Subject: [PATCH 17/29] cd into running directory --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ac8a7132..b69bbe85 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,14 +51,14 @@ jobs: - name: Test - Persistence Test Yaml Files (ubuntu & macos) run: | - echo $(ls -l bin/Debug/YamlValidator/schema) - resultApp=$(sudo dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/AppsWithYaml") + cd bin/Debug/YamlValidator + resultApp=$(dotnet YamlValidator.dll validate --path "../Persistence.Tests/_TestData/AppsWithYaml") echo "$resultApp" if [ "$resultApp" == *"Validation Failed"* ]; then echo "Invalid Yaml Files found in AppsWithYaml" exit 1 fi - resultFiles=$(sudo dotnet bin/Debug/YamlValidator/YamlValidator.dll validate --path "bin/Debug/Persistence.Tests/_TestData/ValidYaml-CI") + resultFiles=$(dotnet YamlValidator.dll validate --path "../Persistence.Tests/_TestData/ValidYaml-CI") echo "$resultFiles" if [ "$resultFiles" == *"Validation Failed"* ]; then echo "Invalid Yaml Files found in ValidYaml-CI" From f069f2947bd4bd3fa1596d9973c38613ad65c0c1 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 10:49:53 -0700 Subject: [PATCH 18/29] cleaning out script --- .github/workflows/CI.yml | 15 +-------------- scripts/PersistenceValidate.sh | 12 ++++++++++++ src/YamlValidator/SchemaLoader.cs | 2 -- 3 files changed, 13 insertions(+), 16 deletions(-) create mode 100644 scripts/PersistenceValidate.sh diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b69bbe85..34df0bd3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,20 +50,7 @@ jobs: # run: dotnet bin/Debug/PAModelTests/PAModelTests.dll - name: Test - Persistence Test Yaml Files (ubuntu & macos) - run: | - cd bin/Debug/YamlValidator - resultApp=$(dotnet YamlValidator.dll validate --path "../Persistence.Tests/_TestData/AppsWithYaml") - echo "$resultApp" - if [ "$resultApp" == *"Validation Failed"* ]; then - echo "Invalid Yaml Files found in AppsWithYaml" - exit 1 - fi - resultFiles=$(dotnet YamlValidator.dll validate --path "../Persistence.Tests/_TestData/ValidYaml-CI") - echo "$resultFiles" - if [ "$resultFiles" == *"Validation Failed"* ]; then - echo "Invalid Yaml Files found in ValidYaml-CI" - exit 1 - fi + run: ./scripts/PersistenceValidate.sh if: ${{ runner.os != 'Windows' }} #- name: Restore workloads for samples diff --git a/scripts/PersistenceValidate.sh b/scripts/PersistenceValidate.sh new file mode 100644 index 00000000..6a9cfb1f --- /dev/null +++ b/scripts/PersistenceValidate.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# This script is used to validate whether persistence has valid tests + +cd ../bin/Debug/YamlValidator + +appTestResults=$(dotnet YamlValidator.dll validate --path "../Persistence.Tests/_TestData/AppsWithYaml") +echo "$appTestResults" + +controlTestResults=$(dotnet YamlValidator.dll validate --path "../Persistence.Tests/_TestData/ValidYaml-CI") +echo "$controlTestResults" + diff --git a/src/YamlValidator/SchemaLoader.cs b/src/YamlValidator/SchemaLoader.cs index 403005c8..05e93e21 100644 --- a/src/YamlValidator/SchemaLoader.cs +++ b/src/YamlValidator/SchemaLoader.cs @@ -11,8 +11,6 @@ public class SchemaLoader public JsonSchema Load(string schemaPath) { - Console.WriteLine(Environment.CurrentDirectory); - Console.WriteLine(schemaPath); var node = JsonSchema.FromFile(schemaPath); var schemaFolder = Path.GetDirectoryName(schemaPath); var subschemaPaths = Directory.GetFiles($@"{schemaFolder}{Path.DirectorySeparatorChar}{_schemaFolderPath}", From 715797115c6436ede55bdffded5b95768a27e975 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 10:54:44 -0700 Subject: [PATCH 19/29] add execute perms to shell script --- scripts/PersistenceValidate.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/PersistenceValidate.sh diff --git a/scripts/PersistenceValidate.sh b/scripts/PersistenceValidate.sh old mode 100644 new mode 100755 From 7e3ff87c4288c042442c437e15d9278647e475f8 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 10:58:25 -0700 Subject: [PATCH 20/29] relative filepath issue (maybe?) --- scripts/PersistenceValidate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/PersistenceValidate.sh b/scripts/PersistenceValidate.sh index 6a9cfb1f..408c0859 100755 --- a/scripts/PersistenceValidate.sh +++ b/scripts/PersistenceValidate.sh @@ -2,6 +2,7 @@ # This script is used to validate whether persistence has valid tests +echo $(pwd) cd ../bin/Debug/YamlValidator appTestResults=$(dotnet YamlValidator.dll validate --path "../Persistence.Tests/_TestData/AppsWithYaml") From f3eeb113f790df66ed9887f729de34735e1764a5 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 11:02:56 -0700 Subject: [PATCH 21/29] more debugging --- scripts/PersistenceValidate.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/PersistenceValidate.sh b/scripts/PersistenceValidate.sh index 408c0859..57f4a4c4 100755 --- a/scripts/PersistenceValidate.sh +++ b/scripts/PersistenceValidate.sh @@ -3,6 +3,10 @@ # This script is used to validate whether persistence has valid tests echo $(pwd) +cd .. +echo $(ls) +cd ./bin +echo $(ls) cd ../bin/Debug/YamlValidator appTestResults=$(dotnet YamlValidator.dll validate --path "../Persistence.Tests/_TestData/AppsWithYaml") From 34cac7734ad54688abd93e34b62c6f169330a852 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 11:06:36 -0700 Subject: [PATCH 22/29] All paths from CI relative to root of repo --- scripts/PersistenceValidate.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/PersistenceValidate.sh b/scripts/PersistenceValidate.sh index 57f4a4c4..e6c39ee6 100755 --- a/scripts/PersistenceValidate.sh +++ b/scripts/PersistenceValidate.sh @@ -2,12 +2,7 @@ # This script is used to validate whether persistence has valid tests -echo $(pwd) -cd .. -echo $(ls) -cd ./bin -echo $(ls) -cd ../bin/Debug/YamlValidator +cd bin/Debug/YamlValidator appTestResults=$(dotnet YamlValidator.dll validate --path "../Persistence.Tests/_TestData/AppsWithYaml") echo "$appTestResults" From 1e5e4c8657d15937fc84172d141be1a117338784 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 14:26:49 -0700 Subject: [PATCH 23/29] run ci validation on windows --- .github/workflows/CI.yml | 4 ++++ scripts/PersistenceValidate.ps1 | 11 +++++++++++ scripts/PersistenceValidate.sh | 1 - 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 scripts/PersistenceValidate.ps1 diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 34df0bd3..04acea09 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -53,6 +53,10 @@ jobs: run: ./scripts/PersistenceValidate.sh if: ${{ runner.os != 'Windows' }} + - name: Test - Persistence Test Yaml Files (windows) + run: ./scripts/PersistenceValidate.ps1 + if: ${{ runner.os == 'Windows' }} + #- name: Restore workloads for samples # run: dotnet workload restore samples/MauiMsApp/MauiMsApp.csproj diff --git a/scripts/PersistenceValidate.ps1 b/scripts/PersistenceValidate.ps1 new file mode 100644 index 00000000..d8158c02 --- /dev/null +++ b/scripts/PersistenceValidate.ps1 @@ -0,0 +1,11 @@ +<# + Validate's the Yaml Controls used by Persistence's Unit Tests +#> + +Set-Location -Path "bin\Debug\YamlValidator" + +$appTestResults = dotnet YamlValidator.dll validate --path "..\Persistence.Tests\_TestData\AppsWithYaml" +Write-Host $appTestResults + +$controlTestResults = dotnet YamlValidator.dll validate --path "..\Persistence.Tests\_TestData\ValidYaml-CI" +Write-Host $controlTestResults diff --git a/scripts/PersistenceValidate.sh b/scripts/PersistenceValidate.sh index e6c39ee6..227c5acf 100755 --- a/scripts/PersistenceValidate.sh +++ b/scripts/PersistenceValidate.sh @@ -9,4 +9,3 @@ echo "$appTestResults" controlTestResults=$(dotnet YamlValidator.dll validate --path "../Persistence.Tests/_TestData/ValidYaml-CI") echo "$controlTestResults" - From 0cfce9dd39aa081e6b36aed659f5845a80596e20 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 14:45:20 -0700 Subject: [PATCH 24/29] add powershell script for windows validation --- scripts/PersistenceValidate.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/PersistenceValidate.ps1 b/scripts/PersistenceValidate.ps1 index d8158c02..c4133fab 100644 --- a/scripts/PersistenceValidate.ps1 +++ b/scripts/PersistenceValidate.ps1 @@ -1,11 +1,12 @@ <# Validate's the Yaml Controls used by Persistence's Unit Tests + Uses the repository's root as entry point (similar to how containers on github actions would) #> Set-Location -Path "bin\Debug\YamlValidator" $appTestResults = dotnet YamlValidator.dll validate --path "..\Persistence.Tests\_TestData\AppsWithYaml" -Write-Host $appTestResults +$appTestResults $controlTestResults = dotnet YamlValidator.dll validate --path "..\Persistence.Tests\_TestData\ValidYaml-CI" -Write-Host $controlTestResults +$controlTestResults From 90666f81c818e51274f760337e645200631ff9fc Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 16:06:59 -0700 Subject: [PATCH 25/29] run full updated CI workflow --- .github/workflows/CI.yml | 22 +++++++++++----------- scripts/PersistenceValidate.ps1 | 19 +++++++++++++++---- scripts/PersistenceValidate.sh | 13 +++++++++---- src/YamlValidator/YamlLoader.cs | 2 +- 4 files changed, 36 insertions(+), 20 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 04acea09..b543cb88 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -40,14 +40,14 @@ jobs: run: ./build ci if: ${{ runner.os != 'Windows' }} - #- name: Test - Persistence - # run: dotnet bin/Debug/Persistence.Tests/Persistence.Tests.dll + - name: Test - Persistence + run: dotnet bin/Debug/Persistence.Tests/Persistence.Tests.dll - name: Test - YamlValidator run: dotnet bin/Debug/YamlValidator.Tests/YamlValidator.Tests.dll - #- name: Test - PAModel - # run: dotnet bin/Debug/PAModelTests/PAModelTests.dll + - name: Test - PAModel + run: dotnet bin/Debug/PAModelTests/PAModelTests.dll - name: Test - Persistence Test Yaml Files (ubuntu & macos) run: ./scripts/PersistenceValidate.sh @@ -57,12 +57,12 @@ jobs: run: ./scripts/PersistenceValidate.ps1 if: ${{ runner.os == 'Windows' }} - #- name: Restore workloads for samples - # run: dotnet workload restore samples/MauiMsApp/MauiMsApp.csproj + - name: Restore workloads for samples + run: dotnet workload restore samples/MauiMsApp/MauiMsApp.csproj - #- name: Install maui-tizen workload - # run: dotnet workload install maui-tizen + - name: Install maui-tizen workload + run: dotnet workload install maui-tizen - #- name: Build samples - # run: dotnet build samples/samples.sln - # if: ${{ runner.os == 'Windows' }} + - name: Build samples + run: dotnet build samples/samples.sln + if: ${{ runner.os == 'Windows' }} diff --git a/scripts/PersistenceValidate.ps1 b/scripts/PersistenceValidate.ps1 index c4133fab..2edf3ff8 100644 --- a/scripts/PersistenceValidate.ps1 +++ b/scripts/PersistenceValidate.ps1 @@ -3,10 +3,21 @@ Uses the repository's root as entry point (similar to how containers on github actions would) #> +$AppTestDir = "..\Persistence.Tests\_TestData\AppsWithYaml" +$ControlTestDir = "..\Persistence.Tests\_TestData\ValidYaml-CI" + +# come back to same directory after validation +Push-Location + Set-Location -Path "bin\Debug\YamlValidator" -$appTestResults = dotnet YamlValidator.dll validate --path "..\Persistence.Tests\_TestData\AppsWithYaml" -$appTestResults +$AppTestResults = dotnet YamlValidator.dll validate --path $AppTestDir +Write-Output "Validating Directory $AppTestDir `n" +$AppTestResults + +$ControlTestResults = dotnet YamlValidator.dll validate --path $ControlTestDir +Write-Output "Validating Directory $ControlTestDir `n" +$ControlTestResults -$controlTestResults = dotnet YamlValidator.dll validate --path "..\Persistence.Tests\_TestData\ValidYaml-CI" -$controlTestResults +# restore location +Pop-Location diff --git a/scripts/PersistenceValidate.sh b/scripts/PersistenceValidate.sh index 227c5acf..8d8794e4 100755 --- a/scripts/PersistenceValidate.sh +++ b/scripts/PersistenceValidate.sh @@ -4,8 +4,13 @@ cd bin/Debug/YamlValidator -appTestResults=$(dotnet YamlValidator.dll validate --path "../Persistence.Tests/_TestData/AppsWithYaml") -echo "$appTestResults" +APP_TEST_DIR="../Persistence.Tests/_TestData/AppsWithYaml" +CONTROL_TEST_DIR="../Persistence.Tests/_TestData/ValidYaml-CI" -controlTestResults=$(dotnet YamlValidator.dll validate --path "../Persistence.Tests/_TestData/ValidYaml-CI") -echo "$controlTestResults" +app_test_results=$(dotnet YamlValidator.dll validate --path $APP_TEST_DIR) +printf "Validating Directory $APP_TEST_DIR \n" +printf "$app_test_results" + +control_test_results=$(dotnet YamlValidator.dll validate --path $CONTROL_TEST_DIR) +printf "Validating Directory $CONTROL_TEST_DIR \n" +printf "$control_test_results" diff --git a/src/YamlValidator/YamlLoader.cs b/src/YamlValidator/YamlLoader.cs index 035ead51..8e8d94e3 100644 --- a/src/YamlValidator/YamlLoader.cs +++ b/src/YamlValidator/YamlLoader.cs @@ -25,7 +25,7 @@ public IReadOnlyDictionary Load(string filePath, string pathType var yamlFiles = Directory.EnumerateFiles(filePath, "*" + Constants.YamlFileExtension, SearchOption.AllDirectories); foreach (var filename in yamlFiles) { - var fileName = Path.GetRelativePath(filePath, filename); + var fileName = Path.GetFullPath(filename); var yamlText = Utility.ReadFileData(filename); deserializedYaml.Add(fileName, yamlText); } From 43f336c1487bce4383458b53fe72a403759c6648 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 16:38:13 -0700 Subject: [PATCH 26/29] remove unecessary validation --- src/YamlValidator/InputProcessor.cs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/YamlValidator/InputProcessor.cs b/src/YamlValidator/InputProcessor.cs index 952c0f30..2045643f 100644 --- a/src/YamlValidator/InputProcessor.cs +++ b/src/YamlValidator/InputProcessor.cs @@ -43,13 +43,6 @@ public static RootCommand GetRootCommand() { result.ErrorMessage = $"The path '{inputFilePath}' does not exist"; } - /*else if (Directory.Exists(inputFilePath)) - { - if (Directory.GetFiles(inputFilePath, $"*{Constants.YamlFileExtension}").Length == 0) - { - result.ErrorMessage = $"The folder '{inputFilePath}' does not contain any yaml files"; - } - }*/ else if (File.Exists(inputFilePath)) { if (!inputFilePath.EndsWith(Constants.YamlFileExtension, StringComparison.OrdinalIgnoreCase)) @@ -77,10 +70,10 @@ public static RootCommand GetRootCommand() { result.ErrorMessage = "The schema file must be a json file"; } - /*else if (!File.Exists(schemaPath)) + else if (!File.Exists(schemaPath)) { result.ErrorMessage = $"The schema file '{schemaPath}' does not exist"; - }*/ + } }); // define root From 381193bce32601383d1c20fc73980462bb05d5c8 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 16:39:36 -0700 Subject: [PATCH 27/29] small name change --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b543cb88..78ed14b1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -49,11 +49,11 @@ jobs: - name: Test - PAModel run: dotnet bin/Debug/PAModelTests/PAModelTests.dll - - name: Test - Persistence Test Yaml Files (ubuntu & macos) + - name: Test - Persistence.Tests Yaml Files (ubuntu & macos) run: ./scripts/PersistenceValidate.sh if: ${{ runner.os != 'Windows' }} - - name: Test - Persistence Test Yaml Files (windows) + - name: Test - Persistence.Tests Yaml Files (windows) run: ./scripts/PersistenceValidate.ps1 if: ${{ runner.os == 'Windows' }} From 3818485f38ec0fe578878e6abede6550265c4a67 Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Wed, 3 Jul 2024 16:40:54 -0700 Subject: [PATCH 28/29] change CI test order --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 78ed14b1..0585f313 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -40,9 +40,6 @@ jobs: run: ./build ci if: ${{ runner.os != 'Windows' }} - - name: Test - Persistence - run: dotnet bin/Debug/Persistence.Tests/Persistence.Tests.dll - - name: Test - YamlValidator run: dotnet bin/Debug/YamlValidator.Tests/YamlValidator.Tests.dll @@ -57,6 +54,9 @@ jobs: run: ./scripts/PersistenceValidate.ps1 if: ${{ runner.os == 'Windows' }} + - name: Test - Persistence + run: dotnet bin/Debug/Persistence.Tests/Persistence.Tests.dll + - name: Restore workloads for samples run: dotnet workload restore samples/MauiMsApp/MauiMsApp.csproj From d39f50cf28643f6c1d8fae3c468416d05cf1919d Mon Sep 17 00:00:00 2001 From: Amruth Baskar Date: Mon, 8 Jul 2024 09:49:08 -0700 Subject: [PATCH 29/29] run dll before yaml validation tests --- .github/workflows/CI.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0585f313..7f699ec4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -40,12 +40,15 @@ jobs: run: ./build ci if: ${{ runner.os != 'Windows' }} - - name: Test - YamlValidator - run: dotnet bin/Debug/YamlValidator.Tests/YamlValidator.Tests.dll + - name: Test - Persistence + run: dotnet bin/Debug/Persistence.Tests/Persistence.Tests.dll - name: Test - PAModel run: dotnet bin/Debug/PAModelTests/PAModelTests.dll + - name: Test - YamlValidator + run: dotnet bin/Debug/YamlValidator.Tests/YamlValidator.Tests.dll + - name: Test - Persistence.Tests Yaml Files (ubuntu & macos) run: ./scripts/PersistenceValidate.sh if: ${{ runner.os != 'Windows' }} @@ -54,9 +57,6 @@ jobs: run: ./scripts/PersistenceValidate.ps1 if: ${{ runner.os == 'Windows' }} - - name: Test - Persistence - run: dotnet bin/Debug/Persistence.Tests/Persistence.Tests.dll - - name: Restore workloads for samples run: dotnet workload restore samples/MauiMsApp/MauiMsApp.csproj