Feature/net6.0 (#42)

* net6.0 support
LeonidEfremov · Feb 2, 2022 · 71f4faa · 71f4faa
1 parent 86ab670
commit 71f4faa
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/AspNet.WebApi.Common.Tests/AspNet.WebApi.Common.Tests.csproj b/AspNet.WebApi.Common.Tests/AspNet.WebApi.Common.Tests.csproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591;</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="xUnit.Asserts.Compare" Version="1.0.0.5" />

diff --git a/AspNet.WebApi.Common/AspNet.WebApi.Common.csproj b/AspNet.WebApi.Common/AspNet.WebApi.Common.csproj
@@ -3,8 +3,7 @@
   <PropertyGroup>
     <PackageId>AspNet.WebApi.Common</PackageId>
     <Product>AspNet.WebApi.Common library</Product>
-    <TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>True</IsPackable>
-    <UserSecretsId>c9616ca5-eec0-49bd-9c08-e3b848e06d5b</UserSecretsId>
   </PropertyGroup>
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <VersionPrefix>1.4.0</VersionPrefix>
+    <VersionPrefix>1.5.0</VersionPrefix>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
     <Company></Company>
     <Authors>Leonid Efremov</Authors>

diff --git a/appveyor.yml b/appveyor.yml
@@ -11,15 +11,15 @@ skip_branch_with_pr: true
 
 max_jobs: 1
 
-image: Ubuntu
+image: Ubuntu2004
 
 shallow_clone: false
 
 init:
   - git config --global core.autocrlf input
 
 install:
-  - dotnet tool install --global dotnet-sonarscanner --version 5.2.2
+  - dotnet tool install --global dotnet-sonarscanner --version 5.4.1
   - ps: |
       $content = Get-Content -Path Directory.Build.props
       $regex = New-Object System.Text.RegularExpressions.Regex ('()([\d]+.[\d]+.[\d]+)(<\/VersionPrefix>)', [System.Text.RegularExpressions.RegexOptions]::MultiLine)

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "5.0.300"
+    "version": "6.0.100"
   }
 }