Skip to content

Commit

Permalink
Update project files. Remove unused MODM constant.
Browse files Browse the repository at this point in the history
  • Loading branch information
OmegaExtern committed Aug 7, 2016
1 parent 947639f commit 3428d82
Show file tree
Hide file tree
Showing 8 changed files with 134 additions and 19 deletions.
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,9 @@ paket-files/
# JetBrains Rider
.idea/
*.sln.iml
/build/tools/NuGet/Package.nuspec
/.travis.yml

# bitwz ignores
*.nuspec
/assemblies
/appveyor.yml
/.travis.yml
12 changes: 9 additions & 3 deletions bitwz.VS2015.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bitwz", "src\bitwz\bitwz.VS2015.csproj", "{2E887966-6786-4E0B-B30F-8537E8794607}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bitwz.VS2015.NET20", "src\bitwz\bitwz.VS2015.NET20.csproj", "{2E887966-6786-4E0B-B30F-8537E8794607}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bitwz.Tests", "tests\bitwz.Tests\bitwz.Tests.VS2015.csproj", "{19EB0AB5-612C-4C7A-AB43-3E6E706D72E5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bitwz.VS2015.NET45", "src\bitwz\bitwz.VS2015.NET45.csproj", "{7D5E1B11-E924-4E98-8C02-FB1900EA12EF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bitwz.UnitTestCodeGenerator", "src\bitwz.UnitTestCodeGenerator\bitwz.UnitTestCodeGenerator.VS2015.csproj", "{AF9F4035-262C-4DCA-96F1-73CD0AF986F4}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bitwz.Tests.VS2015", "tests\bitwz.Tests\bitwz.Tests.VS2015.csproj", "{19EB0AB5-612C-4C7A-AB43-3E6E706D72E5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bitwz.UnitTestCodeGenerator.VS2015", "src\bitwz.UnitTestCodeGenerator\bitwz.UnitTestCodeGenerator.VS2015.csproj", "{AF9F4035-262C-4DCA-96F1-73CD0AF986F4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6FE28764-470B-4AE0-A598-4392610D61E5}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -29,6 +31,10 @@ Global
{2E887966-6786-4E0B-B30F-8537E8794607}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E887966-6786-4E0B-B30F-8537E8794607}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E887966-6786-4E0B-B30F-8537E8794607}.Release|Any CPU.Build.0 = Release|Any CPU
{7D5E1B11-E924-4E98-8C02-FB1900EA12EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7D5E1B11-E924-4E98-8C02-FB1900EA12EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D5E1B11-E924-4E98-8C02-FB1900EA12EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D5E1B11-E924-4E98-8C02-FB1900EA12EF}.Release|Any CPU.Build.0 = Release|Any CPU
{19EB0AB5-612C-4C7A-AB43-3E6E706D72E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19EB0AB5-612C-4C7A-AB43-3E6E706D72E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19EB0AB5-612C-4C7A-AB43-3E6E706D72E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
<None Include="Properties\app.manifest" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\bitwz\bitwz.VS2015.csproj">
<Project>{2e887966-6786-4e0b-b30f-8537e8794607}</Project>
<ProjectReference Include="..\bitwz\bitwz.VS2015.NET45.csproj">
<Project>{7D5E1B11-E924-4E98-8C02-FB1900EA12EF}</Project>
<Name>bitwz</Name>
</ProjectReference>
</ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion src/bitwz/BitwzMath.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System;
#if NET_45
using System.Runtime.CompilerServices;
#endif

namespace bitwz
{
Expand All @@ -16,7 +18,7 @@ public static partial class BitwzMath
/// Number of bits in a byte.
/// </summary>
private const byte BITS = 8;
private const long MOD = 4294967296L, MODM = 4294967295L;
private const long MOD = 4294967296L;
/// <summary>
/// Pre-compiled "Pow(2, n)" array where n is in range from 0 to 31.
/// <para />
Expand All @@ -43,7 +45,9 @@ static BitwzMath()
/// The largest integer less than or equal to d. If d is equal to <see cref="double.NaN" />,
/// <see cref="double.NegativeInfinity" />, or <see cref="double.PositiveInfinity" />, that value is returned.
/// </returns>
#if NET_45
[MethodImpl(MethodImplOptions.AggressiveInlining)]
#endif
public static double floor(double d) => Math.Floor(d);

//public static double floor(double d)
Expand Down
6 changes: 3 additions & 3 deletions src/bitwz/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("2e887966-6786-4e0b-b30f-8537e8794607")]
//[assembly: Guid("")]

// Version information for an assembly consists of the following four values:
//
Expand All @@ -32,6 +32,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]
[assembly: AssemblyVersion("1.2.1.0")]
[assembly: AssemblyFileVersion("1.2.1.0")]
[assembly: NeutralResourcesLanguage("en-US")]
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>bitwz</RootNamespace>
<AssemblyName>bitwz</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
Expand All @@ -20,25 +20,25 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants>DEBUG;TRACE;NET_20</DefineConstants>
<ErrorReport>none</ErrorReport>
<WarningLevel>4</WarningLevel>
<RunCodeAnalysis>true</RunCodeAnalysis>
<Prefer32Bit>false</Prefer32Bit>
<DocumentationFile>bin\Debug\bitwz.XML</DocumentationFile>
<DocumentationFile>bin\Debug\bitwz.xml</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<OutputPath>..\..\assemblies\net20\</OutputPath>
<DefineConstants>TRACE;NET_20</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<DocumentationFile>bin\Release\bitwz.XML</DocumentationFile>
<DocumentationFile>..\..\..\assemblies\net20\bitwz.xml</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<LangVersion>6</LangVersion>
<RunCodeAnalysis>true</RunCodeAnalysis>
Expand Down
102 changes: 102 additions & 0 deletions src/bitwz/bitwz.VS2015.NET45.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.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')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{7D5E1B11-E924-4E98-8C02-FB1900EA12EF}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>bitwz</RootNamespace>
<AssemblyName>bitwz</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET_45</DefineConstants>
<ErrorReport>none</ErrorReport>
<WarningLevel>4</WarningLevel>
<RunCodeAnalysis>true</RunCodeAnalysis>
<Prefer32Bit>false</Prefer32Bit>
<DocumentationFile>bin\Debug\bitwz.xml</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\assemblies\net45\</OutputPath>
<DefineConstants>TRACE;NET_45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<DocumentationFile>..\..\..\assemblies\net45\bitwz.xml</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<LangVersion>6</LangVersion>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="BitwiseAnd.cs" />
<Compile Include="BitwiseLeftShift.cs" />
<Compile Include="BitwiseNot.cs" />
<Compile Include="BitwiseOr.cs" />
<Compile Include="BitwiseRightShift.cs" />
<Compile Include="BitwiseXor.cs" />
<Compile Include="BitwzMath.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="Resources\BitwiseAnd.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\BitwiseNot.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\BitwiseOr.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\BitwiseXOr.png" />
</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>
4 changes: 2 additions & 2 deletions tests/bitwz.Tests/bitwz.Tests.VS2015.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\bitwz\bitwz.VS2015.csproj">
<Project>{2e887966-6786-4e0b-b30f-8537e8794607}</Project>
<ProjectReference Include="..\..\src\bitwz\bitwz.VS2015.NET45.csproj">
<Project>{7D5E1B11-E924-4E98-8C02-FB1900EA12EF}</Project>
<Name>bitwz</Name>
</ProjectReference>
</ItemGroup>
Expand Down

0 comments on commit 3428d82

Please sign in to comment.