Skip to content
Permalink
Browse files

[AssemblyProcessor] Fix a case where ImportReference was not called f…

…or GetTypeFromHandle(). Bumped Cecil to NuGet 0.10.3 rather than custom one.
  • Loading branch information
xen2 committed May 22, 2019
1 parent 8b0821c commit f1183afecbda122c90f1f3f02bdd15738b4c52db
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown

This file was deleted.

This file was deleted.

This file was deleted.

@@ -1,5 +1,5 @@
pushd ..\..\..\bin\iOS-OpenGLES
..\..\deps\Mono.Cecil\monolinker -a Xenko.Engine.dll -a Xenko.Games.dll -a Xenko.Input.dll -a Xenko.Graphics.dll -p link OpenTK-1.1 -u copy -b true -d "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Xamarin.iOS\v1.0"
..\..\deps\monolinker\monolinker -a Xenko.Engine.dll -a Xenko.Games.dll -a Xenko.Input.dll -a Xenko.Graphics.dll -p link OpenTK-1.1 -u copy -b true -d "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Xamarin.iOS\v1.0"
popd

copy ..\..\..\bin\iOS-OpenGLES\output\OpenTK-1.1.dll .
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -20,9 +20,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Cecil">
<HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="nunit.core.interfaces">
<HintPath>..\..\..\deps\NUnit\addins\nunit.core.interfaces.dll</HintPath>
</Reference>
@@ -465,7 +465,7 @@ private static void GenerateSerializerCode(ComplexSerializerRegistry registry)
{
// Generating: System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(<#=type.Value.SerializerType.ConvertCSharp()#>).TypeHandle);
initializeMethodIL.Append(Instruction.Create(OpCodes.Ldtoken, type.Value.SerializerType));
initializeMethodIL.Append(Instruction.Create(OpCodes.Call, getTypeFromHandleMethod));
initializeMethodIL.Append(Instruction.Create(OpCodes.Call, assembly.MainModule.ImportReference(getTypeFromHandleMethod)));
initializeMethodIL.Append(Instruction.Create(OpCodes.Callvirt, getTypeHandleMethodRef));
initializeMethodIL.Append(Instruction.Create(OpCodes.Call, runClassConstructorMethod));
}
@@ -24,19 +24,8 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Mono.Cecil" Version="0.10.3" />
<PackageReference Include="Mono.Options" Version="5.3.0.1" />
<Reference Include="Mono.Cecil">
<HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Pdb">
<HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Mdb">
<HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Rocks">
<HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.Composition" />
</ItemGroup>
<ItemGroup>
@@ -84,7 +73,7 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ILRepack" Version="2.0.15"/>
<PackageReference Include="ILRepack" Version="2.0.15" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
</ItemGroup>
@@ -43,10 +43,7 @@
<PackageReference Include="EnvDTE" Version="8.0.1" />
<PackageReference Include="Xenko.Metrics" Version="1.0.0" />
<PackageReference Include="Xenko.CrashReport" Version="1.0.1" />
<Reference Include="Mono.Cecil">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(XenkoCommonDependenciesDir)Mono.Cecil\Mono.Cecil.dll</HintPath>
</Reference>
<PackageReference Include="Mono.Cecil" Version="0.10.3" />
<PackageReference Include="QuickGraph" Version="3.6.61119.7" />
<Reference Include="Renci.SshNet, Version=2016.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -18,9 +18,7 @@
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Cecil">
<HintPath>$(XenkoCommonDependenciesDir)Mono.Cecil\Mono.Cecil.dll</HintPath>
</Reference>
<PackageReference Include="Mono.Cecil" Version="0.10.3" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

0 comments on commit f1183af

Please sign in to comment.
You can’t perform that action at this time.