Skip to content

Commit dbe9a3e

Browse files
Use Nuget to get System.Buffers and update binding redirects
* This fixes an issue where WeCantSpell.Hunspell can't load the System.Buffers that we end up using
1 parent 43f6e34 commit dbe9a3e

4 files changed

Lines changed: 5 additions & 2 deletions

File tree

Build/mkall.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@
266266
<PalasoFiles Include="SIL.WritingSystems.Tests.dll"/>
267267
<PalasoFiles Include="SIL.Windows.Forms.Archiving.dll"/>
268268
<PalasoFiles Include="SIL.Windows.Forms.WritingSystems.dll"/>
269+
<PalasoFiles Include="System.Buffers.dll"/>
269270
<PalasoFiles Include="System.Drawing.Common.dll"/>
270271
<PalasoFiles Include="System.Drawing.Common.pdb"/>
271272
<PalasoFiles Include="System.Memory.dll"/>
@@ -451,6 +452,7 @@
451452
<SILNugetPackages Include="SIL.Windows.Forms.WritingSystems"><Version>$(PalasoNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
452453
<SILNugetPackages Include="SIL.WritingSystems"><Version>$(PalasoNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
453454
<SILNugetPackages Include="SIL.WritingSystems.Tests"><Version>$(PalasoNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
455+
<SILNugetPackages Include="System.Buffers"><Version>4.6.0</Version><Path>lib/net462/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
454456
<SILNugetPackages Include="System.Drawing.Common"><Version>9.0.0</Version><Path>lib/net462/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
455457
<SILNugetPackages Include="System.Memory"><Version>4.5.4</Version><Path>lib/net461/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
456458
<SILNugetPackages Include="System.Resources.Extensions"><Version>4.6.0</Version><Path>lib/netstandard2.0/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>

Build/nuget-common/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
<package id="SIL.WritingSystems" version="15.0.0-beta0117" targetFramework="net461" />
7878
<package id="Spart" version="1.0.0" targetFramework="net461" />
7979
<package id="structuremap.patched" version="4.7.3" exclude="Build,Analyzers" />
80+
<package id="System.Buffers" version="4.6.0" />
8081
<package id="System.Drawing.Common" version="9.0.0" />
8182
<package id="System.Memory" version="4.5.4" />
8283
<package id="System.Net.Http" version="4.3.4" />

Src/AppForTests.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</dependentAssembly>
1919
<dependentAssembly>
2020
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
21-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
21+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0"/>
2222
</dependentAssembly>
2323
<dependentAssembly>
2424
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

Src/Common/FieldWorks/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
99
<dependentAssembly>
1010
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
11-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
11+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0"/>
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>

0 commit comments

Comments
 (0)