Skip to content

Commit

Permalink
Updated some packages.
Browse files Browse the repository at this point in the history 
Fixed a couple unit tests and the unit test proj files so that it will hopefully pass the automated build process.
  • Loading branch information
JaCraig committed Aug 21, 2015
1 parent b03349d commit 14c7572
Show file tree
Hide file tree
Showing 43 changed files with 109 additions and 155 deletions.
4 changes: 2 additions & 2 deletions CUL.Bender.Tests/CUL.Bender.Tests.csproj
View file
Expand Up @@ -37,8 +37,8 @@
<CodeAnalysisRuleSet>..\AnalyzerSet.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Bender, Version=3.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Bender.3.0.11.0\lib\Bender.dll</HintPath>
<Reference Include="Bender, Version=3.0.22.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Bender.3.0.22.0\lib\Bender.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Flexo, Version=1.0.22.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion CUL.Bender.Tests/packages.config
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Bender" version="3.0.11.0" targetFramework="net45" />
<package id="Bender" version="3.0.22.0" targetFramework="net45" />
<package id="flexo" version="1.0.22.0" targetFramework="net45" />
<package id="xunit" version="2.0.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
Expand Down
4 changes: 2 additions & 2 deletions CUL.Bender/CUL.Bender.csproj
View file
Expand Up @@ -128,8 +128,8 @@
<CodeContractsSkipAnalysisIfCannotConnectToCache>False</CodeContractsSkipAnalysisIfCannotConnectToCache>
</PropertyGroup>
<ItemGroup>
<Reference Include="Bender, Version=3.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Bender.3.0.11.0\lib\Bender.dll</HintPath>
<Reference Include="Bender, Version=3.0.22.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Bender.3.0.22.0\lib\Bender.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Flexo, Version=1.0.22.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion CUL.Bender/packages.config
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Bender" version="3.0.11.0" targetFramework="net45" />
<package id="Bender" version="3.0.22.0" targetFramework="net45" />
<package id="flexo" version="1.0.22.0" targetFramework="net45" />
</packages>
10 changes: 3 additions & 7 deletions CUL.PostgreSQL/CUL.PostgreSQL.csproj
View file
Expand Up @@ -122,13 +122,9 @@
<CodeAnalysisRuleSet>..\AnalyzerSet.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Npgsql.2.2.5\lib\net45\Mono.Security.dll</HintPath>
</Reference>
<Reference Include="Npgsql, Version=2.2.5.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Npgsql.2.2.5\lib\net45\Npgsql.dll</HintPath>
<Reference Include="Npgsql, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
<HintPath>..\packages\Npgsql.3.0.1\lib\net45\Npgsql.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion CUL.PostgreSQL/packages.config
View file
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Npgsql" version="2.2.5" targetFramework="net45" />
<package id="Npgsql" version="3.0.1" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions Ironman.Core.Assets.Less/Ironman.Core.Assets.Less.csproj
View file
Expand Up @@ -134,8 +134,8 @@
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="dotless.Core, Version=1.5.0.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
<HintPath>..\packages\dotless.1.5.0\lib\dotless.Core.dll</HintPath>
<Reference Include="dotless.Core, Version=1.5.1.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
<HintPath>..\packages\dotless.1.5.1\lib\dotless.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion Ironman.Core.Assets.Less/packages.config
View file
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="dotless" version="1.5.0" targetFramework="net45" />
<package id="dotless" version="1.5.1" targetFramework="net45" />
</packages>
3 changes: 0 additions & 3 deletions IronmanTests/IronmanTests.csproj
View file
Expand Up @@ -41,9 +41,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel">
<HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions UnitTests/DataTypes/ExtensionMethods/ReflectionExtensions.cs
View file
Expand Up @@ -202,7 +202,7 @@ public void IsOfTypeTest()
[Fact]
public void LoadAssembliesTest()
{
Assert.Equal(21, new DirectoryInfo(@".\").LoadAssemblies().Count());
Assert.Equal(19, new DirectoryInfo(@".\").LoadAssemblies().Count());
}

[Fact]
Expand Down Expand Up @@ -266,7 +266,7 @@ public void ToShortVersionString()
[Fact]
public void VersionInfo2()
{
Assert.Equal("Microsoft.CodeAnalysis: 1.0\r\nMicrosoft.CodeAnalysis.CSharp: 1.0\r\nMicrosoft.VisualStudio.TestPlatform.ObjectModel: 12.0\r\nMicrosoft.Web.Infrastructure: 1.0\r\nmsdia120typelib_clr0200: 12.0\r\nSystem.Collections.Immutable: 1.1\r\nSystem.Reflection.Metadata: 1.0\r\nSystem.Web.Helpers: 3.0\r\nSystem.Web.Mvc: 5.2\r\nSystem.Web.Razor: 3.0\r\nSystem.Web.WebPages: 3.0\r\nSystem.Web.WebPages.Deployment: 3.0\r\nSystem.Web.WebPages.Razor: 3.0\r\nUnitTests: 1.0\r\nUtilities: 4.0\r\nxunit.abstractions: 2.0\r\nxunit.assert: 2.0\r\nxunit.core: 2.0\r\nxunit.execution.desktop: 2.0\r\nxunit.runner.utility.desktop: 2.0\r\nxunit.runner.visualstudio.testadapter: 2.0\r\n", new DirectoryInfo(@".\").LoadAssemblies().ToString(VersionInfo.ShortVersion));
Assert.Equal("Microsoft.CodeAnalysis: 1.0\r\nMicrosoft.CodeAnalysis.CSharp: 1.0\r\nMicrosoft.Web.Infrastructure: 1.0\r\nSystem.Collections.Immutable: 1.1\r\nSystem.Reflection.Metadata: 1.0\r\nSystem.Web.Helpers: 3.0\r\nSystem.Web.Mvc: 5.2\r\nSystem.Web.Razor: 3.0\r\nSystem.Web.WebPages: 3.0\r\nSystem.Web.WebPages.Deployment: 3.0\r\nSystem.Web.WebPages.Razor: 3.0\r\nUnitTests: 1.0\r\nUtilities: 4.0\r\nxunit.abstractions: 2.0\r\nxunit.assert: 2.0\r\nxunit.core: 2.0\r\nxunit.execution.desktop: 2.0\r\nxunit.runner.utility.desktop: 2.0\r\nxunit.runner.visualstudio.testadapter: 2.0\r\n", new DirectoryInfo(@".\").LoadAssemblies().ToString(VersionInfo.ShortVersion));
}
}

Expand Down
4 changes: 2 additions & 2 deletions UnitTests/IO/DirectoryInfo.cs
View file
Expand Up @@ -87,9 +87,9 @@ public void Enumeration()
var Temp = new Utilities.IO.DirectoryInfo(".");
foreach (IFile File in Temp) { }
Assert.Equal(1, Temp.EnumerateDirectories().Count());
Assert.Equal(39, Temp.EnumerateFiles().Count());
Assert.Equal(37, Temp.EnumerateFiles().Count());
Assert.Equal(1, Temp.EnumerateDirectories(x => x.Created < DateTime.UtcNow).Count());
Assert.Equal(39, Temp.EnumerateFiles(x => x.Created < DateTime.UtcNow).Count());
Assert.Equal(37, Temp.EnumerateFiles(x => x.Created < DateTime.UtcNow).Count());
}

[Fact]
Expand Down
3 changes: 0 additions & 3 deletions UnitTests/UnitTests.csproj
View file
Expand Up @@ -37,9 +37,6 @@
<CodeAnalysisRuleSet>..\AnalyzerSet.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel">
<HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
Expand Down
5 changes: 2 additions & 3 deletions Utilities.DataTypes/DataTypes/ExtensionMethods/IEnumerableExtensions.cs
View file
Expand Up @@ -634,10 +634,9 @@ public static DataTable To(this IEnumerable List, params string[] Columns)
var ReturnValue = new DataTable();
ReturnValue.Locale = CultureInfo.CurrentCulture;
int Count = 0;
foreach (object Item in List)
{
var i = List.GetEnumerator();
while (i.MoveNext())
++Count;
}
if (List == null || Count == 0)
return ReturnValue;
IEnumerator ListEnumerator = List.GetEnumerator();
Expand Down
9 changes: 0 additions & 9 deletions Utilities.DataTypes/GlobalSuppressions.cs
View file

This file was deleted.

1 change: 0 additions & 1 deletion Utilities.DataTypes/Utilities.DataTypes.csproj
View file
Expand Up @@ -188,7 +188,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="DataTypes\Caching\Default\Cache.cs" />
<Compile Include="DataTypes\Caching\Default\CacheCache.cs" />
Expand Down
11 changes: 0 additions & 11 deletions Utilities.ORM/GlobalSuppressions.cs
View file

This file was deleted.

1 change: 0 additions & 1 deletion Utilities.ORM/Utilities.ORM.csproj
View file
Expand Up @@ -173,7 +173,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ORM\BaseClasses\MappingBaseClass.cs" />
<Compile Include="ORM\BaseClasses\ObjectBaseClass.cs" />
Expand Down
12 changes: 0 additions & 12 deletions Utilities.Web/GlobalSuppressions.cs
View file

This file was deleted.

1 change: 0 additions & 1 deletion Utilities.Web/Utilities.Web.csproj
View file
Expand Up @@ -171,7 +171,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Web\ExtensionMethods\DictionaryExtensions.cs" />
<Compile Include="Web\ExtensionMethods\HTMLExtensions.cs" />
Expand Down
8 changes: 4 additions & 4 deletions UtilitiesPackages/CUL.Bender.nuspec
View file
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>CUL.Bender</id>
<version>4.0.286</version>
<version>4.0.287</version>
<title>Craig's Utility Library Bender Support</title>
<authors>James Craig</authors>
<owners>James Craig</owners>
Expand All @@ -11,15 +11,15 @@
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>Craig's Utility Library is one of the largest collections of utility classes and extension methods for .Net. It includes code to help with tasks including encryption, compression, serialization, file management, email, image manipulation, SQL, various file formats (CSV, iCal, etc.), randomization, validation, math related classes, various data types, reflection, code gen, events, code profiling, etc.</description>
<summary>This adds support for Bender as the serializer for XML that the library uses</summary>
<releaseNotes>This version is a complete rewrite of the current system. This will break all of your code, so don't update unless you're a brave soul.</releaseNotes>
<releaseNotes>This version is a complete rewrite from the 3.X line. This will break all of your code, so don't update unless you're a brave soul.</releaseNotes>
<copyright>Copyright 2011</copyright>
<tags>utility utilities</tags>
<references>
<reference file="CUL.Bender.dll" />
</references>
<dependencies>
<dependency id="Bender" version="[3.0.11.0]" />
<dependency id="CraigsUtilityLibrary" version="[4.0.286]" />
<dependency id="Bender" version="[3.0.22.0]" />
<dependency id="CraigsUtilityLibrary" version="[4.0.287]" />
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions UtilitiesPackages/CUL.JSON.Net.nuspec
View file
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>CUL.JSON.Net</id>
<version>4.0.286</version>
<version>4.0.287</version>
<title>Craig's Utility Library JSON.Net Support</title>
<authors>James Craig</authors>
<owners>James Craig</owners>
Expand All @@ -19,7 +19,7 @@
</references>
<dependencies>
<dependency id="Newtonsoft.Json" version="[7.0.1]" />
<dependency id="CraigsUtilityLibrary" version="[4.0.286]" />
<dependency id="CraigsUtilityLibrary" version="[4.0.287]" />
</dependencies>
</metadata>
<files>
Expand Down
6 changes: 3 additions & 3 deletions UtilitiesPackages/CUL.MiniProfiler.nuspec
View file
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>CUL.MiniProfiler</id>
<version>4.0.286</version>
<version>4.0.287</version>
<title>Craig's Utility Library MiniProfiler Support</title>
<authors>James Craig</authors>
<owners>James Craig</owners>
Expand All @@ -11,15 +11,15 @@
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>Craig's Utility Library is one of the largest collections of utility classes and extension methods for .Net. It includes code to help with tasks including encryption, compression, serialization, file management, email, image manipulation, SQL, various file formats (CSV, iCal, etc.), randomization, validation, math related classes, various data types, reflection, code gen, events, code profiling, etc.</description>
<summary>This adds support for MiniProfiler as the profiler that the library uses</summary>
<releaseNotes>This version is a complete rewrite of the current system. This will break all of your code, so don't update unless you're a brave soul.</releaseNotes>
<releaseNotes>This version is a complete rewrite from the 3.X line. This will break all of your code, so don't update unless you're a brave soul.</releaseNotes>
<copyright>Copyright 2011</copyright>
<tags>utility utilities</tags>
<references>
<reference file="CUL.MiniProfiler.dll" />
</references>
<dependencies>
<dependency id="MiniProfiler" version="[3.1.1.140]" />
<dependency id="CraigsUtilityLibrary" version="[4.0.286]" />
<dependency id="CraigsUtilityLibrary" version="[4.0.287]" />
</dependencies>
</metadata>
<files>
Expand Down
6 changes: 3 additions & 3 deletions UtilitiesPackages/CUL.NLog.nuspec
View file
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>CUL.NLog</id>
<version>4.0.286</version>
<version>4.0.287</version>
<title>Craig's Utility Library NLog Support</title>
<authors>James Craig</authors>
<owners>James Craig</owners>
Expand All @@ -11,15 +11,15 @@
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>Craig's Utility Library is one of the largest collections of utility classes and extension methods for .Net. It includes code to help with tasks including encryption, compression, serialization, file management, email, image manipulation, SQL, various file formats (CSV, iCal, etc.), randomization, validation, math related classes, various data types, reflection, code gen, events, code profiling, etc.</description>
<summary>This adds support for NLog as the logger that the library uses</summary>
<releaseNotes>This version is a complete rewrite of the current system. This will break all of your code, so don't update unless you're a brave soul.</releaseNotes>
<releaseNotes>This version is a complete rewrite from the 3.X line. This will break all of your code, so don't update unless you're a brave soul.</releaseNotes>
<copyright>Copyright 2011</copyright>
<tags>utility utilities</tags>
<references>
<reference file="CUL.NLog.dll" />
</references>
<dependencies>
<dependency id="NLog" version="[4.0.1]" />
<dependency id="CraigsUtilityLibrary" version="[4.0.286]" />
<dependency id="CraigsUtilityLibrary" version="[4.0.287]" />
</dependencies>
</metadata>
<files>
Expand Down

0 comments on commit 14c7572

Please sign in to comment.