Extended ci, extended target frameworks (#2)

* - Added core 7 and 5 to target frameworks - Changed build dotnet version to core net 7 * removed true on end * update dependencies * changed version to release --------- Co-authored-by: Павлов Леонид Алексеевич <lpavlov@nvtech.ru>
Zefirrat · Dec 13, 2023 · 43eb62a · 43eb62a
1 parent e44ce1a
commit 43eb62a
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 23 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1
+          dotnet-version: 7.*
       - name: Build Zefirrat.ImageComparer.Abstractions
         run: dotnet build -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer" /p:RepositoryUrl="https://github.com/Zefirrat/ImageComparer" /p:IconUrl="https://avatars.githubusercontent.com/u/37443756?v=4" /p:Description="Recognition of similar or same images with varying degrees of accuracy. For example for images with noise the similarity of compressed images and the original ones to search for the original im…" ./Zefirrat.ImageComparer.Abstractions
       - name: Pack Zefirrat.ImageComparer.Abstractions
@@ -23,9 +23,9 @@ jobs:
           name: Zefirrat.ImageComparer.Abstractions
           path: ./Zefirrat.ImageComparer.Abstractions/bin/Release/Zefirrat.ImageComparer.Abstractions.${{ github.event.release.tag_name }}.nupkg
       - name: Publish Nuget Zefirrat.ImageComparer.Abstractions to nuget
-        run: dotnet nuget push Zefirrat.ImageComparer.Abstractions/bin/Release/Zefirrat.ImageComparer.Abstractions.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key }} --source https://api.nuget.org/v3/index.json --no-symbols true
+        run: dotnet nuget push Zefirrat.ImageComparer.Abstractions/bin/Release/Zefirrat.ImageComparer.Abstractions.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key }} --source https://api.nuget.org/v3/index.json --no-symbols
       - name: Publish Nuget Zefirrat.ImageComparer.Abstractions to github
-        run: dotnet nuget push Zefirrat.ImageComparer.Abstractions/bin/Release/Zefirrat.ImageComparer.Abstractions.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key_github }} --source "github" --no-symbols true
+        run: dotnet nuget push Zefirrat.ImageComparer.Abstractions/bin/Release/Zefirrat.ImageComparer.Abstractions.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key_github }} --source "github" --no-symbols
 
 # Zefirrat.ImageComparer.AspNet.Di
   Zefirrat_ImageComparer_AspNet_Di:
@@ -35,7 +35,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1
+          dotnet-version: 7.*
       - name: Build Zefirrat.ImageComparer.AspNet.Di
         run: dotnet build -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer" /p:RepositoryUrl="https://github.com/Zefirrat/ImageComparer" /p:IconUrl="https://avatars.githubusercontent.com/u/37443756?v=4" /p:Description="Recognition of similar or same images with varying degrees of accuracy. For example for images with noise the similarity of compressed images and the original ones to search for the original im…" ./Zefirrat.ImageComparer.AspNet.Di
       - name: Pack Zefirrat.ImageComparer.AspNet.Di
@@ -46,9 +46,9 @@ jobs:
           name: Zefirrat.ImageComparer.AspNet.Di
           path: ./Zefirrat.ImageComparer.AspNet.Di/bin/Release/Zefirrat.ImageComparer.AspNet.Di.${{ github.event.release.tag_name }}.nupkg
       - name: Publish Nuget Zefirrat.ImageComparer.AspNet.Di
-        run: dotnet nuget push Zefirrat.ImageComparer.AspNet.Di/bin/Release/Zefirrat.ImageComparer.AspNet.Di.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key }} --source https://api.nuget.org/v3/index.json --no-symbols true
+        run: dotnet nuget push Zefirrat.ImageComparer.AspNet.Di/bin/Release/Zefirrat.ImageComparer.AspNet.Di.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key }} --source https://api.nuget.org/v3/index.json --no-symbols
       - name: Publish Nuget Zefirrat.ImageComparer.AspNet.Di to github
-        run: dotnet nuget push Zefirrat.ImageComparer.AspNet.Di/bin/Release/Zefirrat.ImageComparer.AspNet.Di.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key_github }} --source "github" --no-symbols true
+        run: dotnet nuget push Zefirrat.ImageComparer.AspNet.Di/bin/Release/Zefirrat.ImageComparer.AspNet.Di.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key_github }} --source "github" --no-symbols
 
 # Zefirrat.ImageComparer.Hash
   Zefirrat_ImageComparer_Hash:
@@ -58,7 +58,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1
+          dotnet-version: 7.*
       - name: Build Zefirrat.ImageComparer.Hash
         run: dotnet build -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer" /p:RepositoryUrl="https://github.com/Zefirrat/ImageComparer" /p:IconUrl="https://avatars.githubusercontent.com/u/37443756?v=4" /p:Description="Recognition of similar or same images with varying degrees of accuracy. For example for images with noise the similarity of compressed images and the original ones to search for the original im…" ./Zefirrat.ImageComparer.Hash
       - name: Pack Zefirrat.ImageComparer.Hash
@@ -69,9 +69,9 @@ jobs:
           name: Zefirrat.ImageComparer.Hash
           path: ./Zefirrat.ImageComparer.Hash/bin/Release/Zefirrat.ImageComparer.Hash.${{ github.event.release.tag_name }}.nupkg
       - name: Publish Nuget Zefirrat.ImageComparer.Hash
-        run: dotnet nuget push Zefirrat.ImageComparer.Hash/bin/Release/Zefirrat.ImageComparer.Hash.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key }} --source https://api.nuget.org/v3/index.json --no-symbols true
+        run: dotnet nuget push Zefirrat.ImageComparer.Hash/bin/Release/Zefirrat.ImageComparer.Hash.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key }} --source https://api.nuget.org/v3/index.json --no-symbols
       - name: Publish Nuget Zefirrat.ImageComparer.Hash to github
