Skip to content

Commit 53603cb

Browse files
committed
Updating to Unity 5.5.2f1
1 parent c872cb1 commit 53603cb

32 files changed

+734
-197
lines changed

UnityEditor.UI/UnityEditor.UI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<ProjectGuid>{04B72AAC-C806-40B8-AFF3-50C3F0355A11}</ProjectGuid>

UnityEditor/DesktopStandalonePostProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ protected virtual void SetupStagingArea()
252252
string text4 = text2 + "/Metadata";
253253
IL2CPPUtils.RunIl2Cpp(text, this.GetPlatformProvider(this.m_PostProcessArgs.target), delegate(string s)
254254
{
255-
}, this.m_PostProcessArgs.usedClassRegistry, this.Development);
255+
}, this.m_PostProcessArgs.usedClassRegistry, false);
256256
FileUtil.CreateOrCleanDirectory(text3);
257257
IL2CPPUtils.CopyEmbeddedResourceFiles(text, text3);
258258
FileUtil.CreateOrCleanDirectory(text4);

UnityEditor/UnityEditor.Scripting.Compilers/MicrosoftCSharpCompiler.cs

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ namespace UnityEditor.Scripting.Compilers
1111
{
1212
internal class MicrosoftCSharpCompiler : ScriptCompilerBase
1313
{
14-
private static string[] _uwpReferences;
15-
1614
internal static string WindowsDirectory
1715
{
1816
get
@@ -424,14 +422,9 @@ internal static string[] GetAdditionalReferences(WSASDK wsaSDK)
424422
{
425423
result = null;
426424
}
427-
else if (MicrosoftCSharpCompiler._uwpReferences != null)
428-
{
429-
result = MicrosoftCSharpCompiler._uwpReferences;
430-
}
431425
else
432426
{
433-
MicrosoftCSharpCompiler._uwpReferences = UWPReferences.GetReferences();
434-
result = MicrosoftCSharpCompiler._uwpReferences;
427+
result = UWPReferences.GetReferences(UWPReferences.GetDesiredSDKVersion());
435428
}
436429
return result;
437430
}
@@ -442,7 +435,19 @@ internal static string GetPlatformAssemblyPath(WSASDK wsaSDK)
442435
string result;
443436
if (wsaSDK == WSASDK.UWP)
444437
{
445-
result = Path.Combine(windowsKitDirectory, "UnionMetadata\\Facade\\Windows.winmd");
438+
string text = Paths.Combine(new string[]
439+
{
440+
windowsKitDirectory,
441+
"UnionMetadata",
442+
UWPReferences.SdkVersionToString(UWPReferences.GetDesiredSDKVersion()),
443+
"Facade",
444+
"Windows.winmd"
445+
});
446+
if (!File.Exists(text))
447+
{
448+
text = Path.Combine(windowsKitDirectory, "UnionMetadata\\Facade\\Windows.winmd");
449+
}
450+
result = text;
446451
}
447452
else
448453
{

0 commit comments

Comments
 (0)