Skip to content

Commit d4f9a58

Browse files
WhitWaldoWhitWaldo
authored
Drop .NET 6 and .NET 7 support (#1482)
* Updated Directory.Build.props to drop .NET 6 and .NET 7 targets * Removed explicit .NET targets in favor of using Directory.Build.props * Added Directory.Build.props for all examples, updated examples to favor targeting this file instead * Updated README to include missing packages and reflect a few modernization updates (including the new target versions) * Fixed file numbering in doc * Fixed comment on global.json to reflect use of the 9.0.100 minimum SDK version * Removed .net 6 and 7 targets from GitHub build script * Updated integration test build script to remove .NET 7 and .NET 6 targets Signed-off-by: Whit Waldo <[email protected]>
1 parent 55895fa commit d4f9a58

File tree

40 files changed

+30
-97
lines changed

40 files changed

+30
-97
lines changed

‎.github/workflows/itests.yml‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,8 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
dotnet-version: ['6.0', '7.0', '8.0', '9.0']
23+
dotnet-version: ['8.0', '9.0']
2424
include:
25-
- dotnet-version: '6.0'
26-
display-name: '.NET 6.0'
27-
framework: 'net6'
28-
prefix: 'net6'
29-
install-version: '6.0.x'
30-
- dotnet-version: '7.0'
31-
display-name: '.NET 7.0'
32-
framework: 'net7'
33-
prefix: 'net7'
34-
install-version: '7.0.x'
3525
- dotnet-version: '8.0'
3626
display-name: '.NET 8.0'
3727
framework: 'net8'
@@ -50,7 +40,7 @@ jobs:
5040
GOPROXY: https://proxy.golang.org
5141
DAPR_CLI_VER: 1.15.0
5242
DAPR_RUNTIME_VER: 1.15.3
53-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/release-1.14/install/install.sh
43+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/release-1.15/install/install.sh
5444
DAPR_CLI_REF: ''
5545
steps:
5646
- name: Set up Dapr CLI
@@ -124,9 +114,11 @@ jobs:
124114
with:
125115
dotnet-version: '9.0.x'
126116
dotnet-quality: 'ga'
117+
- name: Restore dependencies
118+
run: dotnet restore
127119
- name: Build
128120
# disable deterministic builds, just for test run. Deterministic builds break coverage for some reason
129-
run: dotnet build --configuration release /p:GITHUB_ACTIONS=false
121+
run: dotnet build --configuration release --no-restore /p:GITHUB_ACTIONS=false
130122
- name: Run General Tests
131123
id: tests
132124
continue-on-error: true # proceed if tests fail, the report step will report the failure with more details.

‎.github/workflows/sdk_build.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ jobs:
2828
with:
2929
dotnet-version: 9.0.x
3030
dotnet-quality: 'ga'
31+
- name: Restore dependencies
32+
run: dotnet restore
3133
- name: Build
32-
run: dotnet build --configuration release
34+
run: dotnet build --configuration release --no-restore
3335
- name: Generate Packages
3436
run: dotnet pack --configuration release
3537
- name: Upload packages
@@ -44,18 +46,8 @@ jobs:
4446
strategy:
4547
fail-fast: false
4648
matrix:
47-
dotnet-version: ['6.0', '7.0', '8.0', '9.0']
49+
dotnet-version: ['8.0', '9.0']
4850
include:
49-
- dotnet-version: '6.0'
50-
display-name: '.NET 6.0'
51-
framework: 'net6'
52-
prefix: 'net6'
53-
install-version: '6.0.x'
54-
- dotnet-version: '7.0'
55-
display-name: '.NET 7.0'
56-
framework: 'net7'
57-
prefix: 'net7'
58-
install-version: '7.0.x'
5951
- dotnet-version: '8.0'
6052
display-name: '.NET 8.0'
6153
framework: 'net8'

‎CONTRIBUTING.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ This section describes the guidelines for contributing code / docs to Dapr.
5454
All contributions come through pull requests. To submit a proposed change, we recommend following this workflow:
5555

5656
1. Make sure there's an issue (bug or proposal) raised, which sets the expectations for the contribution you are about to make.
57-
1. Fork the relevant repo and create a new branch
58-
1. Create your change
57+
2. Fork the relevant repo and create a new branch
58+
3. Create your change
5959
- Code changes require tests
60-
1. Update relevant documentation for the change
61-
1. Commit and open a PR
62-
1. Wait for the CI process to finish and make sure all checks are green
63-
1. A maintainer of the project will be assigned, and you can expect a review within a few days
60+
4. Update relevant documentation for the change
61+
5. Commit and open a PR
62+
6. Wait for the CI process to finish and make sure all checks are green
63+
7. A maintainer of the project will be assigned, and you can expect a review within a few days
6464

6565
#### Use work-in-progress PRs for early feedback
6666

‎README.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,21 @@ This repo builds the following packages:
4444
- Dapr.AspNetCore
4545
- Dapr.Actors
4646
- Dapr.Actors.AspNetCore
47+
- Dapr.Actors.Generators
48+
- Dapr.AI
49+
- Dapr.Jobs
50+
- Dapr.Messaging
4751
- Dapr.Extensions.Configuration
4852
- Dapr.Workflow
4953

54+
It also builds the following packages which are not intended for public use and contain common types used in the packages above:
55+
- Dapr.Common
56+
- Dapr.Protos
57+
58+
5059
### Prerequisites
5160

52-
Each project is a normal C# project. At minimum, you need [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0) to build, test, and generate NuGet packages.
61+
Each project is a normal C# project. At minimum, you need [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0) to build, test, and generate NuGet packages.
5362

5463
Also make sure to reference the [.NET SDK contribution guide](https://docs.dapr.io/contributing/sdk-contrib/dotnet-contributing/)
5564

@@ -59,7 +68,7 @@ On macOS or Linux we recommend [Visual Studio Code](https://code.visualstudio.co
5968

6069
**Windows:**
6170

62-
On Windows, we recommend installing [the latest Visual Studio 2019](https://www.visualstudio.com/vs/) which will set you up with all the .NET build tools and allow you to open the solution files. Community Edition is free and can be used to build everything here.
71+
On Windows, we recommend installing [the latest Visual Studio 2022](https://www.visualstudio.com/vs/) which will set you up with all the .NET build tools and allow you to open the solution files. Community Edition is free and can be used to build everything here.
6372

6473
Make sure you [update Visual Studio to the most recent release](https://docs.microsoft.com/visualstudio/install/update-visual-studio).
6574

‎examples/AI/ConversationalAI/ConversationalAI.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
54
<ImplicitUsings>enable</ImplicitUsings>
65
<Nullable>enable</Nullable>
76
</PropertyGroup>

‎examples/Actor/ActorClient/ActorClient.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6</TargetFramework>
65
</PropertyGroup>
76

87
<ItemGroup>

‎examples/Actor/DemoActor/DemoActor.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
4-
<TargetFramework>net6</TargetFramework>
5-
</PropertyGroup>
6-
73
<PropertyGroup>
84
<IsPublishable>true</IsPublishable>
95
<EnableSdkContainerSupport>true</EnableSdkContainerSupport>

‎examples/Actor/IDemoActor/IDemoActor.csproj‎

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

3-
<PropertyGroup>
4-
<TargetFramework>net6</TargetFramework>
5-
</PropertyGroup>
6-
73
<ItemGroup>
84
<ProjectReference Include="..\..\..\src\Dapr.Actors\Dapr.Actors.csproj" />
95
</ItemGroup>

‎examples/AspNetCore/ControllerSample/ControllerSample.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
4-
<TargetFramework>net6</TargetFramework>
5-
</PropertyGroup>
6-
73
<ItemGroup>
84
<ProjectReference Include="..\..\..\src\Dapr.AspNetCore\Dapr.AspNetCore.csproj" />
95
</ItemGroup>

‎examples/AspNetCore/GrpcServiceSample/GrpcServiceSample.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6</TargetFramework>
54
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
65
</PropertyGroup>
76

0 commit comments

Comments
 (0)