Skip to content

Commit 8e8fe58

Browse files
committed
Update dotnetcore.yml And Support .NET6/7 TFM
1 parent d12d04f commit 8e8fe58

File tree

7 files changed

+11
-8
lines changed

7 files changed

+11
-8
lines changed

.github/workflows/dotnetcore.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: .NET Core
22

3-
on: [push]
3+
on:
4+
push:
5+
branches: [ "develop", "release/*", "master" ]
6+
pull_request:
7+
branches: [ "develop", "release/*", "master" ]
48

59
jobs:
610
ubuntu-latest:

src/Magicodes.ExporterAndImporter.Csv/Magicodes.IE.Csv.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\common.props"></Import>
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.Csv</PackageId>
66
</PropertyGroup>
77
<ItemGroup>

src/Magicodes.ExporterAndImporter.Excel/Magicodes.IE.Excel.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\common.props"></Import>
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.Excel</PackageId>
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="DynamicExpresso.Core" Version="2.3.3" />
9-
<!--<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />-->
109
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.6" />
1110
</ItemGroup>
1211
<ItemGroup>

src/Magicodes.ExporterAndImporter.Html/Magicodes.IE.Html.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\common.props"></Import>
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.Html</PackageId>
66
</PropertyGroup>
77

src/Magicodes.ExporterAndImporter.Pdf/Magicodes.IE.Pdf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\common.props"></Import>
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.Pdf</PackageId>
66
</PropertyGroup>
77
<!--<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

src/Magicodes.ExporterAndImporter.Word/Magicodes.IE.Word.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\common.props"></Import>
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.Word</PackageId>
66
</PropertyGroup>
77

src/Magicodes.IE.Excel.NPOI/Magicodes.IE.Excel.NPOI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

0 commit comments

Comments
 (0)