Skip to content

Commit 3eeb074

Browse files
authored
Merge pull request #699 from damageboy/wip/csharp-overhaul
Reorg C# code for 2019
2 parents bac1fc8 + fe86d06 commit 3eeb074

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+96
-2266
lines changed

.gitignore

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,8 @@ gocode/src/extension2
8686
# csharp
8787
csharp/*/bin
8888
csharp/*/obj
89-
csharp/.nuget/nuget.exe
90-
csharp/.nuget/sbe-tool*.nupkg
91-
csharp/.nuget/sbe-tool-all.jar
92-
csharp/.nuget/examples/bin
93-
csharp/.nuget/examples/obj
94-
csharp/.nuget/examples/packages
95-
csharp/.nuget/examples/.vs
9689
csharp/.vs
9790
csharp/TestResults
98-
csharp/packages
9991
csharp/sbe-generated/baseline
10092
csharp/sbe-generated/baseline-bigendian
10193
csharp/sbe-generated/extension
@@ -106,6 +98,8 @@ csharp/sbe-generated/issue661
10698
csharp/sbe-generated/since-deprecated
10799
csharp/sbe-generated/mktdata/*.cs
108100
csharp/sbe-generated/uk_co_real_logic_sbe_benchmarks_fix
101+
csharp/sbe-tests/*.sbe
102+
csharp/nuget/
109103

110104
# rust
111105
rust/car_example/.vscode

.travis.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,20 @@ matrix:
1717
os: linux
1818
script: ./gradlew --scan
1919

20+
- name: "C#"
21+
language: csharp
22+
jdk: openjdk8
23+
dotnet: 2.2
24+
os: linux
25+
mono: latest
26+
global:
27+
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
28+
- DOTNET_CLI_TELEMETRY_OPTOUT=1
29+
script:
30+
- ./csharp/build.sh
31+
- ./csharp/runtests.sh
32+
- ./csharp/pack.sh
33+
2034
- env: COMPILER=g++-5
2135
language: cpp
2236
compiler: gcc
@@ -153,6 +167,7 @@ matrix:
153167
os: osx
154168
script: ./cppbuild/cppbuild
155169

170+
156171
before_cache:
157172
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
158173
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/

ExampleUsingGeneratedStub.sbe

207 Bytes
Binary file not shown.

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,17 +398,20 @@ project(':sbe-samples') {
398398
task runExampleUsingGeneratedStub(dependsOn: 'compileJava', type: JavaExec) {
399399
classpath = sourceSets.main.runtimeClasspath
400400
main = 'uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStub'
401+
systemProperties System.getProperties()
401402
}
402403

403404
task runExampleUsingGeneratedStubExtension(dependsOn: 'compileJava', type: JavaExec) {
404405
classpath = sourceSets.main.runtimeClasspath
405406
main = 'uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStubExtension'
407+
systemProperties System.getProperties()
406408
}
407409

408410
task runOtfExample(dependsOn: 'compileJava', type: JavaExec) {
409411
classpath = sourceSets.main.runtimeClasspath
410412
main = 'uk.co.real_logic.sbe.examples.OtfExample'
411413
workingDir = 'src/main/resources'
414+
systemProperties System.getProperties()
412415
}
413416

414417
task runJavaExamples {

csharp/.nuget/SBE.nuspec

Lines changed: 0 additions & 26 deletions
This file was deleted.

csharp/.nuget/do-release.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

csharp/.nuget/examples/App.config

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)