Skip to content

Commit 2888363

Browse files
lahmaRicoSuter
lahma
and
RicoSuter
authored
Add NET 9 support, drop NET 6 support (#5026)
Co-authored-by: Rico Suter <[email protected]>
1 parent f1797c1 commit 2888363

File tree

56 files changed

+785
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+785
-189
lines changed

‎.github/workflows/pr.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ on:
2525
- '**/*.*'
2626
- '!**/*.md'
2727

28+
concurrency:
29+
group: ${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.run_id }}
30+
cancel-in-progress: true
31+
2832
jobs:
2933
windows-latest:
3034
name: windows-latest

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ _ReSharper.Caches/
8282

8383
/artifacts
8484
*.binlog
85+
*.gen

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>14.1.0</VersionPrefix>
3+
<VersionPrefix>14.2.0</VersionPrefix>
44

55
<Authors>Rico Suter</Authors>
66
<Copyright>Copyright © Rico Suter, 2023</Copyright>

‎build/Build.CI.GitHubActions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
PublishArtifacts = true,
1717
InvokedTargets = [nameof(Compile), nameof(Test), nameof(Pack)],
1818
CacheKeyFiles = [],
19-
ConcurrencyCancelInProgress = false),
19+
ConcurrencyCancelInProgress = true),
2020
]
2121
[CustomGitHubActions(
2222
"build",

‎build/Build.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ void PublishConsoleProject(Project project, string[] targetFrameworks)
269269
PublishConsoleProject(consoleX86Project, ["net462"]);
270270
PublishConsoleProject(consoleProject, ["net462"]);
271271
}
272-
PublishConsoleProject(consoleCoreProject, ["net6.0", "net8.0"]);
272+
PublishConsoleProject(consoleCoreProject, ["net8.0", "net9.0"]);
273273

274274
void CopyConsoleBinaries(AbsolutePath target)
275275
{
@@ -285,8 +285,8 @@ void CopyConsoleBinaries(AbsolutePath target)
285285
(ArtifactsDirectory / "publish" / consoleProject.Name / configuration).Copy(target / "Win", ExistsPolicy.DirectoryMerge);
286286
}
287287

288-
(ArtifactsDirectory / "publish" / consoleCoreProject.Name / (configuration + "_net6.0")).Copy(target / "Net60");
289288
(ArtifactsDirectory / "publish" / consoleCoreProject.Name / (configuration + "_net8.0")).Copy(target / "Net80");
289+
(ArtifactsDirectory / "publish" / consoleCoreProject.Name / (configuration + "_net9.0")).Copy(target / "Net90");
290290
}
291291

292292
if (IsRunningOnWindows)

‎build/_build.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="Nuke.Common" Version="8.1.4" />
20+
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
2021
</ItemGroup>
2122

2223
<ItemGroup>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "9.0.100",
44
"rollForward": "latestMinor"
55
}
66
}

‎src/NSwag.ApiDescription.Client/NSwag.ApiDescription.Client.targets‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
<PropertyGroup>
44
<_NSwagCommand>$(NSwagExe)</_NSwagCommand>
55
<_NSwagCommand
6-
Condition="'$(MSBuildRuntimeType)' == 'Core'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net60)/dotnet-nswag.dll"</_NSwagCommand>
6+
Condition="'$(MSBuildRuntimeType)' == 'Core'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net80)/dotnet-nswag.dll"</_NSwagCommand>
77
<_NSwagCommand
88
Condition="'$(TargetFramework)' == 'net8.0'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net80)/dotnet-nswag.dll"</_NSwagCommand>
9+
<_NSwagCommand
10+
Condition="'$(TargetFramework)' == 'net9.0'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net90)/dotnet-nswag.dll"</_NSwagCommand>
911
</PropertyGroup>
1012

1113
<!-- OpenApiReference support for C# -->

‎src/NSwag.AspNetCore.Launcher/NSwag.AspNetCore.Launcher.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net462</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net462</TargetFrameworks>
44
<PlatformTarget Condition="'$(TargetFramework)'=='net462'">x64</PlatformTarget>
55
<OutputType>Exe</OutputType>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

