Skip to content
This repository was archived by the owner on Jun 28, 2022. It is now read-only.

Commit e092c48

Browse files
authored
Merge pull request #200 from relativitydev/develop
Merging develop into master
2 parents 2fa8d04 + 9f54d81 commit e092c48

7 files changed

Lines changed: 21 additions & 5 deletions

File tree

Source/Relativity.Test.Helpers/Relativity.Test.Helpers.Example.NUnit/app.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
<assemblyIdentity name="itextsharp" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
3939
<bindingRedirect oldVersion="0.0.0.0-5.5.13.1" newVersion="5.5.13.1" />
4040
</dependentAssembly>
41+
<dependentAssembly>
42+
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
43+
<bindingRedirect oldVersion="0.0.0.0-1.8.9.0" newVersion="1.8.9.0" />
44+
</dependentAssembly>
4145
</assemblyBinding>
4246
</runtime>
4347
<startup>

Source/Relativity.Test.Helpers/Relativity.Test.Helpers.NUnit.Integration/app.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@
8585
<assemblyIdentity name="itextsharp" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
8686
<bindingRedirect oldVersion="0.0.0.0-5.5.13.1" newVersion="5.5.13.1" />
8787
</dependentAssembly>
88+
<dependentAssembly>
89+
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
90+
<bindingRedirect oldVersion="0.0.0.0-1.8.9.0" newVersion="1.8.9.0" />
91+
</dependentAssembly>
8892
</assemblyBinding>
8993
</runtime>
9094
<system.web>

Source/Relativity.Test.Helpers/Relativity.Test.Helpers/Relativity.Test.Helpers.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
<Reference Include="BCrypt.Net, Version=0.1.5073.29922, Culture=neutral, PublicKeyToken=6bcd409ee6bc9292, processorArchitecture=MSIL">
6060
<HintPath>..\packages\BCrypt-Official.0.1.109\lib\BCrypt.Net.dll</HintPath>
6161
</Reference>
62-
<Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
63-
<HintPath>..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
62+
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
63+
<HintPath>..\packages\BouncyCastle.1.8.9\lib\BouncyCastle.Crypto.dll</HintPath>
6464
</Reference>
6565
<Reference Include="DbContextHelper, Version=5.0.0.1, Culture=neutral, processorArchitecture=MSIL">
6666
<HintPath>..\packages\RelativityDev.DbContextHelper.5.0.0.1\lib\net462\DbContextHelper.dll</HintPath>

Source/Relativity.Test.Helpers/Relativity.Test.Helpers/app.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
<assemblyIdentity name="ZetaLongPaths" publicKeyToken="b764f59068f31f38" culture="neutral" />
3535
<bindingRedirect oldVersion="0.0.0.0-1.0.0.38" newVersion="1.0.0.38" />
3636
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-1.8.9.0" newVersion="1.8.9.0" />
40+
</dependentAssembly>
3741
</assemblyBinding>
3842
</runtime>
3943
<startup>

Source/Relativity.Test.Helpers/Relativity.Test.Helpers/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="BCrypt-Official" version="0.1.109" targetFramework="net462" />
4-
<package id="BouncyCastle" version="1.8.5" targetFramework="net462" />
4+
<package id="BouncyCastle" version="1.8.9" targetFramework="net462" />
55
<package id="MailKit" version="2.2.0" targetFramework="net462" />
66
<package id="MimeKit" version="2.2.0" targetFramework="net462" />
77
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />

Source/Relativity.Test.Helpers/Relativity.Tests.Helpers.Tests.Unit/app.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
<assemblyIdentity name="itextsharp" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
3535
<bindingRedirect oldVersion="0.0.0.0-5.5.13.1" newVersion="5.5.13.1" />
3636
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-1.8.9.0" newVersion="1.8.9.0" />
40+
</dependentAssembly>
3741
</assemblyBinding>
3842
</runtime>
3943
</configuration>

variables.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"devVersion":"8.1.1.1-DEV-0",
3-
"productionVersion":"8.1.1.1"
2+
"devVersion":"8.1.1.2-DEV-0",
3+
"productionVersion":"8.1.1.2"
44
}

0 commit comments

Comments
 (0)