Merge pull request #882 from Cysharp/feature/MessagePackV3

Upgrade to MessagePack v3
Cysharp · Dec 23, 2024 · 0f67acc · 0f67acc
2 parents 06e7deb + 04a23f6
commit 0f67acc
Show file tree

Hide file tree

Showing 632 changed files with 15,405 additions and 45,356 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-retest": {
+      "version": "0.6.3",
+      "commands": [
+        "dotnet-retest"
+      ],
+      "rollForward": false
+    }
+  }
+}
diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml
@@ -40,15 +40,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: Cysharp/Actions/.github/actions/setup-dotnet@main
-      - run: dotnet test -c Debug MagicOnion.sln
-      - run: dotnet test -c Release MagicOnion.sln
+      - run: dotnet tool restore
+      - run: dotnet retest -- -c Debug MagicOnion.sln
+      - run: dotnet retest -- -c Release MagicOnion.sln
 
   build-unity:
     name: "Build Unity package"
     if: ${{ (github.event_name == 'push' && github.repository_owner == 'Cysharp') || startsWith(github.event.pull_request.head.label, 'Cysharp:') }}
     strategy:
       matrix:
-        unity: ["2021.3.0f1"]
+        unity: ["2022.3.0f1"]
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
@@ -86,28 +87,28 @@ jobs:
 
       # execute scripts/Export Package
       # /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export
-      - name: Build Unity (.unitypacakge)
-        uses: Cysharp/Actions/.github/actions/unity-builder@main
-        env:
-          UNITY_EMAIL: ${{ steps.op-load-secret.outputs.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ steps.op-load-secret.outputs.UNITY_PASSWORD }}
-          UNITY_SERIAL: ${{ steps.op-load-secret.outputs.UNITY_SERIAL }}
-        with:
-          projectPath: src/MagicOnion.Client.Unity
-          unityVersion: ${{ matrix.unity }}
-          targetPlatform: StandaloneLinux64
-          buildMethod: PackageExporter.Export
+      #- name: Build Unity (.unitypacakge)
+      #  uses: Cysharp/Actions/.github/actions/unity-builder@main
+      #  env:
+      #    UNITY_EMAIL: ${{ steps.op-load-secret.outputs.UNITY_EMAIL }}
+      #    UNITY_PASSWORD: ${{ steps.op-load-secret.outputs.UNITY_PASSWORD }}
+      #    UNITY_SERIAL: ${{ steps.op-load-secret.outputs.UNITY_SERIAL }}
+      #  with:
+      #    projectPath: src/MagicOnion.Client.Unity
+      #    unityVersion: ${{ matrix.unity }}
+      #    targetPlatform: StandaloneLinux64
+      #    buildMethod: PackageExporter.Export
 
       - uses: ./.github/actions/check-metas
         with:
           directory: src/MagicOnion.Client.Unity
 
       # Store artifacts.
-      - uses: Cysharp/Actions/.github/actions/upload-artifact@main
-        with:
-          name: MagicOnion.Client.Unity.${{ matrix.unity }}.unitypackage
-          path: ./src/MagicOnion.Client.Unity/MagicOnion.Client.Unity.unitypackage
-          retention-days: 1
+      #- uses: Cysharp/Actions/.github/actions/upload-artifact@main
+      #  with:
+      #    name: MagicOnion.Client.Unity.${{ matrix.unity }}.unitypackage
+      #    path: ./src/MagicOnion.Client.Unity/MagicOnion.Client.Unity.unitypackage
+      #    retention-days: 1
 
   actions-timeline:
     needs: [build-dotnet, run-tests, build-unity]

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -17,7 +17,7 @@ jobs:
     uses: Cysharp/Actions/.github/workflows/update-packagejson.yaml@main
     with:
       file-path: |
-        ./src/MagicOnion.Client.Unity/Assets/Scripts/MagicOnion/package.json
+        ./src/MagicOnion.Client.Unity/Assets/Scripts/MagicOnion.Client.Unity/package.json
         ./Directory.Build.props
       tag: ${{ inputs.tag }}
       dry-run: ${{ inputs.dry-run }}
@@ -43,53 +43,53 @@ jobs:
           path: ./publish/
           retention-days: 1
 
