Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate Core project to .NET Standard 1.0 #19

Merged
merged 1 commit into from
Nov 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Synergy.Contracts/ExcludeFromCodeCoverageAttribute.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace System.Diagnostics.CodeAnalysis
{
/// <summary>Specifies that the attributed code should be excluded from code coverage information. </summary>
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Event, AllowMultiple = false, Inherited = false)]
public sealed class ExcludeFromCodeCoverageAttribute : Attribute
{
}
}
13 changes: 13 additions & 0 deletions Synergy.Contracts/Extensions/TypeExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using System;
using System.Reflection;

namespace Synergy.Contracts.Extensions
{
internal static class TypeExtensions
{
public static bool IsInstanceOfType(this Type type, object obj)
{
return obj != null && type.GetTypeInfo().IsAssignableFrom(obj.GetType().GetTypeInfo());
}
}
}
10 changes: 0 additions & 10 deletions Synergy.Contracts/Failures/DesignByContractViolationException.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Diagnostics;
using System.Runtime.Serialization;
using JetBrains.Annotations;

namespace Synergy.Contracts
Expand All @@ -9,7 +8,6 @@ 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 @@ -27,13 +25,5 @@ public DesignByContractViolationException()
public DesignByContractViolationException([NotNull] string message) : base(message)
{
}

/// <summary>
/// Serialization required constructor.
/// </summary>
protected DesignByContractViolationException([NotNull] SerializationInfo info, StreamingContext context) :
base(info, context)
{
}
}
}
1 change: 1 addition & 0 deletions Synergy.Contracts/Failures/FailCastable.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Diagnostics.CodeAnalysis;
using JetBrains.Annotations;
using Synergy.Contracts.Extensions;

namespace Synergy.Contracts
{
Expand Down
54 changes: 6 additions & 48 deletions Synergy.Contracts/Synergy.Contracts.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
<?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')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<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>
<TargetFramework>netstandard1.0</TargetFramework>
<AssemblyName>Synergy.Contracts</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<RootNamespace>Synergy.Contracts</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -35,42 +28,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<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" />
<PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
<PackageReference Include="JetBrains.Annotations" Version="10.2.1" />
</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: 0 additions & 4 deletions Synergy.Contracts/packages.config

This file was deleted.