Rolled back version of ICSharpZipLib and NPOI used

NPOI 2.4.1 is broken. Earlier versions don't support latest Zip library
xBimTeam · Jun 3, 2019 · 58f6d6f · 58f6d6f
1 parent 31a28ce
commit 58f6d6f
Show file tree

Hide file tree

Showing 27 changed files with 116 additions and 144 deletions.
diff --git a/CreateCobiePas1192/CreateCobiePas1192.csproj b/CreateCobiePas1192/CreateCobiePas1192.csproj
@@ -38,8 +38,8 @@
       <HintPath>..\packages\ManagedEsent.1.9.4\lib\net40\Esent.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Configuration.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>

diff --git a/CreateCobiePas1192/packages.config b/CreateCobiePas1192/packages.config
@@ -9,7 +9,7 @@
   <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net47" />
   <package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net47" />
   <package id="Microsoft.Extensions.Primitives" version="2.1.6" targetFramework="net47" />
-  <package id="SharpZipLib" version="1.1.0" targetFramework="net47" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net47" />
   <package id="System.Buffers" version="4.5.0" targetFramework="net47" />
   <package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net47" />
   <package id="System.Memory" version="4.5.1" targetFramework="net47" />

diff --git a/Tests/App.config b/Tests/App.config
@@ -36,10 +36,6 @@
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.1.0.145" newVersion="1.1.0.145" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" /></startup>

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -196,8 +196,8 @@
       <HintPath>..\packages\ManagedEsent.1.9.4\lib\net40\Esent.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Configuration.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
@@ -229,17 +229,17 @@
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPOI.2.4.1\lib\net45\NPOI.dll</HintPath>
+    <Reference Include="NPOI, Version=2.4.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.4.0\lib\net40\NPOI.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OOXML, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPOI.2.4.1\lib\net45\NPOI.OOXML.dll</HintPath>
+    <Reference Include="NPOI.OOXML, Version=2.4.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.4.0\lib\net40\NPOI.OOXML.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OpenXml4Net, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPOI.2.4.1\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
+    <Reference Include="NPOI.OpenXml4Net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.4.0\lib\net40\NPOI.OpenXml4Net.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OpenXmlFormats, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPOI.2.4.1\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
+    <Reference Include="NPOI.OpenXmlFormats, Version=2.4.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.4.0\lib\net40\NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -277,7 +277,7 @@
     <Reference Include="System.Transactions" />
     <Reference Include="System.XML" />
     <Reference Include="Xbim.CobieExpress, Version=5.1.0.0, Culture=neutral, PublicKeyToken=11e3655e576ec5a9, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xbim.CobieExpress.5.1.138\lib\net47\Xbim.CobieExpress.dll</HintPath>
+      <HintPath>..\packages\Xbim.CobieExpress.5.1.146\lib\net47\Xbim.CobieExpress.dll</HintPath>
     </Reference>
     <Reference Include="Xbim.Common, Version=5.1.0.0, Culture=neutral, PublicKeyToken=11e3655e576ec5a9, processorArchitecture=MSIL">
       <HintPath>..\packages\Xbim.Common.5.1.259\lib\net47\Xbim.Common.dll</HintPath>
@@ -295,7 +295,7 @@
       <HintPath>..\packages\Xbim.Ifc4.5.1.259\lib\net47\Xbim.Ifc4.dll</HintPath>
     </Reference>
     <Reference Include="Xbim.IO.CobieExpress, Version=5.1.0.0, Culture=neutral, PublicKeyToken=11e3655e576ec5a9, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xbim.IO.CobieExpress.5.1.138\lib\net47\Xbim.IO.CobieExpress.dll</HintPath>
+      <HintPath>..\packages\Xbim.IO.CobieExpress.5.1.146\lib\net47\Xbim.IO.CobieExpress.dll</HintPath>
     </Reference>
     <Reference Include="Xbim.IO.Esent, Version=5.1.0.0, Culture=neutral, PublicKeyToken=11e3655e576ec5a9, processorArchitecture=MSIL">
       <HintPath>..\packages\Xbim.IO.Esent.5.1.259\lib\net47\Xbim.IO.Esent.dll</HintPath>
@@ -304,7 +304,7 @@
       <HintPath>..\packages\Xbim.IO.MemoryModel.5.1.259\lib\net47\Xbim.IO.MemoryModel.dll</HintPath>
     </Reference>
     <Reference Include="Xbim.IO.Table, Version=5.1.0.0, Culture=neutral, PublicKeyToken=11e3655e576ec5a9, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xbim.IO.Table.5.1.138\lib\net47\Xbim.IO.Table.dll</HintPath>
+      <HintPath>..\packages\Xbim.IO.Table.5.1.146\lib\net47\Xbim.IO.Table.dll</HintPath>
     </Reference>
     <Reference Include="Xbim.ModelGeometry.Scene, Version=5.1.0.0, Culture=neutral, PublicKeyToken=11e3655e576ec5a9, processorArchitecture=MSIL">
       <HintPath>..\packages\Xbim.ModelGeometry.Scene.5.1.239\lib\net47\Xbim.ModelGeometry.Scene.dll</HintPath>

