Skip to content

Commit

Permalink
Build for .NET Standard and 4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
mattlorimor committed Apr 27, 2018
1 parent 50c1ddd commit 081a36e
Show file tree
Hide file tree
Showing 38 changed files with 41 additions and 244 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ TestProbabilisticDataStructures/obj/
TestResults/ProbabilisticDataStructures.TE.Tests.mdf
TestResults/ProbabilisticDataStructures.TE.Tests_log.ldf
TestResults/
.vs/
29 changes: 11 additions & 18 deletions ProbabilisticDataStructures.sln
Original file line number Diff line number Diff line change
@@ -1,32 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProbabilisticDataStructures", "ProbabilisticDataStructures\ProbabilisticDataStructures.csproj", "{BF43F4A8-A892-413C-8E11-9A53D2249BF4}"
# Visual Studio 15
VisualStudioVersion = 15.0.27428.2043
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProbabilisticDataStructures", "ProbabilisticDataStructures\ProbabilisticDataStructures.csproj", "{4775E89C-C139-43B0-8436-B456C035C9D9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProbabilisticDataStructures", "TestProbabilisticDataStructures\TestProbabilisticDataStructures.csproj", "{8212EFDE-5134-4914-96D3-C550FD9432F1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FB0C1D18-BE84-4C9C-939E-3729FC292735}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
Default.testsettings = Default.testsettings
LICENSE.txt = LICENSE.txt
ProbabilisticDataStructures.vsmdi = ProbabilisticDataStructures.vsmdi
README.md = README.md
EndProjectSection
EndProject
Global
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = ProbabilisticDataStructures.vsmdi
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BF43F4A8-A892-413C-8E11-9A53D2249BF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF43F4A8-A892-413C-8E11-9A53D2249BF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF43F4A8-A892-413C-8E11-9A53D2249BF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF43F4A8-A892-413C-8E11-9A53D2249BF4}.Release|Any CPU.Build.0 = Release|Any CPU
{4775E89C-C139-43B0-8436-B456C035C9D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4775E89C-C139-43B0-8436-B456C035C9D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4775E89C-C139-43B0-8436-B456C035C9D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4775E89C-C139-43B0-8436-B456C035C9D9}.Release|Any CPU.Build.0 = Release|Any CPU
{8212EFDE-5134-4914-96D3-C550FD9432F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8212EFDE-5134-4914-96D3-C550FD9432F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8212EFDE-5134-4914-96D3-C550FD9432F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -35,4 +25,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DD9C9C10-6340-471D-BF9D-A6823302D332}
EndGlobalSection
EndGlobal
5 changes: 0 additions & 5 deletions ProbabilisticDataStructures/BloomFilter.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ProbabilisticDataStructures;
using System.Security.Cryptography;

