Merge pull request #67 from dodopizza/add-net6

dodopizza · Mar 3, 2022 · e6e4966 · e6e4966
2 parents 1c8b801 + b188201
commit e6e4966
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,9 +18,9 @@ jobs:
     strategy:
       matrix:
         dotnet: [
-          { framework: netcoreapp2.1, version: 2.1.x },
           { framework: netcoreapp3.1, version: 3.1.x },
           { framework: net5.0, version: 5.0.x },
+          { framework: net6.0, version: 6.0.x },
         ]
 
     name: ${{ matrix.dotnet.framework }} – run tests

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -12,9 +12,9 @@ jobs:
     strategy:
       matrix:
         dotnet: [
-          { framework: netcoreapp2.1, version: 2.1.x },
           { framework: netcoreapp3.1, version: 3.1.x },
           { framework: net5.0, version: 5.0.x },
+          { framework: net6.0, version: 6.0.x },
         ]
 
     name: ${{ matrix.dotnet.framework }} – run tests

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,9 +11,9 @@ jobs:
     strategy:
       matrix:
         dotnet: [
-          { framework: netcoreapp2.1, version: 2.1.x },
           { framework: netcoreapp3.1, version: 3.1.x },
           { framework: net5.0, version: 5.0.x },
+          { framework: net6.0, version: 6.0.x },
         ]
 
     name: ${{ matrix.dotnet.framework }} – run tests
@@ -63,7 +63,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
 
       - name: Build and publish library to NuGet
         run: |

diff --git a/lgtm.yml b/lgtm.yml
@@ -2,4 +2,4 @@ extraction:
   csharp:
     index:
       dotnet:
-        version: 5.0.100
+        version: 6.0.200
diff --git a/src/Dodo.HttpClient.ResiliencePolicies.Tests/Dodo.HttpClient.ResiliencePolicies.Tests.csproj b/src/Dodo.HttpClient.ResiliencePolicies.Tests/Dodo.HttpClient.ResiliencePolicies.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(Framework)' != 'netcoreapp2.1'">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-    <TargetFramework Condition="'$(Framework)' == 'netcoreapp2.1'">netcoreapp2.1</TargetFramework>
+    <TargetFrameworks Condition="'$(Framework)' != 'net5.0'">netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFramework Condition="'$(Framework)' == 'net5.0'">net5.0</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <IsPackable>false</IsPackable>
     <RootNamespace>Dodo.HttpClientResiliencePolicies.Tests</RootNamespace>

diff --git a/src/Dodo.HttpClient.ResiliencePolicies/Dodo.HttpClient.ResiliencePolicies.csproj b/src/Dodo.HttpClient.ResiliencePolicies/Dodo.HttpClient.ResiliencePolicies.csproj
@@ -1,35 +1,48 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(Framework)' != 'netcoreapp2.1'">netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
-    <TargetFramework Condition="'$(Framework)' == 'netcoreapp2.1'">netstandard2.0</TargetFramework>
+    <!-- The tricky part is that only latest sdk can respect properly each TargetFrameworks entry. It means if you plan to release new package version you have to use latest sdk version. -->
+    <TargetFrameworks Condition="'$(Framework)' != 'net5.0' and '$(Framework)' != 'netcoreapp3.1'">netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <!-- These entries are needed for unit tests for older platform versions. -->
+    <TargetFramework Condition="'$(Framework)' == 'net5.0'">net5.0</TargetFramework>
+    <TargetFramework Condition="'$(Framework)' == 'netcoreapp3.1'">netcoreapp3.1</TargetFramework>
     <LangVersion>8.0</LangVersion>
-    <VersionPrefix>2.0.1</VersionPrefix>
+    <VersionPrefix>2.0.2</VersionPrefix>
     <Title>Dodo.HttpClient.ResiliencePolicies</Title>
     <RootNamespace>Dodo.HttpClientResiliencePolicies</RootNamespace>
     <WarningsAsErrors>true</WarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Polly" Version="7.2.1" />
-    <PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
+    <PackageReference Include="Polly" Version="7.2.2"/>
+    <PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[2.1.0,)"/>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="[2.1.0,)"/>
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="[2.1.0,)"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.0,)"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.0,)"/>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="[3.1.0,)"/>
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="[3.1.0,)"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.0,)"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[5.0.0,)"/>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="[5.0.0,)"/>
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="[5.0.0,)"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[5.0.0,)"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[6.0.0,)"/>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="[6.0.0,)"/>
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="[6.0.0,)"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[6.0.0,)"/>
   </ItemGroup>
 
   <ItemGroup>
@@ -49,7 +62,7 @@
       <Link>README.md</Link>
     </None>
   </ItemGroup>
-  
+
   <PropertyGroup Label="nuspec">
     <PackageId>Dodo.HttpClient.ResiliencePolicies</PackageId>
     <AssemblyTitle>Dodo.HttpClient.ResiliencePolicies</AssemblyTitle>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ extraction: @@
       csharp:
         index:
           dotnet:
-            version: 5.0.100
+            version: 6.0.200