Skip to content

Commit 19e34f6

Browse files
author
Unity Technologies
committed
Unity 2017.2.2p1 C# reference source code
1 parent 2625f4a commit 19e34f6

File tree

15 files changed

+54
-5
lines changed

15 files changed

+54
-5
lines changed

‎Editor/Mono/AssemblyInfo/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
[assembly: InternalsVisibleTo("UnityEditor.TreeEditor")]
4545
[assembly: InternalsVisibleTo("UnityEditor.Timeline")]
4646
[assembly: InternalsVisibleTo("UnityEditor.VR")]
47+
[assembly: InternalsVisibleTo("Unity.RuntimeTests")]
4748
[assembly: InternalsVisibleTo("Unity.RuntimeTests.Framework")]
4849
[assembly: InternalsVisibleTo("UnityEditor.Facebook.Extensions")]
4950
[assembly: InternalsVisibleTo("Assembly-CSharp-Editor-firstpass-testable")]

‎Editor/Mono/BuildPlayerWindowPublish.cs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Copyright (c) Unity Technologies. For terms of use, see
33
// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
44

5+
using System.IO;
56
using UnityEngine;
67
using UnityEditor;
78
using UnityEditor.PackageManager;
@@ -36,6 +37,37 @@ enum PackmanOperationType : uint
3637

3738
private bool xiaomiPackageInstalled = false;
3839

40+
/* The GUIDs are from a unitypackage (UnityChannel.unitypackage - several versions of it, factually).
41+
*
42+
* 8be17ad05558e40a9bb709807433a2b4: Assets/Plugins/UnityChannel/ChannelPurchase.dll.meta
43+
* b4a9e40b1d1574159814dede56a53cb3: Assets/Plugins/UnityChannel/UnityStore.dll.meta
44+
* 7f9b343cc0cc840ac9096a4e0c9e620a: Assets/Plugins/UnityChannel/Android/UnityChannel.aar.meta
45+
* ee71d6ce2ccbe44be9906cf88b06dd3c: Assets/Plugins/UnityChannel/Android.meta
46+
* cfd375853ab09456aaf09e607610061a: Assets/Plugins/UnityChannel/XiaomiSupport/AppStoreSettings.cs.meta
47+
* eca06513904414b078a830503af689fe: Assets/Plugins/UnityChannel/XiaomiSupport/Editor/XiaomiPackageNameExtension.cs.meta
48+
* 0668a01a6fc274116958b6c9a8326652: Assets/Plugins/UnityChannel/XiaomiSupport/Editor/AppStoreOnboardApi.cs.meta
49+
* ad6a04a95a0e44de5840a9487311e96b: Assets/Plugins/UnityChannel/XiaomiSupport/Editor/AppStoreSettingsEditor.cs.meta
50+
* 1727faade967f43b6a6dba36609f4bdb: Assets/Plugins/UnityChannel/XiaomiSupport/Editor/AppStoreModel.cs.meta
51+
* fcb4b3fa8d4f74acca2ce443650b2790: Assets/Plugins/UnityChannel/XiaomiSupport/Editor.meta
52+
* a095042fdce9f439e89ed68ae87f0035: Assets/Plugins/UnityChannel/XiaomiSupport.meta
53+
* 965c7e6a0de3a40e4a2ccd705b0305d0: Assets/Plugins/UnityChannel.meta
54+
*/
55+
56+
string[] guidsToDelete = new string[]
57+
{
58+
"965c7e6a0de3a40e4a2ccd705b0305d0",
59+
"8be17ad05558e40a9bb709807433a2b4",
60+
"a095042fdce9f439e89ed68ae87f0035",
61+
"7f9b343cc0cc840ac9096a4e0c9e620a",
62+
"b4a9e40b1d1574159814dede56a53cb3",
63+
"ee71d6ce2ccbe44be9906cf88b06dd3c",
64+
"cfd375853ab09456aaf09e607610061a",
65+
"fcb4b3fa8d4f74acca2ce443650b2790",
66+
"eca06513904414b078a830503af689fe",
67+
"0668a01a6fc274116958b6c9a8326652",
68+
"ad6a04a95a0e44de5840a9487311e96b",
69+
"1727faade967f43b6a6dba36609f4bdb"
70+
};
3971
string CurrentXiaomiPackageId
4072
{
4173
get
@@ -120,6 +152,8 @@ private void XiaomiPackageControlGUI()
120152
if (packmanOperationRunning)
121153
return;
122154

155+
DeleteUnityChannelObjectsIfInProject();
156+
123157
StatusCode code = Client.Add(out packmanOperationId, LatestXiaomiPackageId);
124158
if (code == StatusCode.Error)
125159
{
@@ -304,5 +338,18 @@ void ExtractLatestXiaomiPackageInfo(long operationId)
304338
latestXiaomiPackageVersion = package.version;
305339
}
306340
}
341+
342+
void DeleteUnityChannelObjectsIfInProject()
343+
{
344+
foreach (string g in guidsToDelete)
345+
{
346+
string assetPath = AssetDatabase.GUIDToAssetPath(g);
347+
if (string.IsNullOrEmpty(assetPath))
348+
continue;
349+
AssetDatabase.DeleteAsset(assetPath);
350+
}
351+
AssetDatabase.SaveAssets();
352+
AssetDatabase.Refresh();
353+
}
307354
}
308355
}

