diff options
| author | Andrew Arnott <andrewarnott@live.com> | 2022-06-16 07:21:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-16 07:21:34 +0300 |
| commit | 888ecb280ba620a2de1d8445b6661fb3e22ffcf7 (patch) | |
| tree | 1cb898a2a396003776b69d4eb38d1843d37ce20e | |
| parent | f1b42c0770b716852fb166c51d8651642c58f8e1 (diff) | |
| parent | a346d11182fb658aea8d86c3dcf7b85b30e7b22c (diff) | |
Merge pull request #1448 from AArnott/dropNet5.0
Drop net5.0 runtime targets
| -rw-r--r-- | azure-pipelines/build_nonWindows.yml | 8 | ||||
| -rw-r--r-- | sandbox/PerfBenchmarkDotNet/PerfBenchmarkDotNet.csproj | 2 | ||||
| -rw-r--r-- | sandbox/PerfNetFramework/PerfNetFramework.csproj | 2 | ||||
| -rw-r--r-- | src/MessagePack.Generator/MessagePack.Generator.csproj | 2 | ||||
| -rw-r--r-- | src/MessagePack/MessagePack.csproj | 2 | ||||
| -rw-r--r-- | tests/MessagePack.Tests/MessagePack.Tests.csproj | 2 |
6 files changed, 5 insertions, 13 deletions
diff --git a/azure-pipelines/build_nonWindows.yml b/azure-pipelines/build_nonWindows.yml index 9a57e2f9..cf3f51d7 100644 --- a/azure-pipelines/build_nonWindows.yml +++ b/azure-pipelines/build_nonWindows.yml @@ -14,14 +14,6 @@ steps: testRunTitle: netcoreapp3.1-$(Agent.JobName) - task: DotNetCoreCLI@2 - displayName: Run MessagePack.Tests (net5.0) - inputs: - command: test - projects: tests/MessagePack.Tests/MessagePack.Tests.csproj - arguments: --no-build -c $(BuildConfiguration) -f net5.0 -v n --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings" - testRunTitle: net5.0-$(Agent.JobName) - -- task: DotNetCoreCLI@2 displayName: Run MessagePack.Tests (net6.0) inputs: command: test diff --git a/sandbox/PerfBenchmarkDotNet/PerfBenchmarkDotNet.csproj b/sandbox/PerfBenchmarkDotNet/PerfBenchmarkDotNet.csproj index d9a575d0..6804253d 100644 --- a/sandbox/PerfBenchmarkDotNet/PerfBenchmarkDotNet.csproj +++ b/sandbox/PerfBenchmarkDotNet/PerfBenchmarkDotNet.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>Exe</OutputType> - <TargetFrameworks>net472;net5.0</TargetFrameworks> + <TargetFrameworks>net472;net6.0</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> </PropertyGroup> diff --git a/sandbox/PerfNetFramework/PerfNetFramework.csproj b/sandbox/PerfNetFramework/PerfNetFramework.csproj index 89e5cedf..57cbfd36 100644 --- a/sandbox/PerfNetFramework/PerfNetFramework.csproj +++ b/sandbox/PerfNetFramework/PerfNetFramework.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>Exe</OutputType> - <TargetFrameworks>net472;net5.0</TargetFrameworks> + <TargetFrameworks>net472;net6.0</TargetFrameworks> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> </PropertyGroup> <ItemGroup> diff --git a/src/MessagePack.Generator/MessagePack.Generator.csproj b/src/MessagePack.Generator/MessagePack.Generator.csproj index f4bd5656..42b02f30 100644 --- a/src/MessagePack.Generator/MessagePack.Generator.csproj +++ b/src/MessagePack.Generator/MessagePack.Generator.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <AssemblyName>mpc</AssemblyName> <OutputType>Exe</OutputType> - <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks> + <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks> <LangVersion>10</LangVersion> <Nullable>enable</Nullable> <IsPackable>true</IsPackable> diff --git a/src/MessagePack/MessagePack.csproj b/src/MessagePack/MessagePack.csproj index cb24047a..801ab7de 100644 --- a/src/MessagePack/MessagePack.csproj +++ b/src/MessagePack/MessagePack.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6.0</TargetFrameworks> <NoWarn>$(NoWarn);CS0649</NoWarn> <AllowUnsafeBlocks>True</AllowUnsafeBlocks> <DefineConstants Condition=" '$(TargetFramework)' != 'netstandard2.0' ">$(DefineConstants);SPAN_BUILTIN</DefineConstants> diff --git a/tests/MessagePack.Tests/MessagePack.Tests.csproj b/tests/MessagePack.Tests/MessagePack.Tests.csproj index f6ff6860..5fb26383 100644 --- a/tests/MessagePack.Tests/MessagePack.Tests.csproj +++ b/tests/MessagePack.Tests/MessagePack.Tests.csproj @@ -1,6 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>net472;netcoreapp3.1;net5.0;net6.0</TargetFrameworks> + <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <LangVersion>10</LangVersion> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> |