Skip to content

Commit

Permalink
Merge pull request #1503 from rogeralsing/add-wire-as-contrib
Browse files Browse the repository at this point in the history
Add wire back as contrib package + Serialization TestKit
  • Loading branch information
Horusiath committed Dec 5, 2015
2 parents e724d60 + 8912086 commit 89bba6d
Show file tree
Hide file tree
Showing 20 changed files with 1,096 additions and 2 deletions.
38 changes: 37 additions & 1 deletion src/Akka.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
VisualStudioVersion = 14.0.24606.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{69279534-1DBA-4115-BF8B-03F77FC8125E}"
EndProject
Expand Down Expand Up @@ -225,6 +225,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.Persistence.Sqlite", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.Persistence.Sqlite.Tests", "contrib\persistence\Akka.Persistence.Sqlite.Tests\Akka.Persistence.Sqlite.Tests.csproj", "{7A832BBF-053E-4E9F-BD83-D988A0130CC8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serializers", "Serializers", "{0E55F1F8-E212-43D7-A0C0-ACEA9794B0D7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.Serialization.Wire", "contrib\serializers\Akka.Serialization.Wire\Akka.Serialization.Wire.csproj", "{B47CA568-40CF-48DE-B87E-31BD400EBB08}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.Serialization.TestKit", "contrib\serializers\Akka.Serialization.TestKit\Akka.Serialization.TestKit.csproj", "{CAA97041-CFC0-4081-9BD2-8B139E62A611}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.Serialization.WireTests", "contrib\serializers\Akka.Serialization.WireTests\Akka.Serialization.WireTests.csproj", "{402FA351-D6C6-40FD-8868-F07156035919}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Mono|Any CPU = Debug Mono|Any CPU
Expand Down Expand Up @@ -822,6 +830,30 @@ Global
{7A832BBF-053E-4E9F-BD83-D988A0130CC8}.Release Mono|Any CPU.Build.0 = Release|Any CPU
{7A832BBF-053E-4E9F-BD83-D988A0130CC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A832BBF-053E-4E9F-BD83-D988A0130CC8}.Release|Any CPU.Build.0 = Release|Any CPU
{B47CA568-40CF-48DE-B87E-31BD400EBB08}.Debug Mono|Any CPU.ActiveCfg = Debug|Any CPU
{B47CA568-40CF-48DE-B87E-31BD400EBB08}.Debug Mono|Any CPU.Build.0 = Debug|Any CPU
{B47CA568-40CF-48DE-B87E-31BD400EBB08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B47CA568-40CF-48DE-B87E-31BD400EBB08}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B47CA568-40CF-48DE-B87E-31BD400EBB08}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU
{B47CA568-40CF-48DE-B87E-31BD400EBB08}.Release Mono|Any CPU.Build.0 = Release|Any CPU
{B47CA568-40CF-48DE-B87E-31BD400EBB08}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B47CA568-40CF-48DE-B87E-31BD400EBB08}.Release|Any CPU.Build.0 = Release|Any CPU
{CAA97041-CFC0-4081-9BD2-8B139E62A611}.Debug Mono|Any CPU.ActiveCfg = Debug|Any CPU
{CAA97041-CFC0-4081-9BD2-8B139E62A611}.Debug Mono|Any CPU.Build.0 = Debug|Any CPU
{CAA97041-CFC0-4081-9BD2-8B139E62A611}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CAA97041-CFC0-4081-9BD2-8B139E62A611}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CAA97041-CFC0-4081-9BD2-8B139E62A611}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU
{CAA97041-CFC0-4081-9BD2-8B139E62A611}.Release Mono|Any CPU.Build.0 = Release|Any CPU
{CAA97041-CFC0-4081-9BD2-8B139E62A611}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CAA97041-CFC0-4081-9BD2-8B139E62A611}.Release|Any CPU.Build.0 = Release|Any CPU
{402FA351-D6C6-40FD-8868-F07156035919}.Debug Mono|Any CPU.ActiveCfg = Debug|Any CPU
{402FA351-D6C6-40FD-8868-F07156035919}.Debug Mono|Any CPU.Build.0 = Debug|Any CPU
{402FA351-D6C6-40FD-8868-F07156035919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{402FA351-D6C6-40FD-8868-F07156035919}.Debug|Any CPU.Build.0 = Debug|Any CPU
{402FA351-D6C6-40FD-8868-F07156035919}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU
{402FA351-D6C6-40FD-8868-F07156035919}.Release Mono|Any CPU.Build.0 = Release|Any CPU
{402FA351-D6C6-40FD-8868-F07156035919}.Release|Any CPU.ActiveCfg = Release|Any CPU
{402FA351-D6C6-40FD-8868-F07156035919}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -921,5 +953,9 @@ Global
{E7BC4F35-B9FB-49CB-B12C-CD00F6A08EA2} = {264C22A4-CAFC-41F6-B82C-4DDC5C196767}
{453EFD22-7C53-4887-9DBF-FCFC9172E909} = {264C22A4-CAFC-41F6-B82C-4DDC5C196767}
{7A832BBF-053E-4E9F-BD83-D988A0130CC8} = {264C22A4-CAFC-41F6-B82C-4DDC5C196767}
{0E55F1F8-E212-43D7-A0C0-ACEA9794B0D7} = {588C1513-FAB6-42C3-B6FC-3485F13620CF}
{B47CA568-40CF-48DE-B87E-31BD400EBB08} = {0E55F1F8-E212-43D7-A0C0-ACEA9794B0D7}
{CAA97041-CFC0-4081-9BD2-8B139E62A611} = {0E55F1F8-E212-43D7-A0C0-ACEA9794B0D7}
{402FA351-D6C6-40FD-8868-F07156035919} = {0E55F1F8-E212-43D7-A0C0-ACEA9794B0D7}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?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>{CAA97041-CFC0-4081-9BD2-8B139E62A611}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Akka.Serialization.TestKit</RootNamespace>
<AssemblyName>Akka.Serialization.TestKit</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AkkaSerializationSpec.cs" />
<Compile Include="ContainerMessage.cs" />
<Compile Include="EmptyActor.cs" />
<Compile Include="ImmutableMessage.cs" />
<Compile Include="ImmutableMessageWithPrivateCtor.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SomeMessage.cs" />
<Compile Include="UntypedContainerMessage.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\core\Akka.TestKit\Akka.TestKit.csproj">
<Project>{0d3cbad0-bbdb-43e5-afc4-ed1d3ecdc224}</Project>
<Name>Akka.TestKit</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\core\Akka.Tests.Shared.Internals\Akka.Tests.Shared.Internals.csproj">
<Project>{e636d23c-3432-4aa9-9a5d-5f29d33d3399}</Project>
<Name>Akka.Tests.Shared.Internals</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\core\Akka\Akka.csproj">
<Project>{5deddf90-37f0-48d3-a0b0-a5cbd8a7e377}</Project>
<Name>Akka</Name>
</ProjectReference>
<ProjectReference Include="..\..\testkits\Akka.TestKit.Xunit2\Akka.TestKit.Xunit2.csproj">
<Project>{7dbd5c17-5e9d-40c4-9201-d092751532a7}</Project>
<Name>Akka.TestKit.Xunit2</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</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>
Loading

0 comments on commit 89bba6d

Please sign in to comment.