From 705577de51961a5f2ab776a11a5ded3d03727b53 Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Mon, 29 Oct 2018 17:21:30 -0700 Subject: [PATCH] Revert "Convert net/FlatBuffers project to be compatible with netstandard (#4811)" This reverts commit 72b05bc8653c30d988d101de6b3fa90c93192081. Change-Id: I17510b7fa49b9861ce0a870b16f5c14a41082db5 --- net/FlatBuffers/FlatBuffers.csproj | 56 ++++++++++++++++++---- net/FlatBuffers/Properties/AssemblyInfo.cs | 52 ++++++++++++++++++++ samples/csharp_sample.sh | 2 +- 3 files changed, 100 insertions(+), 10 deletions(-) create mode 100644 net/FlatBuffers/Properties/AssemblyInfo.cs diff --git a/net/FlatBuffers/FlatBuffers.csproj b/net/FlatBuffers/FlatBuffers.csproj index b0c9ad332..a0290947f 100644 --- a/net/FlatBuffers/FlatBuffers.csproj +++ b/net/FlatBuffers/FlatBuffers.csproj @@ -1,16 +1,54 @@ - - + + + - netstandard1.1;netstandard1.4;netstandard2.0 + Debug + AnyCPU + {28C00774-1E73-4A75-AD8F-844CD21A064D} + Library + Properties FlatBuffers FlatBuffers - 1.0.0.0 - Copyright (c) 2015 Google Inc - https://github.com/google/flatbuffers - https://github.com/google/flatbuffers/blob/master/LICENSE.txt + v3.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/net/FlatBuffers/Properties/AssemblyInfo.cs b/net/FlatBuffers/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..1edfac47a --- /dev/null +++ b/net/FlatBuffers/Properties/AssemblyInfo.cs @@ -0,0 +1,52 @@ +/* + * Copyright 2014 Google Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +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("FlatBuffers")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("FlatBuffers")] +[assembly: AssemblyCopyright("Copyright (c) 2015 Google Inc")] +[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("91c32e64-ef20-47df-9c9f-cec9207bc6df")] + +// 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/samples/csharp_sample.sh b/samples/csharp_sample.sh index 2a163f728..ea472ed9c 100755 --- a/samples/csharp_sample.sh +++ b/samples/csharp_sample.sh @@ -42,7 +42,7 @@ fi echo Compiling and running the C# sample. # Compile and execute the sample. -csc SampleBinary.cs MyGame/Sample/*.cs ../net/FlatBuffers/*.cs +mcs SampleBinary.cs MyGame/Sample/*.cs ../net/FlatBuffers/*.cs mono SampleBinary.exe # Cleanup temporary files.