Skip to content
This repository was archived by the owner on Jan 18, 2022. It is now read-only.

Commit 9d642b9

Browse files
author
Jamie Brynes
authored
Unity 2020.1 Upgrade (#1459)
1 parent ae4c5fc commit 9d642b9

File tree

11 files changed

+80
-42
lines changed

11 files changed

+80
-42
lines changed

‎.buildkite/premerge.steps.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ windows: &windows
1313
- "environment=production"
1414
- "permission_set=builder"
1515
- "platform=windows"
16-
- "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-07-30-165418-bk13785-82b83865-d}"
16+
- "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-08-13-090826-bk14267-5f831930-d}"
1717
- "scaler_version=2"
1818
- "minimum_instances=1"
1919
- "agent_count=1"
@@ -33,8 +33,8 @@ windows: &windows
3333
# Workaround for flaky Git clones, likely due to - https://github.com/PowerShell/Win32-OpenSSH/issues/1322
3434
- exit_status: 128
3535
limit: 3
36-
env: &windows-env
37-
ACCELERATOR_ENDPOINT: "unity-accelerator.production-intinf-eu1.i8e.io"
36+
# env: &windows-env
37+
# ACCELERATOR_ENDPOINT: "unity-accelerator.production-intinf-eu1.i8e.io"
3838

3939
linux: &linux
4040
agents:
@@ -147,7 +147,7 @@ steps:
147147
- logs/**/*
148148
- workers/unity/build/worker/**/*
149149
env:
150-
<<: *windows-env
150+
# <<: *windows-env
151151
WORKER_TYPE: "MobileClient"
152152
BUILD_ENVIRONMENT: "local"
153153
BUILD_TARGET_FILTER: "android"
@@ -159,7 +159,7 @@ steps:
159159
artifact_paths:
160160
- logs/**/*
161161
env:
162-
<<: *windows-env
162+
# <<: *windows-env
163163
WORKER_TYPE: "UnityClient"
164164
BUILD_ENVIRONMENT: "cloud"
165165
SCRIPTING_BACKEND: "mono"
@@ -170,7 +170,7 @@ steps:
170170
artifact_paths:
171171
- logs/**/*
172172
env:
173-
<<: *windows-env
173+
# <<: *windows-env
174174
WORKER_TYPE: "UnityClient"
175175
BUILD_ENVIRONMENT: "local"
176176
SCRIPTING_BACKEND: "il2cpp"
@@ -181,7 +181,7 @@ steps:
181181
artifact_paths:
182182
- logs/**/*
183183
env:
184-
<<: *windows-env
184+
# <<: *windows-env
185185
WORKER_TYPE: "UnityGameLogic"
186186
BUILD_ENVIRONMENT: "cloud"
187187
SCRIPTING_BACKEND: "mono"

‎.buildkite/release-qa.steps.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ windows: &windows
1313
- "environment=production"
1414
- "permission_set=builder"
1515
- "platform=windows"
16-
- "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-07-30-165418-bk13785-82b83865-d}"
16+
- "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-08-13-090826-bk14267-5f831930-d}"
1717
- "scaler_version=2"
1818
- "minimum_instances=1"
1919
- "agent_count=1"
@@ -33,8 +33,8 @@ windows: &windows
3333
# Workaround for flaky Git clones, likely due to - https://github.com/PowerShell/Win32-OpenSSH/issues/1322
3434
- exit_status: 128
3535
limit: 3
36-
env: &windows-env
37-
ACCELERATOR_ENDPOINT: "unity-accelerator.production-intinf-eu1.i8e.io"
36+
# env: &windows-env
37+
# ACCELERATOR_ENDPOINT: "unity-accelerator.production-intinf-eu1.i8e.io"
3838

3939
# NOTE: step labels turn into commit-status names like {org}/{repo}/{pipeline}/{step-label}, lower-case and hyphenated.
4040
# These are then relied on to have stable names by other things, so once named, please beware renaming has consequences.
@@ -47,7 +47,7 @@ steps:
4747
- logs/**/*
4848
- build/assembly/**/*
4949
env:
50-
<<: *windows-env
50+
# <<: *windows-env
5151
WORKER_TYPE: "MobileClient"
5252
BUILD_ENVIRONMENT: "cloud"
5353
BUILD_TARGET_FILTER: "android"
@@ -60,7 +60,7 @@ steps:
6060
- logs/**/*
6161
- build/assembly/**/*
6262
env:
63-
<<: *windows-env
63+
# <<: *windows-env
6464
WORKER_TYPE: "MobileClient"
6565
BUILD_ENVIRONMENT: "cloud"
6666
BUILD_TARGET_FILTER: "ios"
@@ -73,7 +73,7 @@ steps:
7373
- logs/**/*
7474
- build/assembly/**/*
7575
env:
76-
<<: *windows-env
76+
# <<: *windows-env
7777
WORKER_TYPE: "UnityClient"
7878
BUILD_ENVIRONMENT: "cloud"
7979
SCRIPTING_BACKEND: "mono"
@@ -85,7 +85,7 @@ steps:
8585
- logs/**/*
8686
- build/assembly/**/*
8787
env:
88-
<<: *windows-env
88+
# <<: *windows-env
8989
WORKER_TYPE: "UnityGameLogic"
9090
BUILD_ENVIRONMENT: "cloud"
9191
SCRIPTING_BACKEND: "mono"

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
### Breaking Changes
6+
7+
- The minimum supported version of Unity is now 2020.1. [#1459](https://github.com/spatialos/gdk-for-unity/pull/1459)
8+
59
### Added
610

711
- Added `MeansImplicitUse` attribute to `RequireAttribute` to reduce warnings in Rider IDE. [#1462](https://github.com/spatialos/gdk-for-unity/pull/1462)

‎UPGRADE_GUIDE.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Upgrade Guide
22

3+
## From `0.3.10` to `0.4.0`
4+
5+
### Unity 2020.1
6+
7+
In order to use the GDK for Unity `0.4.0`, you will need to upgrade your project to Unity 2020.1. We test against 2020.1.2f1, but any `2020.1.x` version _should_ work.
8+
39
## From `0.3.9` to `0.3.10`
410

511
### AuthorityLossImminent support removed

‎workers/unity/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/ProjectSettings/UnityConnectSettings.asset
88
/*.csproj
99
/*.sln
10+
/Packages/packages-lock.json
1011

1112
# Build artifacts
1213
/build/

‎workers/unity/Packages/io.improbable.gdk.debug/WorkerInspector/EntityList.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Linq;
34
using Improbable.Gdk.Core;
45
using Unity.Entities;
56
using UnityEditor;
@@ -30,7 +31,7 @@ public EntityList()
3031
listView = this.Q<ListView>();
3132
listView.makeItem = () => new Label();
3233
listView.bindItem = BindItem;
33-
listView.onSelectionChanged += OnSelectionChanged;
34+
listView.onSelectionChange += OnSelectionChanged;
3435
listView.itemsSource = entities.FilteredData;
3536

3637
var searchField = this.Q<ToolbarSearchField>();
@@ -83,16 +84,16 @@ private void BindItem(VisualElement element, int index)
8384
label.text = entity.ToString();
8485
}
8586

86-
private void OnSelectionChanged(List<object> selections)
87+
private void OnSelectionChanged(IEnumerable<object> selections)
8788
{
88-
if (selections.Count != 1)
89+
if (selections.Count() != 1)
8990
{
9091
throw new InvalidOperationException("Unexpectedly selected more than one entity.");
9192
}
9293

93-
if (!(selections[0] is EntityData entityData))
94+
if (!(selections.First() is EntityData entityData))
9495
{
95-
throw new InvalidOperationException($"Unexpected type for selection: {selections[0].GetType()}");
96+
throw new InvalidOperationException($"Unexpected type for selection: {selections.First().GetType()}");
9697
}
9798

9899
if (!selectedEntity.HasValue || selectedEntity.Value != entityData)

‎workers/unity/Packages/manifest.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
3-
"com.unity.ide.rider": "1.2.1",
4-
"com.unity.ide.visualstudio": "2.0.1",
3+
"com.unity.ide.rider": "2.0.7",
4+
"com.unity.ide.visualstudio": "2.0.2",
55
"com.unity.quicksearch": "2.0.0",
66
"com.unity.testtools.codecoverage": "0.2.3-preview",
77
"com.unity.ugui": "1.0.0",

‎workers/unity/ProjectSettings/PackageManagerSettings.asset

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 61
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
m_EnablePreviewPackages: 1
16+
m_EnablePackageDependencies: 1
17+
m_AdvancedSettingsExpanded: 1
18+
oneTimeWarningShown: 1

‎workers/unity/ProjectSettings/ProjectSettings.asset

+19-19
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ PlayerSettings:
4949
m_StereoRenderingPath: 0
5050
m_ActiveColorSpace: 0
5151
m_MTRendering: 1
52+
mipStripping: 0
53+
numberOfMipsStripped: 0
5254
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
5355
iosShowActivityIndicatorOnLoading: -1
5456
androidShowActivityIndicatorOnLoading: -1
@@ -111,6 +113,10 @@ PlayerSettings:
111113
switchNVNShaderPoolsGranularity: 33554432
112114
switchNVNDefaultPoolsGranularity: 16777216
113115
switchNVNOtherPoolsGranularity: 16777216
116+
switchNVNMaxPublicTextureIDCount: 0
117+
switchNVNMaxPublicSamplerIDCount: 0
118+
stadiaPresentMode: 0
119+
stadiaTargetFramerate: 0
114120
vulkanNumSwapchainBuffers: 3
115121
vulkanEnableSetSRGBWrite: 0
116122
m_SupportedAspectRatios:
@@ -184,32 +190,16 @@ PlayerSettings:
184190
StripUnusedMeshComponents: 1
185191
VertexChannelCompressionMask: 4054
186192
iPhoneSdkVersion: 988
187-
iOSTargetOSVersionString: 10.0
193+
iOSTargetOSVersionString: 11.0
188194
tvOSSdkVersion: 0
189195
tvOSRequireExtendedGameController: 0
190-
tvOSTargetOSVersionString: 10.0
196+
tvOSTargetOSVersionString: 11.0
191197
uIPrerenderedIcon: 0
192198
uIRequiresPersistentWiFi: 0
193199
uIRequiresFullScreen: 1
194200
uIStatusBarHidden: 1
195201
uIExitOnSuspend: 0
196202
uIStatusBarStyle: 0
197-
iPhoneSplashScreen: {fileID: 0}
198-
iPhoneHighResSplashScreen: {fileID: 0}
199-
iPhoneTallHighResSplashScreen: {fileID: 0}
200-
iPhone47inSplashScreen: {fileID: 0}
201-
iPhone55inPortraitSplashScreen: {fileID: 0}
202-
iPhone55inLandscapeSplashScreen: {fileID: 0}
203-
iPhone58inPortraitSplashScreen: {fileID: 0}
204-
iPhone58inLandscapeSplashScreen: {fileID: 0}
205-
iPadPortraitSplashScreen: {fileID: 0}
206-
iPadHighResPortraitSplashScreen: {fileID: 0}
207-
iPadLandscapeSplashScreen: {fileID: 0}
208-
iPadHighResLandscapeSplashScreen: {fileID: 0}
209-
iPhone65inPortraitSplashScreen: {fileID: 0}
210-
iPhone65inLandscapeSplashScreen: {fileID: 0}
211-
iPhone61inPortraitSplashScreen: {fileID: 0}
212-
iPhone61inLandscapeSplashScreen: {fileID: 0}
213203
appleTVSplashScreen: {fileID: 0}
214204
appleTVSplashScreen2x: {fileID: 0}
215205
tvOSSmallIconLayers: []
@@ -275,6 +265,9 @@ PlayerSettings:
275265
height: 180
276266
banner: {fileID: 0}
277267
androidGamepadSupportLevel: 0
268+
AndroidMinifyWithR8: 0
269+
AndroidMinifyRelease: 0
270+
AndroidMinifyDebug: 0
278271
AndroidValidateAppBundleSize: 1
279272
AndroidAppBundleSizeToValidate: 150
280273
m_BuildTargetIcons: []
@@ -433,12 +426,14 @@ PlayerSettings:
433426
cameraUsageDescription:
434427
locationUsageDescription:
435428
microphoneUsageDescription:
429+
switchNMETAOverride:
436430
switchNetLibKey:
437431
switchSocketMemoryPoolSize: 6144
438432
switchSocketAllocatorPoolSize: 128
439433
switchSocketConcurrencyLimit: 14
440434
switchScreenResolutionBehavior: 2
441435
switchUseCPUProfiler: 0
436+
switchUseGOLDLinker: 0
442437
switchApplicationID: 0x01004b9000490000
443438
switchNSODependencies:
444439
switchTitleNames_0:
@@ -614,6 +609,7 @@ PlayerSettings:
614609
ps4UseResolutionFallback: 0
615610
ps4ReprojectionSupport: 0
616611
ps4UseAudio3dBackend: 0
612+
ps4UseLowGarlicFragmentationMode: 1
617613
ps4SocialScreenEnabled: 0
618614
ps4ScriptOptimizationLevel: 0
619615
ps4Audio3dVirtualSpeakerCount: 14
@@ -649,9 +645,10 @@ PlayerSettings:
649645
webGLAnalyzeBuildSize: 0
650646
webGLUseEmbeddedResources: 0
651647
webGLCompressionFormat: 1
648+
webGLWasmArithmeticExceptions: 0
652649
webGLLinkerTarget: 0
653650
webGLThreadsSupport: 0
654-
webGLWasmStreaming: 0
651+
webGLDecompressionFallback: 0
655652
scriptingDefineSymbols:
656653
1: UNITY_POST_PROCESSING_STACK_V2;UNITY_DISABLE_AUTOMATIC_SYSTEM_BOOTSTRAP
657654
4: UNITY_POST_PROCESSING_STACK_V2;UNITY_DISABLE_AUTOMATIC_SYSTEM_BOOTSTRAP
@@ -676,6 +673,7 @@ PlayerSettings:
676673
managedStrippingLevel: {}
677674
incrementalIl2cppBuild: {}
678675
allowUnsafeCode: 0
676+
useDeterministicCompilation: 1
679677
additionalIl2CppArgs:
680678
scriptingRuntimeVersion: 1
681679
gcIncremental: 0
@@ -737,6 +735,7 @@ PlayerSettings:
737735
XboxOnePersistentLocalStorageSize: 0
738736
XboxOneXTitleMemory: 8
739737
XboxOneOverrideIdentityName:
738+
XboxOneOverrideIdentityPublisher:
740739
vrEditorSettings:
741740
daydream:
742741
daydreamIconForeground: {fileID: 0}
@@ -763,3 +762,4 @@ PlayerSettings:
763762
enableNativePlatformBackendsForNewInputSystem: 0
764763
disableOldInputManagerSupport: 0
765764
legacyClampBlendShapeWeights: 1
765+
virtualTexturingSupportEnabled: 0

‎workers/unity/ProjectSettings/ProjectVersion.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.3.7f1
2-
m_EditorVersionWithRevision: 2019.3.7f1 (6437fd74d35d)
1+
m_EditorVersion: 2020.1.2f1
2+
m_EditorVersionWithRevision: 2020.1.2f1 (7b32bc54ba47)

‎workers/unity/ProjectSettings/VersionControlSettings.asset

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!890905787 &1
4+
VersionControlSettings:
5+
m_ObjectHideFlags: 0
6+
m_Mode: Visible Meta Files
7+
m_CollabEditorSettings:
8+
inProgressEnabled: 1

0 commit comments

Comments
 (0)