diff --git a/Tests/packages.config b/Tests/packages.config
@@ -10,8 +10,8 @@
   <package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net47" />
   <package id="Microsoft.Extensions.Primitives" version="2.1.6" targetFramework="net47" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net47" />
-  <package id="NPOI" version="2.4.1" targetFramework="net47" />
-  <package id="SharpZipLib" version="1.1.0" targetFramework="net47" />
+  <package id="NPOI" version="2.4.0" targetFramework="net47" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net47" />
   <package id="System.Buffers" version="4.5.0" targetFramework="net47" />
   <package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net47" />
   <package id="System.Memory" version="4.5.1" targetFramework="net47" />
@@ -21,18 +21,18 @@
   <package id="System.Security.Permissions" version="4.5.0" targetFramework="net47" />
   <package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net47" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net47" />
-  <package id="Xbim.CobieExpress" version="5.1.138" targetFramework="net47" />
+  <package id="Xbim.CobieExpress" version="5.1.146" targetFramework="net47" />
   <package id="Xbim.Common" version="5.1.259" targetFramework="net47" />
   <package id="Xbim.Essentials" version="5.1.259" targetFramework="net47" />
   <package id="Xbim.Geometry" version="5.1.239" targetFramework="net47" />
   <package id="Xbim.Geometry.Engine.Interop" version="5.1.239" targetFramework="net47" />
   <package id="Xbim.Ifc" version="5.1.259" targetFramework="net47" />
   <package id="Xbim.Ifc2x3" version="5.1.259" targetFramework="net47" />
   <package id="Xbim.Ifc4" version="5.1.259" targetFramework="net47" />
-  <package id="Xbim.IO.CobieExpress" version="5.1.138" targetFramework="net47" />
+  <package id="Xbim.IO.CobieExpress" version="5.1.146" targetFramework="net47" />
   <package id="Xbim.IO.Esent" version="5.1.259" targetFramework="net47" />
   <package id="Xbim.IO.MemoryModel" version="5.1.259" targetFramework="net47" />
-  <package id="Xbim.IO.Table" version="5.1.138" targetFramework="net47" />
+  <package id="Xbim.IO.Table" version="5.1.146" targetFramework="net47" />
   <package id="Xbim.ModelGeometry.Scene" version="5.1.239" targetFramework="net47" />
   <package id="Xbim.Tessellator" version="5.1.259" targetFramework="net47" />
 </packages>
diff --git a/Xbim.COBie.Client/App.config b/Xbim.COBie.Client/App.config
@@ -21,10 +21,6 @@
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.1.0.145" newVersion="1.1.0.145" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/Xbim.COBie.Client/Xbim.COBie.Client.csproj b/Xbim.COBie.Client/Xbim.COBie.Client.csproj
@@ -84,8 +84,8 @@
       <HintPath>..\packages\ManagedEsent.1.9.4\lib\net40\Esent.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Configuration.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
@@ -114,17 +114,17 @@
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPOI.2.4.1\lib\net45\NPOI.dll</HintPath>
+    <Reference Include="NPOI, Version=2.4.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.4.0\lib\net40\NPOI.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OOXML, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPOI.2.4.1\lib\net45\NPOI.OOXML.dll</HintPath>
+    <Reference Include="NPOI.OOXML, Version=2.4.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.4.0\lib\net40\NPOI.OOXML.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OpenXml4Net, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPOI.2.4.1\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
+    <Reference Include="NPOI.OpenXml4Net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.4.0\lib\net40\NPOI.OpenXml4Net.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OpenXmlFormats, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPOI.2.4.1\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
+    <Reference Include="NPOI.OpenXmlFormats, Version=2.4.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.4.0\lib\net40\NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />

diff --git a/Xbim.COBie.Client/packages.config b/Xbim.COBie.Client/packages.config
@@ -10,8 +10,8 @@
   <package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net47" />
   <package id="Microsoft.Extensions.Primitives" version="2.1.6" targetFramework="net47" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net47" />
-  <package id="NPOI" version="2.4.1" targetFramework="net47" />
-  <package id="SharpZipLib" version="1.1.0" targetFramework="net47" />
+  <package id="NPOI" version="2.4.0" targetFramework="net47" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net47" />
   <package id="System.Buffers" version="4.5.0" targetFramework="net47" />
   <package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net47" />
   <package id="System.Memory" version="4.5.1" targetFramework="net47" />

diff --git a/Xbim.COBie/Xbim.COBie.csproj b/Xbim.COBie/Xbim.COBie.csproj
@@ -12,7 +12,7 @@ Supports easy transformation from IFC to COBie and exports to Spreadsheet, JSON
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="NPOI" Version="2.4.1" />
+    <PackageReference Include="NPOI" Version="2.4.0" />
     <PackageReference Include="Xbim.Essentials" Version="5.1.259" />
     <PackageReference Include="Xbim.Geometry" Version="5.1.239" />
   </ItemGroup>

diff --git a/Xbim.COBieLiteUK.Client/App.config b/Xbim.COBieLiteUK.Client/App.config
@@ -25,10 +25,6 @@
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.1.0.145" newVersion="1.1.0.145" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>