Skip to content

Commit 6fa43dd

Browse files
authoredJan 14, 2023
Upgrade to .NET 7
1 parent 593625c commit 6fa43dd

File tree

9 files changed

+20
-36
lines changed

9 files changed

+20
-36
lines changed
 

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,10 @@ jobs:
1818
steps:
1919
- name: Checkout repository
2020
uses: actions/checkout@v2
21-
- name: Setup .NET Core 3.1
21+
- name: Setup .NET Core 7.0
2222
uses: actions/setup-dotnet@v1
2323
with:
24-
dotnet-version: '3.1.x'
25-
- name: Setup .NET Core 6.0
26-
uses: actions/setup-dotnet@v1
27-
with:
28-
dotnet-version: '6.0.x'
24+
dotnet-version: '7.0.x'
2925
- name: Initialize CodeQL
3026
uses: github/codeql-action/init@v1
3127
with:

‎.github/workflows/dotnet-core.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v2
19-
- name: Setup .NET Core 3.1
19+
- name: Setup .NET Core 7.0
2020
uses: actions/setup-dotnet@v1
2121
with:
22-
dotnet-version: '3.1.x'
23-
- name: Setup .NET Core 6.0
24-
uses: actions/setup-dotnet@v1
25-
with:
26-
dotnet-version: '6.0.x'
22+
dotnet-version: '7.0.x'
2723
- name: Install dependencies
2824
run: dotnet restore
2925
- name: Build
@@ -44,14 +40,10 @@ jobs:
4440
runs-on: ubuntu-latest
4541
steps:
4642
- uses: actions/checkout@v2
47-
- name: Setup .NET Core 3.1
48-
uses: actions/setup-dotnet@v1
49-
with:
50-
dotnet-version: '3.1.x'
51-
- name: Setup .NET Core 6.0
43+
- name: Setup .NET Core 7.0
5244
uses: actions/setup-dotnet@v1
5345
with:
54-
dotnet-version: '6.0.x'
46+
dotnet-version: '7.0.x'
5547
- name: Pack NuGet
5648
uses: brandedoutcast/publish-nuget@v2.5.5
5749
with:

‎.github/workflows/sonarqube-analysis.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@ jobs:
1212
- uses: actions/checkout@v2
1313
with:
1414
fetch-depth: 0
15-
- name: Setup .NET Core 3.1
15+
- name: Setup .NET Core 7.0
1616
uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: '3.1.x'
19-
- name: Setup .NET Core 6.0
20-
uses: actions/setup-dotnet@v1
21-
with:
22-
dotnet-version: '6.0.x'
18+
dotnet-version: '7.0.x'
2319
- name: SonarScanner for .NET Core with pull request decoration support
24-
uses: highbyte/sonarscan-dotnet@v2.1.2
20+
uses: highbyte/sonarscan-dotnet@v2.2.1
2521
with:
2622
sonarProjectKey: qatoolkit_qatoolkit-source-swagger-net
2723
sonarProjectName: qatoolkit_qatoolkit-source-swagger-net

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,3 +361,4 @@ MigrationBackup/
361361
# Fody - auto-generated XML schema
362362
FodyWeavers.xsd
363363
/src/QAToolKit.Source.Swagger.Test/global.json
364+
.idea/

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>0.4.0</Version>
3+
<Version>0.4.1</Version>
44
</PropertyGroup>
55
</Project>

‎README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
## Description
99
`QAToolKit.Source.Swagger` is a .NET library, which generates `IEnumerable<HttpRequest>` object that is the input for other components.
1010

11-
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `netcoreapp3.1`, `net6.0`
11+
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net7.0`
1212

1313
Major features:
1414

@@ -182,7 +182,10 @@ By default this option is set to false.
182182

183183
MIT License
184184

185-
Copyright (c) 2020-2021 Miha Jakovac
185+
Copyright (c) 2020-2023 Miha Jakovac
186+
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net7.0`
187+
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `netcoreapp3.1`, `net6.0`
188+
Copyright (c) 2020-2023 Miha Jakovac
186189

187190
Permission is hereby granted, free of charge, to any person obtaining a copy
188191
of this software and associated documentation files (the "Software"), to deal

‎src/QAToolKit.Source.Swagger.Test/QAToolKit.Source.Swagger.Test.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
@@ -21,10 +21,6 @@
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="coverlet.collector" Version="3.1.0">
25-
<PrivateAssets>all</PrivateAssets>
26-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27-
</PackageReference>
2824
</ItemGroup>
2925

3026
<ItemGroup>

‎src/QAToolKit.Source.Swagger/QAToolKit.Source.Swagger.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<LangVersion>latest</LangVersion>
77
<ProjectGuid>ee940718-945a-4c34-8ce6-0790972ada44</ProjectGuid>
@@ -19,7 +19,7 @@
1919
<PackageProjectUrl>https://github.com/qatoolkit/qatoolkit-source-swagger-net</PackageProjectUrl>
2020
<PackageIcon>qatoolkit-64x64.png</PackageIcon>
2121
<RepositoryUrl>https://github.com/qatoolkit/qatoolkit-source-swagger-net</RepositoryUrl>
22-
<PackageTags>qatoolkit-source-swagger-net;.net;c#;f#;swagger;dotnet;netstandard;net6</PackageTags>
22+
<PackageTags>qatoolkit-source-swagger-net;.net;c#;f#;swagger;dotnet;netstandard;net7</PackageTags>
2323
<Configurations>Debug;Release</Configurations>
2424
</PropertyGroup>
2525

‎src/QAToolKit.Source.Swagger/SwaggerProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ private HttpMethod GetHttpMethod(KeyValuePair<OperationType, OpenApiOperation> o
265265
#elif NETCOREAPP3_1
266266
case "patch":
267267
return HttpMethod.Patch;
268-
#elif NET6_0
268+
#elif NET7_0
269269
case "patch":
270270
return HttpMethod.Patch;
271271
#endif

0 commit comments

Comments
 (0)