Merge pull request #9 from kurone-kito/maintenance

Cumulative updates include that supported the .NET v8
kurone-kito · Nov 18, 2024 · 0b10286 · 0b10286
2 parents d6ba61f + b43d558
commit 0b10286
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 50 deletions.
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
@@ -6,7 +6,9 @@ reviews:
   auto_review:
     enabled: true
   path_filters:
-    - "!Assets"
+    - '!Assets/TextMesh Pro/**/*'
+    - '!Assets/UdonSharp/**/*'
+    - '!Assets/XR/**/*'
     - "!Packages/com.vrchat.core.*/**/*"
     - "!ProjectSettings"
   path_instructions:

diff --git a/.editorconfig b/.editorconfig
@@ -14,15 +14,15 @@ indent_size = 4
 [*.{asset,md,meta,prefab,unity}]
 trim_trailing_whitespace = false
 
-[Packages/black.kit.*/**/Runtime/**/*.cs]
-dotnet_diagnostic.IDE0066.severity = none
-
 [Assets/UdonSharp/**.txt]
 indent_size = 4
 
 [LICENSE]
 generated_code = true
 
+[Packages/black.kit.*/**/Runtime/**/*.cs]
+dotnet_diagnostic.IDE0066.severity = none
+
 [Packages/com.*/**]
 insert_final_newline = false
 

diff --git a/.gitattributes b/.gitattributes
@@ -4,15 +4,13 @@
 /Packages/dev.*/** linguist-vendored
 /ProjectSettings/** linguist-vendored
 
-*.asset merge=unityyamlmerge filter=vrc eol=lf text
-*.mat merge=unityyamlmerge eol=lf text
-*.meta merge=unityyamlmerge eol=lf text
-*.prefab merge=unityyamlmerge filter=vrc eol=lf text
-*.unity merge=unityyamlmerge filter=vrc eol=lf text
+*.asset merge=unityyamlmerge filter=vrc eol=lf text=auto
+*.mat merge=unityyamlmerge eol=lf text=auto
+*.meta merge=unityyamlmerge eol=lf text=auto
+*.prefab merge=unityyamlmerge filter=vrc eol=lf text=auto
+*.unity merge=unityyamlmerge filter=vrc eol=lf text=auto
 
 .coderabbit.yaml export-ignore
-.gitattributes export-ignore
-.github export-ignore
-.gitignore export-ignore
-.gitkeep export-ignore
+.git* export-ignore
+.github/** export-ignore
 .imgbotconfig export-ignore
diff --git a/.gitconfig b/.gitconfig
@@ -1,2 +1,6 @@
 [core]
   hideDotFiles = dotGitOnly
+[filter "vrc"]
+	clean = git vrc clean --file %f
+	required = true
+	smudge = git vrc smudge --file %f
diff --git a/.github/workflows/build-listing.yml b/.github/workflows/build-listing.yml
@@ -48,7 +48,7 @@ jobs:
           path: ${{ env.pathToCi }}
           clean: false
       - name: Deploy the global.json file
-        run: cp ${{ github.workspace }}/global.json ${{ env.pathToCi }}/
+        run: cp "${{ github.workspace }}/global.json" "${{ env.pathToCi }}/"
       - name: Load cached data from previous runs
         uses: actions/cache@v4
         with:
@@ -57,7 +57,7 @@ jobs:
             ~/.nuget/packages
           key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
       - name: Build Package Version Listing with Nuke
-        run: ${{ env.pathToCi }}/build.cmd BuildRepoListing --root ${{ env.pathToCi }} --list-publish-directory $GITHUB_WORKSPACE/${{ env.listPublishDirectory }} --current-package-name ${{ vars.PACKAGE_NAME }}
+        run: '"${{ env.pathToCi }}/build.cmd" BuildRepoListing --root "${{ env.pathToCi }}" --list-publish-directory "$GITHUB_WORKSPACE/${{ env.listPublishDirectory }}" --current-package-name "${{ vars.PACKAGE_NAME }}"'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Prepare for GitHub Pages deployment

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -13,20 +13,16 @@ jobs:
       listPublishDirectory: Website
       packagePath: Packages/${{ vars.PACKAGE_NAME }}
       pathToCi: ci
-      unityPackage:
-      zipFile:
+      unityPackage: ${{ vars.PACKAGE_NAME }}-feature.unitypackage
+      zipFile: ${{ vars.PACKAGE_NAME }}-feature.zip
     steps:
       - name: Checkout Local Repository
         uses: actions/checkout@v4
-      - name: Configure the Environment Variables needed for releasing the Package
-        run: |
-          echo "unityPackage=${{ vars.PACKAGE_NAME }}-feature.unitypackage" >> $GITHUB_ENV
-          echo "zipFile=${{ vars.PACKAGE_NAME }}-feature.zip" >> $GITHUB_ENV
       - name: Zip the Package for testing
-        working-directory: "${{ env.packagePath }}"
         run: zip -r "${{ github.workspace }}/${{ env.zipFile }}" .
+        working-directory: "${{ env.packagePath }}"
       - name: Build a list of .meta files for future use
-        run: find "${{ env.packagePath }}/" -name \*.meta >> metaList
+        run: find "${{ env.packagePath }}/" -name '*.meta' -type f >> metaList
       - name: Make a UnityPackage version of the Package for release
         uses: pCYSl5EDgo/create-unitypackage@v1
         with:
@@ -39,7 +35,7 @@ jobs:
           path: ${{ env.pathToCi }}
           clean: false
       - name: Deploy the global.json file
-        run: cp ${{ github.workspace }}/global.json ${{ env.pathToCi }}/
+        run: cp "${{ github.workspace }}/global.json" "${{ env.pathToCi }}/"
       - name: Load cached data from previous runs
         uses: actions/cache@v4
         with:
@@ -48,6 +44,6 @@ jobs:
             ~/.nuget/packages
           key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
       - name: Build Package Version Listing with Nuke
-        run: ${{ env.pathToCi }}/build.cmd BuildRepoListing --root ${{ env.pathToCi }} --list-publish-directory $GITHUB_WORKSPACE/${{ env.listPublishDirectory }} --current-package-name ${{ vars.PACKAGE_NAME }}
+        run: '"${{ env.pathToCi }}/build.cmd" BuildRepoListing --root "${{ env.pathToCi }}" --list-publish-directory "$GITHUB_WORKSPACE/${{ env.listPublishDirectory }}" --current-package-name "${{ vars.PACKAGE_NAME }}"'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,10 +62,10 @@ jobs:
           echo "version=${{ steps.version.outputs.value }}" >> $GITHUB_ENV
           echo "zipFile=${{ vars.PACKAGE_NAME }}-${{ steps.version.outputs.value }}.zip" >> $GITHUB_ENV
       - name: Zip the Package for release
-        working-directory: "${{ env.packagePath }}"
         run: zip -r -9 "${{ github.workspace }}/${{ env.zipFile }}" .
+        working-directory: "${{ env.packagePath }}"
       - name: Build a list of .meta files for future use
-        run: find "${{ env.packagePath }}/" -name \*.meta >> metaList
+        run: find "${{ env.packagePath }}/" -name '*.meta' -type f >> metaList
       - name: Make a UnityPackage version of the Package for release
         uses: pCYSl5EDgo/create-unitypackage@v1
         with:

diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-dotnet 6.0.427
+dotnet 8.0.403
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -3,6 +3,8 @@
     "davidanson.vscode-markdownlint",
     "editorconfig.editorconfig",
     "fernandoescolar.vscode-solution-explorer",
+    "mariomatheu.syntax-project-pbxproj",
+    "mrorz.language-gettext",
     "redhat.vscode-yaml",
     "streetsidesoftware.code-spell-checker",
     "visualstudiotoolsforunity.vstuc",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,30 +2,33 @@
   "explorer.fileNesting.enabled": true,
   "explorer.fileNesting.expand": false,
   "explorer.fileNesting.patterns": {
-    "*": "${capture}.meta, ${capture}.md5",
+    "*": "${capture}.meta, ${capture}.md5, ${capture}-lock",
+    "*.db": "${capture}.db.st",
     "*.dll": "${capture}.pdb",
     "*.md": "${capture}.*.md",
+    "*.png": "${capture}@*.png",
     "*.sln": "*.csproj",
+    "*.xml": "${capture}.dll",
     ".gitconfig": ".gitattributes, .gitignore",
     ".markdownlint.*": ".markdownlint-cli2.*",
-    ".tool-versions": "global.json",
-    "LICENSE*": "LICENSE${capture}.meta"
+    ".tool-versions": "global.json"
   },
   "files.associations": {
     "*.anim": "yaml",
     "*.asmdef": "json",
     "*.asmref": "json",
     "*.asset": "yaml",
     "*.buildreport": "yaml",
-    "*.config": "xml",
     "*.controller": "yaml",
     "*.dwlt": "yaml",
-    "*.info": "json",
+    "*.exe.config": "xml",
     "*.index": "json",
+    "*.info": "json",
     "*.inputactions": "json",
     "*.lighting": "yaml",
     "*.mat": "yaml",
     "*.meta": "yaml",
+    "*.nuget.cache": "json",
     "*.outputdata": "json",
     "*.physicmaterial": "yaml",
     "*.playable": "yaml",
@@ -34,16 +37,19 @@
     "*.scenetemplate": "yaml",
     "*.signal": "yaml",
     "*.terrainlayer": "yaml",
-    "*.tlh": "c",
+    "*.tlh": "cpp",
     "*.traceevents": "jsonl",
     "*.unity": "yaml",
     "*.uss": "css",
+    "*.uxml": "xml",
+    ".buginfo": "yaml",
     ".imgbotconfig": "json",
-    ".settings": "plist",
     ".signature": "json",
+    "CodeResources": "xml",
     "LastSceneManagerSetup.txt": "yaml",
     "LibraryFormatVersion.txt": "yaml",
     "LICENSE": "plaintext",
+    "ProjectCache": "yaml",
     "ProjectVersion.txt": "yaml",
     "XRPackageSettings.asset": "json",
     "XRSettings.asset": "json"
@@ -88,29 +94,48 @@
     "tag:unity3d.com,2011:30 mapping",
     "tag:unity3d.com,2011:33 mapping",
     "tag:unity3d.com,2011:47 mapping",
+    "tag:unity3d.com,2011:54 mapping",
     "tag:unity3d.com,2011:55 mapping",
+    "tag:unity3d.com,2011:60 mapping",
     "tag:unity3d.com,2011:64 mapping",
+    "tag:unity3d.com,2011:65 mapping",
     "tag:unity3d.com,2011:74 mapping",
     "tag:unity3d.com,2011:78 mapping",
     "tag:unity3d.com,2011:81 mapping",
+    "tag:unity3d.com,2011:82 mapping",
     "tag:unity3d.com,2011:84 mapping",
     "tag:unity3d.com,2011:91 mapping",
+    "tag:unity3d.com,2011:92 mapping",
     "tag:unity3d.com,2011:95 mapping",
+    "tag:unity3d.com,2011:102 mapping",
     "tag:unity3d.com,2011:104 mapping",
     "tag:unity3d.com,2011:108 mapping",
     "tag:unity3d.com,2011:114 mapping",
+    "tag:unity3d.com,2011:124 mapping",
     "tag:unity3d.com,2011:126 mapping",
     "tag:unity3d.com,2011:129 mapping",
     "tag:unity3d.com,2011:134 mapping",
+    "tag:unity3d.com,2011:135 mapping",
+    "tag:unity3d.com,2011:136 mapping",
+    "tag:unity3d.com,2011:137 mapping",
+    "tag:unity3d.com,2011:143 mapping",
+    "tag:unity3d.com,2011:154 mapping",
     "tag:unity3d.com,2011:157 mapping",
     "tag:unity3d.com,2011:159 mapping",
     "tag:unity3d.com,2011:162 mapping",
+    "tag:unity3d.com,2011:195 mapping",
     "tag:unity3d.com,2011:196 mapping",
+    "tag:unity3d.com,2011:198 mapping",
+    "tag:unity3d.com,2011:199 mapping",
+    "tag:unity3d.com,2011:206 mapping",
+    "tag:unity3d.com,2011:212 mapping",
+    "tag:unity3d.com,2011:218 mapping",
     "tag:unity3d.com,2011:222 mapping",
     "tag:unity3d.com,2011:223 mapping",
     "tag:unity3d.com,2011:224 mapping",
     "tag:unity3d.com,2011:236 mapping",
     "tag:unity3d.com,2011:310 mapping",
+    "tag:unity3d.com,2011:320 mapping",
     "tag:unity3d.com,2011:1001 mapping",
     "tag:unity3d.com,2011:1002 mapping",
     "tag:unity3d.com,2011:1045 mapping",
@@ -132,11 +157,11 @@
     "tag:unity3d.com,2011:1953259897 mapping"
   ],
   "yaml.schemas": {
-    "https://coderabbit.ai/integrations/coderabbit-overrides.v2.json": [
-      ".coderabbit.yaml"
-    ],
     "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/packages/cspell-types/cspell.schema.json": [
       "cspell.config.yml"
+    ],
+    "https://storage.googleapis.com/coderabbit_public_assets/schema.v2.json": [
+      ".coderabbit.yaml"
     ]
   }
 }
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -34,8 +34,8 @@
       "source": "registry",
       "dependencies": {
         "com.unity.burst": "1.8.4",
-        "com.unity.modules.unityanalytics": "1.0.0",
-        "com.unity.nuget.mono-cecil": "1.11.4"
+        "com.unity.nuget.mono-cecil": "1.11.4",
+        "com.unity.modules.unityanalytics": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -119,9 +119,9 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.director": "1.0.0",
         "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
       "url": "https://packages.unity.com"
@@ -150,9 +150,9 @@
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.modules.subsystems": "1.0.0",
         "com.unity.modules.vr": "1.0.0",
         "com.unity.modules.xr": "1.0.0",
+        "com.unity.modules.subsystems": "1.0.0",
         "com.unity.xr.legacyinputhelpers": "2.1.7"
       },
       "url": "https://packages.unity.com"
@@ -178,7 +178,8 @@
         "com.unity.timeline": "1.7.6",
         "com.unity.xr.management": "4.3.3",
         "com.unity.xr.oculus": "4.0.0",
-        "com.unity.postprocessing": "3.2.2"
+        "com.unity.postprocessing": "3.2.2",
+        "com.unity.ugui": "1.0.0"
       }
     },
     "com.vrchat.core.bootstrap": {
@@ -211,8 +212,7 @@
         "com.unity.cinemachine": "2.9.7",
         "com.unity.textmeshpro": "3.0.6",
         "com.unity.inputsystem": "1.2.0",
-        "com.unity.ai.navigation": "1.1.5",
-        "com.unity.ugui": "1.0.0"
+        "com.unity.ai.navigation": "1.1.5"
       }
     },
     "dev.onevr.vrworldtoolkit": {

diff --git a/Packages/vpm-manifest.json b/Packages/vpm-manifest.json
@@ -7,7 +7,7 @@
       "version": "3.2.0"
     },
     "com.vrchat.worlds": {
-      "version": "3.7.1"
+      "version": "3.7.3"
     }
   },
   "locked": {
@@ -20,13 +20,13 @@
       "dependencies": {}
     },
     "com.vrchat.worlds": {
-      "version": "3.7.1",
+      "version": "3.7.3",
       "dependencies": {
-        "com.vrchat.base": "3.7.1"
+        "com.vrchat.base": "3.7.3"
       }
     },
     "com.vrchat.base": {
-      "version": "3.7.1",
+      "version": "3.7.3",
       "dependencies": {}
     }
   }

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
     "rollForward": "latestMinor",
-    "version": "6.0.427"
+    "version": "8.0.403"
   }
 }