Skip to content

Commit

Permalink
upgrade to dotnet 8
Browse files Browse the repository at this point in the history
  • Loading branch information
LewisPercival committed Apr 11, 2024
1 parent 31ac03f commit 63de29a
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 29 deletions.
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="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="3.0.2" />
<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>

0 comments on commit 63de29a

Please sign in to comment.