Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 39 additions & 12 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,52 @@
name: .NET Core
name: .NET CI

on:
push:
branches: [ master ]
branches: [ main, master ]
pull_request:
branches: [ master ]
branches: [ main, master ]

jobs:
build:

runs-on: ubuntu-latest

runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 3.1.301
- name: Install dependencies
dotnet-version: |
6.0.x
8.0.x
9.0.x

- name: Restore dependencies
run: dotnet restore

- name: Build
run: dotnet build --configuration Release --no-restore

- name: Test
run: dotnet test --no-restore --verbosity normal
run: dotnet test --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=test-results.trx"

- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
with:
name: test-results-${{ matrix.os }}
path: '**/test-results.trx'

- name: Pack NuGet package
if: matrix.os == 'ubuntu-latest'
run: dotnet pack --configuration Release --no-build --output ./artifacts

- name: Upload NuGet package
if: matrix.os == 'ubuntu-latest'
uses: actions/upload-artifact@v4
with:
name: nuget-package
path: ./artifacts/*.nupkg
2 changes: 1 addition & 1 deletion Chsword.Excel2Object.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
.gitattributes = .gitattributes
.gitignore = .gitignore
appveyor.yml = appveyor.yml
.github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml
ExcelFunctions.md = ExcelFunctions.md
README.md = README.md
EndProjectSection
Expand Down
3 changes: 2 additions & 1 deletion Chsword.Excel2Object/Internal/ExcelConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public static class DateFormats
/// This array is intended for use when attempting to parse date/time values from Excel cells that may be formatted in a variety of ways.
/// </remarks>
public static readonly string[] CommonDateTimeFormats =
[
// ISO 8601 formats
"yyyy-MM-ddTHH:mm:ss",
"yyyy-MM-ddTHH:mm:ssZ",
Expand Down Expand Up @@ -99,6 +100,6 @@ public static class DateFormats
"hh:mm tt",
"h:mm:ss tt",
"h:mm tt"
};
];
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![install from nuget](http://img.shields.io/nuget/v/Chsword.Excel2Object.svg?style=flat-square)](https://www.nuget.org/packages/Chsword.Excel2Object)
[![release](https://img.shields.io/github/release/chsword/Excel2Object.svg?style=flat-square)](https://github.com/chsword/Excel2Object/releases)
[![Build status](https://ci.appveyor.com/api/projects/status/4po2h27j7yg4bph5/branch/master?svg=true)](https://ci.appveyor.com/project/chsword/excel2object)
[![Build status](https://github.com/chsword/Excel2Object/actions/workflows/dotnet-core.yml/badge.svg)](https://github.com/chsword/Excel2Object/actions/workflows/dotnet-core.yml)
[![CodeFactor](https://www.codefactor.io/repository/github/chsword/excel2object/badge)](https://www.codefactor.io/repository/github/chsword/excel2object)

Excel 与 .NET 对象互相转换 / Excel convert to .NET Object and vice versa.
Expand Down
2 changes: 1 addition & 1 deletion README_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![install from nuget](http://img.shields.io/nuget/v/Chsword.Excel2Object.svg?style=flat-square)](https://www.nuget.org/packages/Chsword.Excel2Object)
[![release](https://img.shields.io/github/release/chsword/Excel2Object.svg?style=flat-square)](https://github.com/chsword/Excel2Object/releases)
[![Build status](https://ci.appveyor.com/api/projects/status/4po2h27j7yg4bph5/branch/master?svg=true)](https://ci.appveyor.com/project/chsword/excel2object)
[![Build status](https://github.com/chsword/Excel2Object/actions/workflows/dotnet-core.yml/badge.svg)](https://github.com/chsword/Excel2Object/actions/workflows/dotnet-core.yml)
[![CodeFactor](https://www.codefactor.io/repository/github/chsword/excel2object/badge)](https://www.codefactor.io/repository/github/chsword/excel2object)

Excel convert to .NET Object / .NET Object convert to Excel.
Expand Down
16 changes: 0 additions & 16 deletions appveyor.yml

This file was deleted.