Skip to content

Commit 3d72e7a

Browse files
commonsensesoftwarecommonsensesoftware
committed
Update to .NET 7 and remove .NET Core 3.1
1 parent 8832313 commit 3d72e7a

File tree

80 files changed

+130
-581
lines changed

Some content is hidden

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

80 files changed

+130
-581
lines changed

‎build/steps-ci.yml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,11 @@ parameters:
77
default: Release
88

99
steps:
10-
- task: UseDotNet@2
11-
displayName: Install .NET 3.1
12-
inputs:
13-
packageType: sdk
14-
version: 3.1.x
15-
1610
- task: UseDotNet@2
1711
displayName: Install .NET SDK
1812
inputs:
1913
packageType: sdk
20-
version: 6.0.x
14+
version: 7.0.x # https://github.com/dotnet/core/blob/main/release-notes/releases-index.json
2115

2216
- task: DotNetCoreCLI@2
2317
displayName: Build and Test

‎build/test.targets‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44
<PropertyGroup>
5-
<FluentAssertionsVersion>6.7.0</FluentAssertionsVersion>
5+
<FluentAssertionsVersion>6.8.0</FluentAssertionsVersion>
66
<MoqVersion>4.18.2</MoqVersion>
77
<XunitRunnerVersion>2.4.5</XunitRunnerVersion>
8-
<TestHostVersion>6.0.8-*</TestHostVersion>
98
</PropertyGroup>
109

1110
<PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
@@ -14,20 +13,16 @@
1413
<XunitRunnerVersion>2.4.3</XunitRunnerVersion>
1514
</PropertyGroup>
1615

17-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
18-
<TestHostVersion>3.1.28</TestHostVersion>
19-
</PropertyGroup>
20-
2116
<ItemGroup Condition=" '$(IsSharedProject)' == 'false' ">
2217
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0-*" />
2419
<PackageReference Include="Moq" Version="$(MoqVersion)" />
2520
<PackageReference Include="xunit" Version="2.4.2" />
2621
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)" />
2722
</ItemGroup>
2823

2924
<ItemGroup Condition=" '$(IsAspNetCore)' == 'true' ">
30-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(TestHostVersion)" />
25+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.0" />
3126
</ItemGroup>
3227

3328
<ItemGroup>

‎examples/AspNetCore/OData/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Condition="Exists($([MSBuild]::GetPathOfFileAbove('$(MSBuildThisFile)','$(MSBuildThisFileDirectory)../')))"/>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.10" />
8+
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.11" />
99
</ItemGroup>
1010

1111
</Project>

‎examples/AspNetCore/OData/ODataAdvancedExample/ODataAdvancedExample.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎examples/AspNetCore/OData/ODataBasicExample/ODataBasicExample.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎examples/AspNetCore/OData/ODataConventionsExample/ODataConventionsExample.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎examples/AspNetCore/OData/ODataOpenApiExample/ODataOpenApiExample.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.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0-*" />
9+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0-*" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎examples/AspNetCore/OData/SomeODataOpenApiExample/SomeODataOpenApiExample.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.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0-*" />
9+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0-*" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎examples/AspNetCore/WebApi/BasicExample/BasicExample.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎examples/AspNetCore/WebApi/ByNamespaceExample/ByNamespaceExample.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)