Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dotnet core support #456

Merged
merged 1 commit into from
May 20, 2017
Merged

dotnet core support #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ GRTAGS
GPATH
prop
out
.vs/

# cmake
CMakeFiles
Expand Down
Binary file removed csharp/.build/MSBuild.Community.Tasks.dll
View file
Open in desktop
Binary file not shown.
150 changes: 0 additions & 150 deletions csharp/.build/MSBuild.Community.Tasks.targets
View file
Open in desktop

This file was deleted.

15 changes: 5 additions & 10 deletions csharp/.nuget/SBE.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,10 @@
<tags>SBE Marshaling Low Latency Simple Binary Encoding</tags>
</metadata>
<files>
<file src="..\sbe-dll\bin\**\SBE.*" target="lib\net45" />
<file src="sbe-tool.sh" target="bin\net45" />
<file src="sbe-tool-all.jar" target="bin\net45" />
<file src="examples/App.config" target="examples" />
<file src="examples/*.cs" target="examples" />
<file src="examples/Properties/AssemblyInfo.cs" target="examples" />
<file src="examples/baseline/*.cs" target="examples" />
<file src="examples/example-schema.xml" target="examples" />
<file src="examples/sbe-example.sln" target="examples" />
<file src="examples/sbe-samples-car.csproj" target="examples" />
<file src="..\sbe-dll\bin\Release\**\SBE.*" target="lib" />
<file src="readme.txt" target="" />
<file src="sbe-tool.sh" target="tools" />
<file src="sbe-tool-all.jar" target="tools" />
<file src="examples\**" exclude="**\obj\**;**\bin\**" target="src\examples" />
</files>
</package>
9 changes: 0 additions & 9 deletions csharp/GlobalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions csharp/csharp.sln
View file
Open in desktop
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 15
VisualStudioVersion = 15.0.26403.7
VisualStudioVersion = 15.0.26430.6
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sbe-dll", "sbe-dll\sbe-dll.csproj", "{CE883FD9-14A5-409C-AEBC-86BEA4E3C502}"
EndProject
Expand All @@ -11,10 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sbe-samples-extension", "sb
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DF19E161-4491-4C5E-9393-70B1CD14315E}"
ProjectSection(SolutionItems) = preProject
build.xml = build.xml
GlobalAssemblyInfo.cs = GlobalAssemblyInfo.cs
README.md = README.md
TrackJavaCommits.txt = TrackJavaCommits.txt
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sbe-benchmarks", "sbe-benchmarks\sbe-benchmarks.csproj", "{B4A22C65-AC09-43A7-B7D6-141A0B9EC0E0}"
Expand Down
19 changes: 19 additions & 0 deletions csharp/csharpbuild.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
@ECHO OFF
SETLOCAL

SET VERSION=1.0.7
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 CONFIGURATION="Release"

REM Restore packages
%MSBUILD% csharp.sln /target:Restore /property:Configuration=%CONFIGURATION%

REM Rebuild
%MSBUILD% csharp.sln /target:Rebuild /property:Configuration=%CONFIGURATION%

REM Run Tests
%MSTEST% /testcontainer:sbe-tests/bin/%CONFIGURATION%/net45/Org.SbeTool.Sbe.UnitTests.dll

ENDLOCAL
19 changes: 0 additions & 19 deletions csharp/sbe-benchmarks/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

Loading