Merge pull request #84 from microsoft/andrueastman/net8

Support for net 8
microsoft · Nov 15, 2023 · 91c0c4b · 91c0c4b
2 parents 04c67eb + 4f3798c
commit 91c0c4b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
@@ -32,6 +32,11 @@ stages:
         inputs:
           version: 6.x
 
+      - task: UseDotNet@2
+        displayName: 'Use .NET 8'
+        inputs:
+          version: 8.x          
+
       - task: PoliCheck@2
         displayName: 'Run PoliCheck "/src"'
         inputs:
@@ -73,7 +78,7 @@ stages:
         inputs:
           command: test
           projects: '$(Build.SourcesDirectory)\Microsoft.Kiota.Serialization.Form.sln'
-          arguments: '--configuration $(BuildConfiguration) --no-build -f net6.0'
+          arguments: '--configuration $(BuildConfiguration) --no-build -f net8.0'
 
       # CredScan
       - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3

diff --git a/.github/workflows/build-and_test.yml b/.github/workflows/build-and_test.yml
@@ -9,15 +9,15 @@ on:
 
 jobs:
   build-and-test:
-    runs-on: windows-latest # Temporary switch to windows till https://github.com/microsoft/vstest/issues/4549 is released in dotnet version after 7.0.400
+    runs-on: ubuntu-latest
     env:
       solutionName: Microsoft.Kiota.Serialization.Form.sln
     steps:
       - uses: actions/checkout@v4
       - name: Setup .NET
         uses: actions/setup-dotnet@v3.0.3
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.x
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -34,14 +34,12 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: 17
-      - name: Setup .NET 5 # At the moment the scanner requires dotnet 5 https://www.nuget.org/packages/dotnet-sonarscanner
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 5.0.x
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 7.0.x
+        with: # At the moment the scanner requires dotnet 5 https://www.nuget.org/packages/dotnet-sonarscanner
+          dotnet-version: |
+            5.x
+            8.x
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
@@ -71,7 +69,7 @@ jobs:
           CoverletOutputFormat: 'opencover' # https://github.com/microsoft/vstest/issues/4014#issuecomment-1307913682
         shell: pwsh
         run: |
-          ./.sonar/scanner/dotnet-sonarscanner begin /k:"microsoft_kiota-serialization-form-dotnet" /o:"microsoft" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="tests/coverage.net6.0.opencover.xml"
+          ./.sonar/scanner/dotnet-sonarscanner begin /k:"microsoft_kiota-serialization-form-dotnet" /o:"microsoft" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="tests/coverage.net8.0.opencover.xml"
           dotnet workload restore
           dotnet build
           dotnet test Microsoft.Kiota.Serialization.Form.sln --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+## [1.1.1] - 2023-11-15
+
+### Added
+
+- Added support for dotnet 8.
+
 ## [1.1.0] - 2023-10-23
 
 ### Added

diff --git a/src/Microsoft.Kiota.Serialization.Form.csproj b/src/Microsoft.Kiota.Serialization.Form.csproj
@@ -16,7 +16,7 @@
     <PackageProjectUrl>https://aka.ms/kiota/docs</PackageProjectUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <Deterministic>true</Deterministic>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.1.1</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -35,6 +35,8 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <NoWarn>$(NoWarn);NU5048;NETSDK1138</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFrameworkVersion)' == 'net5.0'">    
     <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 

diff --git a/tests/Microsoft.Kiota.Serialization.Form.Tests.csproj b/tests/Microsoft.Kiota.Serialization.Form.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0;net462</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>