Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Anst/unity upgrade #423

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/test-main-game.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ jobs:
with:
fetch-depth: 0
lfs: true
- uses: actions/cache@v2
with:
path: ${{ env.PROJECT_PATH }}/Library
key: Library-${{ env.PROJECT_PATH }}-${{ matrix.targetPlatform }}-${{ hashFiles(env.PROJECT_PATH) }}
restore-keys: |
Library-${{ env.PROJECT_PATH }}-${{ matrix.targetPlatform }}-
Library-${{ env.PROJECT_PATH }}-
Library-
# - uses: actions/cache@v2
# with:
# path: ${{ env.PROJECT_PATH }}/Library
# key: Library-${{ env.PROJECT_PATH }}-${{ matrix.targetPlatform }}-${{ hashFiles(env.PROJECT_PATH) }}
# restore-keys: |
# Library-${{ env.PROJECT_PATH }}-${{ matrix.targetPlatform }}-
# Library-${{ env.PROJECT_PATH }}-
# Library-

# Run setup script
- name: Setup Script
Expand Down
16 changes: 8 additions & 8 deletions UltraStar Play Companion/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
"com.achimmihca.utfunknownunity": "https://github.com/achimmihca/UTF-Unknown-Unity.git?path=UTF-Unknown-Unity/Packages/com.achimmihca.utfunknownunity#v1.0.1",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ai.navigation": "1.1.1",
"com.unity.collab-proxy": "2.0.0",
"com.unity.ide.rider": "3.0.18",
"com.unity.ide.visualstudio": "2.0.17",
"com.unity.inputsystem": "1.4.4",
"com.unity.ai.navigation": "1.1.3",
"com.unity.collab-proxy": "2.0.4",
"com.unity.ide.rider": "3.0.21",
"com.unity.ide.visualstudio": "2.0.18",
"com.unity.inputsystem": "1.5.1",
"com.unity.mobile.android-logcat": "1.3.2",
"com.unity.test-framework": "1.1.33",
"com.unity.timeline": "1.7.2",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.3",
"com.unity.timeline": "1.7.4",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.5",
"com.unity.ugui": "1.0.0",
"com.unity.ui.builder": "2.0.0",
"com.unity.vectorgraphics": "2.0.0-preview.20",
"com.unity.vectorgraphics": "2.0.0-preview.21",
"com.yasirkula.androidruntimepermissions": "https://github.com/yasirkula/UnityAndroidRuntimePermissions.git",
"com.yasirkula.ingamedebugconsole": "https://github.com/yasirkula/UnityIngameDebugConsole.git#v1.5.8",
"playshared": "file:../../UltraStar Play/Packages/playshared",
Expand Down
26 changes: 13 additions & 13 deletions UltraStar Play Companion/Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
}
},
"com.unity.ai.navigation": {
"version": "1.1.1",
"version": "1.1.3",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -53,7 +53,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "2.0.0",
"version": "2.0.4",
"depth": 0,
"source": "registry",
"dependencies": {},
Expand All @@ -67,7 +67,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "3.0.18",
"version": "3.0.21",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -76,7 +76,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.17",
"version": "2.0.18",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -85,7 +85,7 @@
"url": "https://packages.unity.com"
},
"com.unity.inputsystem": {
"version": "1.4.4",
"version": "1.5.1",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -101,18 +101,18 @@
"url": "https://packages.unity.com"
},
"com.unity.sysroot": {
"version": "2.0.4",
"version": "2.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.sysroot.linux-x86_64": {
"version": "2.0.3",
"version": "2.0.5",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.sysroot": "2.0.4"
"com.unity.sysroot": "2.0.6"
},
"url": "https://packages.unity.com"
},
Expand All @@ -128,7 +128,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.7.2",
"version": "1.7.4",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -140,12 +140,12 @@
"url": "https://packages.unity.com"
},
"com.unity.toolchain.win-x86_64-linux-x86_64": {
"version": "2.0.3",
"version": "2.0.5",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.sysroot": "2.0.4",
"com.unity.sysroot.linux-x86_64": "2.0.3"
"com.unity.sysroot": "2.0.6",
"com.unity.sysroot.linux-x86_64": "2.0.5"
},
"url": "https://packages.unity.com"
},
Expand All @@ -165,7 +165,7 @@
"dependencies": {}
},
"com.unity.vectorgraphics": {
"version": "2.0.0-preview.20",
"version": "2.0.0-preview.21",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions UltraStar Play Companion/ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2022.2.4f1
m_EditorVersionWithRevision: 2022.2.4f1 (8216e0211249)
m_EditorVersion: 2022.2.19f1
m_EditorVersionWithRevision: 2022.2.19f1 (765657fe9343)
18 changes: 9 additions & 9 deletions UltraStar Play/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
"com.achimmihca.utfunknownunity": "https://github.com/achimmihca/UTF-Unknown-Unity.git?path=UTF-Unknown-Unity/Packages/com.achimmihca.utfunknownunity#v1.0.1",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ai.navigation": "1.1.1",
"com.unity.collab-proxy": "2.0.0",
"com.unity.ai.navigation": "1.1.3",
"com.unity.collab-proxy": "2.0.4",
"com.unity.ext.nunit": "2.0.3",
"com.unity.ide.rider": "3.0.18",
"com.unity.ide.visualstudio": "2.0.17",
"com.unity.inputsystem": "1.4.4",
"com.unity.ide.rider": "3.0.21",
"com.unity.ide.visualstudio": "2.0.18",
"com.unity.inputsystem": "1.5.1",
"com.unity.mobile.android-logcat": "1.3.2",
"com.unity.render-pipelines.universal": "14.0.5",
"com.unity.render-pipelines.universal": "14.0.7",
"com.unity.test-framework": "1.1.33",
"com.unity.timeline": "1.7.2",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.3",
"com.unity.timeline": "1.7.4",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.5",
"com.unity.ugui": "1.0.0",
"com.unity.ui.builder": "2.0.0",
"com.unity.vectorgraphics": "2.0.0-preview.20",
"com.unity.vectorgraphics": "2.0.0-preview.21",
"com.yasirkula.androidruntimepermissions": "https://github.com/yasirkula/UnityAndroidRuntimePermissions.git",
"com.yasirkula.ingamedebugconsole": "https://github.com/yasirkula/UnityIngameDebugConsole.git#v1.5.8",
"com.unity.modules.ai": "1.0.0",
Expand Down
42 changes: 21 additions & 21 deletions UltraStar Play/Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}
},
"com.unity.ai.navigation": {
"version": "1.1.1",
"version": "1.1.3",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -67,7 +67,7 @@
"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.8.2",
"version": "1.8.4",
"depth": 1,
"source": "registry",
"dependencies": {
Expand All @@ -76,7 +76,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "2.0.0",
"version": "2.0.4",
"depth": 0,
"source": "registry",
"dependencies": {},
Expand All @@ -90,7 +90,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "3.0.18",
"version": "3.0.21",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -99,7 +99,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.17",
"version": "2.0.18",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -108,7 +108,7 @@
"url": "https://packages.unity.com"
},
"com.unity.inputsystem": {
"version": "1.4.4",
"version": "1.5.1",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -131,7 +131,7 @@
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
"version": "14.0.5",
"version": "14.0.7",
"depth": 1,
"source": "builtin",
"dependencies": {
Expand All @@ -142,14 +142,14 @@
}
},
"com.unity.render-pipelines.universal": {
"version": "14.0.5",
"version": "14.0.7",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.mathematics": "1.2.1",
"com.unity.burst": "1.8.2",
"com.unity.render-pipelines.core": "14.0.5",
"com.unity.shadergraph": "14.0.5"
"com.unity.burst": "1.8.4",
"com.unity.render-pipelines.core": "14.0.7",
"com.unity.shadergraph": "14.0.7"
}
},
"com.unity.searcher": {
Expand All @@ -160,27 +160,27 @@
"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
"version": "14.0.5",
"version": "14.0.7",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.render-pipelines.core": "14.0.5",
"com.unity.render-pipelines.core": "14.0.7",
"com.unity.searcher": "4.9.2"
}
},
"com.unity.sysroot": {
"version": "2.0.4",
"version": "2.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.sysroot.linux-x86_64": {
"version": "2.0.3",
"version": "2.0.5",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.sysroot": "2.0.4"
"com.unity.sysroot": "2.0.6"
},
"url": "https://packages.unity.com"
},
Expand All @@ -196,7 +196,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.7.2",
"version": "1.7.4",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -208,12 +208,12 @@
"url": "https://packages.unity.com"
},
"com.unity.toolchain.win-x86_64-linux-x86_64": {
"version": "2.0.3",
"version": "2.0.5",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.sysroot": "2.0.4",
"com.unity.sysroot.linux-x86_64": "2.0.3"
"com.unity.sysroot": "2.0.6",
"com.unity.sysroot.linux-x86_64": "2.0.5"
},
"url": "https://packages.unity.com"
},
Expand All @@ -233,7 +233,7 @@
"dependencies": {}
},
"com.unity.vectorgraphics": {
"version": "2.0.0-preview.20",
"version": "2.0.0-preview.21",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions UltraStar Play/ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2022.2.4f1
m_EditorVersionWithRevision: 2022.2.4f1 (8216e0211249)
m_EditorVersion: 2022.2.19f1
m_EditorVersionWithRevision: 2022.2.19f1 (765657fe9343)
Loading