Merge pull request #64 from johan-v-r/net7-upgrade

Net7 upgrade
johan-v-r · Nov 11, 2022 · 2e7ce18 · 2e7ce18
2 parents 0282958 + c90888f
commit 2e7ce18
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 32 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,12 +38,17 @@ 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
 
     # 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 +59,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 +73,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
@@ -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
@@ -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
@@ -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/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
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>LibSassBuilder</id>
-    <version>2.1.0</version>
+    <version>3.0.0</version>
     <title>LibSassBuilder</title>
     <summary>Auto build task to compile .scss/.sass files to .css</summary>
     <authors>Johan van Rensburg</authors>

diff --git a/src/LibSassBuilder.DirectoryTests/LibSassBuilder.DirectoryTests.csproj b/src/LibSassBuilder.DirectoryTests/LibSassBuilder.DirectoryTests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.0.3">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/LibSassBuilder.ExcludeTests/LibSassBuilder.ExcludeTests.csproj b/src/LibSassBuilder.ExcludeTests/LibSassBuilder.ExcludeTests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.0.3">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj b/src/LibSassBuilder.Tests/LibSassBuilder.Tests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.0.3">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -24,7 +24,7 @@
   </ItemGroup>
 
 	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-		<Exec Command="dotnet run --project ../LibSassBuilder" />
+		<Exec Command="dotnet run --project ../LibSassBuilder ./" />
 	</Target>
 
 </Project>
diff --git a/src/LibSassBuilder/LibSassBuilder.csproj b/src/LibSassBuilder/LibSassBuilder.csproj
@@ -2,8 +2,8 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<Version>2.1.0</Version>
-		<TargetFramework>net6.0</TargetFramework>
+		<Version>3.0.0</Version>
+		<TargetFramework>net7.0</TargetFramework>
 		<PackAsTool>true</PackAsTool>
 		<PackageId>LibSassBuilder-Tool</PackageId>
 		<ToolCommandName>lsb</ToolCommandName>
@@ -18,12 +18,12 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommandLineParser" Version="2.8.0" />
-		<PackageReference Include="LibSassHost" Version="1.3.2" />
-		<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.3.2" />
-		<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.3.2" />
-		<PackageReference Include="LibSassHost.Native.win-x64" Version="1.3.2" />
-		<PackageReference Include="LibSassHost.Native.win-x86" Version="1.3.2" />
+		<PackageReference Include="CommandLineParser" Version="2.9.1" />
+		<PackageReference Include="LibSassHost" Version="1.3.3" />
+		<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.3.3" />
+		<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.3.3" />
+		<PackageReference Include="LibSassHost.Native.win-x64" Version="1.3.3" />
+		<PackageReference Include="LibSassHost.Native.win-x86" Version="1.3.3" />
 	</ItemGroup>
 
 	<ItemGroup>