-  build-unity:
-    needs: [update-packagejson]
-    strategy:
-      matrix:
-        unity: ["2021.3.0f1"]
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - name: Load secrets
-        id: op-load-secret
-        uses: 1password/load-secrets-action@v2
-        with:
-          export-env: false
-        env:
-          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_PUBLIC }}
-          UNITY_EMAIL: "op://GitHubActionsPublic/UNITY_LICENSE/username"
-          UNITY_PASSWORD: "op://GitHubActionsPublic/UNITY_LICENSE/credential"
-          UNITY_SERIAL: "op://GitHubActionsPublic/UNITY_LICENSE/serial"
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ needs.update-packagejson.outputs.sha }}
-      # execute scripts/Export Package
-      # /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export
-      - name: Build Unity (.unitypacakge)
-        uses: Cysharp/Actions/.github/actions/unity-builder@main
-        env:
-          UNITY_EMAIL: ${{ steps.op-load-secret.outputs.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ steps.op-load-secret.outputs.UNITY_PASSWORD }}
-          UNITY_SERIAL: ${{ steps.op-load-secret.outputs.UNITY_SERIAL }}
-          UNITY_PACKAGE_VERSION: ${{ inputs.tag }}
-        with:
-          projectPath: src/MagicOnion.Client.Unity
-          unityVersion: ${{ matrix.unity }}
-          targetPlatform: StandaloneLinux64
-          buildMethod: PackageExporter.Export
-
-      - uses: ./.github/actions/check-metas
-        with:
-          directory: src/MagicOnion.Client.Unity
-
-      # Store artifacts.
-      - uses: Cysharp/Actions/.github/actions/upload-artifact@main
-        with:
-          name: MagicOnion.Client.Unity.unitypackage
-          path: ./src/MagicOnion.Client.Unity/MagicOnion.Client.Unity.unitypackage
-          retention-days: 1
+  #build-unity:
+  #  needs: [update-packagejson]
+  #  strategy:
+  #    matrix:
+  #      unity: ["2022.3.0f1"]
+  #  runs-on: ubuntu-latest
+  #  timeout-minutes: 15
+  #  steps:
+  #    - name: Load secrets
+  #      id: op-load-secret
+  #      uses: 1password/load-secrets-action@v2
+  #      with:
+  #        export-env: false
+  #      env:
+  #        OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_PUBLIC }}
+  #        UNITY_EMAIL: "op://GitHubActionsPublic/UNITY_LICENSE/username"
+  #        UNITY_PASSWORD: "op://GitHubActionsPublic/UNITY_LICENSE/credential"
+  #        UNITY_SERIAL: "op://GitHubActionsPublic/UNITY_LICENSE/serial"
+  #
+  #    - uses: actions/checkout@v4
+  #      with:
+  #        ref: ${{ needs.update-packagejson.outputs.sha }}
+  #    # execute scripts/Export Package
+  #    # /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export
+  #    - name: Build Unity (.unitypacakge)
+  #      uses: Cysharp/Actions/.github/actions/unity-builder@main
+  #      env:
+  #        UNITY_EMAIL: ${{ steps.op-load-secret.outputs.UNITY_EMAIL }}
+  #        UNITY_PASSWORD: ${{ steps.op-load-secret.outputs.UNITY_PASSWORD }}
+  #        UNITY_SERIAL: ${{ steps.op-load-secret.outputs.UNITY_SERIAL }}
+  #        UNITY_PACKAGE_VERSION: ${{ inputs.tag }}
+  #      with:
+  #        projectPath: src/MagicOnion.Client.Unity
+  #        unityVersion: ${{ matrix.unity }}
+  #        targetPlatform: StandaloneLinux64
+  #        buildMethod: PackageExporter.Export
+  #
+  #    - uses: ./.github/actions/check-metas
+  #      with:
+  #        directory: src/MagicOnion.Client.Unity
+  #
+  #    # Store artifacts.
+  #    - uses: Cysharp/Actions/.github/actions/upload-artifact@main
+  #      with:
+  #        name: MagicOnion.Client.Unity.unitypackage
+  #        path: ./src/MagicOnion.Client.Unity/MagicOnion.Client.Unity.unitypackage
+  #        retention-days: 1
 
   # release
   create-release:

diff --git a/.github/workflows/build-update-sourcegenerator-for-unity.yml b/.github/workflows/build-update-sourcegenerator-for-unity.yml
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,7 +7,7 @@
     <GrpcVersion>2.57.0</GrpcVersion>
     <GrpcCCoreVersion>2.46.6</GrpcCCoreVersion>
     <MemoryPackVersion>1.21.1</MemoryPackVersion>
-    <MessagePackVersion>2.5.187</MessagePackVersion>
+    <MessagePackVersion>3.1.0</MessagePackVersion>
     <MicrosoftCodeAnalysisVersion>4.3.1</MicrosoftCodeAnalysisVersion>
     <MicrosoftCodeAnalysisVersionUnity>3.9.0</MicrosoftCodeAnalysisVersionUnity>
     <MulticasterVersion>0.1.12</MulticasterVersion>