-        run: dotnet nuget push Zefirrat.ImageComparer.Hash/bin/Release/Zefirrat.ImageComparer.Hash.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key_github }} --source "github" --no-symbols true
+        run: dotnet nuget push Zefirrat.ImageComparer.Hash/bin/Release/Zefirrat.ImageComparer.Hash.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key_github }} --source "github" --no-symbols
 
 # Zefirrat.ImageComparer
   Zefirrat_ImageComparer:
@@ -81,7 +81,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1
+          dotnet-version: 7.*
       - name: Build Zefirrat.ImageComparer
         run: dotnet build -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer" /p:RepositoryUrl="https://github.com/Zefirrat/ImageComparer" /p:IconUrl="https://avatars.githubusercontent.com/u/37443756?v=4" /p:Description="Recognition of similar or same images with varying degrees of accuracy. For example for images with noise the similarity of compressed images and the original ones to search for the original im…" ./Zefirrat.ImageComparer
       - name: Pack Zefirrat.ImageComparer
@@ -92,9 +92,9 @@ jobs:
           name: Zefirrat.ImageComparer
           path: ./Zefirrat.ImageComparer/bin/Release/Zefirrat.ImageComparer.${{ github.event.release.tag_name }}.nupkg
       - name: Publish Nuget Zefirrat.ImageComparer
-        run: dotnet nuget push Zefirrat.ImageComparer/bin/Release/Zefirrat.ImageComparer.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key }} --source https://api.nuget.org/v3/index.json --no-symbols true
+        run: dotnet nuget push Zefirrat.ImageComparer/bin/Release/Zefirrat.ImageComparer.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key }} --source https://api.nuget.org/v3/index.json --no-symbols
       - name: Publish Nuget Zefirrat.ImageComparer to github
-        run: dotnet nuget push Zefirrat.ImageComparer/bin/Release/Zefirrat.ImageComparer.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key_github }} --source "github" --no-symbols true
+        run: dotnet nuget push Zefirrat.ImageComparer/bin/Release/Zefirrat.ImageComparer.${{ github.event.release.tag_name }}.nupkg --api-key ${{ secrets.nuget_api_key_github }} --source "github" --no-symbols
 
 
 
diff --git a/ConsoleApp1/ConsoleApp1.csproj b/ConsoleApp1/ConsoleApp1.csproj
@@ -10,7 +10,7 @@
 
 
     <ItemGroup>
-      <PackageReference Include="Zefirrat.ImageComparer" Version="1.1.0" />
+      <PackageReference Include="Zefirrat.ImageComparer" Version="1.1.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/Zefirrat.ImageComparer.Abstractions/Zefirrat.ImageComparer.Abstractions.csproj b/Zefirrat.ImageComparer.Abstractions/Zefirrat.ImageComparer.Abstractions.csproj
@@ -18,7 +18,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <TargetFrameworks>netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net7;net5;netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
         <LangVersion>8</LangVersion>
         <ImplicitUsings>disable</ImplicitUsings>
         <Author>Zefirrat</Author>

diff --git a/Zefirrat.ImageComparer.AspNet.Di/Zefirrat.ImageComparer.AspNet.Di.csproj b/Zefirrat.ImageComparer.AspNet.Di/Zefirrat.ImageComparer.AspNet.Di.csproj
@@ -16,7 +16,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <TargetFrameworks>netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net7;net5;netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
         <LangVersion>8</LangVersion>
         <ImplicitUsings>disable</ImplicitUsings>
         <Author>Zefirrat</Author>
@@ -25,8 +25,8 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0"/>
-        <PackageReference Include="Zefirrat.ImageComparer.Abstractions" Version="1.1.0" />
-        <PackageReference Include="Zefirrat.ImageComparer" Version="1.1.0" />
+        <PackageReference Include="Zefirrat.ImageComparer.Abstractions" Version="1.1.0.1" />
+        <PackageReference Include="Zefirrat.ImageComparer" Version="1.1.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/Zefirrat.ImageComparer.Hash/Zefirrat.ImageComparer.Hash.csproj b/Zefirrat.ImageComparer.Hash/Zefirrat.ImageComparer.Hash.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <PackageIconUrl>https://avatars.githubusercontent.com/u/37443756?v=4</PackageIconUrl>
+        <TargetFrameworks>net7;net5;netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Zefirrat.ImageComparer.Abstractions" Version="1.1.0" />
+      <PackageReference Include="Zefirrat.ImageComparer.Abstractions" Version="1.1.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/Zefirrat.ImageComparer/Zefirrat.ImageComparer.csproj b/Zefirrat.ImageComparer/Zefirrat.ImageComparer.csproj
@@ -16,15 +16,15 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <TargetFrameworks>netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net7;net5;netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
         <LangVersion>8</LangVersion>
         <ImplicitUsings>disable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
       <PackageReference Include="SixLabors.ImageSharp" Version="2.1.6" />
-      <PackageReference Include="Zefirrat.ImageComparer.Abstractions" Version="1.1.0" />
-      <PackageReference Include="Zefirrat.ImageComparer.Hash" Version="1.1.0" />
+      <PackageReference Include="Zefirrat.ImageComparer.Abstractions" Version="1.1.0.1" />
+      <PackageReference Include="Zefirrat.ImageComparer.Hash" Version="1.1.0.1" />
     </ItemGroup>
 
 

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "3.1.0",
+    "version": "7.0.0",
     "rollForward": "latestMinor",
     "allowPrerelease": true
   }