-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
68 changed files
with
232 additions
and
254 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/FsSpreadsheet.Exceljs/Cell.fs → src/FsSpreadsheet.Js/Cell.fs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| namespace FsSpreadsheet.Exceljs | ||
| namespace FsSpreadsheet.Js | ||
|
|
||
|
|
||
| module JsCell = | ||
|
|
||
4 changes: 2 additions & 2 deletions
4
src/FsSpreadsheet.Exceljs/FsExtensions.fs → src/FsSpreadsheet.Js/FsExtensions.fs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 50 additions & 50 deletions
100
...heet.Exceljs/FsSpreadsheet.Exceljs.fsproj → src/FsSpreadsheet.Js/FsSpreadsheet.Js.fsproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,50 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <Authors>Kevin Frey, Heinrich Lukas Weil, Oliver Maus, Kevin Schneider, Timo Mühlhaus</Authors> | ||
| <Description>Excel IO Extensions for the FsSpreadsheet Datamodel in js environments using exceljs.</Description> | ||
| <Summary>Spreadsheet creation and manipulation in FSharp</Summary> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <PackageIcon>logo.png</PackageIcon> | ||
| <PackageTags>F# FSharp spreadsheet Excel xlsx datascience fable fable-library fable-javascript</PackageTags> | ||
| <RepositoryUrl>https://github.com/CSBiology/FsSpreadsheet</RepositoryUrl> | ||
| <RepositoryType>git</RepositoryType> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="..\..\docs\img\logo.png" Link="logo.png"> | ||
| <PackagePath>\</PackagePath> | ||
| <Pack>true</Pack> | ||
| </None> | ||
| <Compile Include="Cell.fs" /> | ||
| <Compile Include="Table.fs" /> | ||
| <Compile Include="Worksheet.fs" /> | ||
| <Compile Include="Workbook.fs" /> | ||
| <Compile Include="Xlsx.fs" /> | ||
| <Compile Include="FsExtensions.fs" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Fable.Exceljs" Version="1.6.0" /> | ||
| <PackageReference Include="Fable.Promise" Version="3.2.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\FsSpreadsheet\FsSpreadsheet.fsproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <NpmDependencies> | ||
| <NpmPackage Name="@nfdi4plants/exceljs" Version="gte 0.1.0 lt 1.0.0" ResolutionStrategy="Max" /> | ||
| </NpmDependencies> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <Authors>Kevin Frey, Heinrich Lukas Weil, Oliver Maus, Kevin Schneider, Timo Mühlhaus</Authors> | ||
| <Description>Excel IO Extensions for the FsSpreadsheet Datamodel in js environments using exceljs.</Description> | ||
| <Summary>Spreadsheet creation and manipulation in FSharp</Summary> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <PackageIcon>logo.png</PackageIcon> | ||
| <PackageTags>F# FSharp spreadsheet Excel xlsx datascience fable fable-library fable-javascript</PackageTags> | ||
| <RepositoryUrl>https://github.com/CSBiology/FsSpreadsheet</RepositoryUrl> | ||
| <RepositoryType>git</RepositoryType> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="..\..\docs\img\logo.png" Link="logo.png"> | ||
| <PackagePath>\</PackagePath> | ||
| <Pack>true</Pack> | ||
| </None> | ||
| <Compile Include="Cell.fs" /> | ||
| <Compile Include="Table.fs" /> | ||
| <Compile Include="Worksheet.fs" /> | ||
| <Compile Include="Workbook.fs" /> | ||
| <Compile Include="Xlsx.fs" /> | ||
| <Compile Include="FsExtensions.fs" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Fable.Exceljs" Version="1.6.0" /> | ||
| <PackageReference Include="Fable.Promise" Version="3.2.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\FsSpreadsheet\FsSpreadsheet.fsproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <NpmDependencies> | ||
| <NpmPackage Name="@nfdi4plants/exceljs" Version="gte 0.1.0 lt 1.0.0" ResolutionStrategy="Max" /> | ||
| </NpmDependencies> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
2 changes: 1 addition & 1 deletion
2
src/FsSpreadsheet.Exceljs/Table.fs → src/FsSpreadsheet.Js/Table.fs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| namespace FsSpreadsheet.Exceljs | ||
| namespace FsSpreadsheet.Js | ||
|
|
||
| module JsTable = | ||
|
|
||
|
|
||
2 changes: 1 addition & 1 deletion
2
src/FsSpreadsheet.Exceljs/Workbook.fs → src/FsSpreadsheet.Js/Workbook.fs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| namespace FsSpreadsheet.Exceljs | ||
| namespace FsSpreadsheet.Js | ||
|
|
||
| module JsWorkbook = | ||
| open FsSpreadsheet | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
src/FsSpreadsheet.Exceljs/Worksheet.fs → src/FsSpreadsheet.Js/Worksheet.fs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| namespace FsSpreadsheet.Exceljs | ||
| namespace FsSpreadsheet.Js | ||
|
|
||
|
|
||
| module JsWorksheet = | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
src/FsSpreadsheet.Exceljs/Xlsx.fs → src/FsSpreadsheet.Js/Xlsx.fs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| namespace FsSpreadsheet.Exceljs | ||
| namespace FsSpreadsheet.Js | ||
|
|
||
| open FsSpreadsheet | ||
| open Fable.ExcelJs | ||
|
|
||
File renamed without changes.
File renamed without changes.
File renamed without changes.
120 changes: 60 additions & 60 deletions
120
...heet.ExcelIO/FsSpreadsheet.ExcelIO.fsproj → ...sSpreadsheet.Net/FsSpreadsheet.Net.fsproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,60 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>netstandard2.0</TargetFrameworks> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <Authors>Heinrich Lukas Weil, Oliver Maus, Kevin Schneider, Timo Mühlhaus</Authors> | ||
| <Description>Excel IO Extensions for the FsSpreadsheet Datamodel</Description> | ||
| <Summary>Excel IO Extensions for the FsSpreadsheet Datamodel</Summary> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <PackageIcon>logo.png</PackageIcon> | ||
| <PackageTags>F# FSharp spreadsheet xlsx datascience</PackageTags> | ||
| <RepositoryUrl>https://github.com/CSBiology/FsSpreadsheet</RepositoryUrl> | ||
| <RepositoryType>git</RepositoryType> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Include="Stylesheet.fs" /> | ||
| <Compile Include="SharedStringTable.fs" /> | ||
| <Compile Include="Cell.fs" /> | ||
| <Compile Include="CellData.fs" /> | ||
| <Compile Include="Row.fs" /> | ||
| <Compile Include="SheetData.fs" /> | ||
| <Compile Include="Sheet.fs" /> | ||
| <Compile Include="Table.fs" /> | ||
| <Compile Include="Worksheet.fs" /> | ||
| <Compile Include="Workbook.fs" /> | ||
| <Compile Include="Spreadsheet.fs" /> | ||
| <Compile Include="Package.fs" /> | ||
| <Compile Include="ZipArchiveReader.fs" /> | ||
| <Compile Include="FsExtensions.fs" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="DocumentFormat.OpenXml" Version="2.16.0" /> | ||
| <None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\FsSpreadsheet\FsSpreadsheet.fsproj" PackageVersion="[5.0.0, 6.0.0)" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec"> | ||
| <ItemGroup> | ||
| <_ProjectReferenceWithExplicitPackageVersion Include="@(ProjectReference->'%(FullPath)')" Condition="'%(ProjectReference.PackageVersion)' != ''" /> | ||
| <_ProjectReferenceWithExactPackageVersion Include="@(ProjectReference->'%(FullPath)')" Condition="'%(ProjectReference.ExactVersion)' == 'true'" /> | ||
| <_ProjectReferenceWithReassignedVersion Include="@(_ProjectReferencesWithVersions)" Condition="'%(Identity)' != '' And '@(_ProjectReferenceWithExplicitPackageVersion)' == '@(_ProjectReferencesWithVersions)'"> | ||
| <ProjectVersion>@(_ProjectReferenceWithExplicitPackageVersion->'%(PackageVersion)')</ProjectVersion> | ||
| </_ProjectReferenceWithReassignedVersion> | ||
| <_ProjectReferenceWithReassignedVersion Include="@(_ProjectReferencesWithVersions)" Condition="'%(Identity)' != '' And '@(_ProjectReferenceWithExactPackageVersion)' == '@(_ProjectReferencesWithVersions)'"> | ||
| <ProjectVersion>[@(_ProjectReferencesWithVersions->'%(ProjectVersion)')]</ProjectVersion> | ||
| </_ProjectReferenceWithReassignedVersion> | ||
| <_ProjectReferencesWithVersions Remove="@(_ProjectReferenceWithReassignedVersion)" /> | ||
| <_ProjectReferencesWithVersions Include="@(_ProjectReferenceWithReassignedVersion)" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| </Project> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>netstandard2.0</TargetFrameworks> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <Authors>Heinrich Lukas Weil, Oliver Maus, Kevin Schneider, Timo Mühlhaus</Authors> | ||
| <Description>Excel IO Extensions for the FsSpreadsheet Datamodel</Description> | ||
| <Summary>Excel IO Extensions for the FsSpreadsheet Datamodel</Summary> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <PackageIcon>logo.png</PackageIcon> | ||
| <PackageTags>F# FSharp spreadsheet xlsx datascience</PackageTags> | ||
| <RepositoryUrl>https://github.com/CSBiology/FsSpreadsheet</RepositoryUrl> | ||
| <RepositoryType>git</RepositoryType> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Include="Stylesheet.fs" /> | ||
| <Compile Include="SharedStringTable.fs" /> | ||
| <Compile Include="Cell.fs" /> | ||
| <Compile Include="CellData.fs" /> | ||
| <Compile Include="Row.fs" /> | ||
| <Compile Include="SheetData.fs" /> | ||
| <Compile Include="Sheet.fs" /> | ||
| <Compile Include="Table.fs" /> | ||
| <Compile Include="Worksheet.fs" /> | ||
| <Compile Include="Workbook.fs" /> | ||
| <Compile Include="Spreadsheet.fs" /> | ||
| <Compile Include="Package.fs" /> | ||
| <Compile Include="ZipArchiveReader.fs" /> | ||
| <Compile Include="FsExtensions.fs" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="DocumentFormat.OpenXml" Version="2.16.0" /> | ||
| <None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\FsSpreadsheet\FsSpreadsheet.fsproj" PackageVersion="[5.0.0, 6.0.0)" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec"> | ||
| <ItemGroup> | ||
| <_ProjectReferenceWithExplicitPackageVersion Include="@(ProjectReference->'%(FullPath)')" Condition="'%(ProjectReference.PackageVersion)' != ''" /> | ||
| <_ProjectReferenceWithExactPackageVersion Include="@(ProjectReference->'%(FullPath)')" Condition="'%(ProjectReference.ExactVersion)' == 'true'" /> | ||
| <_ProjectReferenceWithReassignedVersion Include="@(_ProjectReferencesWithVersions)" Condition="'%(Identity)' != '' And '@(_ProjectReferenceWithExplicitPackageVersion)' == '@(_ProjectReferencesWithVersions)'"> | ||
| <ProjectVersion>@(_ProjectReferenceWithExplicitPackageVersion->'%(PackageVersion)')</ProjectVersion> | ||
| </_ProjectReferenceWithReassignedVersion> | ||
| <_ProjectReferenceWithReassignedVersion Include="@(_ProjectReferencesWithVersions)" Condition="'%(Identity)' != '' And '@(_ProjectReferenceWithExactPackageVersion)' == '@(_ProjectReferencesWithVersions)'"> | ||
| <ProjectVersion>[@(_ProjectReferencesWithVersions->'%(ProjectVersion)')]</ProjectVersion> | ||
| </_ProjectReferenceWithReassignedVersion> | ||
| <_ProjectReferencesWithVersions Remove="@(_ProjectReferenceWithReassignedVersion)" /> | ||
| <_ProjectReferencesWithVersions Include="@(_ProjectReferenceWithReassignedVersion)" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| </Project> |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file removed
BIN
-5.18 KB
tests/FsSpreadsheet.ExcelIO.Tests/TestFiles/TestWorkbook_FsSpreadsheet_WRITE.net.xlsx
Binary file not shown.
22 changes: 0 additions & 22 deletions
22
tests/FsSpreadsheet.Exceljs.Tests/FsSpreadsheet.Exceljs.Tests.csproj
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| open TestingUtils | ||
| open FsSpreadsheet | ||
| open FsSpreadsheet.Exceljs | ||
| open FsSpreadsheet.Js | ||
| open Fable.Core | ||
|
|
||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
tests/FsSpreadsheet.Exceljs.Tests/Main.fs → tests/FsSpreadsheet.Js.Tests/Main.fs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| module FsSpreadsheet.Exceljs.Tests | ||
| module FsSpreadsheet.Js.Tests | ||
|
|
||
| open Fable.Core.JsInterop | ||
| open Fable.Pyxpecto | ||
|
|
||
Oops, something went wrong.