diff --git a/MagicOnion.sln b/MagicOnion.sln
@@ -60,7 +60,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 		.github\workflows\build-debug.yml = .github\workflows\build-debug.yml
 		.github\workflows\build-docs.yml = .github\workflows\build-docs.yml
 		.github\workflows\build-release.yml = .github\workflows\build-release.yml
-		.github\workflows\build-update-sourcegenerator-for-unity.yml = .github\workflows\build-update-sourcegenerator-for-unity.yml
 		.github\workflows\prevent-github-change.yml = .github\workflows\prevent-github-change.yml
 		.github\workflows\stale.yml = .github\workflows\stale.yml
 	EndProjectSection
@@ -97,12 +96,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Client.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Client.SourceGenerator.Tests", "tests\MagicOnion.Client.SourceGenerator.Tests\MagicOnion.Client.SourceGenerator.Tests.csproj", "{632C8D1B-3293-4D02-9ED1-0CB191619334}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Client.SourceGenerator.Unity", "src\MagicOnion.Client.SourceGenerator.Unity\MagicOnion.Client.SourceGenerator.Unity.csproj", "{A817FC3D-5C8D-4F47-B082-DB6A8EE227FD}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleServiceDefinitions", "tests\samples\SampleServiceDefinitions\SampleServiceDefinitions.csproj", "{45EA8028-41C1-4DF6-9E0F-EEE8967799DA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MagicOnion.Client.SourceGenerator.Unity.Tests", "tests\MagicOnion.Client.SourceGenerator.Unity.Tests\MagicOnion.Client.SourceGenerator.Unity.Tests.csproj", "{AFB26C11-0833-459D-B071-7CA001BD7F01}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SourceGeneratorPerf", "SourceGeneratorPerf", "{E9E11DFE-29C4-4933-A21B-2222646D946E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGeneratorPerf", "perf\SourceGeneratorPerf\SourceGeneratorPerf\SourceGeneratorPerf.csproj", "{7F132098-0C1D-4F3A-B049-ACABF5E35973}"
@@ -241,18 +236,10 @@ Global
 		{632C8D1B-3293-4D02-9ED1-0CB191619334}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{632C8D1B-3293-4D02-9ED1-0CB191619334}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{632C8D1B-3293-4D02-9ED1-0CB191619334}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A817FC3D-5C8D-4F47-B082-DB6A8EE227FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A817FC3D-5C8D-4F47-B082-DB6A8EE227FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A817FC3D-5C8D-4F47-B082-DB6A8EE227FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A817FC3D-5C8D-4F47-B082-DB6A8EE227FD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{45EA8028-41C1-4DF6-9E0F-EEE8967799DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{45EA8028-41C1-4DF6-9E0F-EEE8967799DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{45EA8028-41C1-4DF6-9E0F-EEE8967799DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{45EA8028-41C1-4DF6-9E0F-EEE8967799DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AFB26C11-0833-459D-B071-7CA001BD7F01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFB26C11-0833-459D-B071-7CA001BD7F01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFB26C11-0833-459D-B071-7CA001BD7F01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AFB26C11-0833-459D-B071-7CA001BD7F01}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F132098-0C1D-4F3A-B049-ACABF5E35973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F132098-0C1D-4F3A-B049-ACABF5E35973}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F132098-0C1D-4F3A-B049-ACABF5E35973}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -340,9 +327,7 @@ Global
 		{95C3B040-BD5A-4A80-B5D4-26CAA21B4829} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
 		{7130EC5B-C987-487A-B319-E91B6D03F5BF} = {1987061F-8970-4018-8D58-6932961C9EB4}
 		{632C8D1B-3293-4D02-9ED1-0CB191619334} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
-		{A817FC3D-5C8D-4F47-B082-DB6A8EE227FD} = {1987061F-8970-4018-8D58-6932961C9EB4}
 		{45EA8028-41C1-4DF6-9E0F-EEE8967799DA} = {B5617CC1-55FD-4F77-BA75-9450474C6527}
-		{AFB26C11-0833-459D-B071-7CA001BD7F01} = {7ACC27E8-8FBE-4807-B91F-B89AF3CFF7E0}
 		{E9E11DFE-29C4-4933-A21B-2222646D946E} = {A0CED9FB-5B18-4EE3-859F-CE3A6F90A82A}
 		{7F132098-0C1D-4F3A-B049-ACABF5E35973} = {E9E11DFE-29C4-4933-A21B-2222646D946E}
 		{6C34E9BF-4E05-4A73-B439-75F3369B88A8} = {1987061F-8970-4018-8D58-6932961C9EB4}

diff --git a/src/MagicOnion.Client.SourceGenerator.Unity/MagicOnion.Client.SourceGenerator.Unity.csproj b/src/MagicOnion.Client.SourceGenerator.Unity/MagicOnion.Client.SourceGenerator.Unity.csproj