Skip to content

Commit 54176b1

Browse files
Mark McDowellmarkmcdowell
Mark McDowell
authored andcommitted
building for netstandard 1.3 and net45
1 parent 410ceb3 commit 54176b1

File tree

18 files changed

+104
-826
lines changed

18 files changed

+104
-826
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ GRTAGS
2424
GPATH
2525
prop
2626
out
27+
.vs/
2728

2829
# cmake
2930
CMakeFiles
-622 KB
Binary file not shown.

csharp/.build/MSBuild.Community.Tasks.targets

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

csharp/.nuget/SBE.nuspec

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,10 @@
1616
<tags>SBE Marshaling Low Latency Simple Binary Encoding</tags>
1717
</metadata>
1818
<files>
19-
<file src="..\sbe-dll\bin\**\SBE.*" target="lib\net45" />
20-
<file src="sbe-tool.sh" target="bin\net45" />
21-
<file src="sbe-tool-all.jar" target="bin\net45" />
22-
<file src="examples/App.config" target="examples" />
23-
<file src="examples/*.cs" target="examples" />
24-
<file src="examples/Properties/AssemblyInfo.cs" target="examples" />
25-
<file src="examples/baseline/*.cs" target="examples" />
26-
<file src="examples/example-schema.xml" target="examples" />
27-
<file src="examples/sbe-example.sln" target="examples" />
28-
<file src="examples/sbe-samples-car.csproj" target="examples" />
19+
<file src="..\sbe-dll\bin\Release\**\SBE.*" target="lib" />
20+
<file src="readme.txt" target="" />
21+
<file src="sbe-tool.sh" target="tools" />
22+
<file src="sbe-tool-all.jar" target="tools" />
23+
<file src="examples\**" exclude="**\obj\**;**\bin\**" target="src\examples" />
2924
</files>
3025
</package>

csharp/GlobalAssemblyInfo.cs

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

csharp/csharp.sln

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26403.7
4+
VisualStudioVersion = 15.0.26430.6
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sbe-dll", "sbe-dll\sbe-dll.csproj", "{CE883FD9-14A5-409C-AEBC-86BEA4E3C502}"
77
EndProject
@@ -11,10 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sbe-samples-extension", "sb
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DF19E161-4491-4C5E-9393-70B1CD14315E}"
1313
ProjectSection(SolutionItems) = preProject
14-
build.xml = build.xml
15-
GlobalAssemblyInfo.cs = GlobalAssemblyInfo.cs
1614
README.md = README.md
17-
TrackJavaCommits.txt = TrackJavaCommits.txt
1815
EndProjectSection
1916
EndProject
2017
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sbe-benchmarks", "sbe-benchmarks\sbe-benchmarks.csproj", "{B4A22C65-AC09-43A7-B7D6-141A0B9EC0E0}"

csharp/csharpbuild.cmd

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
@ECHO OFF
2+
SETLOCAL
3+
4+
SET VERSION=1.0.7
5+
SET MSBUILD="c:/Program Files (x86)/Microsoft Visual Studio/2017/Community/MSBuild/15.0/Bin/msbuild.exe"
6+
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."
8+
SET CONFIGURATION="Release"
9+
10+
REM Restore packages
11+
%MSBUILD% csharp.sln /target:Restore /property:Configuration=%CONFIGURATION%
12+
13+
REM Rebuild
14+
%MSBUILD% csharp.sln /target:Rebuild /property:Configuration=%CONFIGURATION%
15+
16+
REM Run Tests
17+
%MSTEST% /testcontainer:sbe-tests/bin/%CONFIGURATION%/net45/Org.SbeTool.Sbe.UnitTests.dll
18+
19+
ENDLOCAL

csharp/sbe-benchmarks/Properties/AssemblyInfo.cs

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

0 commit comments

Comments
 (0)