‎Editor/Src/CloudServicesSettings/CrashReporting/Managed/CrashReporting.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ public static void UploadSymbolsInPath(string authToken, string symbolPath, stri
162162
string args = string.Format("-symbolPath \"{0}\" -log \"{1}\" -filter \"{2}\" -excludeFilter \"{3}\"", symbolPath, platformConfig.LogFilePath, includeFilter, excludeFilter);
163163

164164
NativeProgram nativeProgram = new NativeProgram(platformConfig.UsymtoolPath, args);
165-
nativeProgram.GetProcessStartInfo().EnvironmentVariables.Add("USYM_UPLOAD_AUTH_TOKEN", authToken);
166-
nativeProgram.GetProcessStartInfo().EnvironmentVariables.Add("USYM_UPLOAD_URL_SOURCE", SignedUrlSourceUrl);
167-
nativeProgram.GetProcessStartInfo().EnvironmentVariables.Add("LZMA_PATH", platformConfig.LzmaPath);
165+
nativeProgram.GetProcessStartInfo().EnvironmentVariables["USYM_UPLOAD_AUTH_TOKEN"] = authToken;
166+
nativeProgram.GetProcessStartInfo().EnvironmentVariables["USYM_UPLOAD_URL_SOURCE"] = SignedUrlSourceUrl;
167+
nativeProgram.GetProcessStartInfo().EnvironmentVariables["LZMA_PATH"] = platformConfig.LzmaPath;
168168
nativeProgram.Start();
169169

170170
if (waitForExit)

‎External/Mono/builds/monodistribution/lib/mono/2.0/Boo.Lang.Compiler.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/Boo.Lang.Parser.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/Boo.Lang.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/Mono.Posix.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/Mono.Security.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/System.Core.dll

512 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/System.Xml.Linq.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/System.Xml.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/System.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/UnityScript.dll

0 Bytes
Binary file not shown.

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Unity 2017.2.2f1 C# reference source code
1+
## Unity 2017.2.2p1 C# reference source code
22

33
The C# part of the Unity engine and editor source code.
44
May be used for reference purposes only.

‎artifacts/generated/common/runtime/ApplicationBindings.gen.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,11 @@ public static bool isMobilePlatform
151151
case RuntimePlatform.IPhonePlayer:
152152
case RuntimePlatform.Android:
153153
case RuntimePlatform.TizenPlayer:
154+
return true;
154155
case RuntimePlatform.WSAPlayerX86:
155156
case RuntimePlatform.WSAPlayerX64:
156157
case RuntimePlatform.WSAPlayerARM:
157-
return true;
158+
return SystemInfo.deviceType == DeviceType.Handheld;
158159
default:
159160
return false;
160161
}

0 commit comments

Comments
 (0)