Skip to content

Commit 81c940a

Browse files
papehpapeh
authored
Update to ProDotNetZip 1.20 (#563)
DotNetZip has a security vulnerability (LT-22325). Update to ProDotNetZip 1.20 and include its dependencies. Change-Id: I66d87e488dc12447d7ac903bba5e4c90a906178b
1 parent 0b29d7f commit 81c940a

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

‎Build/mkall.targets‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,6 @@
578578
<NuGottenFiles Include="$(GeckoDir)/content/**/*.*"/>
579579
<NuGottenFiles Include="$(PackagesDir)/Analytics.3.6.0/lib/net461/Analytics.dll"/>
580580
<NuGottenFiles Include="$(PackagesDir)/DocumentFormat.OpenXml.2.20.0/lib/net46/DocumentFormat.OpenXml.dll"/>
581-
<NuGottenFiles Include="$(PackagesDir)/DotNetZip.1.16.0/lib/net40/*.*"/>
582581
<NuGottenFiles Include="$(PackagesDir)/icu.net.3.0.0-beta.297/lib/netstandard2.0/icu.net.dll"/>
583582
<NuGottenFiles Include="$(PackagesDir)/Markdig.Signed.0.30.0/lib/net452/Markdig.Signed.dll"/>
584583
<NuGottenFiles Include="$(PackagesDir)/Microsoft.Extensions.DependencyModel.2.0.4/lib/net451/Microsoft.Extensions.DependencyModel.dll"/>
@@ -596,6 +595,7 @@
596595
<NuGottenFiles Include="$(PackagesDir)/ParatextData.$(ParatextNugetVersion)/lib/netstandard2.0/Paratext.LexicalContractsV2.dll" />
597596
<NuGottenFiles Include="$(PackagesDir)/ParatextData.$(ParatextNugetVersion)/lib/netstandard2.0/ParatextData.dll"/>
598597
<NuGottenFiles Include="$(PackagesDir)/ParatextData.$(ParatextNugetVersion)/lib/netstandard2.0/PtxUtils.dll"/>
598+
<NuGottenFiles Include="$(PackagesDir)/ProDotNetZip.1.20.0/lib/netstandard2.0/*.*"/>
599599
<NuGottenFiles Include="$(PackagesDir)/SIL.DesktopAnalytics.4.0.0/lib/net461/DesktopAnalytics.dll"/>
600600
<NuGottenFiles Include="$(PackagesDir)/SIL.ParatextShared.7.4.0.1/runtimes/$(OsDir)/lib/net40/FormattedEditor.dll"/>
601601
<NuGottenFiles Include="$(PackagesDir)/SIL.ParatextShared.7.4.0.1/runtimes/$(OsDir)/lib/net40/HelpSystem.dll"/>
@@ -609,6 +609,8 @@
609609
<NuGottenFiles Include="$(PackagesDir)/System.Numerics.Vectors.4.5.0/lib/net46/System.Numerics.Vectors.dll"/>
610610
<NuGottenFiles Include="$(PackagesDir)/System.Resources.Extensions.4.6.0/lib/netstandard2.0/System.Resources.Extensions.dll"/>
611611
<NuGottenFiles Include="$(PackagesDir)/System.Runtime.CompilerServices.Unsafe.6.0.0/lib/net461/System.Runtime.CompilerServices.Unsafe.dll"/>
612+
<NuGottenFiles Include="$(PackagesDir)/System.Security.Permissions.8.0.0/lib/net462/System.Security.Permissions.dll"/>
613+
<NuGottenFiles Include="$(PackagesDir)/System.Text.Encoding.CodePages.8.0.0/lib/net462/System.Text.Encoding.CodePages.dll"/>
612614
<NuGottenFiles Include="$(PackagesDir)/System.Threading.Tasks.Extensions.4.5.4/lib/net461/System.Threading.Tasks.Extensions.dll"/>
613615
<NuGottenFiles Include="$(PackagesDir)/System.ValueTuple.4.5.0/lib/net461/System.ValueTuple.dll"/>
614616
</ItemGroup>

‎Build/nuget-common/packages.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<package id="CsvHelper" version="28.0.1" />
1010
<package id="DialogAdapters" version="0.1.11" />
1111
<package id="DocumentFormat.OpenXml" version="2.20.0" targetFramework="net461" />
12-
<package id="DotNetZip" version="1.16.0" targetFramework="net461" />
1312
<package id="Enchant.Net" version="1.4.3-beta0010" targetFramework="net461" />
1413
<package id="GdkSharp-signed" version="3.22.24.37" />
1514
<package id="GioSharp-signed" version="3.22.24.37" />
@@ -37,6 +36,7 @@
3736
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.7.0" />
3837
<package id="NUnit3TestAdapter" version="4.3.2" />
3938
<package id="ParatextData" version="9.4.0.1-beta" targetFramework="net46"/>
39+
<package id="ProDotNetZip" version="1.20.0" />
4040
<package id="protobuf-net" version="2.4.6" exclude="Build,Analyzers" />
4141
<package id="Sandwych.QuickGraph.Core" version="1.0.0" />
4242
<package id="SharpZipLib" version="1.4.0" exclude="Build,Analyzers" />
@@ -86,6 +86,8 @@
8686
<package id="System.Numerics.Vectors" version="4.5.0" />
8787
<package id="System.Resources.Extensions" version="4.6.0" />
8888
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" />
89+
<package id="System.Security.Permissions" version="8.0.0" /> <!-- required for ProDotNetZip 1.20 -->
90+
<package id="System.Text.Encoding.CodePages" version="8.0.0" /> <!-- required for ProDotNetZip 1.20 -->
8991
<package id="System.Threading.Tasks.Extensions" version="4.5.4" />
9092
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
9193
<package id="TagLibSharp" version="2.2.0" targetFramework="net45" />

‎Src/Common/FieldWorks/App.config‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
<assemblyIdentity name="icu.net" publicKeyToken="416fdd914afa6b66" culture="neutral" />
3535
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
3636
</dependentAssembly>
37-
<dependentAssembly>
38-
<assemblyIdentity name="DotnetZip" publicKeyToken="6583c7c814667745" culture="neutral" />
39-
<bindingRedirect oldVersion="0.0.0.0-1.16.0.0" newVersion="1.16.0.0" />
40-
</dependentAssembly>
4137
<!--
4238
Comment out the following section when the ParatextData and FieldWorks versions of libpalaso converge
4339
-->

‎Src/LexText/LexTextControls/LexTextControls.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@
137137
<SpecificVersion>False</SpecificVersion>
138138
<HintPath>..\..\..\Output\Debug\DesktopAnalytics.dll</HintPath>
139139
</Reference>
140-
<Reference Include="DotNetZip, Version=1.13.3.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
140+
<Reference Include="ProDotNetZip, Version=1.20.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
141141
<SpecificVersion>False</SpecificVersion>
142-
<HintPath>..\..\..\Output\Debug\DotNetZip.dll</HintPath>
142+
<HintPath>..\..\..\Output\Debug\ProDotNetZip.dll</HintPath>
143143
</Reference>
144144
<Reference Include="SIL.Core.Desktop, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cab3c8c5232dfcf2, processorArchitecture=x86">
145145
<SpecificVersion>False</SpecificVersion>

‎Src/xWorks/xWorks.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@
156156
<SpecificVersion>False</SpecificVersion>
157157
<HintPath>..\..\Output\Debug\DocumentFormat.OpenXml.dll</HintPath>
158158
</Reference>
159-
<Reference Include="DotNetZip">
160-
<HintPath>..\..\packages\DotNetZip.1.13.7\lib\net40\DotNetZip.dll</HintPath>
159+
<Reference Include="ProDotNetZip">
160+
<HintPath>..\..\Output\Debug\ProDotNetZip.dll</HintPath>
161161
</Reference>
162162
<Reference Include="Microsoft.CSharp" />
163163
<Reference Include="NAudio, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">

‎Src/xWorks/xWorksTests/xWorksTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@
187187
<Reference Include="FwUtilsTests, Version=7.0.1.13090, Culture=neutral, processorArchitecture=x86">
188188
<SpecificVersion>False</SpecificVersion>
189189
</Reference>
190-
<Reference Include="DotNetZip">
191-
<HintPath>..\..\..\Output\Debug\DotNetZip.dll</HintPath>
190+
<Reference Include="ProDotNetZip">
191+
<HintPath>..\..\..\Output\Debug\ProDotNetZip.dll</HintPath>
192192
</Reference>
193193
<Reference Include="LexEdDll, Version=8.0.4.12240, Culture=neutral, processorArchitecture=x86">
194194
<SpecificVersion>False</SpecificVersion>

0 commit comments

Comments
 (0)