Merge branch 'develop'

YarnSpinnerTool · Dec 13, 2024 · 65f7352 · 65f7352
2 parents 838761a + de1bc0e
commit 65f7352
Show file tree

Hide file tree

Showing 288 changed files with 29,547 additions and 17,736 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,51 +2,50 @@ name: Build Yarn Spinner
 
 on:
   push:
-    branches: [ main, 'feature/**', 'release/**' ]
+    branches: [main, "feature/**", "release/**"]
   pull_request:
-    branches: [ main, 'feature/**' ]
+    branches: [main, "feature/**", "release/**"]
   workflow_dispatch:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 8.0.x
-
-    - name: Fetch all commits
-      run: git fetch --unshallow
-
-    - uses: gittools/actions/gitversion/setup@v0.9.10
-      name: Install GitVersion
-      with:
-          versionSpec: '6.x'
-
-    - uses: gittools/actions/gitversion/execute@v0.9.10
-      name: Execute GitVersion
-      id: gitversion # step id used as reference for output values
-      with:
-        updateAssemblyInfo: true
-      
-    - name: Print version information
-      run: |
-        echo "Major: ${{ steps.gitversion.outputs.major }}"
-        echo "Minor: ${{ steps.gitversion.outputs.minor }}"
-        echo "Patch: ${{ steps.gitversion.outputs.patch }}"
-        echo "MajorMinorPatch: ${{ steps.gitversion.outputs.majorMinorPatch }}"
-        echo "SemVer: ${{ steps.gitversion.outputs.semVer }}"
-
-    - name: Restore dependencies
-      run: dotnet restore
-
-    - name: Build
-      run: dotnet build --no-restore --configuration Release
-
-    - name: Test
-      run: dotnet test --no-build --configuration Release --verbosity normal
+      - uses: actions/checkout@v2
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Fetch all commits
+        run: git fetch --unshallow
+
+      - uses: gittools/actions/gitversion/setup@v0.9.10
+        name: Install GitVersion
+        with:
+          versionSpec: "6.x"
+
+      - uses: gittools/actions/gitversion/execute@v0.9.10
+        name: Execute GitVersion
+        id: gitversion # step id used as reference for output values
+        with:
+          updateAssemblyInfo: true
+
+      - name: Print version information
+        run: |
+          echo "Major: ${{ steps.gitversion.outputs.major }}"
+          echo "Minor: ${{ steps.gitversion.outputs.minor }}"
+          echo "Patch: ${{ steps.gitversion.outputs.patch }}"
+          echo "MajorMinorPatch: ${{ steps.gitversion.outputs.majorMinorPatch }}"
+          echo "SemVer: ${{ steps.gitversion.outputs.semVer }}"
+
+      - name: Restore dependencies
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet build --no-restore --configuration Release
+
+      - name: Test
+        run: dotnet test --no-build --configuration Release --verbosity normal
diff --git a/.gitignore b/.gitignore
@@ -30,71 +30,6 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-### Unity ###
-# This .gitignore file should be placed at the root of your Unity project directory
-#
-# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
-/[Ll]ibrary/
-/[Tt]emp/
-/[Oo]bj/
-/[Bb]uild/
-/[Bb]uilds/
-/[Ll]ogs/
-/[Mm]emoryCaptures/
-
-# Never ignore Asset meta data
-!/[Aa]ssets/**/*.meta
-
-# Uncomment this line if you wish to ignore the asset store tools plugin
-# /[Aa]ssets/AssetStoreTools*
-
-# TextMesh Pro files
-[Aa]ssets/TextMesh*Pro/
-
-# Autogenerated Jetbrains Rider plugin
-[Aa]ssets/Plugins/Editor/JetBrains*
-
-# 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
-*.symbols.zip
-
-# Crashlytics generated file
-crashlytics-build.properties
-
-
 ### VisualStudioCode ###
 .vscode/*
 !.vscode/settings.json
@@ -146,6 +81,7 @@ Unity/Logs
 
 export.log
 
+nuget/
 
 # Auto-generated API documentation metadata
 /_api/

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,9 +1,8 @@
 {
     "protoc": {
-        "path": "/usr/local/bin/protoc",
         "options": [
-            "-I=${workspaceRoot}/YarnSpinner", 
-            "--csharp_out=${workspaceRoot}/YarnSpinner", 
+            "-I=${workspaceRoot}/YarnSpinner",
+            "--csharp_out=${workspaceRoot}/YarnSpinner",
             "${workspaceRoot}/YarnSpinner/yarn_spinner.proto"
         ]
     },
@@ -20,4 +19,7 @@
     ],
     "omnisharp.useModernNet": true,
     "dotnet-test-explorer.testProjectPath": "**/*Tests.csproj",
+    "[antlr]": {
+        "editor.formatOnSave": false,
+    }
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,6 +1,17 @@
 {
     "version": "2.0.0",
     "tasks": [
+        {
+            "label": "protobuf",
+            "command": "protoc",
+            "type": "process",
+            "args": [
+                "-I=${workspaceRoot}/YarnSpinner",
+                "--csharp_out=${workspaceRoot}/YarnSpinner",
+                "${workspaceRoot}/YarnSpinner/yarn_spinner.proto"
+            ],
+            "problemMatcher": []
+        },
         {
             "label": "build",
             "command": "dotnet",