Update dotnetcore.yml And Support .NET6/7 TFM

3 years ago · 8e8fe585fc
7 changed files with 11 additions and 8 deletions
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@ -1,6 +1,10 @@
 name: .NET Core

-on: [push]
+on: 
+  push:
+    branches: [ "develop", "release/*", "master" ]
+  pull_request:
+    branches: [ "develop", "release/*", "master" ]

 jobs:
  ubuntu-latest:
--- a/src/Magicodes.ExporterAndImporter.Csv/Magicodes.IE.Csv.csproj
+++ b/src/Magicodes.ExporterAndImporter.Csv/Magicodes.IE.Csv.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\common.props"></Import>
  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
    <PackageId>Magicodes.IE.Csv</PackageId>
  </PropertyGroup>
  <ItemGroup>
--- a/src/Magicodes.ExporterAndImporter.Excel/Magicodes.IE.Excel.csproj
+++ b/src/Magicodes.ExporterAndImporter.Excel/Magicodes.IE.Excel.csproj
@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\common.props"></Import>
  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
    <PackageId>Magicodes.IE.Excel</PackageId>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="DynamicExpresso.Core" Version="2.3.3" />
-    <!--<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />-->
    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.6" />
  </ItemGroup>
  <ItemGroup>
--- a/src/Magicodes.ExporterAndImporter.Html/Magicodes.IE.Html.csproj
+++ b/src/Magicodes.ExporterAndImporter.Html/Magicodes.IE.Html.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\common.props"></Import>
  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
    <PackageId>Magicodes.IE.Html</PackageId>
  </PropertyGroup>

--- a/src/Magicodes.ExporterAndImporter.Pdf/Magicodes.IE.Pdf.csproj
+++ b/src/Magicodes.ExporterAndImporter.Pdf/Magicodes.IE.Pdf.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\common.props"></Import>
  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
    <PackageId>Magicodes.IE.Pdf</PackageId>
  </PropertyGroup>
  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
--- a/src/Magicodes.ExporterAndImporter.Word/Magicodes.IE.Word.csproj
+++ b/src/Magicodes.ExporterAndImporter.Word/Magicodes.IE.Word.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\common.props"></Import>
  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
    <PackageId>Magicodes.IE.Word</PackageId>
  </PropertyGroup>

--- a/src/Magicodes.IE.Excel.NPOI/Magicodes.IE.Excel.NPOI.csproj
+++ b/src/Magicodes.IE.Excel.NPOI/Magicodes.IE.Excel.NPOI.csproj
@ -2,7 +2,7 @@

 	<Import Project="..\..\common.props"></Import>
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
 		<PackageId>Magicodes.IE.Excel.NPOI</PackageId>
 	</PropertyGroup>
 	<ItemGroup>