Skip to content

Commit c3a2de3

Browse files
lahmalahma
committed
Remove NET 7 support
1 parent 6b49eef commit c3a2de3

Some content is hidden

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

42 files changed

+37
-2394
lines changed

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ jobs:
4040
run: |
4141
echo "Adding GNU tar to PATH"
4242
echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%"
43+
- uses: actions/setup-dotnet@v3
44+
with:
45+
dotnet-version: |
46+
6.0
4347
- uses: actions/checkout@v3
4448
- name: 'Run: Compile, Test, Pack, Publish'
4549
run: ./build.cmd Compile Test Pack Publish
@@ -72,6 +76,10 @@ jobs:
7276
name: ubuntu-latest
7377
runs-on: ubuntu-latest
7478
steps:
79+
- uses: actions/setup-dotnet@v3
80+
with:
81+
dotnet-version: |
82+
6.0
7583
- uses: actions/checkout@v3
7684
- name: 'Run: Compile, Test, Pack, Publish'
7785
run: ./build.cmd Compile Test Pack Publish
@@ -84,6 +92,10 @@ jobs:
8492
name: macos-latest
8593
runs-on: macos-latest
8694
steps:
95+
- uses: actions/setup-dotnet@v3
96+
with:
97+
dotnet-version: |
98+
6.0
8799
- uses: actions/checkout@v3
88100
- name: 'Run: Compile, Test, Pack, Publish'
89101
run: ./build.cmd Compile Test Pack Publish

‎.github/workflows/pr.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ jobs:
3838
run: |
3939
echo "Adding GNU tar to PATH"
4040
echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%"
41+
- uses: actions/setup-dotnet@v3
42+
with:
43+
dotnet-version: |
44+
6.0
4145
- uses: actions/checkout@v3
4246
- name: 'Run: Compile, Test, Pack'
4347
run: ./build.cmd Compile Test Pack
@@ -65,13 +69,21 @@ jobs:
6569
name: ubuntu-latest
6670
runs-on: ubuntu-latest
6771
steps:
72+
- uses: actions/setup-dotnet@v3
73+
with:
74+
dotnet-version: |
75+
6.0
6876
- uses: actions/checkout@v3
6977
- name: 'Run: Compile, Test, Pack'
7078
run: ./build.cmd Compile Test Pack
7179
macos-latest:
7280
name: macos-latest
7381
runs-on: macos-latest
7482
steps:
83+
- uses: actions/setup-dotnet@v3
84+
with:
85+
dotnet-version: |
86+
6.0
7587
- uses: actions/checkout@v3
7688
- name: 'Run: Compile, Test, Pack'
7789
run: ./build.cmd Compile Test Pack

‎build/Build.CI.GitHubActions.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,7 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC
4949
var newSteps = new List<GitHubActionsStep>(job.Steps);
5050

5151
// only need to list the ones that are missing from default image
52-
/*
53-
newSteps.Insert(0, new GitHubActionsSetupDotNetStep(new[]
54-
{
55-
"8.0.100"
56-
}));
57-
*/
52+
newSteps.Insert(0, new GitHubActionsSetupDotNetStep(["6.0"]));
5853

5954
var onWindows = image.ToString().StartsWith("windows", StringComparison.OrdinalIgnoreCase);
6055
if (onWindows)

‎build/Build.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ void PublishConsoleProject(Project project, string[] targetFrameworks)
268268
PublishConsoleProject(consoleX86Project, ["net462"]);
269269
PublishConsoleProject(consoleProject, ["net462"]);
270270
}
271-
PublishConsoleProject(consoleCoreProject, ["net6.0", "net7.0", "net8.0"]);
271+
PublishConsoleProject(consoleCoreProject, ["net6.0", "net8.0"]);
272272

273273
void CopyConsoleBinaries(AbsolutePath target)
274274
{
@@ -285,7 +285,6 @@ void CopyConsoleBinaries(AbsolutePath target)
285285
}
286286

287287
CopyDirectoryRecursively(ArtifactsDirectory / "publish" / consoleCoreProject.Name / (configuration + "_net6.0"), target / "Net60");
288-
CopyDirectoryRecursively(ArtifactsDirectory / "publish" / consoleCoreProject.Name / (configuration + "_net7.0"), target / "Net70");
289288
CopyDirectoryRecursively(ArtifactsDirectory / "publish" / consoleCoreProject.Name / (configuration + "_net8.0"), target / "Net80");
290289
}
291290

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
<_NSwagCommand>$(NSwagExe)</_NSwagCommand>
55
<_NSwagCommand
66
Condition="'$(MSBuildRuntimeType)' == 'Core'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net60)/dotnet-nswag.dll"</_NSwagCommand>
7-
<_NSwagCommand
8-
Condition="'$(TargetFramework)' == 'net7.0'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net70)/dotnet-nswag.dll"</_NSwagCommand>
97
<_NSwagCommand
108
Condition="'$(TargetFramework)' == 'net8.0'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net80)/dotnet-nswag.dll"</_NSwagCommand>
119
</PropertyGroup>

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

