Upgrade to .NET 8

gabrielweyer · Nov 18, 2023 · 79af5d1 · 79af5d1
1 parent 1008aac
commit 79af5d1
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 9 deletions.
diff --git a/.github/workflows/coster.yml b/.github/workflows/coster.yml
@@ -26,6 +26,11 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
+      - uses: actions/setup-dotnet@v3
+        name: Install .NET 8
+        with:
+          dotnet-version: '8.0.x'
+          dotnet-quality: 'ga'
       - name: Build
         run: ./build.sh
       - name: Upload test results

diff --git a/.github/workflows/security-scanning-csharp.yml b/.github/workflows/security-scanning-csharp.yml
@@ -27,6 +27,12 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Install .NET 8
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '8.0.x'
+        dotnet-quality: 'ga'
+
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:

diff --git a/README.md b/README.md
@@ -144,7 +144,7 @@ Price `VMs` using the `JSON` pricing files generated by the `Parser`. The `Coste
 
 ### Coster pre-requisites
 
-- [.NET SDK 6.x][dotnet-sdk]
+- [.NET SDK 8.x][dotnet-sdk]
 
 ### Coster usage
 
@@ -222,7 +222,7 @@ The `Coster` will generate a `CSV` file in the `Out\` directory with the followi
 [european-union]: https://europa.eu/european-union/about-eu/countries_en#tab-0-0
 [swizerland-official-languages]: https://en.wikipedia.org/wiki/Switzerland#Languages
 [azure-china]: https://www.azure.cn/en-us/pricing/details/virtual-machines/
-[dotnet-sdk]: https://dotnet.microsoft.com/download/dotnet/6.0
+[dotnet-sdk]: https://dotnet.microsoft.com/download/dotnet/8.0
 [github-actions-parser-shield]: https://github.com/gabrielweyer/azure-vm-pricing/actions/workflows/parser.yml/badge.svg
 [github-actions-parser]: https://github.com/gabrielweyer/azure-vm-pricing/actions/workflows/parser.yml
 [github-actions-coster-shield]: https://github.com/gabrielweyer/azure-vm-pricing/actions/workflows/coster.yml/badge.svg

diff --git a/coster/.nuke/build.schema.json b/coster/.nuke/build.schema.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Build Schema",
   "$ref": "#/definitions/build",
+  "title": "Build Schema",
   "definitions": {
     "build": {
       "type": "object",
@@ -113,4 +113,4 @@
       }
     }
   }
-}
+}
diff --git a/coster/build/Build.cs b/coster/build/Build.cs
@@ -101,7 +101,7 @@ from framework in testProject.GetTargetFrameworks()
         .Executes(() =>
         {
             ReportGeneratorTasks.ReportGenerator(s => s
-                .SetFramework("net6.0")
+                .SetFramework("net8.0")
                 .SetReports($"{TestResultsDirectory}/**/coverage.cobertura.xml")
                 .SetTargetDirectory(CodeCoverageDirectory)
                 .SetReportTypes(ReportTypes.Html));

diff --git a/coster/build/_build.csproj b/coster/build/_build.csproj
@@ -2,12 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Gabo</RootNamespace>
     <NoWarn>CS0649;CS0169;CA1707</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>
     <NukeScriptDirectory>..</NukeScriptDirectory>
     <NukeTelemetryVersion>1</NukeTelemetryVersion>
+    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/coster/src/AzureVmCoster/AzureVmCoster.csproj b/coster/src/AzureVmCoster/AzureVmCoster.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/coster/src/AzureVmCoster/Services/VmPricingParser.cs b/coster/src/AzureVmCoster/Services/VmPricingParser.cs
@@ -24,7 +24,7 @@ public List<VmPricing> Parse()
 
             var fileVmPricing = JsonSerializer.Deserialize<List<VmPricing>>(File.ReadAllText(pricingFile));
 
-            if (fileVmPricing == null || !fileVmPricing.Any())
+            if (fileVmPricing == null || fileVmPricing.Count == 0)
             {
                 continue;
             }

diff --git a/coster/tests/AzureVmCosterTests/AzureVmCosterTests.csproj b/coster/tests/AzureVmCosterTests/AzureVmCosterTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>