Skip to content
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
9 changes: 4 additions & 5 deletions csharp/.nuget/SBE.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@
<package>
<metadata>
<id>sbe-tool</id>
<version>0.1.7.1-alpha-2</version>
<version>0.1.7.9-alpha-3</version>
<title>Simple Binary Encoding for .NET</title>
<authors>MarketFactory Inc, Adaptive Consulting</authors>
<owners>MarketFactory Inc, Adaptive Consulting</owners>
<authors>Bill Segall, MarketFactory Inc, Adaptive Consulting</authors>
<owners>Bill Segall, MarketFactory Inc, Adaptive Consulting</owners>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://github.com/real-logic/simple-binary-encoding</projectUrl>
<iconUrl>http://weareadaptive.com/assets/ico/favicon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package contains all you need to define SBE messages and generate C# encoders and decoders. See https://github.com/real-logic/simple-binary-encoding for more detailed instructions</description>
<releaseNotes />
<copyright>Copyright (C) MarketFactory Inc 2017, Adaptive Consulting 2013</copyright>
<copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive Consulting 2013</copyright>
<tags>SBE Marshaling Low Latency Simple Binary Encoding</tags>
</metadata>
<files>
Expand Down
2 changes: 1 addition & 1 deletion csharp/.nuget/do-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ VERSIONTXT=`cat $ROOTDIR/../../version.txt`
VERSION=${VERSIONTXT%-SNAPSHOT} # Seems to be what's used

# Copy in the jar
cp $ROOTDIR/../../sbe-tool/build/libs/sbe-tool-$VERSIONTXT-all.jar $ROOTDIR/sbe-tool-all.jar
cp $ROOTDIR/../../sbe-tool/build/libs/sbe-tool-$VERSIONTXT.jar $ROOTDIR/sbe-tool-all.jar

# Build the nuget package
NUGET=$ROOTDIR/nuget.exe
Expand Down
5 changes: 3 additions & 2 deletions csharp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ The Java code that performs the generation of C# code is

The [Visual Studio 2017 Community
solution](https://github.com/real-logic/simple-binary-encoding/blob/master/csharp/csharp.sln) provides the projects:

* sbe-dll (for common marshalling and DirectBuffer functionality)
* sbe-generated (containing C# code generated by sbe-tool)
* sbe-tests (an mstest suite for unit testing)
Expand All @@ -32,12 +33,11 @@ solution](https://github.com/real-logic/simple-binary-encoding/blob/master/cshar

Roadmap
-------
The csharp generator is as of May 2017 a preview release. API stability is not guaranteed. Documentation is a work in progress. The current roadmap contains:
The csharp generator is as of March 2018 a beta release. The current roadmap contains:

* Improved Documentation
* Testing/bug fixes
* Better nuget Packaging
* Dotnet standard 2.9 support when available
* Possible changes to make group objects accessible without requiring
a linear progression.

Expand All @@ -57,6 +57,7 @@ Want to build things yourself?
------------------------------

For now you can:

* build the SBE csharp generator using `gradlew`
* generate the csharp codecs using `gradlew GenerateCSharpCodecs`
* Use the [Visual Studio 2017 Community solution](https://github.com/real-logic/simple-binary-encoding/blob/master/csharp/csharp.sln) to build the solution, run the unit tests, examples and benchmarks
Expand Down
4 changes: 2 additions & 2 deletions csharp/csharpbuild.cmd
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@ECHO OFF
SETLOCAL

SET VERSION=1.0.7
SET VERSION=1.0.7.9
SET MSBUILD="c:/Program Files (x86)/Microsoft Visual Studio/2017/Community/MSBuild/15.0/Bin/msbuild.exe"
SET MSTEST="c:/Program Files (x86)/Microsoft Visual Studio/2017/Community/Common7/IDE/MSTest.exe"
SET COPYRIGHT="Copyright 2017 MarketFactory Inc. Copyright Adaptive 2014. All rights reserved."
SET COPYRIGHT="Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved."
SET CONFIGURATION="Release"

REM Restore packages
Expand Down
4 changes: 2 additions & 2 deletions csharp/sbe-benchmarks/sbe-benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RootNamespace>Org.SbeTool.Sbe.Benchmarks</RootNamespace>
<AssemblyName>Org.SbeTool.Sbe.Benchmarks</AssemblyName>
<OutputTypeEx>exe</OutputTypeEx>
<Copyright>Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved.</Copyright>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
<Description />
<Product>SBE</Product>
</PropertyGroup>
Expand All @@ -15,4 +15,4 @@
<ProjectReference Include="..\sbe-generated\sbe-generated.csproj" />
</ItemGroup>

</Project>
</Project>
9 changes: 5 additions & 4 deletions csharp/sbe-dll/sbe-dll.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<AssemblyName>SBE</AssemblyName>
<RootNamespace>Org.SbeTool.Sbe.Dll</RootNamespace>
<Product>Org.SbeTool.Sbe.Dll</Product>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
<DocumentationFile>bin\Release\net45\SBE.xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.3|AnyCPU'">
<DocumentationFile>bin\Release\netstandard1.3\SBE.xml</DocumentationFile>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<DocumentationFile>bin\Release\netstandard2.0\SBE.xml</DocumentationFile>
</PropertyGroup>

</Project>
</Project>
2 changes: 1 addition & 1 deletion csharp/sbe-generated/sbe-generated.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFrameworks>net45</TargetFrameworks>
<RootNamespace>Org.SbeTool.Sbe.Generated</RootNamespace>
<AssemblyName>Org.SbeTool.Sbe.Generated</AssemblyName>
<Copyright>Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved.</Copyright>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
<Description />
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions csharp/sbe-samples/sbe-samples-extension.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<OutputTypeEx>exe</OutputTypeEx>
<RootNamespace>Org.SbeTool.Sbe.Example.Extension</RootNamespace>
<AssemblyName>Org.SbeTool.Sbe.Example.Extension</AssemblyName>
<Copyright>Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved.</Copyright>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
<Description />
<Product>SBE</Product>
<ApplicationIcon />
Expand All @@ -30,4 +30,4 @@
<Compile Remove="CarExample.cs" />
</ItemGroup>

</Project>
</Project>
10 changes: 5 additions & 5 deletions csharp/sbe-tests/sbe-tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RootNamespace>Org.SbeTool.Sbe.Tests</RootNamespace>
<AssemblyName>Org.SbeTool.Sbe.UnitTests</AssemblyName>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<Copyright>Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved.</Copyright>
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
<Description />
</PropertyGroup>

Expand All @@ -24,13 +24,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170517-02" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.17" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.17" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
</ItemGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>

</Project>
</Project>