9-
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
9+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
1010
<PackageReference Include="System.Runtime.Loader" Version="4.0.0" />
1111
</ItemGroup>
1212
</Project>

‎src/NSwag.AspNetCore/NSwag.AspNetCore.csproj‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net462;netstandard2.0;net6.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net462;netstandard2.0;net8.0;net9.0</TargetFrameworks>
44
<PackageTags>Swagger Documentation AspNetCore NetCore TypeScript CodeGen</PackageTags>
55
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
66
<SymbolPackageFormat>symbols.nupkg</SymbolPackageFormat>
@@ -14,12 +14,8 @@
1414
<MicrosoftAspNetCoreStaticFilesPackageVersion>1.0.4</MicrosoftAspNetCoreStaticFilesPackageVersion>
1515
<MicrosoftExtensionsApiDescriptionServerPackageVersion>6.0.3</MicrosoftExtensionsApiDescriptionServerPackageVersion>
1616
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>1.0.1</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
17-
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersionCore31>3.1.0</MicrosoftExtensionsFileProvidersEmbeddedPackageVersionCore31>
18-
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet5>5.0.0</MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet5>
19-
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6>6.0.0</MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6>
20-
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet7>7.0.0</MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet7>
2117
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet8>8.0.0</MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet8>
22-
<NETStandardLibraryPackageVersion>1.6.1</NETStandardLibraryPackageVersion>
18+
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet9>9.0.0</MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet9>
2319
<SystemIOFileSystemPackageVersion>4.3.0</SystemIOFileSystemPackageVersion>
2420
<SystemXmlXPathXDocumentPackageVersion>4.0.1</SystemXmlXPathXDocumentPackageVersion>
2521
</PropertyGroup>
@@ -42,16 +38,16 @@
4238
<PackageReference Include="System.Xml.XPath.XDocument" Version="$(SystemXmlXPathXDocumentPackageVersion)" />
4339
</ItemGroup>
4440

45-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
46-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
47-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6)" />
48-
</ItemGroup>
49-
5041
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
5142
<FrameworkReference Include="Microsoft.AspNetCore.App" />
5243
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet8)" />
5344
</ItemGroup>
5445

46+
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
47+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
48+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet9)" />
49+
</ItemGroup>
50+
5551
<ItemGroup>
5652
<ProjectReference Include="..\NSwag.Annotations\NSwag.Annotations.csproj" />
5753
<ProjectReference Include="..\NSwag.Core.Yaml\NSwag.Core.Yaml.csproj" />
@@ -72,12 +68,8 @@
7268
microsoftAspNetCoreStaticFilesPackageVersion=$(MicrosoftAspNetCoreStaticFilesPackageVersion);
7369
microsoftExtensionsApiDescriptionServerPackageVersion=$(MicrosoftExtensionsApiDescriptionServerPackageVersion);
7470
microsoftExtensionsFileProvidersEmbeddedPackageVersion=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion);
75-
microsoftExtensionsFileProvidersEmbeddedPackageVersionCore31=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionCore31);
76-
microsoftExtensionsFileProvidersEmbeddedPackageVersionNet5=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet5);
77-
microsoftExtensionsFileProvidersEmbeddedPackageVersionNet6=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6);
78-
microsoftExtensionsFileProvidersEmbeddedPackageVersionNet7=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet7);
7971
microsoftExtensionsFileProvidersEmbeddedPackageVersionNet8=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet8);
80-
netStandardLibraryPackageVersion=$(NETStandardLibraryPackageVersion);
72+
microsoftExtensionsFileProvidersEmbeddedPackageVersionNet9=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet9);
8173
systemIOFileSystemPackageVersion=$(SystemIOFileSystemPackageVersion);
8274
systemXmlXPathXDocumentPackageVersion=$(SystemXmlXPathXDocumentPackageVersion);
8375
</NuspecProperties>

0 commit comments

Comments
 (0)