Skip to content
This repository has been archived by the owner on Jun 12, 2021. It is now read-only.

Commit

Permalink
split SDK for net40 only and added ilmerge to afterbuild
Browse files Browse the repository at this point in the history
--HG--
branch : sdksplit
rename : src/Xbehave.Net40/Sdk/BackgroundStep.cs => src/Xbehave.Sdk.Net40/BackgroundStep.cs
rename : src/Xbehave.Net40/Sdk/CommandBase.cs => src/Xbehave.Sdk.Net40/CommandBase.cs
rename : src/Xbehave.Net40/Sdk/Context.cs => src/Xbehave.Sdk.Net40/Context.cs
rename : src/Xbehave.Net40/Sdk/ContextFactory.cs => src/Xbehave.Sdk.Net40/ContextFactory.cs
rename : src/Xbehave.Net40/Sdk/CurrentScenario.cs => src/Xbehave.Sdk.Net40/CurrentScenario.cs
rename : src/Xbehave.Net40/Sdk/DisposalCommand.cs => src/Xbehave.Sdk.Net40/DisposalCommand.cs
rename : src/Xbehave.Net40/Sdk/ExceptionCommand.cs => src/Xbehave.Sdk.Net40/ExceptionCommand.cs
rename : src/Xbehave.Net40/Sdk/ExpressionNaming/BinaryExpressionExtensions.cs => src/Xbehave.Sdk.Net40/ExpressionNaming/BinaryExpressionExtensions.cs
rename : src/Xbehave.Net40/Sdk/ExpressionNaming/ConstantExpressionExtensions.cs => src/Xbehave.Sdk.Net40/ExpressionNaming/ConstantExpressionExtensions.cs
rename : src/Xbehave.Net40/Sdk/ExpressionNaming/ExpressionExtensions.cs => src/Xbehave.Sdk.Net40/ExpressionNaming/ExpressionExtensions.cs
rename : src/Xbehave.Net40/Sdk/ExpressionNaming/ExpressionTypeExtensions.cs => src/Xbehave.Sdk.Net40/ExpressionNaming/ExpressionTypeExtensions.cs
rename : src/Xbehave.Net40/Sdk/ExpressionNaming/LambdaExpressionExtensions.cs => src/Xbehave.Sdk.Net40/ExpressionNaming/LambdaExpressionExtensions.cs
rename : src/Xbehave.Net40/Sdk/ExpressionNaming/MemberExpressionExtensions.cs => src/Xbehave.Sdk.Net40/ExpressionNaming/MemberExpressionExtensions.cs
rename : src/Xbehave.Net40/Sdk/ExpressionNaming/MethodCallExpressionExtensions.cs => src/Xbehave.Sdk.Net40/ExpressionNaming/MethodCallExpressionExtensions.cs
rename : src/Xbehave.Net40/Sdk/ExpressionNaming/MethodInfoExtensions.cs => src/Xbehave.Sdk.Net40/ExpressionNaming/MethodInfoExtensions.cs
rename : src/Xbehave.Net40/Sdk/ExpressionNaming/Optimizations.cs => src/Xbehave.Sdk.Net40/ExpressionNaming/Optimizations.cs
rename : src/Xbehave.Net40/Sdk/ExpressionNaming/StringExtensions.cs => src/Xbehave.Sdk.Net40/ExpressionNaming/StringExtensions.cs
rename : src/Xbehave.Net40/Sdk/ExpressionNaming/TypeExtensions.cs => src/Xbehave.Sdk.Net40/ExpressionNaming/TypeExtensions.cs
rename : src/Xbehave.Net40/Sdk/ExpressionNaming/UnaryExpressionExtensions.cs => src/Xbehave.Sdk.Net40/ExpressionNaming/UnaryExpressionExtensions.cs
rename : src/Xbehave.Net40/Sdk/Infrastructure/Disposable.cs => src/Xbehave.Sdk.Net40/Infrastructure/Disposable.cs
rename : src/Xbehave.Net40/Sdk/Infrastructure/DisposableExtensions.cs => src/Xbehave.Sdk.Net40/Infrastructure/DisposableExtensions.cs
rename : src/Xbehave.Net40/Sdk/Infrastructure/EnumerableExtensions.cs => src/Xbehave.Sdk.Net40/Infrastructure/EnumerableExtensions.cs
rename : src/Xbehave.Net40/Sdk/Infrastructure/Guard.cs => src/Xbehave.Sdk.Net40/Infrastructure/Guard.cs
rename : src/Xbehave.Net40/Sdk/Infrastructure/StringExtensions.cs => src/Xbehave.Sdk.Net40/Infrastructure/StringExtensions.cs
rename : src/Xbehave.Net40/Sdk/ScenarioDefinition.cs => src/Xbehave.Sdk.Net40/ScenarioDefinition.cs
rename : src/Xbehave.Net40/Sdk/Step.cs => src/Xbehave.Sdk.Net40/Step.cs
rename : src/Xbehave.Net40/Sdk/StepCommand.cs => src/Xbehave.Sdk.Net40/StepCommand.cs
rename : src/Xbehave.Net40/Sdk/TestCommandExtensions.cs => src/Xbehave.Sdk.Net40/TestCommandExtensions.cs
  • Loading branch information
