.NET 8, dependency updates, and dependabot (#102)

* .NET 8, dependency updates, and dependabot * Add icon * Update ncalc.png * Update ncalc.png * Reverting project version
sklose · Mar 26, 2024 · f8e42df · f8e42df
1 parent 00b37ae
commit f8e42df
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "nuget"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+    groups:
+      default:
+        patterns:
+          - "*"     
diff --git a/src/NCalc.Play/NCalc.Play.csproj b/src/NCalc.Play/NCalc.Play.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>

diff --git a/src/NCalc/NCalc.csproj b/src/NCalc/NCalc.csproj
@@ -5,7 +5,7 @@
 		<AssemblyTitle>CoreCLR-NCalc</AssemblyTitle>
 		<VersionPrefix>3.0.0</VersionPrefix>
 		<Authors>Sebastian Klose</Authors>
-		<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net45;netstandard2.0;net6.0;net8.0</TargetFrameworks>
 		<AssemblyName>NCalc</AssemblyName>
 		<PackageId>CoreCLR-NCalc</PackageId>
 		<PackageTags>ncalc;coreclr;expression;evaluator</PackageTags>
@@ -22,12 +22,13 @@
 		<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
 		<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
+		<PackageIcon>ncalc.png</PackageIcon>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)'=='Release'">
-		<DefineConstants />
-	</PropertyGroup>
-
+	<ItemGroup>
+		<None Include="ncalc.png" Pack="true" Visible="false" PackagePath="" />
+	</ItemGroup>	
+	
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
 		<Reference Include="System" />
 		<Reference Include="Microsoft.CSharp" />
@@ -43,18 +44,12 @@
 		<None Include="..\..\README.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
+	<ItemGroup>
 		<PackageReference Include="Antlr4.Runtime.Standard">
 			<Version>4.13.1</Version>
 		</PackageReference>
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-		<PackageReference Include="Antlr4.Runtime.Standard">
-			<Version>4.13.0</Version>
-		</PackageReference>
-	</ItemGroup>
-
 	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
 		<Exec Command="antlr4 -Dlanguage=CSharp &quot;../../grammer/NCalc.g&quot; -o &quot;./Generated/&quot;" />
 	</Target>

diff --git a/src/NCalc/ncalc.png b/src/NCalc/ncalc.png
diff --git a/test/NCalc.Tests/NCalc.Tests.csproj b/test/NCalc.Tests/NCalc.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<IsPackable>false</IsPackable>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
@@ -12,11 +12,11 @@
 
 	<ItemGroup>
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="xunit" Version="2.5.0" />
+		<PackageReference Include="xunit" Version="2.7.0" />
 	</ItemGroup>
 </Project>