Merge remote-tracking branch 'origin/master'

Cysharp · Oct 3, 2019 · 88ac998 · 88ac998
2 parents 9762acf + a4243d2
commit 88ac998
Show file tree

Hide file tree

Showing 792 changed files with 45,244 additions and 49,599 deletions.
diff --git a/samples/ChatApp/ChatApp.Unity/.gitignore b/samples/ChatApp/ChatApp.Unity/.gitignore
@@ -54,3 +54,18 @@ sysinfo.txt
 
 # Crashlytics generated file
 crashlytics-build.properties
+
+# gRPC Plugins
+# https://packages.grpc.io/
+[Aa]ssets/Plugins/Google.Protobuf/
+[Aa]ssets/Plugins/Google.Protobuf.meta
+[Aa]ssets/Plugins/Grpc.Core/
+[Aa]ssets/Plugins/Grpc.Core.meta
+[Aa]ssets/Plugins/Grpc.Core.Api/
+[Aa]ssets/Plugins/Grpc.Core.Api.meta
+[Aa]ssets/Plugins/System.Buffers/
+[Aa]ssets/Plugins/System.Buffers.meta
+[Aa]ssets/Plugins/System.Memory/
+[Aa]ssets/Plugins/System.Memory.meta
+[Aa]ssets/Plugins/System.Runtime.CompilerServices.Unsafe/
+[Aa]ssets/Plugins/System.Runtime.CompilerServices.Unsafe.meta
diff --git a/...App/ChatApp.Unity/Assets/Plugins/dll.meta → ...ns/System.Threading.Tasks.Extensions.meta b/...App/ChatApp.Unity/Assets/Plugins/dll.meta → ...ns/System.Threading.Tasks.Extensions.meta
diff --git a/...Assets/Plugins/dll/Grpc.Core.Api/lib.meta → ...ystem.Threading.Tasks.Extensions/lib.meta b/...Assets/Plugins/dll/Grpc.Core.Api/lib.meta → ...ystem.Threading.Tasks.Extensions/lib.meta
diff --git a/.../Plugins/dll/Grpc.Core.Api/lib/net45.meta → ...Threading.Tasks.Extensions/lib/net45.meta b/.../Plugins/dll/Grpc.Core.Api/lib/net45.meta → ...Threading.Tasks.Extensions/lib/net45.meta
diff --git a/...Plugins/System.Threading.Tasks.Extensions/lib/net45/System.Threading.Tasks.Extensions.dll b/...Plugins/System.Threading.Tasks.Extensions/lib/net45/System.Threading.Tasks.Extensions.dll
diff --git a/...Assets/Plugins/dll/Grpc.Core.Api.dll.meta → ...ystem.Threading.Tasks.Extensions.dll.meta b/...Assets/Plugins/dll/Grpc.Core.Api.dll.meta → ...ystem.Threading.Tasks.Extensions.dll.meta
diff --git a/samples/ChatApp/ChatApp.Unity/Assets/Plugins/dll/Google.Protobuf.meta b/samples/ChatApp/ChatApp.Unity/Assets/Plugins/dll/Google.Protobuf.meta
diff --git a/samples/ChatApp/ChatApp.Unity/Assets/Plugins/dll/Google.Protobuf/lib.meta b/samples/ChatApp/ChatApp.Unity/Assets/Plugins/dll/Google.Protobuf/lib.meta
diff --git a/samples/ChatApp/ChatApp.Unity/Assets/Plugins/dll/Google.Protobuf/lib/net45.meta b/samples/ChatApp/ChatApp.Unity/Assets/Plugins/dll/Google.Protobuf/lib/net45.meta
diff --git a/...es/ChatApp/ChatApp.Unity/Assets/Plugins/dll/Google.Protobuf/lib/net45/Google.Protobuf.dll b/...es/ChatApp/ChatApp.Unity/Assets/Plugins/dll/Google.Protobuf/lib/net45/Google.Protobuf.dll
diff --git a/...atApp/ChatApp.Unity/Assets/Plugins/dll/Google.Protobuf/lib/net45/Google.Protobuf.dll.meta b/...atApp/ChatApp.Unity/Assets/Plugins/dll/Google.Protobuf/lib/net45/Google.Protobuf.dll.meta
diff --git a/samples/ChatApp/ChatApp.Unity/Assets/Plugins/dll/Grpc.Core.Api.dll b/samples/ChatApp/ChatApp.Unity/Assets/Plugins/dll/Grpc.Core.Api.dll
diff --git a/samples/ChatApp/ChatApp.Unity/Assets/Plugins/dll/Grpc.Core.Api.meta b/samples/ChatApp/ChatApp.Unity/Assets/Plugins/dll/Grpc.Core.Api.meta