Skip to content

Commit

Permalink
Upgrade Unity to v2022.3.8 LTS and upgrade UMVC.Core dependencies (#64)
Browse files Browse the repository at this point in the history
* Upgrade Unity to v2022.3.8 LTS and upgrade UMVC.Core dependencies

* Upgrade pipelines to unity 2022.3.8

* Upgrade game-ci/unity-test-runner to v3
  • Loading branch information
loic-lopez committed Sep 3, 2023
1 parent 7eff398 commit 6dfacec
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 28 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/UMVC.Core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- uses: actions/setup-java@v3 # Used for sonarcloud scanner
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'

- name: install dotnet-coverage
run: dotnet tool install --global dotnet-coverage
Expand All @@ -54,11 +54,11 @@ jobs:
/o:"loic-lopez" `
/n:"UMVC.Core" `
/v:"${{ steps.gitversion.outputs.semVer }}" `
/d:sonar.login="${{ secrets.SONAR_TOKEN_CORE }}" `
/d:sonar.token="${{ secrets.SONAR_TOKEN_CORE }}" `
/d:sonar.cs.vscoveragexml.reportsPaths="UMVC.Core/coverage.xml" `
/d:sonar.scm.provider=git `
/d:sonar.projectDescription="UMVC.Core - Model-View-Controller Base classes for UMVC" `
/d:sonar.host.url=https://sonarcloud.io /d:sonar.verbose=true `
/d:sonar.host.url=https://sonarcloud.io `
- name: Test UMVC.Core
run: dotnet-coverage collect 'dotnet test UMVC.Core/UMVC.Core.sln' -f xml -o 'UMVC.Core/coverage.xml'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/UMVC.Editor.Core.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ jobs:
run: rm -rf Assets/UMVC.Tests

- name: Create UMVC.Editor.PreBuiltDlls.unitypackage with prebundled UMVC.Core
uses: game-ci/unity-builder@v2
uses: game-ci/unity-builder@v3
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
with:
unityVersion: 2021.3.25f1
unityVersion: 2022.3.8f1
versioning: None
buildMethod: UMVC.Export.UMVCPackageExport.ExportWithPreBuiltDlls

Expand All @@ -55,11 +55,11 @@ jobs:
path: ./UMVC.Editor.PreBuiltDlls.unitypackage

- name: Create UMVC.Editor.MsBuildForUnity.unitypackage with unbundled UMVC.Core
uses: game-ci/unity-builder@v2
uses: game-ci/unity-builder@v3
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
with:
unityVersion: 2021.3.25f1
unityVersion: 2022.3.8f1
versioning: None
buildMethod: UMVC.Export.UMVCPackageExport.ExportWithMsBuildForUnity

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/UMVC.Editor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ jobs:

# Test edit mode
- name: Run playmode & editmode tests
uses: game-ci/unity-test-runner@v2
uses: game-ci/unity-test-runner@v3
id: tests
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
unityVersion: 2021.3.25f1
unityVersion: 2022.3.8f1
testMode: All
coverageOptions: useProjectSettings;generateAdditionalMetrics
customParameters: -debugCodeOptimization -enableCodeCoverage
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unity_activation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
id: getManualLicenseFile
uses: game-ci/unity-request-activation-file@v2
with:
unityVersion: 2021.3.25f1
unityVersion: 2022.3.8f1
# Upload artifact (Unity_v20XX.X.XXXX.alf)
- name: Expose as artifact
uses: actions/upload-artifact@v3
Expand Down
5 changes: 3 additions & 2 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@
"com.microsoft.msbuildforunity": "0.9.2-20230322.1",
"com.solidalloy.type-references": "2.16.0",
"com.solidalloy.util": "1.36.2",
"com.unity.ide.rider": "3.0.21",
"com.unity.ai.navigation": "1.1.4",
"com.unity.ide.rider": "3.0.24",
"com.unity.ide.visualstudio": "2.0.18",
"com.unity.test-framework": "1.1.33",
"com.unity.testtools.codecoverage": "1.2.3",
"com.unity.testtools.codecoverage": "1.2.4",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
26 changes: 12 additions & 14 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@
"dependencies": {},
"url": "https://package.openupm.com"
},
"com.unity.ai.navigation": {
"version": "1.1.4",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.ai": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,
Expand All @@ -43,7 +52,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "3.0.21",
"version": "3.0.24",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -61,7 +70,7 @@
"url": "https://packages.unity.com"
},
"com.unity.settings-manager": {
"version": "1.0.3",
"version": "2.0.1",
"depth": 1,
"source": "registry",
"dependencies": {},
Expand All @@ -79,7 +88,7 @@
"url": "https://packages.unity.com"
},
"com.unity.testtools.codecoverage": {
"version": "1.2.3",
"version": "1.2.4",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -261,17 +270,6 @@
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.uielementsnative": "1.0.0"
}
},
"com.unity.modules.uielementsnative": {
"version": "1.0.0",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.25f1
m_EditorVersionWithRevision: 2021.3.25f1 (68ef2c4f8861)
m_EditorVersion: 2022.3.8f1
m_EditorVersionWithRevision: 2022.3.8f1 (b5eafc012955)
Empty file removed ProjectSettings/boot.config
Empty file.

0 comments on commit 6dfacec

Please sign in to comment.