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

Upgrade Unity to 2021 LTS #17

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft
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
2 changes: 0 additions & 2 deletions .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ jobs:
fail-fast: false
matrix:
unityVersion: # Available versions see: https://game.ci/docs/docker/versions
- 2019.4.40f1
- 2020.3.48f1
- 2021.3.42f1
- 2022.3.42f1
- 2023.2.20f1
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,12 @@ jobs:
fail-fast: false
matrix:
unityVersion: # Available versions see: https://game.ci/docs/docker/versions
- 2019.4.40f1
- 2020.3.48f1
- 2021.3.42f1
- 2022.3.42f1
- 2023.2.20f1
- 6000.0.22f1
include:
- unityVersion: 2019.4.40f1
- unityVersion: 2021.3.42f1
octocov: true

steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@
"allowUnsafeCode": false,
"overrideReferences": true,
"precompiledReferences": [
"nunit.framework.dll",
"NSubstitute.dll",
"Castle.Core.dll",
"System.Threading.Tasks.Extensions.dll"
"nunit.framework.dll",
"NSubstitute.dll"
],
"autoReferenced": false,
"defineConstraints": [
"UNITY_INCLUDE_TESTS",
"UNITY_EDITOR"
"UNITY_INCLUDE_TESTS",
"UNITY_EDITOR"
],
"versionDefines": [],
"noEngineReferences": false
Expand Down
16 changes: 12 additions & 4 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
"com.unity.textmeshpro": "2.1.6",
"com.unity.timeline": "1.2.18",
"com.unity.ugui": "1.0.0",
"net.tnrd.nsubstitute": "4.2.2",
"org.nuget.idisposableanalyzers": "4.0.7",
"org.nuget.nsubstitute": "5.1.0",
"org.nuget.nsubstitute.analyzers.csharp": "1.0.16",
"org.nuget.nunit.analyzers": "3.3.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
Expand Down Expand Up @@ -59,9 +62,14 @@
"url": "https://package.openupm.com",
"scopes": [
"com.cysharp",
"com.nowsprinting",
"com.openupm",
"net.tnrd.nsubstitute"
"com.nowsprinting"
]
},
{
"name": "Unity NuGet",
"url": "https://unitynuget-registry.azurewebsites.net",
"scopes": [
"org.nuget"
]
}
]
Expand Down
121 changes: 99 additions & 22 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@
"url": "https://package.openupm.com"
},
"com.unity.addressables": {
"version": "1.17.15",
"version": "1.19.19",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.scriptablebuildpipeline": "1.17.0",
"com.unity.scriptablebuildpipeline": "1.19.6",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
Expand All @@ -76,7 +76,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "1.14.18",
"version": "2.2.0",
"depth": 0,
"source": "registry",
"dependencies": {},
Expand Down Expand Up @@ -126,33 +126,26 @@
"url": "https://packages.unity.com"
},
"com.unity.nuget.newtonsoft-json": {
"version": "2.0.0",
"version": "3.2.1",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.scriptablebuildpipeline": {
"version": "1.17.0",
"version": "1.20.1",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.settings-manager": {
"version": "1.0.1",
"version": "1.0.3",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.subsystemregistration": {
"version": "1.0.6",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.4.5",
"depth": 0,
Expand Down Expand Up @@ -192,7 +185,7 @@
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "2.1.6",
"version": "3.0.6",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -201,7 +194,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.2.18",
"version": "1.6.5",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -222,7 +215,7 @@
}
},
"com.unity.xr.legacyinputhelpers": {
"version": "2.1.9",
"version": "2.1.10",
"depth": 1,
"source": "registry",
"dependencies": {
Expand All @@ -232,24 +225,96 @@
"url": "https://packages.unity.com"
},
"com.unity.xr.management": {
"version": "4.0.5",
"version": "4.4.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.subsystems": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.7",
"com.unity.subsystemregistration": "1.0.6"
"com.unity.xr.legacyinputhelpers": "2.1.7"
},
"url": "https://packages.unity.com"
},
"net.tnrd.nsubstitute": {
"version": "4.2.2",
"org.nuget.castle.core": {
"version": "5.1.1",
"depth": 1,
"source": "registry",
"dependencies": {
"org.nuget.system.diagnostics.eventlog": "4.7.0",
"org.nuget.system.reflection.emit": "4.7.0"
},
"url": "https://unitynuget-registry.azurewebsites.net"
},
"org.nuget.idisposableanalyzers": {
"version": "4.0.7",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://package.openupm.com"
"url": "https://unitynuget-registry.azurewebsites.net"
},
"org.nuget.nsubstitute": {
"version": "5.1.0",
"depth": 0,
"source": "registry",
"dependencies": {
"org.nuget.castle.core": "5.1.1",
"org.nuget.system.threading.tasks.extensions": "4.4.0"
},
"url": "https://unitynuget-registry.azurewebsites.net"
},
"org.nuget.nsubstitute.analyzers.csharp": {
"version": "1.0.16",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://unitynuget-registry.azurewebsites.net"
},
"org.nuget.nunit.analyzers": {
"version": "3.3.0",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://unitynuget-registry.azurewebsites.net"
},
"org.nuget.system.diagnostics.eventlog": {
"version": "4.7.0",
"depth": 2,
"source": "registry",
"dependencies": {
"org.nuget.system.security.principal.windows": "4.7.0"
},
"url": "https://unitynuget-registry.azurewebsites.net"
},
"org.nuget.system.reflection.emit": {
"version": "4.7.0",
"depth": 2,
"source": "registry",
"dependencies": {
"org.nuget.system.reflection.emit.ilgeneration": "4.7.0"
},
"url": "https://unitynuget-registry.azurewebsites.net"
},
"org.nuget.system.reflection.emit.ilgeneration": {
"version": "4.7.0",
"depth": 3,
"source": "registry",
"dependencies": {},
"url": "https://unitynuget-registry.azurewebsites.net"
},
"org.nuget.system.security.principal.windows": {
"version": "4.7.0",
"depth": 3,
"source": "registry",
"dependencies": {},
"url": "https://unitynuget-registry.azurewebsites.net"
},
"org.nuget.system.threading.tasks.extensions": {
"version": "4.4.0",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://unitynuget-registry.azurewebsites.net"
},
"com.unity.modules.ai": {
"version": "1.0.0",
Expand Down Expand Up @@ -384,6 +449,18 @@
"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",
"com.unity.modules.jsonserialize": "1.0.0"
}
Expand Down
35 changes: 35 additions & 0 deletions ProjectSettings/MemorySettings.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!387306366 &1
MemorySettings:
m_ObjectHideFlags: 0
m_EditorMemorySettings:
m_MainAllocatorBlockSize: -1
m_ThreadAllocatorBlockSize: -1
m_MainGfxBlockSize: -1
m_ThreadGfxBlockSize: -1
m_CacheBlockSize: -1
m_TypetreeBlockSize: -1
m_ProfilerBlockSize: -1
m_ProfilerEditorBlockSize: -1
m_BucketAllocatorGranularity: -1
m_BucketAllocatorBucketsCount: -1
m_BucketAllocatorBlockSize: -1
m_BucketAllocatorBlockCount: -1
m_ProfilerBucketAllocatorGranularity: -1
m_ProfilerBucketAllocatorBucketsCount: -1
m_ProfilerBucketAllocatorBlockSize: -1
m_ProfilerBucketAllocatorBlockCount: -1
m_TempAllocatorSizeMain: -1
m_JobTempAllocatorBlockSize: -1
m_BackgroundJobTempAllocatorBlockSize: -1
m_JobTempAllocatorReducedBlockSize: -1
m_TempAllocatorSizeGIBakingWorker: -1
m_TempAllocatorSizeNavMeshWorker: -1
m_TempAllocatorSizeAudioWorker: -1
m_TempAllocatorSizeCloudWorker: -1
m_TempAllocatorSizeGfx: -1
m_TempAllocatorSizeJobWorker: -1
m_TempAllocatorSizeBackgroundWorker: -1
m_TempAllocatorSizePreloadManager: -1
m_PlatformMemorySettings: {}
45 changes: 22 additions & 23 deletions ProjectSettings/PackageManagerSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -12,43 +12,42 @@ MonoBehaviour:
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_EnablePreReleasePackages: 0
m_EnablePackageDependencies: 0
m_AdvancedSettingsExpanded: 0
m_ScopedRegistriesSettingsExpanded: 1
m_SeeAllPackageVersions: 0
oneTimeWarningShown: 0
m_Registries:
- m_Id: main
m_Name:
m_Url: https://packages.unity.com
m_Scopes: []
m_IsDefault: 1
- m_Id: scoped:package.openupm.com
m_Capabilities: 7
m_ConfigSource: 0
- m_Id: scoped:project:package.openupm.com
m_Name: package.openupm.com
m_Url: https://package.openupm.com
m_Scopes:
- com.cysharp
- com.nowsprinting
- com.openupm
- net.tnrd.nsubstitute
m_IsDefault: 0
m_UserSelectedRegistryName:
m_Capabilities: 0
m_ConfigSource: 4
- m_Id: scoped:project:Unity NuGet
m_Name: Unity NuGet
m_Url: https://unitynuget-registry.azurewebsites.net
m_Scopes:
- org.nuget
m_IsDefault: 0
m_Capabilities: 0
m_ConfigSource: 4
m_UserSelectedRegistryName: Unity NuGet
m_UserAddingNewScopedRegistry: 0
m_RegistryInfoDraft:
m_ErrorMessage:
m_Original:
m_Id: scoped:package.openupm.com
m_Name: package.openupm.com
m_Url: https://package.openupm.com
m_Scopes:
- com.cysharp
- com.nowsprinting
- com.openupm
- net.tnrd.nsubstitute
m_IsDefault: 0
m_Modified: 0
m_Name: package.openupm.com
m_Url: https://package.openupm.com
m_Scopes:
- com.cysharp
- com.nowsprinting
- com.openupm
- net.tnrd.nsubstitute
m_SelectedScopeIndex: 0
m_ErrorMessage:
m_UserModificationsInstanceId: -822
m_OriginalInstanceId: -826
m_LoadAssets: 0
Loading