Skip to content

Commit 00803d4

Browse files
mjpt777mjpt777
authored
Merge pull request aeron-io#552 from billsegall/netstandard2.0
Netstandard2.0
2 parents 3c7ee72 + af09952 commit 00803d4

File tree

9 files changed

+25
-24
lines changed

9 files changed

+25
-24
lines changed

‎csharp/.nuget/SBE.nuspec‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
<package>
33
<metadata>
44
<id>sbe-tool</id>
5-
<version>0.1.7.1-alpha-2</version>
5+
<version>0.1.7.9-alpha-3</version>
66
<title>Simple Binary Encoding for .NET</title>
7-
<authors>MarketFactory Inc, Adaptive Consulting</authors>
8-
<owners>MarketFactory Inc, Adaptive Consulting</owners>
7+
<authors>Bill Segall, MarketFactory Inc, Adaptive Consulting</authors>
8+
<owners>Bill Segall, MarketFactory Inc, Adaptive Consulting</owners>
99
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
1010
<projectUrl>https://github.com/real-logic/simple-binary-encoding</projectUrl>
11-
<iconUrl>http://weareadaptive.com/assets/ico/favicon.png</iconUrl>
1211
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1312
<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>
1413
<releaseNotes />
15-
<copyright>Copyright (C) MarketFactory Inc 2017, Adaptive Consulting 2013</copyright>
14+
<copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive Consulting 2013</copyright>
1615
<tags>SBE Marshaling Low Latency Simple Binary Encoding</tags>
1716
</metadata>
1817
<files>

‎csharp/.nuget/do-release.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ VERSIONTXT=`cat $ROOTDIR/../../version.txt`
77
VERSION=${VERSIONTXT%-SNAPSHOT} # Seems to be what's used
88

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

1212
# Build the nuget package
1313
NUGET=$ROOTDIR/nuget.exe

‎csharp/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ The Java code that performs the generation of C# code is
2323

2424
The [Visual Studio 2017 Community
2525
solution](https://github.com/real-logic/simple-binary-encoding/blob/master/csharp/csharp.sln) provides the projects:
26+
2627
* sbe-dll (for common marshalling and DirectBuffer functionality)
2728
* sbe-generated (containing C# code generated by sbe-tool)
2829
* sbe-tests (an mstest suite for unit testing)
@@ -32,12 +33,11 @@ solution](https://github.com/real-logic/simple-binary-encoding/blob/master/cshar
3233

3334
Roadmap
3435
-------
35-
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:
36+
The csharp generator is as of March 2018 a beta release. The current roadmap contains:
3637

3738
* Improved Documentation
3839
* Testing/bug fixes
3940
* Better nuget Packaging
40-
* Dotnet standard 2.9 support when available
4141
* Possible changes to make group objects accessible without requiring
4242
a linear progression.
4343

@@ -57,6 +57,7 @@ Want to build things yourself?
5757
------------------------------
5858

5959
For now you can:
60+
6061
* build the SBE csharp generator using `gradlew`
6162
* generate the csharp codecs using `gradlew GenerateCSharpCodecs`
6263
* 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

‎csharp/csharpbuild.cmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@ECHO OFF
22
SETLOCAL
33

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

1010
REM Restore packages

‎csharp/sbe-benchmarks/sbe-benchmarks.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RootNamespace>Org.SbeTool.Sbe.Benchmarks</RootNamespace>
66
<AssemblyName>Org.SbeTool.Sbe.Benchmarks</AssemblyName>
77
<OutputTypeEx>exe</OutputTypeEx>
8-
<Copyright>Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved.</Copyright>
8+
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
99
<Description />
1010
<Product>SBE</Product>
1111
</PropertyGroup>
@@ -15,4 +15,4 @@
1515
<ProjectReference Include="..\sbe-generated\sbe-generated.csproj" />
1616
</ItemGroup>
1717

18-
</Project>
18+
</Project>

‎csharp/sbe-dll/sbe-dll.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
4+
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
55
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
66
<AssemblyName>SBE</AssemblyName>
77
<RootNamespace>Org.SbeTool.Sbe.Dll</RootNamespace>
88
<Product>Org.SbeTool.Sbe.Dll</Product>
9+
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
910
</PropertyGroup>
1011

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

15-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.3|AnyCPU'">
16-
<DocumentationFile>bin\Release\netstandard1.3\SBE.xml</DocumentationFile>
16+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
17+
<DocumentationFile>bin\Release\netstandard2.0\SBE.xml</DocumentationFile>
1718
</PropertyGroup>
1819

19-
</Project>
20+
</Project>

‎csharp/sbe-generated/sbe-generated.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net45</TargetFrameworks>
55
<RootNamespace>Org.SbeTool.Sbe.Generated</RootNamespace>
66
<AssemblyName>Org.SbeTool.Sbe.Generated</AssemblyName>
7-
<Copyright>Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved.</Copyright>
7+
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
88
<Description />
99
</PropertyGroup>
1010

‎csharp/sbe-samples/sbe-samples-extension.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<OutputTypeEx>exe</OutputTypeEx>
1010
<RootNamespace>Org.SbeTool.Sbe.Example.Extension</RootNamespace>
1111
<AssemblyName>Org.SbeTool.Sbe.Example.Extension</AssemblyName>
12-
<Copyright>Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved.</Copyright>
12+
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
1313
<Description />
1414
<Product>SBE</Product>
1515
<ApplicationIcon />
@@ -30,4 +30,4 @@
3030
<Compile Remove="CarExample.cs" />
3131
</ItemGroup>
3232

33-
</Project>
33+
</Project>

‎csharp/sbe-tests/sbe-tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RootNamespace>Org.SbeTool.Sbe.Tests</RootNamespace>
66
<AssemblyName>Org.SbeTool.Sbe.UnitTests</AssemblyName>
77
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
8-
<Copyright>Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved.</Copyright>
8+
<Copyright>Copyright (C) Bill Segall 2018, MarketFactory Inc 2017, Adaptive 2014. All rights reserved.</Copyright>
99
<Description />
1010
</PropertyGroup>
1111

@@ -24,13 +24,13 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170517-02" />
28-
<PackageReference Include="MSTest.TestAdapter" Version="1.1.17" />
29-
<PackageReference Include="MSTest.TestFramework" Version="1.1.17" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
28+
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
29+
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
3030
</ItemGroup>
3131

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

36-
</Project>
36+
</Project>

0 commit comments

Comments
 (0)