diff --git a/.gitignore b/.gitignore index 1503f07fee..344be0fc51 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ GRTAGS GPATH prop out +.vs/ # cmake CMakeFiles diff --git a/csharp/.build/MSBuild.Community.Tasks.dll b/csharp/.build/MSBuild.Community.Tasks.dll deleted file mode 100644 index 3f6c06da1a..0000000000 Binary files a/csharp/.build/MSBuild.Community.Tasks.dll and /dev/null differ diff --git a/csharp/.build/MSBuild.Community.Tasks.targets b/csharp/.build/MSBuild.Community.Tasks.targets deleted file mode 100644 index be807d884e..0000000000 --- a/csharp/.build/MSBuild.Community.Tasks.targets +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - $(MSBuildExtensionsPath)\MSBuildCommunityTasks - $([MSBUILD]::Unescape($(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.dll)) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/csharp/.nuget/SBE.nuspec b/csharp/.nuget/SBE.nuspec index ffff764206..e2cfe0b39b 100644 --- a/csharp/.nuget/SBE.nuspec +++ b/csharp/.nuget/SBE.nuspec @@ -16,15 +16,10 @@ SBE Marshaling Low Latency Simple Binary Encoding - - - - - - - - - - + + + + + diff --git a/csharp/GlobalAssemblyInfo.cs b/csharp/GlobalAssemblyInfo.cs deleted file mode 100644 index 76a1c1722a..0000000000 --- a/csharp/GlobalAssemblyInfo.cs +++ /dev/null @@ -1,9 +0,0 @@ -[assembly: System.Reflection.AssemblyCopyright("Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved.")] -#if DEBUG -[assembly: System.Reflection.AssemblyDescription("Debug")] -#else -[assembly: System.Reflection.AssemblyDescription("Release")] -#endif -[assembly: System.Reflection.AssemblyVersion("0.1.7.0")] -[assembly: System.Reflection.AssemblyFileVersion("0.1.7.0")] -[assembly: System.Reflection.AssemblyInformationalVersion("0.1.7.0")] diff --git a/csharp/csharp.sln b/csharp/csharp.sln index 36d0ba13ca..50c5bb2312 100644 --- a/csharp/csharp.sln +++ b/csharp/csharp.sln @@ -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 @@ -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}" diff --git a/csharp/csharpbuild.cmd b/csharp/csharpbuild.cmd new file mode 100644 index 0000000000..79e570e1d1 --- /dev/null +++ b/csharp/csharpbuild.cmd @@ -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 diff --git a/csharp/sbe-benchmarks/Properties/AssemblyInfo.cs b/csharp/sbe-benchmarks/Properties/AssemblyInfo.cs deleted file mode 100644 index a17ce96739..0000000000 --- a/csharp/sbe-benchmarks/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Org.SbeTool.Sbe.Benchmarks")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Org.SbeTool.Sbe.Benchmarks")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f1503bce-80ee-483c-96d2-a4ba360da9ad")] diff --git a/csharp/sbe-benchmarks/sbe-benchmarks.csproj b/csharp/sbe-benchmarks/sbe-benchmarks.csproj index 72eb9bf023..07a5c7aa74 100644 --- a/csharp/sbe-benchmarks/sbe-benchmarks.csproj +++ b/csharp/sbe-benchmarks/sbe-benchmarks.csproj @@ -1,75 +1,18 @@ - - - + + - Debug - AnyCPU - {B4A22C65-AC09-43A7-B7D6-141A0B9EC0E0} - Exe - Properties + net45 Org.SbeTool.Sbe.Benchmarks Org.SbeTool.Sbe.Benchmarks - v4.5 - 512 - ..\ - true - + exe + Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved. + + SBE - - x64 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - x64 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - Properties\GlobalAssemblyInfo.cs - - - - - {a623d315-cc7f-40d9-acc1-3a5253fa141d} - Generated - - - {CE883FD9-14A5-409C-AEBC-86BEA4E3C502} - sbe-dll - - + - + + - - - + \ No newline at end of file diff --git a/csharp/sbe-dll/Properties/AssemblyInfo.cs b/csharp/sbe-dll/Properties/AssemblyInfo.cs deleted file mode 100644 index 6c0a2e0fe4..0000000000 --- a/csharp/sbe-dll/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Org.SbeTool.Sbe.Dll")] -[assembly: AssemblyProduct("Org.SbeTool.Sbe.Dll")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8cbbb281-95dd-4e50-9b91-dfabce6f463b")] diff --git a/csharp/sbe-dll/sbe-dll.csproj b/csharp/sbe-dll/sbe-dll.csproj index 4dd2229f39..260c280149 100644 --- a/csharp/sbe-dll/sbe-dll.csproj +++ b/csharp/sbe-dll/sbe-dll.csproj @@ -1,73 +1,19 @@ - - - + + - Debug - AnyCPU - {CE883FD9-14A5-409C-AEBC-86BEA4E3C502} - Library - Properties - Org.SbeTool.Sbe.Dll + net45;netstandard1.3 + True SBE - v4.5 - 512 - + Org.SbeTool.Sbe.Dll + Org.SbeTool.Sbe.Dll - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - false + + + bin\Release\net45\SBE.xml - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - bin\Release\SBE.xml - false + + + bin\Release\netstandard1.3\SBE.xml - - - - - - - - - - - - - - - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - + \ No newline at end of file diff --git a/csharp/sbe-generated/Properties/AssemblyInfo.cs b/csharp/sbe-generated/Properties/AssemblyInfo.cs deleted file mode 100644 index 08309eccec..0000000000 --- a/csharp/sbe-generated/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Org.SbeTool.Sbe.Generated")] -// [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Org.SbeTool.Sbe.Generated")] -//[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("a623d315-cc7f-40d9-acc1-3a5253fa141d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -//[assembly: AssemblyVersion("1.0.0.0")] -//[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/csharp/sbe-generated/sbe-generated.csproj b/csharp/sbe-generated/sbe-generated.csproj index e1497b2ac8..6dc8e9cc09 100644 --- a/csharp/sbe-generated/sbe-generated.csproj +++ b/csharp/sbe-generated/sbe-generated.csproj @@ -1,177 +1,15 @@ - - - + + - Debug - AnyCPU - {A623D315-CC7F-40D9-ACC1-3A5253FA141D} - Library - Properties + net45 Org.SbeTool.Sbe.Generated Org.SbeTool.Sbe.Generated - v4.5 - 512 - + Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved. + - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {ce883fd9-14a5-409c-aebc-86bea4e3c502} - sbe-dll - - + - + - + \ No newline at end of file diff --git a/csharp/sbe-samples/Properties/AssemblyInfo.cs b/csharp/sbe-samples/Properties/AssemblyInfo.cs deleted file mode 100644 index 1a6abbda57..0000000000 --- a/csharp/sbe-samples/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Org.SbeTool.Sbe.Examples")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Org.SbeTool.Sbe.Examples")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("448ea266-a18f-4296-9d2a-e7315d1fb39d")] diff --git a/csharp/sbe-samples/sbe-samples-car.csproj b/csharp/sbe-samples/sbe-samples-car.csproj index 02ae3b9dda..b34890f811 100644 --- a/csharp/sbe-samples/sbe-samples-car.csproj +++ b/csharp/sbe-samples/sbe-samples-car.csproj @@ -1,91 +1,24 @@ - - - + + - Debug - AnyCPU - {1B325F15-0C54-49F5-A4B9-16088222CC0E} - Exe - Properties + net45 + exe Org.SbeTool.Sbe.Example.Car - Org.SbeTool.Sbe.Example.Car - v4.5 - 512 - + Org.SbeTool.Sbe.Example.Car - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - x86 - false - - - Baseline.Program - - - - - - - - - - - - - - - - Properties\GlobalAssemblyInfo.cs - - + - - {a623d315-cc7f-40d9-acc1-3a5253fa141d} - Generated - - - {CE883FD9-14A5-409C-AEBC-86BEA4E3C502} - sbe-dll - + + + - + + + - - example-extension-schema.xml - - - example-schema.xml - + - - - - - - + \ No newline at end of file diff --git a/csharp/sbe-samples/sbe-samples-extension.csproj b/csharp/sbe-samples/sbe-samples-extension.csproj index 1d3be45454..89fd0068c3 100644 --- a/csharp/sbe-samples/sbe-samples-extension.csproj +++ b/csharp/sbe-samples/sbe-samples-extension.csproj @@ -1,91 +1,27 @@ - - - + + - Debug - AnyCPU - {3B325F15-0C54-49F5-A4B9-16088222CC0E} - Exe - Properties + net45 + exe Org.SbeTool.Sbe.Example.Extension Org.SbeTool.Sbe.Example.Extension - v4.5 - 512 - + Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved. + + SBE - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - x86 - false - - - Baseline.Program - - - - - - - - - - - - - - - - Properties\GlobalAssemblyInfo.cs - - + - - {a623d315-cc7f-40d9-acc1-3a5253fa141d} - Generated - - - {CE883FD9-14A5-409C-AEBC-86BEA4E3C502} - sbe-dll - + + + - + + + - - example-extension-schema.xml - - - example-schema.xml - + - - - - - - + \ No newline at end of file diff --git a/csharp/sbe-tests/Properties/AssemblyInfo.cs b/csharp/sbe-tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 6195ff8756..0000000000 --- a/csharp/sbe-tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Org.SbeTool.Sbe.UnitTests")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Org.SbeTool.Sbe.UnitTests")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - -[assembly: Guid("385951e3-f332-462d-9d4c-dd17a8dbacb3")] - -// [assembly: AssemblyVersion("1.0.*")] diff --git a/csharp/sbe-tests/sbe-tests.csproj b/csharp/sbe-tests/sbe-tests.csproj index 6e50b50c4c..06775bd86c 100644 --- a/csharp/sbe-tests/sbe-tests.csproj +++ b/csharp/sbe-tests/sbe-tests.csproj @@ -1,66 +1,14 @@ - - - + + - Debug - AnyCPU - {385951E3-F332-462D-9D4C-DD17A8DBACB3} - Library - Properties - Org.SbeTool.Sbe.UnitTests + net45 + Org.SbeTool.Sbe.Tests Org.SbeTool.Sbe.UnitTests - v4.5 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + True + Copyright © 2017 MarketFactory Inc. Copyright © Adaptive 2014. All rights reserved. + - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - - - - ..\packages\MSTest.TestFramework.1.1.17\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\packages\MSTest.TestFramework.1.1.17\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - - - - - - - - - - - - Properties\GlobalAssemblyInfo.cs - - + issue435.xml @@ -69,27 +17,16 @@ since-deprecated-test-schema.xml + - - {a623d315-cc7f-40d9-acc1-3a5253fa141d} - Generated - - - {ce883fd9-14a5-409c-aebc-86bea4e3c502} - sbe-dll - + + + - + + + - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - + \ No newline at end of file