Skip to content

Commit

Permalink
Revert "Merge pull request synergy-software#19 from kmorcinek/master"
Browse files Browse the repository at this point in the history
This reverts commit 89575d3, reversing
changes made to 8bb0ba4.
  • Loading branch information
kmorcinek committed Jan 18, 2018
1 parent abc0918 commit 0bfb7f2
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 27 deletions.
8 changes: 0 additions & 8 deletions Synergy.Contracts/ExcludeFromCodeCoverageAttribute.cs

This file was deleted.

13 changes: 0 additions & 13 deletions Synergy.Contracts/Extensions/TypeExtensions.cs

This file was deleted.

10 changes: 10 additions & 0 deletions Synergy.Contracts/Failures/DesignByContractViolationException.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Diagnostics;
using System.Runtime.Serialization;
using JetBrains.Annotations;

namespace Synergy.Contracts
Expand All @@ -8,6 +9,7 @@ namespace Synergy.Contracts
/// The exception thrown when some contract check failed.
/// When you see it it means that someone does not meet the contract.
/// </summary>
[Serializable]
[DebuggerStepThrough]
public class DesignByContractViolationException : Exception
{
Expand All @@ -25,5 +27,13 @@ public DesignByContractViolationException()
public DesignByContractViolationException([NotNull] string message) : base(message)
{
}

/// <summary>
/// Serialization required constructor.
/// </summary>
protected DesignByContractViolationException([NotNull] SerializationInfo info, StreamingContext context) :
base(info, context)
{
}
}
}
54 changes: 48 additions & 6 deletions Synergy.Contracts/Synergy.Contracts.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<?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>
<TargetFramework>netstandard1.0</TargetFramework>
<AssemblyName>Synergy.Contracts</AssemblyName>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{653FF172-0DC5-4D81-91AE-3CE09D8CF7C1}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Synergy.Contracts</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>Synergy.Contracts</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -28,7 +35,42 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
<PackageReference Include="JetBrains.Annotations" Version="10.2.1" />
<Reference Include="JetBrains.Annotations, Version=10.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
<HintPath>..\packages\JetBrains.Annotations.10.2.1\lib\net\JetBrains.Annotations.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\SynergyAssemblyInfo.cs">
<Link>Properties\SynergyAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Extensions\StringFormatExtensions.cs" />
<Compile Include="Failures\DesignByContractViolationException.cs" />
<Compile Include="Failures\Fail.cs" />
<Compile Include="Failures\FailEnum.cs" />
<Compile Include="Failures\FailString.cs" />
<Compile Include="Failures\FailBoolean.cs" />
<Compile Include="Failures\FailCastable.cs" />
<Compile Include="Failures\FailCollection.cs" />
<Compile Include="Failures\FailDateTime.cs" />
<Compile Include="Failures\FailEquality.cs" />
<Compile Include="Failures\FailGuid.cs" />
<Compile Include="Failures\FailNullability.cs" />
<Compile Include="Pooling\Pool.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Synergy.Contracts.nuspec" />
</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: 4 additions & 0 deletions Synergy.Contracts/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="JetBrains.Annotations" version="10.2.1" targetFramework="net452" />
</packages>

0 comments on commit 0bfb7f2

Please sign in to comment.