diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 24acc53f4b8..4feb304ddd8 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -52,16 +52,16 @@ extends: - checkout: self - task: UseDotNet@2 - displayName: 'Use .NET 8 sdk' + displayName: 'Use .NET 10 sdk' inputs: packageType: sdk - version: 8.x - + version: 10.x + - task: UseDotNet@2 - displayName: 'Use .NET 10 sdk' + displayName: 'Use .NET 11 sdk' inputs: packageType: sdk - version: 10.x + version: 11.x - task: NuGetAuthenticate@1 displayName: 'Authenticate to Azure Artifacts' @@ -117,15 +117,15 @@ extends: projects: '$(Build.SourcesDirectory)\src\Microsoft.Graph\Microsoft.Graph.csproj' arguments: '-c $(BuildConfiguration) --no-incremental -f netstandard2.1 --no-restore' - task: DotNetCoreCLI@2 - displayName: 'dotnet build net8.0' + displayName: 'dotnet build net10.0' inputs: projects: '$(Build.SourcesDirectory)\src\Microsoft.Graph\Microsoft.Graph.csproj' - arguments: '-c $(BuildConfiguration) --no-incremental -f net8.0 --no-restore' + arguments: '-c $(BuildConfiguration) --no-incremental -f net10.0 --no-restore' - task: DotNetCoreCLI@2 - displayName: 'dotnet build net10.0' + displayName: 'dotnet build net11.0' inputs: projects: '$(Build.SourcesDirectory)\src\Microsoft.Graph\Microsoft.Graph.csproj' - arguments: '-c $(BuildConfiguration) --no-incremental -f net10.0 --no-restore' + arguments: '-c $(BuildConfiguration) --no-incremental -f net11.0 --no-restore' - task: DotNetCoreCLI@2 displayName: 'dotnet build test project' diff --git a/.azure-pipelines/daily-ci-build.yml b/.azure-pipelines/daily-ci-build.yml index fbbf8c9d5fe..379502385ad 100644 --- a/.azure-pipelines/daily-ci-build.yml +++ b/.azure-pipelines/daily-ci-build.yml @@ -41,16 +41,16 @@ extends: submodules: recursive - task: UseDotNet@2 - displayName: Set up .NET 8 + displayName: Set up .NET 10 inputs: packageType: 'sdk' - version: 8.x + version: 10.x - task: UseDotNet@2 - displayName: Set up .NET 10 + displayName: Set up .NET 11 inputs: packageType: 'sdk' - version: 10.x + version: 11.x - task: NuGetAuthenticate@1 displayName: Authenticate to Azure Artifacts @@ -82,14 +82,14 @@ extends: displayName: Build SDK (netstandard2.1) workingDirectory: $(Build.SourcesDirectory) - - script: dotnet build src\Microsoft.Graph\Microsoft.Graph.csproj --no-restore -f net8.0 - displayName: Build SDK (net8.0) - workingDirectory: $(Build.SourcesDirectory) - - script: dotnet build src\Microsoft.Graph\Microsoft.Graph.csproj --no-restore -f net10.0 displayName: Build SDK (net10.0) workingDirectory: $(Build.SourcesDirectory) + - script: dotnet build src\Microsoft.Graph\Microsoft.Graph.csproj --no-restore -f net11.0 + displayName: Build SDK (net11.0) + workingDirectory: $(Build.SourcesDirectory) + - script: dotnet build tests\Microsoft.Graph.DotnetCore.Test\Microsoft.Graph.DotnetCore.Test.csproj --no-restore displayName: Build test project workingDirectory: $(Build.SourcesDirectory) diff --git a/.github/workflows/validatePullRequest.yml b/.github/workflows/validatePullRequest.yml index 3db350ab5f9..5a60cd41412 100644 --- a/.github/workflows/validatePullRequest.yml +++ b/.github/workflows/validatePullRequest.yml @@ -22,7 +22,9 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0 with: - dotnet-version: 8.x + dotnet-version: | + 10.x + 11.x - name: Initialize CodeQL uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2 with: diff --git a/README.md b/README.md index 4bca840533a..b0e47f89bd5 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Integrate the [Microsoft Graph API](https://graph.microsoft.com) into your .NET project! -The Microsoft Graph .NET Client Library targets .NetStandard 2.0. +The Microsoft Graph .NET Client Library targets .NET Standard 2.0, .NET Standard 2.1, .NET 10, and .NET 11. The dedicated .NET 8 target has been removed; the .NET Standard targets remain available for compatible applications. ## Installation via NuGet @@ -138,7 +138,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope If you are looking to build the library locally for the purposes of contributing code or running tests, you will need to: -- Have the .NET Core SDK (> 1.0) installed +- Have the .NET 11 SDK and .NET 10 runtime installed to build all targets and run tests for .NET 10 and .NET 11 - Run `dotnet restore` from the command line in your package directory - Run `nuget restore` and `msbuild` from CLI or run Build from Visual Studio to restore Nuget packages and build the project diff --git a/src/Microsoft.Graph/Microsoft.Graph.csproj b/src/Microsoft.Graph/Microsoft.Graph.csproj index af5a155ecf8..5afa08863aa 100644 --- a/src/Microsoft.Graph/Microsoft.Graph.csproj +++ b/src/Microsoft.Graph/Microsoft.Graph.csproj @@ -5,7 +5,7 @@ © Microsoft Corporation. All rights reserved. Microsoft Graph V1.0 Service Client Library Microsoft - netstandard2.0;netstandard2.1;net8.0;net10.0 + netstandard2.0;netstandard2.1;net10.0;net11.0 latest false Microsoft.Graph diff --git a/tests/Microsoft.Graph.DotnetCore.Test/Microsoft.Graph.DotnetCore.Test.csproj b/tests/Microsoft.Graph.DotnetCore.Test/Microsoft.Graph.DotnetCore.Test.csproj index eccc0a8eafc..629e1358fb7 100644 --- a/tests/Microsoft.Graph.DotnetCore.Test/Microsoft.Graph.DotnetCore.Test.csproj +++ b/tests/Microsoft.Graph.DotnetCore.Test/Microsoft.Graph.DotnetCore.Test.csproj @@ -1,7 +1,7 @@ - net8.0;net10.0 + net10.0;net11.0 Microsoft.Graph.DotnetCore.Test Microsoft.Graph.DotnetCore.Test true