From 2c85ed2439747151a12fa029499a4289b57fe91a Mon Sep 17 00:00:00 2001 From: johan-v-r Date: Fri, 11 Nov 2022 09:36:24 +0200 Subject: [PATCH 1/4] Update target framework to NET 7.0 --- README.md | 5 ++++- package/LibSassBuilder.nuspec | 2 +- .../LibSassBuilder.DirectoryTests.csproj | 2 +- .../LibSassBuilder.ExcludeTests.csproj | 2 +- src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj | 2 +- src/LibSassBuilder/LibSassBuilder.csproj | 4 ++-- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 88bec69..9ea5918 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,10 @@ ___ ## Requirements -`LibSassBuilder` can be installed on any project, however the underlying build tool requires [.NET 6](https://dotnet.microsoft.com/download/dotnet/6.0) installed on the machine. (.NET 5 required with `v1.x`) +`LibSassBuilder` can be installed on any project, however the underlying build tool requires [.NET 7](https://dotnet.microsoft.com/download/dotnet/7.0) installed on the machine. + +> .NET 5 required with `v1.x` +> .NET 6 required with `v2.x` ## Support diff --git a/package/LibSassBuilder.nuspec b/package/LibSassBuilder.nuspec index 302a98d..f217e76 100644 --- a/package/LibSassBuilder.nuspec +++ b/package/LibSassBuilder.nuspec @@ -2,7 +2,7 @@ LibSassBuilder - 2.1.0 + 3.0.0 LibSassBuilder Auto build task to compile .scss/.sass files to .css Johan van Rensburg diff --git a/src/LibSassBuilder.DirectoryTests/LibSassBuilder.DirectoryTests.csproj b/src/LibSassBuilder.DirectoryTests/LibSassBuilder.DirectoryTests.csproj index 6b1c319..c0e883d 100644 --- a/src/LibSassBuilder.DirectoryTests/LibSassBuilder.DirectoryTests.csproj +++ b/src/LibSassBuilder.DirectoryTests/LibSassBuilder.DirectoryTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 false diff --git a/src/LibSassBuilder.ExcludeTests/LibSassBuilder.ExcludeTests.csproj b/src/LibSassBuilder.ExcludeTests/LibSassBuilder.ExcludeTests.csproj index 5c54d45..88a4d01 100644 --- a/src/LibSassBuilder.ExcludeTests/LibSassBuilder.ExcludeTests.csproj +++ b/src/LibSassBuilder.ExcludeTests/LibSassBuilder.ExcludeTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 false diff --git a/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj b/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj index 7ae1485..e699f9a 100644 --- a/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj +++ b/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 false diff --git a/src/LibSassBuilder/LibSassBuilder.csproj b/src/LibSassBuilder/LibSassBuilder.csproj index 805e3a1..115a49f 100644 --- a/src/LibSassBuilder/LibSassBuilder.csproj +++ b/src/LibSassBuilder/LibSassBuilder.csproj @@ -2,8 +2,8 @@ Exe - 2.1.0 - net6.0 + 3.0.0 + net7.0 true LibSassBuilder-Tool lsb From 72697c636ab46b625178cf5d44be2cbec4632b65 Mon Sep 17 00:00:00 2001 From: johan-v-r Date: Fri, 11 Nov 2022 09:40:20 +0200 Subject: [PATCH 2/4] Update dependencies --- .../LibSassBuilder.DirectoryTests.csproj | 8 ++++---- .../LibSassBuilder.ExcludeTests.csproj | 8 ++++---- src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj | 8 ++++---- src/LibSassBuilder/LibSassBuilder.csproj | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/LibSassBuilder.DirectoryTests/LibSassBuilder.DirectoryTests.csproj b/src/LibSassBuilder.DirectoryTests/LibSassBuilder.DirectoryTests.csproj index c0e883d..469dafa 100644 --- a/src/LibSassBuilder.DirectoryTests/LibSassBuilder.DirectoryTests.csproj +++ b/src/LibSassBuilder.DirectoryTests/LibSassBuilder.DirectoryTests.csproj @@ -7,13 +7,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/LibSassBuilder.ExcludeTests/LibSassBuilder.ExcludeTests.csproj b/src/LibSassBuilder.ExcludeTests/LibSassBuilder.ExcludeTests.csproj index 88a4d01..9b2dd02 100644 --- a/src/LibSassBuilder.ExcludeTests/LibSassBuilder.ExcludeTests.csproj +++ b/src/LibSassBuilder.ExcludeTests/LibSassBuilder.ExcludeTests.csproj @@ -7,13 +7,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj b/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj index e699f9a..26a1e9c 100644 --- a/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj +++ b/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj @@ -7,13 +7,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/LibSassBuilder/LibSassBuilder.csproj b/src/LibSassBuilder/LibSassBuilder.csproj index 115a49f..3825cfb 100644 --- a/src/LibSassBuilder/LibSassBuilder.csproj +++ b/src/LibSassBuilder/LibSassBuilder.csproj @@ -18,12 +18,12 @@ - - - - - - + + + + + + From 12bfc59b42f1c08ff6711c68306b89d2210420fb Mon Sep 17 00:00:00 2001 From: johan-v-r Date: Fri, 11 Nov 2022 09:54:29 +0200 Subject: [PATCH 3/4] Update build versions --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/dotnet-core.yml | 2 +- .github/workflows/publish-nuget.yml | 2 +- .github/workflows/publish-tool.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 84bc7c8..451ca56 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -43,7 +43,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -54,7 +54,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -68,4 +68,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index a647e5b..2d6e20d 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -29,7 +29,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.x' + dotnet-version: '7.x' - name: Install dependencies run: dotnet restore - name: Build LibSassBuilder diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml index 72d238b..92a3be5 100644 --- a/.github/workflows/publish-nuget.yml +++ b/.github/workflows/publish-nuget.yml @@ -20,7 +20,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.x' + dotnet-version: '7.x' - name: Install dependencies run: dotnet restore - name: Build diff --git a/.github/workflows/publish-tool.yml b/.github/workflows/publish-tool.yml index 7e426dd..533615d 100644 --- a/.github/workflows/publish-tool.yml +++ b/.github/workflows/publish-tool.yml @@ -20,7 +20,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.x' + dotnet-version: '7.x' - name: Install dependencies run: dotnet restore - name: Build From c90888f26dcfa6198200dfd786290b9bf2458c05 Mon Sep 17 00:00:00 2001 From: johan-v-r Date: Fri, 11 Nov 2022 10:02:25 +0200 Subject: [PATCH 4/4] Setup .NET 7 for CodeQL --- .github/workflows/codeql-analysis.yml | 5 +++++ src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 451ca56..17cb51e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,6 +38,11 @@ jobs: # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed steps: + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '7.0' + - name: Checkout repository uses: actions/checkout@v2 diff --git a/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj b/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj index 26a1e9c..d97437b 100644 --- a/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj +++ b/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj @@ -24,7 +24,7 @@ - +