Skip to content

Commit

Permalink
Merge pull request #55 from Cysharp/feature/Update-MagicOnion-6.1.4
Browse files Browse the repository at this point in the history
Update MagicOnion to 6.1.4
  • Loading branch information
mayuki authored Jul 30, 2024
2 parents 1b7b284 + 73964bb commit bfef7fe
Show file tree
Hide file tree
Showing 426 changed files with 14,102 additions and 4,486 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
if: ${{ (github.event_name == 'push' && github.repository_owner == 'Cysharp') || startsWith(github.event.pull_request.head.label, 'Cysharp:') }}
strategy:
matrix:
unity: ["2020.3.29f1"]
unity: ["2022.3.39f1"]
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
needs: [update-packagejson]
strategy:
matrix:
unity: ["2020.3.29f1"]
unity: ["2022.3.39f1"]
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
Expand Down
3 changes: 2 additions & 1 deletion DFrame.sln
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{15E00CDF-0E36-4FF1-A88B-E211066D8FDE}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
src\Directory.Packages.props = src\Directory.Packages.props
README.md = README.md
EndProjectSection
EndProject
Expand Down Expand Up @@ -44,7 +45,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DFrame.RestSdk", "src\DFram
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinimumGrpc", "sandbox\MinimumGrpc\MinimumGrpc.csproj", "{C7BBF6FF-BFB2-4791-AA0D-36B9BFF84C9A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleMultipleWorker", "sandbox\ConsoleMultipleWorker\ConsoleMultipleWorker.csproj", "{1BFEF842-0BD4-4249-818A-09DD5E151434}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleMultipleWorker", "sandbox\ConsoleMultipleWorker\ConsoleMultipleWorker.csproj", "{1BFEF842-0BD4-4249-818A-09DD5E151434}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
2 changes: 1 addition & 1 deletion src/DFrame.Controller/RunDFrameController.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using DFrame.Controller;
using DFrame.Internal;
using MagicOnion.Serialization;
using MagicOnion.Serialization.MessagePack;
using MagicOnion.Server;
using MagicOnion.Server.Diagnostics;
using MessagePack;
Expand Down Expand Up @@ -42,7 +43,6 @@ static async Task RunDFrameControllerAsync(WebApplicationBuilder appBuilder, DFr
// Should use same options between DFrame.Controller(this) and DFrame.Worker
x.MessageSerializer = MessagePackMagicOnionSerializerProvider.Default;
});
services.AddSingleton<IMagicOnionLogger, MagicOnionLogToLogger>();

services.AddRazorPages()
.ConfigureApplicationPartManager(manager =>
Expand Down
64 changes: 64 additions & 0 deletions src/DFrame.Unity/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# This .gitignore file should be placed at the root of your Unity project directory

/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/

# Never ignore Asset meta data
!/[Aa]ssets/**/*.meta

# Never ignore Packages under Assets
!/[Aa]ssets/Packages/**/*.*

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# TextMesh Pro files
[Aa]ssets/TextMesh*Pro/

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.unitypackage

# Crashlytics generated file
crashlytics-build.properties

# gRPC Plugins
# https://packages.grpc.io/
[Aa]ssets/Plugins/Google.Protobuf/
[Aa]ssets/Plugins/Google.Protobuf.meta
8 changes: 8 additions & 0 deletions src/DFrame.Unity/Assets/Editor.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions src/DFrame.Unity/Assets/Editor/PackageExporter.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions src/DFrame.Unity/Assets/NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<disabledPackageSources />
<activePackageSource>
<add key="All" value="(Aggregate source)" />
</activePackageSource>
<config>
<add key="packageInstallLocation" value="CustomWithinAssets" />
<add key="repositoryPath" value="./Packages" />
<add key="PackagesConfigDirectoryPath" value="." />
<add key="slimRestore" value="true" />
<add key="PreferNetStandardOverNetFramework" value="true" />
</config>
</configuration>
23 changes: 23 additions & 0 deletions src/DFrame.Unity/Assets/NuGet.config.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/DFrame.Unity/Assets/Packages.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/DFrame.Unity/Assets/Packages/Grpc.Core.Api.2.65.0.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Grpc.Core.Api</id>
<version>2.65.0</version>
<authors>The gRPC Authors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
<icon>packageIcon.png</icon>
<readme>README.md</readme>
<projectUrl>https://github.com/grpc/grpc-dotnet</projectUrl>
<description>gRPC C# Surface API</description>
<copyright>Copyright 2019 The gRPC Authors</copyright>
<tags>gRPC RPC HTTP/2</tags>
<repository type="git" url="https://github.com/grpc/grpc-dotnet.git" commit="60156334d62c5169792c5fca1a653aa490c1abd8" />
<dependencies>
<group targetFramework=".NETFramework4.6.2">
<dependency id="System.Memory" version="4.5.3" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="System.Memory" version="4.5.3" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.1" />
</dependencies>
<frameworkAssemblies>
<frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.6.2" />
<frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.6.2" />
</frameworkAssemblies>
</metadata>
</package>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Grpc.Core.Api

`Grpc.Core.Api` is the shared API package for gRPC C# and gRPC for .NET implementations of gRPC.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bfef7fe

Please sign in to comment.