chore: resolve conflicts

immutable · Oct 16, 2024 · f2c1cc1 · f2c1cc1
2 parents 5a7a408 + db83239
commit f2c1cc1
Show file tree

Hide file tree

Showing 165 changed files with 29 additions and 520 deletions.
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -26,7 +26,7 @@ jobs:
           UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         with:
           unityVersion: 2021.3.26f1
-          projectPath: './sample'
+          projectPath: './src/Packages/Passport/Samples~/sample'
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           testMode: 'EditMode'
       - uses: actions/upload-artifact@v4
@@ -71,7 +71,7 @@ jobs:
         with:
           unityVersion: 2021.3.26f1
           targetPlatform: ${{ matrix.targetPlatform }}
-          projectPath: './sample'
+          projectPath: './src/Packages/Passport/Samples~/sample'
       - uses: actions/upload-artifact@v3
         with:
           name: Build
@@ -105,7 +105,7 @@ jobs:
         with:
           unityVersion: 2021.3.26f1
           targetPlatform: ${{ matrix.targetPlatform }}
-          projectPath: './sample'
+          projectPath: './src/Packages/Passport/Samples~/sample'
       - uses: actions/upload-artifact@v3
         with:
           name: Build

diff --git a/sample/ProjectSettings/boot.config → .github/workflows/test.yml b/sample/ProjectSettings/boot.config → .github/workflows/test.yml
diff --git a/.gitignore b/.gitignore
@@ -80,8 +80,8 @@ crashlytics-build.properties
 ._.DS_Store
 
 sample-passport-unity-game/
-sample/iosBuild
-!/sample/webgl/Build/
+src/Packages/Passport/Samples~/sample/iosBuild
+!src/Packages/Passport/Samples~/sample/webgl/Build/
 
 # Android
 src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/**/*.meta

diff --git a/analyzers/microsoft.unity.analyzers.1.17.0/analyzers/dotnet/cs/Microsoft.Unity.Analyzers.dll b/analyzers/microsoft.unity.analyzers.1.17.0/analyzers/dotnet/cs/Microsoft.Unity.Analyzers.dll
diff --git a/sample/.vscode/settings.json b/sample/.vscode/settings.json
diff --git a/sample/Assets/Editor/README.txt b/sample/Assets/Editor/README.txt
diff --git a/sample/Assets/Editor/README.txt.meta b/sample/Assets/Editor/README.txt.meta
diff --git a/sample/Assets/Editor/SdkBuilder.cs b/sample/Assets/Editor/SdkBuilder.cs
diff --git a/sample/Assets/Editor/SdkBuilder.cs.meta b/sample/Assets/Editor/SdkBuilder.cs.meta