From 4002f3a840f22e0c19260fd9c7907e1f524fd184 Mon Sep 17 00:00:00 2001 From: Rico Suter Date: Tue, 14 Nov 2023 23:17:22 +0100 Subject: [PATCH] Use .NET 8.0.100 (#4580) * feature: Use .NET 8.0.100-rc.2 * specific version * dotnet 8 --- .github/workflows/build.yml | 2 +- .github/workflows/pr.yml | 2 +- azure-pipelines.yml | 2 +- build/Build.CI.GitHubActions.cs | 2 +- global.json | 2 +- src/NSwag.sln | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62dce5fe9e..59c0809780 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: - uses: actions/setup-dotnet@v3 with: dotnet-version: | - 8.0.100-rc.1.23463.5 + 8.0.100 - uses: actions/checkout@v3 - name: 'Cache: .nuke/temp, ~/.nuget/packages' uses: actions/cache@v3 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 35edba28e1..c483a50e68 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-dotnet@v3 with: dotnet-version: | - 8.0.100-rc.1.23463.5 + 8.0.100 - uses: actions/checkout@v3 - name: 'Cache: .nuke/temp, ~/.nuget/packages' uses: actions/cache@v3 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c6831b89fb..a9601c275e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -43,7 +43,7 @@ steps: displayName: 'Install .NET Core SDK' inputs: packageType: 'sdk' - version: '8.0.100-rc.1.23463.5' + version: '8.0.100' includePreviewVersions: true performMultiLevelLookup: true useGlobalJson: true diff --git a/build/Build.CI.GitHubActions.cs b/build/Build.CI.GitHubActions.cs index 3bcafab1a7..b6683d010f 100644 --- a/build/Build.CI.GitHubActions.cs +++ b/build/Build.CI.GitHubActions.cs @@ -50,7 +50,7 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC // only need to list the ones that are missing from default image newSteps.Insert(0, new GitHubActionsSetupDotNetStep(new[] { - "8.0.100-rc.1.23463.5" + "8.0.100" })); newSteps.Insert(0, new GitHubActionsUseGnuTarStep()); diff --git a/global.json b/global.json index ada2e61fcf..989a69cafb 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-rc.1.23463.5", + "version": "8.0.100", "rollForward": "latestMinor" } } \ No newline at end of file diff --git a/src/NSwag.sln b/src/NSwag.sln index 1942d2cb6a..5af5e15e45 100644 --- a/src/NSwag.sln +++ b/src/NSwag.sln @@ -115,6 +115,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00 Build", "00 Build", "{6F ProjectSection(SolutionItems) = preProject ..\azure-pipelines.yml = ..\azure-pipelines.yml Directory.Build.props = Directory.Build.props + ..\global.json = ..\global.json EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "..\build\_build.csproj", "{AC3D8125-AE21-49FC-A217-D96C7B585FF9}"