namespace ProbabilisticDataStructures
Expand Down
8 changes: 1 addition & 7 deletions ProbabilisticDataStructures/Buckets.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
namespace ProbabilisticDataStructures
{
/// <summary>
/// Buckets is a fast, space-efficient array of buckets where each bucket can store
Expand Down
5 changes: 0 additions & 5 deletions ProbabilisticDataStructures/CountMinSketch.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
{
Expand Down
7 changes: 1 addition & 6 deletions ProbabilisticDataStructures/CountingBloomFilter.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using System.Security.Cryptography;

namespace ProbabilisticDataStructures
{
Expand Down
3 changes: 0 additions & 3 deletions ProbabilisticDataStructures/CuckooBloomFilter.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
{
Expand Down
9 changes: 3 additions & 6 deletions ProbabilisticDataStructures/Defaults.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using System.Security.Cryptography;
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("TestProbabilisticDataStructures")]

namespace ProbabilisticDataStructures
{
Expand Down
7 changes: 1 addition & 6 deletions ProbabilisticDataStructures/DeletableBloomFilter.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using System.Security.Cryptography;

namespace ProbabilisticDataStructures
{
Expand Down
4 changes: 0 additions & 4 deletions ProbabilisticDataStructures/Element.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
{
Expand Down
2 changes: 0 additions & 2 deletions ProbabilisticDataStructures/ElementHeap.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
{
Expand Down
3 changes: 0 additions & 3 deletions ProbabilisticDataStructures/Hash.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
{
Expand Down
3 changes: 0 additions & 3 deletions ProbabilisticDataStructures/HyperLogLog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ included in all copies or substantial portions of the Software.
*/

using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
{
Expand Down
8 changes: 1 addition & 7 deletions ProbabilisticDataStructures/IFilter.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
namespace ProbabilisticDataStructures
{
public interface IFilter
{
Expand Down
4 changes: 0 additions & 4 deletions ProbabilisticDataStructures/InverseBloomFilter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,8 @@ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
{
Expand Down
1 change: 0 additions & 1 deletion ProbabilisticDataStructures/MinHash.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
Expand Down
4 changes: 0 additions & 4 deletions ProbabilisticDataStructures/PartitionedBloomFilter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ copies or substantial portions of the Software.
*/

using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
{
Expand Down
74 changes: 5 additions & 69 deletions ProbabilisticDataStructures/ProbabilisticDataStructures.csproj
Original file line number Diff line number Diff line change
@@ -1,71 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{BF43F4A8-A892-413C-8E11-9A53D2249BF4}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ProbabilisticDataStructures</RootNamespace>
<AssemblyName>ProbabilisticDataStructures</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="BloomFilter.cs" />
<Compile Include="Buckets.cs" />
<Compile Include="CountingBloomFilter.cs" />
<Compile Include="CountMinSketch.cs" />
<Compile Include="CuckooBloomFilter.cs" />
<Compile Include="Defaults.cs" />
<Compile Include="DeletableBloomFilter.cs" />
<Compile Include="Element.cs" />
<Compile Include="ElementHeap.cs" />
<Compile Include="Hash.cs" />
<Compile Include="HyperLogLog.cs" />
<Compile Include="IFilter.cs" />
<Compile Include="InverseBloomFilter.cs" />
<Compile Include="PartitionedBloomFilter.cs" />
<Compile Include="MinHash.cs" />
<Compile Include="Utils.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ScalableBloomFilter.cs" />
<Compile Include="StableBloomFilter.cs" />
<Compile Include="TopK.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
39 changes: 0 additions & 39 deletions ProbabilisticDataStructures/Properties/AssemblyInfo.cs

This file was deleted.

2 changes: 0 additions & 2 deletions ProbabilisticDataStructures/ScalableBloomFilter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ copies or substantial portions of the Software.
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
{
Expand Down
4 changes: 0 additions & 4 deletions ProbabilisticDataStructures/StableBloomFilter.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
{
Expand Down
8 changes: 1 addition & 7 deletions ProbabilisticDataStructures/TopK.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
namespace ProbabilisticDataStructures
{
/// <summary>
/// TopK uses a Count-Min Sketch to calculate the top-K frequent elements in a
Expand Down
3 changes: 0 additions & 3 deletions ProbabilisticDataStructures/Utils.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;

namespace ProbabilisticDataStructures
{
Expand Down
4 changes: 1 addition & 3 deletions TestProbabilisticDataStructures/TestBloomFilter.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using ProbabilisticDataStructures;
using System.Text;
using System.Collections.Generic;

namespace TestProbabilisticDataStructures
{
Expand Down
3 changes: 1 addition & 2 deletions TestProbabilisticDataStructures/TestBuckets.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using ProbabilisticDataStructures;

namespace TestProbabilisticDataStructures
Expand Down
3 changes: 1 addition & 2 deletions TestProbabilisticDataStructures/TestCountMinSketch.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Text;
using System.Text;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using ProbabilisticDataStructures;

Expand Down
Loading

0 comments on commit 081a36e

Please sign in to comment.