Skip to content

Commit

Permalink
Merge pull request #239 from sillsdev/update-dependencies
Browse files Browse the repository at this point in the history
Updated Newtonsoft.Json and other libraries
  • Loading branch information
tombogle authored Jun 28, 2022
2 parents 665d749 + 67809b6 commit 4e031b3
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build/build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<Target Name="RestoreLocalPackages" DependsOnTargets="CheckPrerequisites">
<Message Text="RestartBuild=$(RestartBuild)"/>
<Exec Command='$(NuGetCommand) install SIL.BuildTasks -excludeVersion -PreRelease -source "$(PackageSources)" -solutionDirectory "$(SolutionDir)."' />
<Exec Command='$(NuGetCommand) install NUnit.ConsoleRunner -excludeVersion -Version 3.12.0 -source "$(PackageSources)" -solutionDirectory "$(SolutionDir)."' />
<Exec Command='$(NuGetCommand) install NUnit.ConsoleRunner -excludeVersion -Version 3.15.0 -source "$(PackageSources)" -solutionDirectory "$(SolutionDir)."' />
<Exec Command='$(NuGetCommand) install SIL.libpalaso.l10ns -excludeVersion -Version 9.0.1-beta0011 -source "$(PackageSources)" -solutionDirectory "$(SolutionDir)."' />
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="BuildInternal"
Properties="Configuration=$(Configuration)" Condition="$(RestartBuild)" />
Expand Down
10 changes: 5 additions & 5 deletions src/HearThis/HearThis.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@
<Version>3.1.6</Version>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyModel">
<Version>5.0.0</Version>
<Version>6.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Windows.Compatibility">
<Version>5.0.2</Version>
<Version>6.0.0</Version>
</PackageReference>
<PackageReference Include="NAudio">
<Version>1.10.0</Version>
Expand All @@ -148,10 +148,10 @@
<Version>1.2.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
<Version>13.0.1</Version>
</PackageReference>
<PackageReference Include="ParatextData">
<Version>9.2.6.2</Version>
<Version>9.2.6.5</Version>
</PackageReference>
<PackageReference Include="SIL.Core">
<Version>10.0.0-beta0023</Version>
Expand Down Expand Up @@ -182,7 +182,7 @@
<Version>10.0.0-beta0023</Version>
</PackageReference>
<PackageReference Include="ZXing.Net">
<Version>0.16.5</Version>
<Version>0.16.8</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion src/HearThis/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<!-- Now that we're using nuget to manage dependencies, hopefully none of this comment out stuff will ever be needed again.-->
<!-- This is needed only when HearThis is using a newer (nostrongname) version of libpalaso than ParatextData (see similar comments in HearThis.csproj and Installer.wxs)
Expand Down Expand Up @@ -142,6 +142,10 @@
<assemblyIdentity name="Microsoft.DotNet.PlatformAbstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyModel" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<appSettings>
Expand Down
8 changes: 4 additions & 4 deletions src/HearThisTests/HearThisTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,16 @@
<Version>62.2.1-beta</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
<Version>13.0.1</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>3.13.0</Version>
<Version>3.13.3</Version>
</PackageReference>
<PackageReference Include="NUnit.ConsoleRunner">
<Version>3.12.0</Version>
<Version>3.15.0</Version>
</PackageReference>
<PackageReference Include="ParatextData">
<Version>9.2.6.2</Version>
<Version>9.2.6.5</Version>
</PackageReference>
<PackageReference Include="SIL.Core">
<Version>10.0.0-beta0023</Version>
Expand Down
4 changes: 2 additions & 2 deletions src/HearThisTests/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyModel" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="DotNetZip" publicKeyToken="6583c7c814667745" culture="neutral" />
Expand Down

0 comments on commit 4e031b3

Please sign in to comment.