File tree Expand file tree Collapse file tree 8 files changed +35
-12
lines changed
Assets/MixedRealityToolkit/Utilities/Editor Expand file tree Collapse file tree 8 files changed +35
-12
lines changed Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ static EditorProjectUtilities()
2929 /// </remarks>
3030 public static void CheckMinimumEditorVersion ( )
3131 {
32- #if ! UNITY_2018_3_OR_NEWER
32+ #if ! UNITY_2018_4_OR_NEWER
3333 DisplayIncorrectEditorVersionDialog ( ) ;
3434#endif
3535 }
Original file line number Diff line number Diff line change @@ -233,7 +233,7 @@ public static bool IsMSBuildForUnityEnabled()
233233 return false ;
234234 }
235235
236- // Load the manfiest file.
236+ // Load the manifest file.
237237 string manifestFileContents = File . ReadAllText ( manifestPath ) ;
238238 if ( string . IsNullOrWhiteSpace ( manifestFileContents ) )
239239 {
Original file line number Diff line number Diff line change 1+ # Pipelines
2+
3+ ## Each file and their use
4+
5+ ### ci-daily
6+
7+ This runs on externally-facing machines daily. It validates the repo on both Unity 2018 and Unity 2019.
8+
9+ ### ci-packaging-dontpublish
10+
11+ This runs on externally-facing machines whenever a PR is merged.
12+
13+ ### ci-packaging-internal
14+
15+ This runs on internally-facing machines whenever a PR is merged.
16+
17+ ### ci-release
18+
19+ This runs on internally-facing machines manually. It packages and signs the packages for public release.
20+
21+ ### pr
22+
23+ This runs on externally-facing machines as part of PR validation.
Original file line number Diff line number Diff line change 11# CI build for developer builds.
22
33variables :
4- Unity2018Version : Unity2018.3.7f1
4+ Unity2018Version : Unity2018.4.6f1
55 Unity2019Version : Unity2019.2.0f1
66 MRTKVersion : 2.3.0
77 packagingEnabled : false
2525 pool :
2626 name : On-Prem Unity
2727 demands :
28- - Unity2018.3.7f1
28+ - Unity2018.4.6f1
2929 - COG-UnityCache-WUS2-01
3030 - SDK_18362 -equals TRUE
3131 steps :
Original file line number Diff line number Diff line change 11# CI build producing developer packages.
22
33variables :
4- Unity2018Version : Unity2018.3.7f1
4+ Unity2018Version : Unity2018.4.6f1
55 Unity2019Version : Unity2019.2.0f1
66 MRTKVersion : 2.3.0
77
1111 pool :
1212 name : On-Prem Unity
1313 demands :
14- - Unity2018.3.7f1
14+ - Unity2018.4.6f1
1515 - COG-UnityCache-WUS2-01
1616 - SDK_18362 -equals TRUE
1717 steps :
Original file line number Diff line number Diff line change 11# CI build producing developer packages.
22
33variables :
4- Unity2018Version : Unity2018.3.7f1
4+ Unity2018Version : Unity2018.4.12f1
55 Unity2019Version : Unity2019.2.0f1
66 MRTKVersion : 2.3.0
77
1111 pool :
1212 name : Analog On-Prem
1313 demands :
14- - Unity2018.3.7f1
14+ - Unity2018.4.12f1
1515 - COG-UnityCache-WUS2-01
1616 - SDK_18362 -equals TRUE
1717 steps :
Original file line number Diff line number Diff line change 44name : $(Date:yyyyMMdd)v$(Rev:r)
55
66variables :
7- Unity2018Version : Unity2018.3.7f1
7+ Unity2018Version : Unity2018.4.12f1
88 Unity2019Version : Unity2019.2.0f1
99 MRTKVersion : 2.3.0 # Major.Minor.Patch
1010 MRTKReleaseTag : ' ' # final version component, e.g. 'RC2.1' or empty string
1515 pool :
1616 name : Analog On-Prem
1717 demands :
18- - Unity2018.3.7f1 # variable expansion not allowed here
18+ - Unity2018.4.12f1 # variable expansion not allowed here
1919 - COG-UnityCache-WUS2-01
2020 - SDK_18362 -equals TRUE
2121 steps :
Original file line number Diff line number Diff line change 11# Build for PR validation.
22
33variables :
4- Unity2018Version : Unity2018.3.7f1
4+ Unity2018Version : Unity2018.4.6f1
55 Unity2019Version : Unity2019.2.0f1
66 MRTKVersion : 2.3.0
77
1111 pool :
1212 name : On-Prem Unity
1313 demands :
14- - Unity2018.3.7f1
14+ - Unity2018.4.6f1
1515 - COG-UnityCache-WUS2-01
1616 - SDK_18362 -equals TRUE
1717 steps :
You can’t perform that action at this time.
0 commit comments