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.

Sign up for GitHub

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

Jump to bottom

.net standard support to SimpleInjector, Reactive, TestFramework #914

Merged
merged 2 commits into from
Jun 18, 2017
Merged

.net standard support to SimpleInjector, Reactive, TestFramework #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dadf9e2
add .net standard support to simple injection support lib
jacobpovar Jun 14, 2017
fc50f40
add .net standard support to reactive and testframework
jacobpovar Jun 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...ainers/MassTransit.SimpleInjectorIntegration/MassTransit.SimpleInjectorIntegration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net452</TargetFrameworks>
<TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\MassTransit.snk</AssemblyOriginatorKeyFile>
<DebugType>portable</DebugType>
Expand All @@ -14,8 +15,6 @@
<PackageReference Include="GreenPipes" Version="1.0.10" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
<PackageReference Include="SimpleInjector" Version="4.0.7" />
<Reference Include="System" />
<Reference Include="System.Core" />
<ProjectReference Include="..\..\MassTransit\MassTransit.csproj" />
</ItemGroup>
</Project>
37 changes: 5 additions & 32 deletions src/MassTransit.Reactive/MassTransit.Reactive.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net452</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1587,1591,1998,3008,3001</NoWarn>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\Release\MassTransit.Reactive.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\MassTransit.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\MassTransit.snk</AssemblyOriginatorKeyFile>
<DebugType>portable</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GreenPipes" Version="1.0.10" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
<Reference Include="System" />
<Reference Include="System.Core" />
<PackageReference Include="System.Reactive.Core" Version="3.1.1" />
<PackageReference Include="System.Reactive.Interfaces" Version="3.1.1" />
<PackageReference Include="System.Reactive.Linq" Version="3.1.1" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<ProjectReference Include="..\MassTransit\MassTransit.csproj" />
<ProjectReference Include="..\MassTransit\MassTransit.csproj" />
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions src/MassTransit.TestFramework/IntentionalTestException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,12 @@ public IntentionalTestException(string message, Exception innerException)
{
}


#if !NETCORE
protected IntentionalTestException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
}
#endif
}
}
61 changes: 12 additions & 49 deletions src/MassTransit.TestFramework/MassTransit.TestFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net452</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1587,1591,1998,3008,3001</NoWarn>
<DocumentationFile>
</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\MassTransit.TestFramework.XML</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<NoWarn>1587,1591,1998,3008,3001</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AssemblyOriginatorKeyFile>..\..\MassTransit.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
</PropertyGroup>

<PropertyGroup>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\MassTransit.xml</DocumentationFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GreenPipes" Version="1.0.10" />
<PackageReference Include="NewId" Version="3.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
<PackageReference Include="NUnit" Version="3.6.1" />
<Reference Include="System" />
<Reference Include="System.Core" />
<ProjectReference Include="..\MassTransit\MassTransit.csproj" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<ProjectReference Include="..\MassTransit\MassTransit.csproj" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion src/MassTransit.TestFramework/SerializerCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace MassTransit.TestFramework
{
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Threading;
using GreenPipes.Internals.Extensions;
using GreenPipes.Internals.Reflection;
Expand Down Expand Up @@ -78,7 +79,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist

public override bool CanConvert(Type objectType)
{
return objectType.IsInterface;
return objectType.GetTypeInfo().IsInterface;
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/MassTransit.TestFramework/TestConsumeContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ namespace MassTransit.TestFramework
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using Context;
Expand Down Expand Up @@ -186,7 +187,7 @@ public IEnumerable<string> SupportedMessageTypes

public bool HasMessageType(Type messageType)
{
return messageType.IsAssignableFrom(typeof(TMessage));
return messageType.GetTypeInfo().IsAssignableFrom(typeof(TMessage));
}

public bool TryGetMessage<T>(out ConsumeContext<T> consumeContext)
Expand Down
12 changes: 5 additions & 7 deletions src/MassTransit.TestFramework/TestSymmetricKeyProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,13 @@ public TestSymmetricKeyProvider(params string[] ids)
byte[] key;
byte[] iv;

using (var provider = new AesCryptoServiceProvider())
using (var aes = Aes.Create())
{
provider.GenerateIV();
provider.GenerateKey();
aes.GenerateKey();
aes.GenerateIV();

key = provider.Key;
iv = provider.IV;

provider.Clear();
key = aes.Key;
iv = aes.IV;
}

_keys.Add(id, new TestSymmetricKey(key, iv));
Expand Down