Skip to content

Commit f2c1cc1

Browse files
committed
chore: resolve conflicts
2 parents 5a7a408 + db83239 commit f2c1cc1

File tree

165 files changed

+29
-520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+29
-520
lines changed

.github/workflows/test-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
2727
with:
2828
unityVersion: 2021.3.26f1
29-
projectPath: './sample'
29+
projectPath: './src/Packages/Passport/Samples~/sample'
3030
githubToken: ${{ secrets.GITHUB_TOKEN }}
3131
testMode: 'EditMode'
3232
- uses: actions/upload-artifact@v4
@@ -71,7 +71,7 @@ jobs:
7171
with:
7272
unityVersion: 2021.3.26f1
7373
targetPlatform: ${{ matrix.targetPlatform }}
74-
projectPath: './sample'
74+
projectPath: './src/Packages/Passport/Samples~/sample'
7575
- uses: actions/upload-artifact@v3
7676
with:
7777
name: Build
@@ -105,7 +105,7 @@ jobs:
105105
with:
106106
unityVersion: 2021.3.26f1
107107
targetPlatform: ${{ matrix.targetPlatform }}
108-
projectPath: './sample'
108+
projectPath: './src/Packages/Passport/Samples~/sample'
109109
- uses: actions/upload-artifact@v3
110110
with:
111111
name: Build
File renamed without changes.

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ crashlytics-build.properties
8080
._.DS_Store
8181

8282
sample-passport-unity-game/
83-
sample/iosBuild
84-
!/sample/webgl/Build/
83+
src/Packages/Passport/Samples~/sample/iosBuild
84+
!src/Packages/Passport/Samples~/sample/webgl/Build/
8585

8686
# Android
8787
src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/**/*.meta

analyzers/microsoft.unity.analyzers.1.17.0/analyzers/dotnet/cs/Microsoft.Unity.Analyzers.dll

Lines changed: 0 additions & 3 deletions
This file was deleted.

sample/.vscode/settings.json

Lines changed: 0 additions & 55 deletions
This file was deleted.

sample/Assets/Editor/README.txt

Lines changed: 0 additions & 123 deletions
This file was deleted.

sample/Assets/Editor/README.txt.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

sample/Assets/Editor/SdkBuilder.cs

Lines changed: 0 additions & 144 deletions
This file was deleted.

sample/Assets/Editor/SdkBuilder.cs.meta

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)