adamralph committed Jul 14, 2012
1 parent 133f5bb commit ca72b3d
Show file tree
Hide file tree
Showing 38 changed files with 507 additions and 76 deletions.
1 change: 1 addition & 0 deletions packages/repositories.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
<repository path="..\src\Xbehave.Net40\packages.config" />
<repository path="..\src\Xbehave.Samples.Net35\packages.config" />
<repository path="..\src\Xbehave.Samples.Net40\packages.config" />
<repository path="..\src\Xbehave.Sdk.Net40\packages.config" />
</repositories>
2 changes: 1 addition & 1 deletion src/Xbehave.Net40/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@

[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "Xbehave.Fluent", Justification = "WIP")]

[assembly: InternalsVisibleTo("Xbehave.Test, PublicKey=00240000048000009400000006020000002400005253413100040000010001007d4673eb20dad4551b5d2bc273e94c65ebb195b30713b429184bf04b799d98c6f6142bc70dc5049230a8a7d0c70406d01c886b2bf9000d68ca10bf8712fc4c0062192d4a0cdcf18d08a8f3ccaea6865cf9943eaf3820e08eaf2b4a4903ce1bca37166866796260623f88117c89a162d6100a6cf720a9c4b4324c2b0fe6b352c5")]
////[assembly: InternalsVisibleTo("Xbehave.Test, PublicKey=00240000048000009400000006020000002400005253413100040000010001007d4673eb20dad4551b5d2bc273e94c65ebb195b30713b429184bf04b799d98c6f6142bc70dc5049230a8a7d0c70406d01c886b2bf9000d68ca10bf8712fc4c0062192d4a0cdcf18d08a8f3ccaea6865cf9943eaf3820e08eaf2b4a4903ce1bca37166866796260623f88117c89a162d6100a6cf720a9c4b4324c2b0fe6b352c5")]
43 changes: 9 additions & 34 deletions src/Xbehave.Net40/Xbehave.Net40.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -91,53 +91,25 @@
<DependentUpon>StepDefinition.cs</DependentUpon>
</Compile>
<Compile Include="Deprecated\StringExtensions.cs" />
<Compile Include="Sdk\BackgroundStep.cs" />
<Compile Include="Sdk\ExceptionCommand.cs" />
<Compile Include="Sdk\Infrastructure\EnumerableExtensions.cs" />
<Compile Include="Sdk\Infrastructure\DisposableExtensions.cs" />
<Compile Include="Sdk\TestCommandExtensions.cs" />
<Compile Include="StepDefinitionExtensions.cs" />
<Compile Include="StepDefinitionExtensions.Expressions.cs">
<DependentUpon>StepDefinitionExtensions.cs</DependentUpon>
</Compile>
<Compile Include="StringExtensions.cs" />
<Compile Include="Sdk\Infrastructure\StringExtensions.cs" />
<Compile Include="_.cs" />
<Compile Include="Sdk\Infrastructure\Disposable.cs" />
<None Include="Sandbox\DynamicStringExtensions.cs" />
<Compile Include="Deprecated\_.cs" />
<Compile Include="Fluent\IStepDefinition.cs" />
<Compile Include="Sdk\Context.cs" />
<Compile Include="Sdk\CommandBase.cs" />
<Compile Include="Sdk\DisposalCommand.cs" />
<Compile Include="Sdk\ScenarioDefinition.cs" />
<Compile Include="Sdk\Infrastructure\Guard.cs" />
<Compile Include="Sdk\ContextFactory.cs" />
<None Include="Sandbox\Scenario.cs" />
<Compile Include="ScenarioAttribute.cs" />
<Compile Include="Deprecated\ScenarioDataAttribute.cs" />
<Compile Include="Deprecated\DisposableAction.cs" />
<Compile Include="Deprecated\SpecificationAttribute.cs" />
<Compile Include="Deprecated\SpecificationExtensions.cs" />
<Compile Include="Sdk\StepCommand.cs" />
<Compile Include="Sdk\Step.cs" />
<Compile Include="Sdk\CurrentScenario.cs" />
<Compile Include="Deprecated\ContextDelegate.cs" />
<Compile Include="Deprecated\ThesisAttribute.cs" />
<Compile Include="Fluent\StepDefinition.cs" />
<Compile Include="Sdk\ExpressionNaming\BinaryExpressionExtensions.cs" />
<Compile Include="Sdk\ExpressionNaming\ConstantExpressionExtensions.cs" />
<Compile Include="Sdk\ExpressionNaming\LambdaExpressionExtensions.cs" />
<Compile Include="Sdk\ExpressionNaming\Optimizations.cs" />
<Compile Include="Sdk\ExpressionNaming\UnaryExpressionExtensions.cs" />
<Compile Include="Sdk\ExpressionNaming\MemberExpressionExtensions.cs" />
<Compile Include="Sdk\ExpressionNaming\MethodCallExpressionExtensions.cs" />
<Compile Include="Sdk\ExpressionNaming\MethodInfoExtensions.cs" />
<Compile Include="Sdk\ExpressionNaming\TypeExtensions.cs" />
<Compile Include="Sdk\ExpressionNaming\StringExtensions.cs" />
<Compile Include="Sdk\ExpressionNaming\ExpressionTypeExtensions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Sdk\ExpressionNaming\ExpressionExtensions.cs" />
<Compile Include="_.Expressions.cs">
<DependentUpon>_.cs</DependentUpon>
</Compile>
Expand All @@ -153,14 +125,17 @@
<Link>Properties\Xbehave.CustomDictionary.xml</Link>
</CodeAnalysisDictionary>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xbehave.Sdk.Net40\Xbehave.Sdk.Net40.csproj">
<Project>{69370680-9671-466C-B7BC-1C9BB5474F31}</Project>
<Name>Xbehave.Sdk.Net40</Name>
<ILMerge>True</ILMerge>
</ProjectReference>
</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 Name="AfterBuild">
<Exec Command="&quot;$(SolutionDir)\..\tools\ILMerge\ILmerge.exe&quot; /lib:$(OutputPath) /targetplatform:v4 /internalize /out:@(MainAssembly) &quot;@(IntermediateAssembly)&quot; &quot;$(OutputPath)XBehave.Sdk.dll&quot;" />
</Target>
-->
<PropertyGroup>
<StyleCopMSBuildTargetsFile>..\..\packages\StyleCop.MSBuild.4.7.34.0\tools\StyleCop.targets</StyleCopMSBuildTargetsFile>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Xbehave.Sdk
{
using System;

internal class BackgroundStep : Step
public class BackgroundStep : Step
{
public BackgroundStep(string stepType, string text, Action body)
: base(stepType, text, body)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Xbehave.Sdk
using System.Globalization;
using Xunit.Sdk;

internal abstract class CommandBase : TestCommand
public abstract class CommandBase : TestCommand
{
private readonly string name;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Xbehave.Sdk
using Xunit.Sdk;
using Guard = Xbehave.Sdk.Infrastructure.Guard;

internal class Context
public class Context
{
[ThreadStatic]
private static string failedStepName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Xbehave.Sdk
using System.Linq;
using Xbehave.Sdk.Infrastructure;

internal partial class ContextFactory
public partial class ContextFactory
{
public IEnumerable<Context> CreateContexts(ScenarioDefinition definition, IEnumerable<Step> steps)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Xbehave.Sdk
using System.Linq;
using Xunit.Sdk;

internal static class CurrentScenario
public static class CurrentScenario
{
[ThreadStatic]
private static bool addingBackgroundSteps;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Xbehave.Sdk
using Xbehave.Sdk.Infrastructure;
using Xunit.Sdk;

internal class DisposalCommand : CommandBase
public class DisposalCommand : CommandBase
{
private readonly IEnumerable<IDisposable> disposables;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Xbehave.Sdk
using System;
using Xunit.Sdk;

internal class ExceptionCommand : TestCommand
public class ExceptionCommand : TestCommand
{
private readonly Exception exception;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Xbehave.Sdk.ExpressionNaming
using System.Collections.Generic;
using System.Linq.Expressions;

internal static class BinaryExpressionExtensions
public static class BinaryExpressionExtensions
{
public static IEnumerable<string> ToTokens(this BinaryExpression expression)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Xbehave.Sdk.ExpressionNaming
using System.Collections.Generic;
using System.Linq.Expressions;

internal static class ConstantExpressionExtensions
public static class ConstantExpressionExtensions
{
public static IEnumerable<string> ToTokens(this ConstantExpression expression)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Xbehave.Sdk.ExpressionNaming
using System.Linq;
using System.Linq.Expressions;

internal static class ExpressionExtensions
public static class ExpressionExtensions
{
public static string ToSentence(this Expression expression)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Xbehave.Sdk.ExpressionNaming
using System.Collections.Generic;
using System.Linq.Expressions;

internal static class ExpressionTypeExtensions
public static class ExpressionTypeExtensions
{
private static readonly Dictionary<ExpressionType, string> Tokens = new Dictionary<ExpressionType, string>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Xbehave.Sdk.ExpressionNaming
using System.Collections.Generic;
using System.Linq.Expressions;

internal static class LambdaExpressionExtensions
public static class LambdaExpressionExtensions
{
public static IEnumerable<string> ToTokens(this LambdaExpression expression)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Xbehave.Sdk.ExpressionNaming
using System.Collections.Generic;
using System.Linq.Expressions;

internal static class MemberExpressionExtensions
public static class MemberExpressionExtensions
{
public static IEnumerable<string> ToTokens(this MemberExpression expression)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Xbehave.Sdk.ExpressionNaming
using System.Linq;
using System.Linq.Expressions;

internal static class MethodCallExpressionExtensions
public static class MethodCallExpressionExtensions
{
public static IEnumerable<string> ToTokens(this MethodCallExpression expression)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Xbehave.Sdk.ExpressionNaming
using System.Reflection;
using System.Runtime.CompilerServices;

internal static class MethodInfoExtensions
public static class MethodInfoExtensions
{
public static bool IsExtension(this MethodInfo method)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Xbehave.Sdk.ExpressionNaming
using System;
using System.Collections.Generic;

internal static class Optimizations
public static class Optimizations
{
private static readonly HashSet<string> IgnoredTypes = new HashSet<string>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Xbehave.Sdk.ExpressionNaming
using System.Diagnostics.CodeAnalysis;
using System.Text.RegularExpressions;

internal static class StringExtensions
public static class StringExtensions
{
[SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "The result is used for display purposes only.")]
public static string ToToken(this string text)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Xbehave.Sdk.ExpressionNaming
using System.Linq;
using System.Runtime.CompilerServices;

internal static class TypeExtensions
public static class TypeExtensions
{
public static bool AllowsInferenceOf(this Type type, Type genericType)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Xbehave.Sdk.ExpressionNaming
using System.Linq;
using System.Linq.Expressions;

internal static class UnaryExpressionExtensions
public static class UnaryExpressionExtensions
{
public static IEnumerable<string> ToTokens(this UnaryExpression expression)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Xbehave.Sdk.Infrastructure
{
using System;

internal class Disposable : IDisposable
public class Disposable : IDisposable
{
private readonly Action disposal;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Xbehave.Sdk.Infrastructure
using System.Diagnostics.CodeAnalysis;
using System.Linq;

internal static class DisposableExtensions
public static class DisposableExtensions
{
[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Emulating nested using blocks.")]
public static void DisposeAll(this IEnumerable<IDisposable> source)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Xbehave.Sdk.Infrastructure
{
using System.Collections.Generic;

internal static class EnumerableExtensions
public static class EnumerableExtensions
{
public static IEnumerable<T> Concat<T>(this IEnumerable<T> source, T item)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Xbehave.Sdk.Infrastructure
using System.Diagnostics;
using System.Globalization;

internal static class Guard
public static class Guard
{
[DebuggerStepThrough]
public static void AgainstNullArgument<T>(string parameterName, [ValidatedNotNull]T argument) where T : class
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Xbehave.Sdk.Infrastructure
using System.Globalization;
using System.Linq;

internal static class StringExtensions
public static class StringExtensions
{
public static string CompressWhitespace(this string source)
{
Expand Down
17 changes: 17 additions & 0 deletions src/Xbehave.Sdk.Net40/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// <copyright file="AssemblyInfo.cs" company="Adam Ralph">
// Copyright (c) Adam Ralph. All rights reserved.
// </copyright>

using System;
using System.Reflection;
using System.Runtime.InteropServices;

[assembly: AssemblyTitle("xBehave.net SDK")]
[assembly: AssemblyDescription("The SDK used for building xBehave.net.")]
[assembly: AssemblyProduct("xBehave.net")]

[assembly: ComVisible(false)]

[assembly: CLSCompliant(true)]

//// [assembly: publicsVisibleTo("Xbehave.Sdk.Test, PublicKey=00240000048000009400000006020000002400005253413100040000010001007d4673eb20dad4551b5d2bc273e94c65ebb195b30713b429184bf04b799d98c6f6142bc70dc5049230a8a7d0c70406d01c886b2bf9000d68ca10bf8712fc4c0062192d4a0cdcf18d08a8f3ccaea6865cf9943eaf3820e08eaf2b4a4903ce1bca37166866796260623f88117c89a162d6100a6cf720a9c4b4324c2b0fe6b352c5")]
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Xbehave.Sdk
using Xunit.Sdk;
using Guard = Xbehave.Sdk.Infrastructure.Guard;

internal partial class ScenarioDefinition
public partial class ScenarioDefinition
{
private readonly IMethodInfo method;
private readonly object[] args;
Expand Down
Loading

0 comments on commit ca72b3d

Please sign in to comment.