Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jwickberg authored Aug 26, 2019
2 parents 392eace + 689f0d3 commit ffd9d33
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions SIL.Archiving.Tests/SIL.Archiving.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetZip, Version=1.11.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll</HintPath>
<Reference Include="DotNetZip, Version=1.13.3.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetZip.1.13.3\lib\net40\DotNetZip.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Archiving.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DotNetZip" version="1.11.0" targetFramework="net461" />
<package id="DotNetZip" version="1.13.3" targetFramework="net461" />
<package id="NUnit" version="2.6.4" targetFramework="net40" />
</packages>
4 changes: 2 additions & 2 deletions SIL.Archiving/SIL.Archiving.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Reference Include="DotNetZip, Version=1.11.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll</HintPath>
<Reference Include="DotNetZip, Version=1.13.3.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetZip.1.13.3\lib\net40\DotNetZip.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Archiving/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DotNetZip" version="1.11.0" targetFramework="net461" />
<package id="DotNetZip" version="1.13.3" targetFramework="net461" />
</packages>
4 changes: 2 additions & 2 deletions SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetZip, Version=1.11.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll</HintPath>
<Reference Include="DotNetZip, Version=1.13.3.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetZip.1.13.3\lib\net40\DotNetZip.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion SIL.DblBundle.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DotNetZip" version="1.11.0" targetFramework="net461" />
<package id="DotNetZip" version="1.13.3" targetFramework="net461" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
</packages>
3 changes: 2 additions & 1 deletion SIL.Windows.Forms.Tests/Progress/LogBox/LogBoxTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public void ShowLogBox()
}

[Test]
[Category("Long Running")]
[Category("LongRunning")]
[Category("SkipOnTeamCity")]
public void WriteVerbose_AtMaximumLength_RtfContainsMaximumLengthExceeded()
{
Console.WriteLine("Showing LogBox");
Expand Down

0 comments on commit ffd9d33

Please sign in to comment.