Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dotnet8 #6

Merged
merged 5 commits into from
Apr 22, 2024
Merged
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
- name: Install GitVersion
uses: gittools/actions/gitversion/[email protected]
with:
versionSpec: "5.5.x"
versionSpec: "5.8.x"
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v2
with:
dotnet-version: "3.1.x"
dotnet-version: "8.0.x"
- name: Install dependencies
run: dotnet restore src
- name: Use GitVersion
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
- name: Install GitVersion
uses: gittools/actions/gitversion/[email protected]
with:
versionSpec: "5.5.x"
versionSpec: "5.8.x"
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v2
with:
dotnet-version: "3.1.x"
dotnet-version: "8.0.x"
- name: Install dependencies
run: dotnet restore src
- name: Use GitVersion
Expand Down
4 changes: 1 addition & 3 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
next-version: 1.0.3
next-version: 2.0.0
mode: Mainline
major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
patch-version-bump-message: '\+semver:\s?(fix|patch)'
no-bump-message: '\+semver:\s?(none|skip)'
ignore:
commits-before: 2023-01-01T00:00:00 # what is this for? should it be removed?

Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public IWorkbook GetWorkbook(string dataFile)
private IWorkbook LoadWorkbook(string dataFile)
{
var datafilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data", dataFile);
var workbook = new XLWorkbook(GetMemoryStream(datafilePath), XLEventTracking.Disabled);
var workbook = new XLWorkbook(GetMemoryStream(datafilePath));
var fileName = Path.GetFileName(datafilePath);
return new Workbook(workbook, fileName);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="LittleBlocks.Testing" Version="1.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="LittleBlocks.Testing" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/LittleBlocks.Excel.ClosedXml/DataSheetCell.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public Guid GetGuidMandatory()
public object Value
{
get => _cell.Value;
set => _cell.Value = value;
set => _cell.Value = (XLCellValue)value;
}

public bool IsEmpty()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Mohammad Moattar, Justin French, Aurimas Gecas</Authors>
<Company>ICG</Company>
<Description>LittleBlocks.Excel implementation based on ClosedXML API.</Description>
<RepositoryUrl>https://github.com/LittleBlocks/LittleBlocks.Excel</RepositoryUrl>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ClosedXML" Version="0.97.0" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
<PackageReference Include="System.Drawing.Common" Version="4.5.1" />
<PackageReference Include="ClosedXML" Version="0.102.2" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="System.Drawing.Common" Version="8.0.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LittleBlocks.Excel\LittleBlocks.Excel.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/LittleBlocks.Excel.ClosedXml/WorkbookLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public IWorkbook Load(string path)
var fileName = Path.GetFileName(path);
var stream = FileHelper.ReadFileToMemoryStream(path);

return new Workbook(new XLWorkbook(stream, XLEventTracking.Disabled), fileName);
return new Workbook(new XLWorkbook(stream), fileName);
}
catch (FileFormatException ex)
{
Expand All @@ -54,7 +54,7 @@ public IWorkbook Load(Stream stream)
{
if (stream == null) throw new ArgumentNullException(nameof(stream));

return new Workbook(new XLWorkbook(stream, XLEventTracking.Disabled));
return new Workbook(new XLWorkbook(stream));
}
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Justin French / Aurimas Gecas</Authors>
<Company>ICG</Company>
<Description>Extensions to register with ServiceCollection for Excel.</Description>
<RepositoryUrl>https://github.com/LittleBlocks/LittleBlocks.Excel</RepositoryUrl>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LittleBlocks.Excel.ClosedXml\LittleBlocks.Excel.ClosedXml.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LittleBlocks.Excel.ClosedXml\LittleBlocks.Excel.ClosedXml.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/LittleBlocks.Excel.SampleApp/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private static void ConfigureServices(IServiceCollection services)
private static IWorkbook LoadWorkbook(string dataFile)
{
var datafilePath = $"{AppDomain.CurrentDomain.BaseDirectory}\\data\\{dataFile}";
var workbook = new XLWorkbook(GetMemoryStream(datafilePath), XLEventTracking.Disabled);
var workbook = new XLWorkbook(GetMemoryStream(datafilePath));
var fileName = Path.GetFileName(datafilePath);
return new Workbook(workbook, fileName);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="LittleBlocks.Testing" Version="1.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="LittleBlocks.Testing" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions src/LittleBlocks.Excel/LittleBlocks.Excel.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Authors>Mohammad Moattar, Justin French, Aurimas Gecas</Authors>
<Company>ICG</Company>
<Description>Abstraction &amp; Fluent API for loading and manipulating excel OpenDocument format.</Description>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<RepositoryUrl>https://github.com/LittleBlocks/LittleBlocks.Excel</RepositoryUrl>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="LittleBlocks.Extensions" Version="1.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
<PackageReference Include="LittleBlocks.Extensions" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
</ItemGroup>
</Project>
Loading