Upgrade to dotnet 7

oxsecurity · Jan 5, 2023 · 7630633 · 7630633
1 parent 4e5b040
commit 7630633
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,10 +16,8 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
 - Drone CI enhancements
   - Config generator tool now supports Drone CI
   - Added information about how to change trigger rules for Drone CI workflow
-
 - Fix perl linter skipping files
-
-- Upgrade to dotnet 6.0 + `list_of_files` for dotnet-format CLI lint mode to improve performances (requires `.csproj` or `.vbproj` in the repo)
+- Upgrade to dotnet 7.0, dotnet-format requires `.sln`, `.csproj` or `.vbproj` in the repo
 
 - Linter versions upgrades
   - [csharpier](https://csharpier.com/) from 0.21.0 to **0.16.0** on 2022-12-29

diff --git a/Dockerfile b/Dockerfile
@@ -313,7 +313,7 @@ RUN rc-update add docker boot && rc-service docker start || true \
 # CSHARP installation
     && wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 
@@ -366,7 +366,7 @@ RUN mkdir -p ${PWSH_DIRECTORY} \
 # Next line commented because already managed by another linter
 # RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
 #     && chmod +x dotnet-install.sh \
-#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
 # Next line commented because already managed by another linter
 # ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 
@@ -544,7 +544,7 @@ ENV PATH="~/.raku/bin:/opt/rakudo-pkg/bin:/opt/rakudo-pkg/share/perl6/site/bin:$
 # Next line commented because already managed by another linter
 # RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
 #     && chmod +x dotnet-install.sh \
-#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
 # Next line commented because already managed by another linter
 # ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 RUN dotnet tool install --global Microsoft.CST.DevSkim.CLI \
@@ -601,7 +601,7 @@ RUN dotnet tool install --global Microsoft.CST.DevSkim.CLI \
 # Next line commented because already managed by another linter
 # RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
 #     && chmod +x dotnet-install.sh \
-#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
 # Next line commented because already managed by another linter
 # ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
     && dotnet tool install --global TSQLLint \

diff --git a/flavors/dotnet/Dockerfile b/flavors/dotnet/Dockerfile
@@ -235,7 +235,7 @@ RUN mkdir -p ${PWSH_DIRECTORY} \
 # CSHARP installation
     && wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 
@@ -255,7 +255,7 @@ RUN mkdir -p ${PWSH_DIRECTORY} \
 # Next line commented because already managed by another linter
 # RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
 #     && chmod +x dotnet-install.sh \
-#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
 # Next line commented because already managed by another linter
 # ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 
@@ -362,7 +362,7 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
 # Next line commented because already managed by another linter
 # RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
 #     && chmod +x dotnet-install.sh \
-#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
 # Next line commented because already managed by another linter
 # ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
     && dotnet tool install --global TSQLLint

diff --git a/flavors/security/Dockerfile b/flavors/security/Dockerfile
@@ -210,7 +210,7 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
 # devskim installation
     && wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 RUN dotnet tool install --global Microsoft.CST.DevSkim.CLI \

diff --git a/linters/csharp_dotnet_format/Dockerfile b/linters/csharp_dotnet_format/Dockerfile
@@ -107,7 +107,7 @@ ENV PATH="/node_modules/.bin:${PATH}"
 # CSHARP installation
 RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 

diff --git a/linters/repository_devskim/Dockerfile b/linters/repository_devskim/Dockerfile
@@ -132,7 +132,7 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \
 # devskim installation
 RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 RUN dotnet tool install --global Microsoft.CST.DevSkim.CLI

diff --git a/linters/sql_tsqllint/Dockerfile b/linters/sql_tsqllint/Dockerfile
@@ -107,7 +107,7 @@ ENV PATH="/node_modules/.bin:${PATH}"
 # tsqllint installation
 RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 RUN dotnet tool install --global TSQLLint

diff --git a/linters/vbdotnet_dotnet_format/Dockerfile b/linters/vbdotnet_dotnet_format/Dockerfile
@@ -107,7 +107,7 @@ ENV PATH="/node_modules/.bin:${PATH}"
 # VBDOTNET installation
 RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 

diff --git a/megalinter/descriptors/csharp.megalinter-descriptor.yml b/megalinter/descriptors/csharp.megalinter-descriptor.yml
@@ -19,7 +19,7 @@ install:
     - |
       RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
           && chmod +x dotnet-install.sh \
-          && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+          && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
     - ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 linters:
   # DOTNET FORMAT

diff --git a/megalinter/descriptors/repository.megalinter-descriptor.yml b/megalinter/descriptors/repository.megalinter-descriptor.yml
@@ -92,7 +92,7 @@ linters:
         - |
           RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
               && chmod +x dotnet-install.sh \
-              && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+              && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
         - ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
         - RUN dotnet tool install --global Microsoft.CST.DevSkim.CLI
     ide:

diff --git a/megalinter/descriptors/sql.megalinter-descriptor.yml b/megalinter/descriptors/sql.megalinter-descriptor.yml
@@ -82,7 +82,7 @@ linters:
         - |
           RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
               && chmod +x dotnet-install.sh \
-              && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+              && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
         - ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
         - RUN dotnet tool install --global TSQLLint
     ide:

diff --git a/megalinter/descriptors/vbdotnet.megalinter-descriptor.yml b/megalinter/descriptors/vbdotnet.megalinter-descriptor.yml
@@ -19,7 +19,7 @@ install:
     - |
       RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
           && chmod +x dotnet-install.sh \
-          && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
+          && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 7.0 -version latest
     - ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 linters:
   # DOTNET FORMAT