From adee51b28804d2a03670a2f311d07d5b247384d5 Mon Sep 17 00:00:00 2001 From: Derek Bailey Date: Fri, 26 Aug 2022 15:56:20 -0700 Subject: [PATCH 1/4] Define nuget package --- net/FlatBuffers/FlatBuffers.csproj | 23 +++++++++++++++++++++ net/FlatBuffers/Properties/AssemblyInfo.cs | 10 ++++----- net/FlatBuffers/flatbuffers.png | Bin 0 -> 5073 bytes 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 net/FlatBuffers/flatbuffers.png diff --git a/net/FlatBuffers/FlatBuffers.csproj b/net/FlatBuffers/FlatBuffers.csproj index a2b8bfb4e84..4ce2a72a69b 100644 --- a/net/FlatBuffers/FlatBuffers.csproj +++ b/net/FlatBuffers/FlatBuffers.csproj @@ -3,6 +3,25 @@ netstandard2.1;netstandard2.0;net46 false + Google.FlatBuffers + FlatBuffers + FlatBuffers + A cross-platform memory efficient serialization library + 2.0.8-beta + Wouter van Oortmerssen, Derek Bailey + Google + https://github.com/google/flatbuffers + master + e2eb5ee67096f5c039947c3d03477370d3be44f8 + Apache-2.0 + flatbuffers.png + Google;FlatBuffers;Serialization;Buffer;Binary;zero copy + First official nuget package release of flatbuffers + Copyright 2022 Google Inc. All rights reserved. + true + true + true + Release @@ -20,4 +39,8 @@ + + + + diff --git a/net/FlatBuffers/Properties/AssemblyInfo.cs b/net/FlatBuffers/Properties/AssemblyInfo.cs index 1edfac47aae..1e06b01cb7a 100644 --- a/net/FlatBuffers/Properties/AssemblyInfo.cs +++ b/net/FlatBuffers/Properties/AssemblyInfo.cs @@ -22,11 +22,11 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("FlatBuffers")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Memory Efficient Serialization Library")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Google")] [assembly: AssemblyProduct("FlatBuffers")] -[assembly: AssemblyCopyright("Copyright (c) 2015 Google Inc")] +[assembly: AssemblyCopyright("Copyright (c) 2022 Google Inc")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -48,5 +48,5 @@ // 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")] +[assembly: AssemblyVersion("2.0.7.0")] +[assembly: AssemblyFileVersion("2.0.7.0")] diff --git a/net/FlatBuffers/flatbuffers.png b/net/FlatBuffers/flatbuffers.png new file mode 100644 index 0000000000000000000000000000000000000000..2c728f3b541184490702effdc4360c3f795cb1bd GIT binary patch literal 5073 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 k814(#XmNDa Date: Tue, 30 Aug 2022 20:46:39 -0700 Subject: [PATCH 2/4] C# Switch to Google.FlatBuffers namespace --- net/FlatBuffers/ByteBuffer.cs | 2 +- net/FlatBuffers/ByteBufferUtil.cs | 2 +- net/FlatBuffers/FlatBufferBuilder.cs | 2 +- net/FlatBuffers/FlatBufferConstants.cs | 2 +- ...ffers.csproj => Google.FlatBuffers.csproj} | 23 +++----- net/FlatBuffers/IFlatbufferObject.cs | 2 +- net/FlatBuffers/Offset.cs | 2 +- net/FlatBuffers/Properties/AssemblyInfo.cs | 52 ------------------- net/FlatBuffers/Struct.cs | 2 +- net/FlatBuffers/Table.cs | 2 +- scripts/generate_code.py | 2 +- src/idl_gen_csharp.cpp | 14 ++--- .../FlatBufferBuilderBenchmark.cs | 2 +- tests/FlatBuffers.Benchmarks/Program.cs | 2 +- tests/FlatBuffers.Test/Assert.cs | 2 +- tests/FlatBuffers.Test/ByteBufferTests.cs | 2 +- .../FlatBufferBuilderTests.cs | 2 +- .../FlatBuffersExampleTests.cs | 2 +- .../FlatBuffers.Test/FlatBuffersFuzzTests.cs | 2 +- .../FlatBuffersTestClassAttribute.cs | 2 +- .../FlatBuffersTestMethodAttribute.cs | 2 +- tests/FlatBuffers.Test/FuzzTestData.cs | 2 +- tests/FlatBuffers.Test/Lcg.cs | 2 +- tests/FlatBuffers.Test/Program.cs | 2 +- tests/FlatBuffers.Test/TestTable.cs | 2 +- tests/KeywordTest/KeywordsInTable.cs | 2 +- tests/KeywordTest/KeywordsInUnion.cs | 2 +- tests/MyGame/Example/Ability.cs | 2 +- tests/MyGame/Example/Any.cs | 2 +- tests/MyGame/Example/AnyAmbiguousAliases.cs | 2 +- tests/MyGame/Example/AnyUniqueAliases.cs | 2 +- tests/MyGame/Example/ArrayStruct.cs | 2 +- tests/MyGame/Example/ArrayTable.cs | 2 +- tests/MyGame/Example/Monster.cs | 2 +- tests/MyGame/Example/NestedStruct.cs | 2 +- tests/MyGame/Example/Referrable.cs | 2 +- tests/MyGame/Example/Stat.cs | 2 +- tests/MyGame/Example/StructOfStructs.cs | 2 +- .../Example/StructOfStructsOfStructs.cs | 2 +- tests/MyGame/Example/Test.cs | 2 +- .../MyGame/Example/TestSimpleTableWithEnum.cs | 2 +- tests/MyGame/Example/TypeAliases.cs | 2 +- tests/MyGame/Example/Vec3.cs | 2 +- tests/MyGame/Example2/Monster.cs | 2 +- tests/MyGame/InParentNamespace.cs | 2 +- tests/MyGame/MonsterExtra.cs | 2 +- .../NamespaceA/NamespaceB/StructInNestedNS.cs | 2 +- .../NamespaceA/NamespaceB/TableInNestedNS.cs | 2 +- .../NamespaceA/NamespaceB/UnionInNestedNS.cs | 2 +- .../NamespaceA/SecondTableInA.cs | 2 +- .../NamespaceA/TableInFirstNS.cs | 2 +- tests/namespace_test/NamespaceC/TableInC.cs | 2 +- .../nested_namespace_test1_generated.cs | 2 +- .../nested_namespace_test2_generated.cs | 2 +- .../nested_namespace_test3_generated.cs | 2 +- tests/optional_scalars/ScalarStuff.cs | 2 +- tests/type_field_collsion/Collision.cs | 2 +- tests/union_vector/Attacker.cs | 2 +- tests/union_vector/BookReader.cs | 2 +- tests/union_vector/Character.cs | 2 +- tests/union_vector/FallingTub.cs | 2 +- tests/union_vector/Gadget.cs | 2 +- tests/union_vector/HandFan.cs | 2 +- tests/union_vector/Movie.cs | 2 +- tests/union_vector/Rapunzel.cs | 2 +- 65 files changed, 78 insertions(+), 135 deletions(-) rename net/FlatBuffers/{FlatBuffers.csproj => Google.FlatBuffers.csproj} (63%) delete mode 100644 net/FlatBuffers/Properties/AssemblyInfo.cs diff --git a/net/FlatBuffers/ByteBuffer.cs b/net/FlatBuffers/ByteBuffer.cs index 15d77879ba0..4c0d000a07f 100644 --- a/net/FlatBuffers/ByteBuffer.cs +++ b/net/FlatBuffers/ByteBuffer.cs @@ -51,7 +51,7 @@ #warning ENABLE_SPAN_T requires UNSAFE_BYTEBUFFER to also be defined #endif -namespace FlatBuffers +namespace Google.FlatBuffers { public abstract class ByteBufferAllocator { diff --git a/net/FlatBuffers/ByteBufferUtil.cs b/net/FlatBuffers/ByteBufferUtil.cs index 66e8266843b..a5f2fb9420c 100644 --- a/net/FlatBuffers/ByteBufferUtil.cs +++ b/net/FlatBuffers/ByteBufferUtil.cs @@ -16,7 +16,7 @@ using System; -namespace FlatBuffers +namespace Google.FlatBuffers { /// /// Class that collects utility functions around `ByteBuffer`. diff --git a/net/FlatBuffers/FlatBufferBuilder.cs b/net/FlatBuffers/FlatBufferBuilder.cs index 252c7cd1bdd..e550f90f833 100644 --- a/net/FlatBuffers/FlatBufferBuilder.cs +++ b/net/FlatBuffers/FlatBufferBuilder.cs @@ -23,7 +23,7 @@ /// @addtogroup flatbuffers_csharp_api /// @{ -namespace FlatBuffers +namespace Google.FlatBuffers { /// /// Responsible for building up and accessing a FlatBuffer formatted byte diff --git a/net/FlatBuffers/FlatBufferConstants.cs b/net/FlatBuffers/FlatBufferConstants.cs index 3af67d338bc..e3f0f89b731 100644 --- a/net/FlatBuffers/FlatBufferConstants.cs +++ b/net/FlatBuffers/FlatBufferConstants.cs @@ -19,7 +19,7 @@ using System.Linq; using System.Text; -namespace FlatBuffers +namespace Google.FlatBuffers { public static class FlatBufferConstants { diff --git a/net/FlatBuffers/FlatBuffers.csproj b/net/FlatBuffers/Google.FlatBuffers.csproj similarity index 63% rename from net/FlatBuffers/FlatBuffers.csproj rename to net/FlatBuffers/Google.FlatBuffers.csproj index 4ce2a72a69b..4597b17b5a6 100644 --- a/net/FlatBuffers/FlatBuffers.csproj +++ b/net/FlatBuffers/Google.FlatBuffers.csproj @@ -4,24 +4,16 @@ netstandard2.1;netstandard2.0;net46 false Google.FlatBuffers - FlatBuffers - FlatBuffers A cross-platform memory efficient serialization library - 2.0.8-beta - Wouter van Oortmerssen, Derek Bailey - Google + 2.0.8-beta.1 + Google LLC + https://github.com/google/flatbuffers https://github.com/google/flatbuffers - master - e2eb5ee67096f5c039947c3d03477370d3be44f8 - Apache-2.0 + true + LICENSE.txt flatbuffers.png Google;FlatBuffers;Serialization;Buffer;Binary;zero copy - First official nuget package release of flatbuffers - Copyright 2022 Google Inc. All rights reserved. - true - true - true - Release + Copyright 2022 Google LLC @@ -40,7 +32,8 @@ - + + diff --git a/net/FlatBuffers/IFlatbufferObject.cs b/net/FlatBuffers/IFlatbufferObject.cs index 6a15aba6e5b..c1d106cd347 100644 --- a/net/FlatBuffers/IFlatbufferObject.cs +++ b/net/FlatBuffers/IFlatbufferObject.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace FlatBuffers +namespace Google.FlatBuffers { /// /// This is the base for both structs and tables. diff --git a/net/FlatBuffers/Offset.cs b/net/FlatBuffers/Offset.cs index 2b17cec85d4..d2dd6281acc 100644 --- a/net/FlatBuffers/Offset.cs +++ b/net/FlatBuffers/Offset.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace FlatBuffers +namespace Google.FlatBuffers { /// /// Offset class for typesafe assignments. diff --git a/net/FlatBuffers/Properties/AssemblyInfo.cs b/net/FlatBuffers/Properties/AssemblyInfo.cs deleted file mode 100644 index 1e06b01cb7a..00000000000 --- a/net/FlatBuffers/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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("Memory Efficient Serialization Library")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Google")] -[assembly: AssemblyProduct("FlatBuffers")] -[assembly: AssemblyCopyright("Copyright (c) 2022 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("2.0.7.0")] -[assembly: AssemblyFileVersion("2.0.7.0")] diff --git a/net/FlatBuffers/Struct.cs b/net/FlatBuffers/Struct.cs index 4832cda3c0c..b4539bfd5ca 100644 --- a/net/FlatBuffers/Struct.cs +++ b/net/FlatBuffers/Struct.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace FlatBuffers +namespace Google.FlatBuffers { /// /// All structs in the generated code derive from this class, and add their own accessors. diff --git a/net/FlatBuffers/Table.cs b/net/FlatBuffers/Table.cs index d888de5928c..21ef7dc8b82 100644 --- a/net/FlatBuffers/Table.cs +++ b/net/FlatBuffers/Table.cs @@ -18,7 +18,7 @@ using System.Text; using System.Runtime.InteropServices; -namespace FlatBuffers +namespace Google.FlatBuffers { /// /// All tables in the generated code derive from this struct, and add their own accessors. diff --git a/scripts/generate_code.py b/scripts/generate_code.py index ff2dd1a51b2..53499b93882 100755 --- a/scripts/generate_code.py +++ b/scripts/generate_code.py @@ -226,7 +226,7 @@ def glob(path, pattern): # For Rust we currently generate two independent schemas, with namespace_test2 # duplicating the types in namespace_test1 flatc( - RUST_OPTS, + RUST_OPTS + CS_OPTS, prefix="namespace_test", schema=[ "namespace_test/namespace_test1.fbs", diff --git a/src/idl_gen_csharp.cpp b/src/idl_gen_csharp.cpp index 7556cbc40bd..fa67eaf0299 100644 --- a/src/idl_gen_csharp.cpp +++ b/src/idl_gen_csharp.cpp @@ -226,7 +226,7 @@ class CSharpGenerator : public BaseGenerator { if (needs_includes) { code += "using global::System;\n"; code += "using global::System.Collections.Generic;\n"; - code += "using global::FlatBuffers;\n\n"; + code += "using global::Google.FlatBuffers;\n\n"; } code += classcode; if (!namespace_name.empty()) { code += "\n}\n"; } @@ -1307,9 +1307,9 @@ class CSharpGenerator : public BaseGenerator { code += "Offset<" + struct_def.name + ">"; code += "[] offsets) {\n"; code += " Array.Sort(offsets,\n"; - code += " (Offset<" + struct_def.name + - "> o1, Offset<" + struct_def.name + "> o2) =>\n"; - code += " "+ GenKeyGetter(struct_def, key_field); + code += " (Offset<" + struct_def.name + "> o1, Offset<" + + struct_def.name + "> o2) =>\n"; + code += " " + GenKeyGetter(struct_def, key_field); code += ");\n"; code += " return builder.CreateVectorOfTables(offsets);\n }\n"; @@ -1463,8 +1463,10 @@ class CSharpGenerator : public BaseGenerator { } code += "\n"; // Pack() - code += " public static int Pack(FlatBuffers.FlatBufferBuilder builder, " + - union_name + " _o) {\n"; + code += + " public static int Pack(Google.FlatBuffers.FlatBufferBuilder " + "builder, " + + union_name + " _o) {\n"; code += " switch (_o.Type) {\n"; for (auto it = enum_def.Vals().begin(); it != enum_def.Vals().end(); ++it) { auto &ev = **it; diff --git a/tests/FlatBuffers.Benchmarks/FlatBufferBuilderBenchmark.cs b/tests/FlatBuffers.Benchmarks/FlatBufferBuilderBenchmark.cs index 1df5ac31710..b3858858e6c 100644 --- a/tests/FlatBuffers.Benchmarks/FlatBufferBuilderBenchmark.cs +++ b/tests/FlatBuffers.Benchmarks/FlatBufferBuilderBenchmark.cs @@ -17,7 +17,7 @@ using BenchmarkDotNet.Attributes; using MyGame.Example; -namespace FlatBuffers.Benchmarks +namespace Google.FlatBuffers.Benchmarks { //[EtwProfiler] - needs elevated privileges [MemoryDiagnoser] diff --git a/tests/FlatBuffers.Benchmarks/Program.cs b/tests/FlatBuffers.Benchmarks/Program.cs index 9e63b4bf705..fa152caa98c 100644 --- a/tests/FlatBuffers.Benchmarks/Program.cs +++ b/tests/FlatBuffers.Benchmarks/Program.cs @@ -16,7 +16,7 @@ using BenchmarkDotNet.Running; -namespace FlatBuffers.Benchmarks +namespace Google.FlatBuffers.Benchmarks { public static class Program { diff --git a/tests/FlatBuffers.Test/Assert.cs b/tests/FlatBuffers.Test/Assert.cs index 488c338f1a3..7bb80040288 100644 --- a/tests/FlatBuffers.Test/Assert.cs +++ b/tests/FlatBuffers.Test/Assert.cs @@ -19,7 +19,7 @@ using System.Linq; using System.Text; -namespace FlatBuffers.Test +namespace Google.FlatBuffers.Test { public class AssertFailedException : Exception diff --git a/tests/FlatBuffers.Test/ByteBufferTests.cs b/tests/FlatBuffers.Test/ByteBufferTests.cs index 2507073b92f..6bff2ac548c 100644 --- a/tests/FlatBuffers.Test/ByteBufferTests.cs +++ b/tests/FlatBuffers.Test/ByteBufferTests.cs @@ -17,7 +17,7 @@ using System; using System.Runtime.InteropServices; -namespace FlatBuffers.Test +namespace Google.FlatBuffers.Test { [FlatBuffersTestClass] public class ByteBufferTests diff --git a/tests/FlatBuffers.Test/FlatBufferBuilderTests.cs b/tests/FlatBuffers.Test/FlatBufferBuilderTests.cs index 290f45e2772..7fe974030a1 100644 --- a/tests/FlatBuffers.Test/FlatBufferBuilderTests.cs +++ b/tests/FlatBuffers.Test/FlatBufferBuilderTests.cs @@ -16,7 +16,7 @@ using System; -namespace FlatBuffers.Test +namespace Google.FlatBuffers.Test { [FlatBuffersTestClass] public class FlatBufferBuilderTests diff --git a/tests/FlatBuffers.Test/FlatBuffersExampleTests.cs b/tests/FlatBuffers.Test/FlatBuffersExampleTests.cs index 2b1fe2d3e68..6c9e309c969 100644 --- a/tests/FlatBuffers.Test/FlatBuffersExampleTests.cs +++ b/tests/FlatBuffers.Test/FlatBuffersExampleTests.cs @@ -21,7 +21,7 @@ using optional_scalars; using KeywordTest; -namespace FlatBuffers.Test +namespace Google.FlatBuffers.Test { [FlatBuffersTestClass] public class FlatBuffersExampleTests diff --git a/tests/FlatBuffers.Test/FlatBuffersFuzzTests.cs b/tests/FlatBuffers.Test/FlatBuffersFuzzTests.cs index b6c60ea6d15..0377a7b40b3 100644 --- a/tests/FlatBuffers.Test/FlatBuffersFuzzTests.cs +++ b/tests/FlatBuffers.Test/FlatBuffersFuzzTests.cs @@ -16,7 +16,7 @@ using System; -namespace FlatBuffers.Test +namespace Google.FlatBuffers.Test { [FlatBuffersTestClass] public class FlatBuffersFuzzTests diff --git a/tests/FlatBuffers.Test/FlatBuffersTestClassAttribute.cs b/tests/FlatBuffers.Test/FlatBuffersTestClassAttribute.cs index f31e38b3b57..7ad7df60fe7 100644 --- a/tests/FlatBuffers.Test/FlatBuffersTestClassAttribute.cs +++ b/tests/FlatBuffers.Test/FlatBuffersTestClassAttribute.cs @@ -19,7 +19,7 @@ using System.Linq; using System.Text; -namespace FlatBuffers.Test +namespace Google.FlatBuffers.Test { [AttributeUsage(AttributeTargets.Class)] public class FlatBuffersTestClassAttribute : Attribute diff --git a/tests/FlatBuffers.Test/FlatBuffersTestMethodAttribute.cs b/tests/FlatBuffers.Test/FlatBuffersTestMethodAttribute.cs index 989dae5b26f..4276b74ed66 100644 --- a/tests/FlatBuffers.Test/FlatBuffersTestMethodAttribute.cs +++ b/tests/FlatBuffers.Test/FlatBuffersTestMethodAttribute.cs @@ -16,7 +16,7 @@ using System; -namespace FlatBuffers.Test +namespace Google.FlatBuffers.Test { [AttributeUsage(AttributeTargets.Method)] public class FlatBuffersTestMethodAttribute : Attribute diff --git a/tests/FlatBuffers.Test/FuzzTestData.cs b/tests/FlatBuffers.Test/FuzzTestData.cs index 119e44eb1ad..186e312da54 100644 --- a/tests/FlatBuffers.Test/FuzzTestData.cs +++ b/tests/FlatBuffers.Test/FuzzTestData.cs @@ -16,7 +16,7 @@ using System; -namespace FlatBuffers.Test +namespace Google.FlatBuffers.Test { internal static class FuzzTestData { diff --git a/tests/FlatBuffers.Test/Lcg.cs b/tests/FlatBuffers.Test/Lcg.cs index c329ed84aad..c6322d51b09 100644 --- a/tests/FlatBuffers.Test/Lcg.cs +++ b/tests/FlatBuffers.Test/Lcg.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace FlatBuffers.Test +namespace Google.FlatBuffers.Test { /// /// Lcg Pseudo RNG diff --git a/tests/FlatBuffers.Test/Program.cs b/tests/FlatBuffers.Test/Program.cs index f8cec4e1dcf..cd04d25b606 100644 --- a/tests/FlatBuffers.Test/Program.cs +++ b/tests/FlatBuffers.Test/Program.cs @@ -19,7 +19,7 @@ using System.Linq; using System.Reflection; -namespace FlatBuffers.Test +namespace Google.FlatBuffers.Test { static class Program { diff --git a/tests/FlatBuffers.Test/TestTable.cs b/tests/FlatBuffers.Test/TestTable.cs index 4f663f01853..659ac8f6ecf 100644 --- a/tests/FlatBuffers.Test/TestTable.cs +++ b/tests/FlatBuffers.Test/TestTable.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace FlatBuffers.Test +namespace Google.FlatBuffers.Test { /// /// A test Table object that gives easy access to the slot data diff --git a/tests/KeywordTest/KeywordsInTable.cs b/tests/KeywordTest/KeywordsInTable.cs index 1d2b3c71f74..af2a37567c3 100644 --- a/tests/KeywordTest/KeywordsInTable.cs +++ b/tests/KeywordTest/KeywordsInTable.cs @@ -7,7 +7,7 @@ namespace KeywordTest using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct KeywordsInTable : IFlatbufferObject { diff --git a/tests/KeywordTest/KeywordsInUnion.cs b/tests/KeywordTest/KeywordsInUnion.cs index 68c050e61b1..0efa0668d7d 100644 --- a/tests/KeywordTest/KeywordsInUnion.cs +++ b/tests/KeywordTest/KeywordsInUnion.cs @@ -28,7 +28,7 @@ public class KeywordsInUnionUnion { public KeywordTest.KeywordsInTableT Asinternal() { return this.As(); } public static KeywordsInUnionUnion Frominternal(KeywordTest.KeywordsInTableT _internal) { return new KeywordsInUnionUnion{ Type = KeywordsInUnion.@internal, Value = _internal }; } - public static int Pack(FlatBuffers.FlatBufferBuilder builder, KeywordsInUnionUnion _o) { + public static int Pack(Google.FlatBuffers.FlatBufferBuilder builder, KeywordsInUnionUnion _o) { switch (_o.Type) { default: return 0; case KeywordsInUnion.@static: return KeywordTest.KeywordsInTable.Pack(builder, _o.Asstatic()).Value; diff --git a/tests/MyGame/Example/Ability.cs b/tests/MyGame/Example/Ability.cs index ae6a5b42495..e19406351ee 100644 --- a/tests/MyGame/Example/Ability.cs +++ b/tests/MyGame/Example/Ability.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct Ability : IFlatbufferObject { diff --git a/tests/MyGame/Example/Any.cs b/tests/MyGame/Example/Any.cs index 2e1717b9e17..90cd22bf9a3 100644 --- a/tests/MyGame/Example/Any.cs +++ b/tests/MyGame/Example/Any.cs @@ -31,7 +31,7 @@ public class AnyUnion { public MyGame.Example2.MonsterT AsMyGame_Example2_Monster() { return this.As(); } public static AnyUnion FromMyGame_Example2_Monster(MyGame.Example2.MonsterT _mygame_example2_monster) { return new AnyUnion{ Type = Any.MyGame_Example2_Monster, Value = _mygame_example2_monster }; } - public static int Pack(FlatBuffers.FlatBufferBuilder builder, AnyUnion _o) { + public static int Pack(Google.FlatBuffers.FlatBufferBuilder builder, AnyUnion _o) { switch (_o.Type) { default: return 0; case Any.Monster: return MyGame.Example.Monster.Pack(builder, _o.AsMonster()).Value; diff --git a/tests/MyGame/Example/AnyAmbiguousAliases.cs b/tests/MyGame/Example/AnyAmbiguousAliases.cs index 9253cc942aa..eec41723519 100644 --- a/tests/MyGame/Example/AnyAmbiguousAliases.cs +++ b/tests/MyGame/Example/AnyAmbiguousAliases.cs @@ -31,7 +31,7 @@ public class AnyAmbiguousAliasesUnion { public MyGame.Example.MonsterT AsM3() { return this.As(); } public static AnyAmbiguousAliasesUnion FromM3(MyGame.Example.MonsterT _m3) { return new AnyAmbiguousAliasesUnion{ Type = AnyAmbiguousAliases.M3, Value = _m3 }; } - public static int Pack(FlatBuffers.FlatBufferBuilder builder, AnyAmbiguousAliasesUnion _o) { + public static int Pack(Google.FlatBuffers.FlatBufferBuilder builder, AnyAmbiguousAliasesUnion _o) { switch (_o.Type) { default: return 0; case AnyAmbiguousAliases.M1: return MyGame.Example.Monster.Pack(builder, _o.AsM1()).Value; diff --git a/tests/MyGame/Example/AnyUniqueAliases.cs b/tests/MyGame/Example/AnyUniqueAliases.cs index ab332766194..bb6a21206b9 100644 --- a/tests/MyGame/Example/AnyUniqueAliases.cs +++ b/tests/MyGame/Example/AnyUniqueAliases.cs @@ -31,7 +31,7 @@ public class AnyUniqueAliasesUnion { public MyGame.Example2.MonsterT AsM2() { return this.As(); } public static AnyUniqueAliasesUnion FromM2(MyGame.Example2.MonsterT _m2) { return new AnyUniqueAliasesUnion{ Type = AnyUniqueAliases.M2, Value = _m2 }; } - public static int Pack(FlatBuffers.FlatBufferBuilder builder, AnyUniqueAliasesUnion _o) { + public static int Pack(Google.FlatBuffers.FlatBufferBuilder builder, AnyUniqueAliasesUnion _o) { switch (_o.Type) { default: return 0; case AnyUniqueAliases.M: return MyGame.Example.Monster.Pack(builder, _o.AsM()).Value; diff --git a/tests/MyGame/Example/ArrayStruct.cs b/tests/MyGame/Example/ArrayStruct.cs index df0e2ac0dc1..70a8bddd194 100644 --- a/tests/MyGame/Example/ArrayStruct.cs +++ b/tests/MyGame/Example/ArrayStruct.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct ArrayStruct : IFlatbufferObject { diff --git a/tests/MyGame/Example/ArrayTable.cs b/tests/MyGame/Example/ArrayTable.cs index afd7378b809..a5e4e796421 100644 --- a/tests/MyGame/Example/ArrayTable.cs +++ b/tests/MyGame/Example/ArrayTable.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct ArrayTable : IFlatbufferObject { diff --git a/tests/MyGame/Example/Monster.cs b/tests/MyGame/Example/Monster.cs index 31039ca08bc..87d8ef3b6bd 100644 --- a/tests/MyGame/Example/Monster.cs +++ b/tests/MyGame/Example/Monster.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; /// an example documentation comment: "monster object" public struct Monster : IFlatbufferObject diff --git a/tests/MyGame/Example/NestedStruct.cs b/tests/MyGame/Example/NestedStruct.cs index f323342c041..78173acc613 100644 --- a/tests/MyGame/Example/NestedStruct.cs +++ b/tests/MyGame/Example/NestedStruct.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct NestedStruct : IFlatbufferObject { diff --git a/tests/MyGame/Example/Referrable.cs b/tests/MyGame/Example/Referrable.cs index 91adbfe2aea..a9b59c4d5b4 100644 --- a/tests/MyGame/Example/Referrable.cs +++ b/tests/MyGame/Example/Referrable.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct Referrable : IFlatbufferObject { diff --git a/tests/MyGame/Example/Stat.cs b/tests/MyGame/Example/Stat.cs index d8acbbafc04..32c05dc0dfa 100644 --- a/tests/MyGame/Example/Stat.cs +++ b/tests/MyGame/Example/Stat.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct Stat : IFlatbufferObject { diff --git a/tests/MyGame/Example/StructOfStructs.cs b/tests/MyGame/Example/StructOfStructs.cs index 3a1607dc8cb..955aeabdeca 100644 --- a/tests/MyGame/Example/StructOfStructs.cs +++ b/tests/MyGame/Example/StructOfStructs.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct StructOfStructs : IFlatbufferObject { diff --git a/tests/MyGame/Example/StructOfStructsOfStructs.cs b/tests/MyGame/Example/StructOfStructsOfStructs.cs index e458f70b86c..90cfc299aad 100644 --- a/tests/MyGame/Example/StructOfStructsOfStructs.cs +++ b/tests/MyGame/Example/StructOfStructsOfStructs.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct StructOfStructsOfStructs : IFlatbufferObject { diff --git a/tests/MyGame/Example/Test.cs b/tests/MyGame/Example/Test.cs index a805218c9b6..68f3354486f 100644 --- a/tests/MyGame/Example/Test.cs +++ b/tests/MyGame/Example/Test.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct Test : IFlatbufferObject { diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.cs b/tests/MyGame/Example/TestSimpleTableWithEnum.cs index 61b7c51a0bd..837ad19fc4e 100644 --- a/tests/MyGame/Example/TestSimpleTableWithEnum.cs +++ b/tests/MyGame/Example/TestSimpleTableWithEnum.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; internal partial struct TestSimpleTableWithEnum : IFlatbufferObject { diff --git a/tests/MyGame/Example/TypeAliases.cs b/tests/MyGame/Example/TypeAliases.cs index 925144d2c7c..f936ad615f8 100644 --- a/tests/MyGame/Example/TypeAliases.cs +++ b/tests/MyGame/Example/TypeAliases.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct TypeAliases : IFlatbufferObject { diff --git a/tests/MyGame/Example/Vec3.cs b/tests/MyGame/Example/Vec3.cs index 31c9f7ea5a2..a4861faf661 100644 --- a/tests/MyGame/Example/Vec3.cs +++ b/tests/MyGame/Example/Vec3.cs @@ -7,7 +7,7 @@ namespace MyGame.Example using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct Vec3 : IFlatbufferObject { diff --git a/tests/MyGame/Example2/Monster.cs b/tests/MyGame/Example2/Monster.cs index 9e866cae41c..af736e7dd29 100644 --- a/tests/MyGame/Example2/Monster.cs +++ b/tests/MyGame/Example2/Monster.cs @@ -7,7 +7,7 @@ namespace MyGame.Example2 using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct Monster : IFlatbufferObject { diff --git a/tests/MyGame/InParentNamespace.cs b/tests/MyGame/InParentNamespace.cs index 7791cbb9101..6237e7c4bf5 100644 --- a/tests/MyGame/InParentNamespace.cs +++ b/tests/MyGame/InParentNamespace.cs @@ -7,7 +7,7 @@ namespace MyGame using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct InParentNamespace : IFlatbufferObject { diff --git a/tests/MyGame/MonsterExtra.cs b/tests/MyGame/MonsterExtra.cs index ef4bb1cf492..0236856d034 100644 --- a/tests/MyGame/MonsterExtra.cs +++ b/tests/MyGame/MonsterExtra.cs @@ -7,7 +7,7 @@ namespace MyGame using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct MonsterExtra : IFlatbufferObject { diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs index 0ed6a638652..2874a273832 100644 --- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs +++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs @@ -7,7 +7,7 @@ namespace NamespaceA.NamespaceB using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct StructInNestedNS : IFlatbufferObject { diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs index abf969de301..fab8e020003 100644 --- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs +++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs @@ -7,7 +7,7 @@ namespace NamespaceA.NamespaceB using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct TableInNestedNS : IFlatbufferObject { diff --git a/tests/namespace_test/NamespaceA/NamespaceB/UnionInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/UnionInNestedNS.cs index 7d1234f99a8..08bc431e243 100644 --- a/tests/namespace_test/NamespaceA/NamespaceB/UnionInNestedNS.cs +++ b/tests/namespace_test/NamespaceA/NamespaceB/UnionInNestedNS.cs @@ -25,7 +25,7 @@ public class UnionInNestedNSUnion { public NamespaceA.NamespaceB.TableInNestedNST AsTableInNestedNS() { return this.As(); } public static UnionInNestedNSUnion FromTableInNestedNS(NamespaceA.NamespaceB.TableInNestedNST _tableinnestedns) { return new UnionInNestedNSUnion{ Type = UnionInNestedNS.TableInNestedNS, Value = _tableinnestedns }; } - public static int Pack(FlatBuffers.FlatBufferBuilder builder, UnionInNestedNSUnion _o) { + public static int Pack(Google.FlatBuffers.FlatBufferBuilder builder, UnionInNestedNSUnion _o) { switch (_o.Type) { default: return 0; case UnionInNestedNS.TableInNestedNS: return NamespaceA.NamespaceB.TableInNestedNS.Pack(builder, _o.AsTableInNestedNS()).Value; diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.cs b/tests/namespace_test/NamespaceA/SecondTableInA.cs index f6741490c80..9db2226029f 100644 --- a/tests/namespace_test/NamespaceA/SecondTableInA.cs +++ b/tests/namespace_test/NamespaceA/SecondTableInA.cs @@ -7,7 +7,7 @@ namespace NamespaceA using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct SecondTableInA : IFlatbufferObject { diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.cs b/tests/namespace_test/NamespaceA/TableInFirstNS.cs index 1b4f9a2c691..ad72eee482c 100644 --- a/tests/namespace_test/NamespaceA/TableInFirstNS.cs +++ b/tests/namespace_test/NamespaceA/TableInFirstNS.cs @@ -7,7 +7,7 @@ namespace NamespaceA using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct TableInFirstNS : IFlatbufferObject { diff --git a/tests/namespace_test/NamespaceC/TableInC.cs b/tests/namespace_test/NamespaceC/TableInC.cs index 0352e95c84f..50ca3e4a34d 100644 --- a/tests/namespace_test/NamespaceC/TableInC.cs +++ b/tests/namespace_test/NamespaceC/TableInC.cs @@ -7,7 +7,7 @@ namespace NamespaceC using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct TableInC : IFlatbufferObject { diff --git a/tests/nested_namespace_test/nested_namespace_test1_generated.cs b/tests/nested_namespace_test/nested_namespace_test1_generated.cs index e42e96a9531..f1e646c4214 100644 --- a/tests/nested_namespace_test/nested_namespace_test1_generated.cs +++ b/tests/nested_namespace_test/nested_namespace_test1_generated.cs @@ -7,7 +7,7 @@ namespace NamespaceB using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))] public enum Color : sbyte diff --git a/tests/nested_namespace_test/nested_namespace_test2_generated.cs b/tests/nested_namespace_test/nested_namespace_test2_generated.cs index cdc1b09f5b1..efd2584dd9e 100644 --- a/tests/nested_namespace_test/nested_namespace_test2_generated.cs +++ b/tests/nested_namespace_test/nested_namespace_test2_generated.cs @@ -7,7 +7,7 @@ namespace NamespaceA.NamespaceB using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))] public enum Color : sbyte diff --git a/tests/nested_namespace_test/nested_namespace_test3_generated.cs b/tests/nested_namespace_test/nested_namespace_test3_generated.cs index b76ad8cdc03..85040c5f9c5 100644 --- a/tests/nested_namespace_test/nested_namespace_test3_generated.cs +++ b/tests/nested_namespace_test/nested_namespace_test3_generated.cs @@ -7,7 +7,7 @@ namespace NamespaceA.NamespaceB using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct ColorTestTable : IFlatbufferObject { diff --git a/tests/optional_scalars/ScalarStuff.cs b/tests/optional_scalars/ScalarStuff.cs index c2b56b76e27..85c16725029 100644 --- a/tests/optional_scalars/ScalarStuff.cs +++ b/tests/optional_scalars/ScalarStuff.cs @@ -7,7 +7,7 @@ namespace optional_scalars using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct ScalarStuff : IFlatbufferObject { diff --git a/tests/type_field_collsion/Collision.cs b/tests/type_field_collsion/Collision.cs index 0670b5d9525..2fc24f36e55 100644 --- a/tests/type_field_collsion/Collision.cs +++ b/tests/type_field_collsion/Collision.cs @@ -7,7 +7,7 @@ namespace type_field_collsion using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct Collision : IFlatbufferObject { diff --git a/tests/union_vector/Attacker.cs b/tests/union_vector/Attacker.cs index d3c06f37d5d..57c32fa139a 100644 --- a/tests/union_vector/Attacker.cs +++ b/tests/union_vector/Attacker.cs @@ -4,7 +4,7 @@ using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct Attacker : IFlatbufferObject { diff --git a/tests/union_vector/BookReader.cs b/tests/union_vector/BookReader.cs index 6cd88b3f2b2..74dd32f27ed 100644 --- a/tests/union_vector/BookReader.cs +++ b/tests/union_vector/BookReader.cs @@ -4,7 +4,7 @@ using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct BookReader : IFlatbufferObject { diff --git a/tests/union_vector/Character.cs b/tests/union_vector/Character.cs index 4978bdcb427..181f914a372 100644 --- a/tests/union_vector/Character.cs +++ b/tests/union_vector/Character.cs @@ -37,7 +37,7 @@ public class CharacterUnion { public string AsUnused() { return this.As(); } public static CharacterUnion FromUnused(string _unused) { return new CharacterUnion{ Type = Character.Unused, Value = _unused }; } - public static int Pack(FlatBuffers.FlatBufferBuilder builder, CharacterUnion _o) { + public static int Pack(Google.FlatBuffers.FlatBufferBuilder builder, CharacterUnion _o) { switch (_o.Type) { default: return 0; case Character.MuLan: return Attacker.Pack(builder, _o.AsMuLan()).Value; diff --git a/tests/union_vector/FallingTub.cs b/tests/union_vector/FallingTub.cs index 36c574c93ee..792dbedcd1f 100644 --- a/tests/union_vector/FallingTub.cs +++ b/tests/union_vector/FallingTub.cs @@ -4,7 +4,7 @@ using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct FallingTub : IFlatbufferObject { diff --git a/tests/union_vector/Gadget.cs b/tests/union_vector/Gadget.cs index e4770dddbd4..8e5ca7b1553 100644 --- a/tests/union_vector/Gadget.cs +++ b/tests/union_vector/Gadget.cs @@ -25,7 +25,7 @@ public class GadgetUnion { public HandFanT AsHandFan() { return this.As(); } public static GadgetUnion FromHandFan(HandFanT _handfan) { return new GadgetUnion{ Type = Gadget.HandFan, Value = _handfan }; } - public static int Pack(FlatBuffers.FlatBufferBuilder builder, GadgetUnion _o) { + public static int Pack(Google.FlatBuffers.FlatBufferBuilder builder, GadgetUnion _o) { switch (_o.Type) { default: return 0; case Gadget.FallingTub: return FallingTub.Pack(builder, _o.AsFallingTub()).Value; diff --git a/tests/union_vector/HandFan.cs b/tests/union_vector/HandFan.cs index a64c36ccc64..52e3e747d9e 100644 --- a/tests/union_vector/HandFan.cs +++ b/tests/union_vector/HandFan.cs @@ -4,7 +4,7 @@ using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct HandFan : IFlatbufferObject { diff --git a/tests/union_vector/Movie.cs b/tests/union_vector/Movie.cs index b6fbdc7e296..9bc2d9a3cb9 100644 --- a/tests/union_vector/Movie.cs +++ b/tests/union_vector/Movie.cs @@ -4,7 +4,7 @@ using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct Movie : IFlatbufferObject { diff --git a/tests/union_vector/Rapunzel.cs b/tests/union_vector/Rapunzel.cs index 31d2cdfd362..b9559d33200 100644 --- a/tests/union_vector/Rapunzel.cs +++ b/tests/union_vector/Rapunzel.cs @@ -4,7 +4,7 @@ using global::System; using global::System.Collections.Generic; -using global::FlatBuffers; +using global::Google.FlatBuffers; public struct Rapunzel : IFlatbufferObject { From fe0565b5dd7fe2f3c3f435ef8bc05bc58993759c Mon Sep 17 00:00:00 2001 From: Derek Bailey Date: Tue, 30 Aug 2022 21:22:48 -0700 Subject: [PATCH 3/4] Add Source Link for nuget package --- net/FlatBuffers/Google.FlatBuffers.csproj | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/FlatBuffers/Google.FlatBuffers.csproj b/net/FlatBuffers/Google.FlatBuffers.csproj index 4597b17b5a6..0bf83b1c9f6 100644 --- a/net/FlatBuffers/Google.FlatBuffers.csproj +++ b/net/FlatBuffers/Google.FlatBuffers.csproj @@ -2,8 +2,6 @@ netstandard2.1;netstandard2.0;net46 - false - Google.FlatBuffers A cross-platform memory efficient serialization library 2.0.8-beta.1 Google LLC @@ -14,6 +12,8 @@ flatbuffers.png Google;FlatBuffers;Serialization;Buffer;Binary;zero copy Copyright 2022 Google LLC + true + snupkg @@ -31,6 +31,10 @@ + + + + From 9c5e50f9893e8a5c300948dd9695b2ab6e4492b2 Mon Sep 17 00:00:00 2001 From: Derek Bailey Date: Wed, 31 Aug 2022 10:06:15 -0700 Subject: [PATCH 4/4] Add Strong Name signing of Google.FlatBuffers --- net/FlatBuffers/Google.FlatBuffers.csproj | 5 ++++- net/FlatBuffers/flatbuffers.snk | Bin 0 -> 596 bytes 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 net/FlatBuffers/flatbuffers.snk diff --git a/net/FlatBuffers/Google.FlatBuffers.csproj b/net/FlatBuffers/Google.FlatBuffers.csproj index 0bf83b1c9f6..107ba7c213d 100644 --- a/net/FlatBuffers/Google.FlatBuffers.csproj +++ b/net/FlatBuffers/Google.FlatBuffers.csproj @@ -14,6 +14,9 @@ Copyright 2022 Google LLC true snupkg + true + flatbuffers.snk + false @@ -36,7 +39,7 @@ - + diff --git a/net/FlatBuffers/flatbuffers.snk b/net/FlatBuffers/flatbuffers.snk new file mode 100644 index 0000000000000000000000000000000000000000..70a214680557786d306d68b59a6f10a0c64419ca GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50096UOp~KYEaclmnLz=clIDWTdOwvEr%>?_ z_ISHiVnfxNu?-5?GwqErFJkOf?CNWUIq`KnqYuyhQkaCI7L2zo2Cpq_$iOZmo0}d6 zq03*xmNq8^N2{z`Qy6{^H}YeWnOXm1A;Go{`0F|cnJ;bXUR)HeMh=r=bC%+3&&kZyz{u_&D%C4A-$D3Ch9zVk55kU-i=zd_hufm{s&zO+j87ge?< zQbn3hAr|;$x+c=BY*5PnFh(I#`K25u`!hy2vMB<}!)?=%hor$_#n=6QyXn)_YEKhg zC_!Bq1((M+<{bW?kk!PhU$}-0fYCMN*KAr5*eKbIpmw>izt9B_3FPe5W_jmT{4xuq3Sq;6!_Hh|V_{%_G8 z_6(q_$Y1M4E7!R?e!H|@e=gl>4l)};0I$cJMSTYCwI_sj{`PWO`ss~oy${H92?}~J z<1@7sJ8>(k-BLmbDPrKRs{x-jI?&?c&+f9-Y$QJANtD6u+4pxM`-#M!GRsY_F%24M i@6cK*Sd{o5PDkEZ!~zEggh-w