Skip to content

Commit

Permalink
Add support for .NET 6 (#5572)
Browse files Browse the repository at this point in the history
* Add support for .NET 6

* Update workflows

* Update TFM test

* Revert "Add support for .NET 6"

This reverts commit eeffc98.

* update to .net6

* update to  .net6

* update to .net6

* Use windows-2022 runner

* Remove unneeded msbuild files

* Update TFM of legacy web projects

* Update AzureFunctions worker samples

Co-authored-by: Brandon Ording <bording@gmail.com>
  • Loading branch information
soujay and bording authored Dec 16, 2021
1 parent c97bd71 commit 2a0b44d
Show file tree
Hide file tree
Showing 671 changed files with 753 additions and 707 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-solutions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ env:
jobs:
build-solutions:
name: Build samples & snippets
runs-on: windows-latest
runs-on: windows-2022
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup .NET 5 SDK
- name: Setup .NET SDK
uses: actions/setup-dotnet@v1.8.1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v1
- name: Build affected samples & snippets
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/validate-pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,40 @@ env:
jobs:
content-verification:
name: Content verification
runs-on: windows-latest
runs-on: windows-2022
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup .NET 5 SDK
- name: Setup .NET SDK
uses: actions/setup-dotnet@v1.8.1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Install docstool
run: dotnet tool install -g Particular.DocsTool --add-source=https://www.myget.org/F/particular/api/v3/index.json
- name: Run docstool
run: docstool test
integrity-tests:
name: Integrity tests
runs-on: windows-latest
runs-on: windows-2022
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup .NET 5 SDK
- name: Setup .NET SDK
uses: actions/setup-dotnet@v1.8.1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Run integrity tests
run: dotnet test tests/IntegrityTests/IntegrityTests.csproj --configuration Release
build-projects:
name: Build samples & snippets
runs-on: windows-latest
runs-on: windows-2022
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup .NET 5 SDK
- name: Setup .NET SDK
uses: actions/setup-dotnet@v1.8.1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
- name: Build affected samples & snippets
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/verify-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ env:
jobs:
content-verification:
name: Content verification
runs-on: windows-latest
runs-on: windows-2022
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup .NET Core SDK
- name: Setup .NET SDK
uses: actions/setup-dotnet@v1.8.1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Install docstool
run: dotnet tool install -g Particular.DocsTool --add-source=https://www.myget.org/F/particular/api/v3/index.json
- name: Run docstool
Expand All @@ -36,14 +36,14 @@ jobs:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DOCS_CHANNEL_WEBHOOK }}
integrity-tests:
name: Integrity tests
runs-on: windows-latest
runs-on: windows-2022
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup .NET 5 SDK
- name: Setup .NET SDK
uses: actions/setup-dotnet@v1.8.1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Run integrity tests
run: dotnet test tests/IntegrityTests/IntegrityTests.csproj --configuration Release
- name: Notify Slack on failure
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
<TargetFramework>net6.0</TargetFramework>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
<TargetFramework>net6.0</TargetFramework>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
<TargetFramework>net6.0</TargetFramework>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
<RootNamespace>Endpoint</RootNamespace>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net48</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
<LangVersion>7.3</LangVersion>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
<LangVersion>7.3</LangVersion>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
<LangVersion>7.3</LangVersion>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
<LangVersion>7.3</LangVersion>
</PropertyGroup>

Expand Down
Loading

0 comments on commit 2a0b44d

Please sign in to comment.