From 454fa09b81d128512ae2ec894c2c301c4a05a31a Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Wed, 26 Aug 2020 08:50:53 -0500 Subject: [PATCH] Fixed it? --- Dockerfile | 2 +- lib/linter.sh | 2 +- lib/worker.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7d6f5a5a..535289aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -114,7 +114,7 @@ RUN wget --tries=5 -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \ && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel Current -version latest \ && /usr/share/dotnet/dotnet tool install -g dotnet-format -ENV PATH="${PATH}:/root/.dotnet/tools" +ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet" ############################## # Installs Perl dependencies # diff --git a/lib/linter.sh b/lib/linter.sh index 8799c0f5..7fc396fa 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -1430,7 +1430,7 @@ if [ "${VALIDATE_CSHARP}" == "true" ]; then # Lint the C# files # ######################### # LintCodebase "FILE_TYPE" "LINTER_NAME" "LINTER_CMD" "FILE_TYPES_REGEX" "FILE_ARRAY" - LintCodebase "CSHARP" "dotnet-format" "dotnet-format --check --include" ".*\.\(cs\)\$" "${FILE_ARRAY_CSHARP[@]}" + LintCodebase "CSHARP" "dotnet-format" "dotnet-format --folder --check --include" ".*\.\(cs\)\$" "${FILE_ARRAY_CSHARP[@]}" fi ############### diff --git a/lib/worker.sh b/lib/worker.sh index 921c2cac..52e23e3d 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -617,7 +617,7 @@ function RunTestCases() { TestCodebase "CLOUDFORMATION" "cfn-lint" "cfn-lint --config-file ${CLOUDFORMATION_LINTER_RULES}" ".*\.\(json\|yml\|yaml\)\$" "cloudformation" TestCodebase "CLOJURE" "clj-kondo" "clj-kondo --config ${CLOJURE_LINTER_RULES} --lint" ".*\.\(clj\|cljs\|cljc\|edn\)\$" "clojure" TestCodebase "COFFEESCRIPT" "coffeelint" "coffeelint -f ${COFFEESCRIPT_LINTER_RULES}" ".*\.\(coffee\)\$" "coffeescript" - TestCodebase "CSHARP" "dotnet-format" "dotnet-format --folder --include" ".*\.\(cs\)\$ --check" "csharp" + TestCodebase "CSHARP" "dotnet-format" "dotnet-format --check --folder --include" ".*\.\(cs\)\$" "csharp" TestCodebase "CSS" "stylelint" "stylelint --config ${CSS_LINTER_RULES}" ".*\.\(css\|scss\|sass\)\$" "css" TestCodebase "DART" "dart" "dartanalyzer --fatal-infos --fatal-warnings --options ${DART_LINTER_RULES}" ".*\.\(dart\)\$" "dart" TestCodebase "DOCKERFILE" "dockerfilelint" "dockerfilelint -c ${DOCKERFILE_LINTER_RULES}" ".*\(Dockerfile\)\$" "docker"