Lines changed: 1 addition & 6 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;net7.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net462;netstandard2.0;net6.0;net8.0</TargetFrameworks>
44
<PackageTags>Swagger Documentation AspNetCore NetCore TypeScript CodeGen</PackageTags>
55
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
66
<SymbolPackageFormat>symbols.nupkg</SymbolPackageFormat>
@@ -47,11 +47,6 @@
4747
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6)" />
4848
</ItemGroup>
4949

50-
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
51-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
52-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet7)" />
53-
</ItemGroup>
54-
5550
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
5651
<FrameworkReference Include="Microsoft.AspNetCore.App" />
5752
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet8)" />

‎src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,6 @@
4646
<dependency id="Microsoft.Extensions.ApiDescription.Server" version="$microsoftExtensionsApiDescriptionServerPackageVersion$" />
4747
<dependency id="Microsoft.Extensions.FileProviders.Embedded" version="$MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6$" exclude="Build,Analyzers" />
4848
</group>
49-
<group targetFramework="net7.0">
50-
<dependency id="NSwag.Annotations" version="$version$" exclude="Build,Analyzers" />
51-
<dependency id="NSwag.Core" version="$version$" exclude="Build,Analyzers" />
52-
<dependency id="NSwag.Core.Yaml" version="$version$" exclude="Build,Analyzers" />
53-
<dependency id="NSwag.Generation.AspNetCore" version="$version$" exclude="Build,Analyzers" />
54-
<dependency id="NSwag.Generation" version="$version$" exclude="Build,Analyzers" />
55-
<dependency id="Microsoft.Extensions.ApiDescription.Server" version="$microsoftExtensionsApiDescriptionServerPackageVersion$" />
56-
<dependency id="Microsoft.Extensions.FileProviders.Embedded" version="$MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet7$" exclude="Build,Analyzers" />
57-
</group>
5849
<group targetFramework="net8.0">
5950
<dependency id="NSwag.Annotations" version="$version$" exclude="Build,Analyzers" />
6051
<dependency id="NSwag.Core" version="$version$" exclude="Build,Analyzers" />
@@ -76,8 +67,6 @@
7667
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_netstandard2.0\NSwag.AspNetCore.xml" target="lib\netstandard2.0\" />
7768
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net6.0\NSwag.AspNetCore.dll" target="lib\net6.0\" />
7869
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net6.0\NSwag.AspNetCore.xml" target="lib\net6.0\" />
79-
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net7.0\NSwag.AspNetCore.dll" target="lib\net7.0\" />
80-
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net7.0\NSwag.AspNetCore.xml" target="lib\net7.0\" />
8170
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net8.0\NSwag.AspNetCore.dll" target="lib\net8.0\" />
8271
<file src="..\..\artifacts\bin\NSwag.AspNetCore\$configuration$_net8.0\NSwag.AspNetCore.xml" target="lib\net8.0\" />
8372
</files>

‎src/NSwag.Commands/NSwag.Commands.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net462;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<!-- obsolete usage, missing comments -->
77
<NoWarn>$(NoWarn),618,1591</NoWarn>
@@ -17,12 +17,6 @@
1717
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
1818
</ItemGroup>
1919

20-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
21-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
22-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.0" />
23-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
24-
</ItemGroup>
25-
2620
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
2721
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
2822
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />

‎src/NSwag.Commands/NSwagDocument.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,6 @@ private string GetArgumentsPrefix()
243243
{
244244
return "\"" + System.IO.Path.Combine(RootBinaryDirectory, "Net60/dotnet-nswag.dll") + "\" ";
245245
}
246-
else if (runtime == Runtime.Net70)
247-
{
248-
return "\"" + System.IO.Path.Combine(RootBinaryDirectory, "Net70/dotnet-nswag.dll") + "\" ";
249-
}
250246
else if (runtime == Runtime.Net80)
251247
{
252248
return "\"" + System.IO.Path.Combine(RootBinaryDirectory, "Net80/dotnet-nswag.dll") + "\" ";

‎src/NSwag.Commands/Runtime.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ public enum Runtime
2323
/// <summary>.NET 6 app.</summary>
2424
Net60,
2525

26-
/// <summary>.NET 7 app.</summary>
27-
Net70,
28-
2926
/// <summary>.NET 8 app.</summary>
3027
Net80,
3128

0 commit comments

Comments
 (0)