Upgrade to ClosedXML 0.101 (#321)

* Upgrade to ClosedXML 0.101; target netstandard2.0 and netstandard2.1

* Fix test that started to fail after upgrading calc engine in ClosedXML;  make the test culture-independent

Author: Pankraty

ClosedXML.Report/ClosedXML.Report.csproj

@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <LangVersion>10</LangVersion>
     <AssemblyName>ClosedXML.Report</AssemblyName>
     <PackageId>ClosedXML.Report</PackageId>
     <Configurations>Debug;Release</Configurations>
-    <PackageLicenseUrl></PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/ClosedXML/ClosedXML.Report</PackageProjectUrl>
     <RepositoryUrl>https://github.com/ClosedXML/ClosedXML.Report</RepositoryUrl>
-    <Authors>Alexey Rozhkov</Authors>
+    <Authors>Alexey Rozhkov, Alexey Pankratev</Authors>
     <Copyright>MIT</Copyright>
     <Product>ClosedXML.Report</Product>
     <PackageReleaseNotes>See https://github.com/ClosedXML/ClosedXML.Report/releases/tag/$(productVersion)</PackageReleaseNotes>
@@ -37,20 +36,9 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
-    <DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="ClosedXML" Version="0.100.3" />
+    <PackageReference Include="ClosedXML" Version="0.101.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="morelinq" Version="3.4.1" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.0" />
   </ItemGroup>

tests/ClosedXML.Report.Tests/ClosedXML.Report.Tests.csproj

@@ -1,24 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>10</LangVersion>
-    <Configurations>Debug;Release</Configurations>
-    <PackageLicenseUrl>https://github.com/ClosedXML/ClosedXML.Report/blob/master/LICENSE</PackageLicenseUrl>
-    <PackageProjectUrl>https://github.com/ClosedXML/ClosedXML.Report</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/ClosedXML/ClosedXML.Report</RepositoryUrl>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Authors>Alexey Rozhkov</Authors>
-    <Copyright>MIT</Copyright>
-    <Version>0.1.0.0</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>ClosedXML.Report.snk</AssemblyOriginatorKeyFile>
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Remove="FiledBuilderTests.cs" />
   </ItemGroup>

tests/ClosedXML.Report.Tests/ReportOptionsTests.cs

@@ -27,15 +27,13 @@ public void Hidden_option_should_hide_sheet()
         [Fact]
         public void OnlyValues_option_should_remove_formulas_on_sheet()
         {
-            //TODO make tests culture-independent
-            Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture("ru-RU");
             XlTemplateTest("5_options.xlsx",
                 tpl => { },
                 wb =>
                 {
                     var worksheet = wb.Worksheet(1);
                     worksheet.Cell("B3").HasFormula.Should().BeFalse();
-                    worksheet.Cell("B3").GetValue<string>().Should().Be("Begin at " + DateTime.Today.Subtract(TimeSpan.FromDays(7)).ToShortDateString());
+                    worksheet.Cell("B3").GetValue<string>().Should().Be("Begin at 19.01.2023");
                     worksheet = wb.Worksheet(3);
                     worksheet.Cell("B4").HasFormula.Should().BeFalse();
                     worksheet.Cell("B4").GetValue<int>().Should().Be(10);
@@ -45,14 +43,13 @@ public void OnlyValues_option_should_remove_formulas_on_sheet()
         [Fact]
         public void ColsFit_option_should_FitWidth()
         {
-            Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture("ru-RU");
             XlTemplateTest("5_options.xlsx",
                 tpl => { },
                 wb =>
                 {
                     var worksheet = wb.Worksheet(1);
-                    worksheet.Column(4).Width.Should().BeApproximately(5.03, 0.01);
-                    worksheet.Column(5).Width.Should().BeApproximately(13.61, 0.01);
+                    worksheet.Column(4).Width.Should().BeApproximately(5.0, 0.01);
+                    worksheet.Column(5).Width.Should().BeApproximately(16.16, 0.01);
                 });
         }