mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:mono/linux-packaging-mono

Browse Source 
Former-commit-id: 7c227ea037a197dab3c562dc99e1a275496448dd
This commit is contained in:
Jo Shields 2018-02-15 16:39:02 -05:00
commit 8d854ff04d
49 changed files with 121 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
df960e3f494b0d30d808c1bd44ee0be557e4ca67
1ec1f13b23336e839dceed8ccd6731dd02720915

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
0da7de0818f03e991729bf29ede5a6c90311c912
3d0bab926f5da4bfa2c3b38e7dad08f280c2228b

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
mono (5.10.0.116-0xamarin1) alpha; urgency=medium
* New release - mono-5.10.0.116.tar.bz2
-- Xamarin Public Jenkins (auto-signing) <releng@xamarin.com> Thu, 15 Feb 2018 19:26:55 +0000
mono (5.10.0.107-0xamarin1) alpha; urgency=medium
* New release - mono-5.10.0.107.tar.bz2

13
external/cecil/Mono.Cecil.Tests.props vendored
View File

@ -5,10 +5,13 @@
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<Import Project="Mono.Cecil.props" />
<PropertyGroup Condition="'$(NetStandard)' == 'true'">
<PropertyGroup Condition="$(NetStandard)">
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup Condition="'$(NetStandard)' == 'true'">
<PropertyGroup Condition="!$(NetStandard)">
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup Condition="$(NetStandard)">
<PackageReference Include="NUnit">
<Version>3.7.1</Version>
</PackageReference>
@ -17,9 +20,9 @@
</PackageReference>
<PackageReference Include="NUnit3TestAdapter">
<Version>3.8.0</Version>
</PackageReference>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(NetStandard)' != 'true'">
<ItemGroup Condition="!$(NetStandard)">
<Reference Include="nunit.core">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(MSBuildThisFileDirectory)\Test\libs\nunit-2.6.2\nunit.core.dll</HintPath>
@ -37,7 +40,7 @@
<Target Name="ForceGenerationOfBindingRedirects"
AfterTargets="ResolveAssemblyReferences"
BeforeTargets="GenerateBindingRedirects"
Condition="'$(AutoGenerateBindingRedirects)' == 'true'">
Condition="$(AutoGenerateBindingRedirects)">
<PropertyGroup>
<!-- Needs to be set in a target because it has to be set after the initial evaluation in the common targets -->
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>

11
external/cecil/Mono.Cecil.props vendored
View File

@ -14,6 +14,7 @@
<MSBuildCSharpTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</MSBuildCSharpTargets>
<NetStandard Condition=" $(Configuration.StartsWith('netstandard')) Or '$(NuGetRestoreTargets)' != '' ">true</NetStandard>
<NetStandard Condition=" '$(NetStandard)' == '' ">false</NetStandard>
<IsTestProject Condition=" '$(IsTestProject)' == '' ">false</IsTestProject>
</PropertyGroup>
<PropertyGroup Condition=" $(Configuration.Contains('Debug')) ">
<DebugSymbols>true</DebugSymbols>
@ -42,13 +43,13 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<DefineConstants>$(DefineConstants);NET_4_0;</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(NetStandard)' == 'true'">
<TargetFramework Condition="'$(IsTestProject)' == 'true'">netcoreapp2.0</TargetFramework>
<TargetFramework Condition="'$(IsTestProject)' != 'true'">netstandard1.3</TargetFramework>
<PropertyGroup Condition="$(NetStandard)">
<TargetFramework Condition="$(IsTestProject)">netcoreapp2.0</TargetFramework>
<TargetFramework Condition="!$(IsTestProject)">netstandard1.3</TargetFramework>
</PropertyGroup>
<Import Project="NetStandard.props" Condition="'$(NetStandard)' == 'true'" />
<Import Project="NetStandard.props" Condition="$(NetStandard)" />
<!-- Shared References -->
<ItemGroup Condition="'$(NetStandard)' != 'true'">
<ItemGroup Condition="!$(NetStandard)">
<Reference Include="System.Core" />
<Reference Include="System" />
</ItemGroup>

4
external/cecil/Test/Mono.Cecil.Tests.csproj vendored
View File

@ -6,7 +6,7 @@
<RootNamespace>Mono.Cecil.Tests</RootNamespace>
<AssemblyName>Mono.Cecil.Tests</AssemblyName>
</PropertyGroup>
<ItemGroup Condition="'$(NetStandard)' == 'true'">
<ItemGroup Condition="$(NetStandard)">
<PackageReference Include="System.Reflection.TypeExtensions">
<Version>4.3.0</Version>
</PackageReference>
@ -50,5 +50,5 @@
<ItemGroup>
<None Include="Resources\**\*" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(NetStandard)' != 'true'" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="!$(NetStandard)" />
</Project>

14
external/cecil/Test/Mono.Cecil.Tests/AssemblyTests.cs vendored
View File

@ -89,5 +89,19 @@ namespace Mono.Cecil.Tests {
Assert.AreEqual (module.AssemblyReferences [0], module.TypeSystem.CoreLibrary);
}, verify: !Platform.OnMono);
}
[Test]
public void MismatchedLibraryAndSymbols_DoNotThrow ()
{
// SQLite-net.dll (from nuget) shiped with mismatched symbol files, but throwIfNoSymbol did not prevent it from throwing
var readerParms = new ReaderParameters {
ReadSymbols = true,
SymbolReaderProvider = new Cil.DefaultSymbolReaderProvider (throwIfNoSymbol: false)
};
using (var module = GetResourceModule ("SQLite-net.dll", readerParms)) {
Assert.Null (module.SymbolReader);
}
}
}
}

BIN
external/cecil/Test/Resources/assemblies/SQLite-net.dll.mdb vendored Normal file
View File

Binary file not shown.

2
mcs/build/common/Consts.cs
View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.10.0.107";
public const string MonoVersion = "5.10.0.116";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

19
mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs
View File

@ -322,6 +322,12 @@ public class Tests : TestsBase, ITest2
new Tests ().attach ();
return 0;
}
if (args.Length > 0 && args [0] == "step-out-void-async") {
var wait = new ManualResetEvent (false);
step_out_void_async (wait);
wait.WaitOne ();//Don't exist until step_out_void_async is executed...
return 0;
}
assembly_load ();
breakpoints ();
single_stepping ();
@ -1726,6 +1732,19 @@ public class Tests : TestsBase, ITest2
{
UninitializedClass.Call();//Breakpoint here and step in
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
static async void step_out_void_async (ManualResetEvent wait)
{
await Task.Yield ();
step_out_void_async_2 ();
wait.Set ();
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
static void step_out_void_async_2 ()
{
}
}
public class SentinelClass : MarshalByRefObject {

2
mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id
View File

@ -1 +1 @@
baa41091ff26fd05cb8ef05525565e96e4d31f82
6e48d3edd50a7737adc6ec6d9325e46139ed8ffc

2
mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
bcddfd5f8af86e0b05fd9c450ea4edada90bb493
3528a4d084d9db2620ae927a78704f2fdc4dde09

2
mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
625ac8e9f00e37f03dcaf40a9ab5a8a1aad5c9e5
d09b9a3a1574069b1e574798dbd6483681665184

2
mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
7d093351bb4b8ff663b2f39fa536221188341b25
598dca2f70bb95b4532acc6da208566dc4893deb

2
mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
647964d71fe4b956b19eea16d85d62a6a31d0214
38f717388041bdb3e62229118e44818753615a33

2
mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
ce49c39b40d2ff5525da2fc5badbdfeed1ad5766
126bb76fe92fca40a38be6608587a58a3257b9a6

2
mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
f78e411b0e0ef98a22b4d4e0092347189395dcf8
6862f39b66c913f59d89f0548ee8df36a44c18ec

2
mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
1c80cfd07f438371c803270dfa1d3df05d5565b5
4d4451e4c348d6415ad163198098b22ccfc16145

2
mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
bcddfd5f8af86e0b05fd9c450ea4edada90bb493
3528a4d084d9db2620ae927a78704f2fdc4dde09

2
mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
625ac8e9f00e37f03dcaf40a9ab5a8a1aad5c9e5
d09b9a3a1574069b1e574798dbd6483681665184

2
mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
7d093351bb4b8ff663b2f39fa536221188341b25
598dca2f70bb95b4532acc6da208566dc4893deb

2
mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
647964d71fe4b956b19eea16d85d62a6a31d0214
38f717388041bdb3e62229118e44818753615a33

2
mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
ce49c39b40d2ff5525da2fc5badbdfeed1ad5766
126bb76fe92fca40a38be6608587a58a3257b9a6

2
mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
f78e411b0e0ef98a22b4d4e0092347189395dcf8
6862f39b66c913f59d89f0548ee8df36a44c18ec

2
mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
1c80cfd07f438371c803270dfa1d3df05d5565b5
4d4451e4c348d6415ad163198098b22ccfc16145

2
mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
bcddfd5f8af86e0b05fd9c450ea4edada90bb493
3528a4d084d9db2620ae927a78704f2fdc4dde09

2
mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
625ac8e9f00e37f03dcaf40a9ab5a8a1aad5c9e5
d09b9a3a1574069b1e574798dbd6483681665184

2
mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
7d093351bb4b8ff663b2f39fa536221188341b25
598dca2f70bb95b4532acc6da208566dc4893deb

2
mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
647964d71fe4b956b19eea16d85d62a6a31d0214
38f717388041bdb3e62229118e44818753615a33

2
mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
ce49c39b40d2ff5525da2fc5badbdfeed1ad5766
126bb76fe92fca40a38be6608587a58a3257b9a6

2
mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
f78e411b0e0ef98a22b4d4e0092347189395dcf8
6862f39b66c913f59d89f0548ee8df36a44c18ec

2
mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
1c80cfd07f438371c803270dfa1d3df05d5565b5
4d4451e4c348d6415ad163198098b22ccfc16145

18
mcs/tools/xbuild/data/deniedAssembliesList.txt
View File

@ -5,6 +5,13 @@ System.Runtime.InteropServices.RuntimeInformation.dll,F580BAAC-12BD-4716-B486-C0
System.Threading.Overlapped.dll,212BEDF2-E3F5-4D59-8C1A-F4D1C58B46CD,4,1,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,33D296D9-EE6D-404E-BF9F-432A429FF5DA,4,0,2,0
System.Runtime.InteropServices.RuntimeInformation.dll,E5AE3324-2100-4F77-9E41-AEEF226C9649,4,0,2,0
System.Globalization.Extensions.dll,28006E9A-74DB-45AC-8A8D-030CEBAA272A,4,1,0,0
System.IO.Compression.dll,1332CE2F-1517-4BD7-93FD-7D4BCFBAED66,4,2,0,0
System.Net.Http.dll,8E2F55F3-D010-417B-A742-21386EDDD388,4,2,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,6D334D4D-0149-4D07-9DEF-CC52213145CE,4,0,2,0
System.Threading.Overlapped.dll,F4FFC4A6-E694-49D9-81B2-12F2C9A29652,4,1,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,CA2D23DE-55E1-45D8-9720-0EBE3EEC1DF2,4,0,2,0
System.Runtime.InteropServices.RuntimeInformation.dll,0C4BCFB3-F609-4631-93A6-17B19C69D9B6,4,0,2,0
System.Globalization.Extensions.dll,FC1439FC-C1B8-4DB1-914D-165CCFA77002,4,1,0,0
System.IO.Compression.dll,05C07BD4-AFF1-4B12-900B-F0A5EB88DDB4,4,2,0,0
System.Net.Http.dll,DB06A592-E332-44A1-8B85-20CAB3C3C147,4,2,0,0
@ -16,17 +23,6 @@ System.IO.Compression.dll,C786B28D-0850-4D4C-AED9-FE6B86EE7C31,4,2,0,0
System.Net.Http.dll,903A137B-BB3F-464A-94D4-780B89EE5580,4,2,0,0
System.Threading.Overlapped.dll,3336A2A3-1772-4EF9-A74B-AFDC80A8B21E,4,1,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,D87389D8-6E9C-48CF-B128-3637018577AF,4,0,2,0
System.Globalization.Extensions.dll,B9BA8638-25D2-4A3B-B91F-16B3D3799861,4,1,0,0
System.IO.Compression.dll,35DD20B5-8766-476B-B5D2-0EA16EF0A946,4,2,0,0
System.Net.Http.dll,27BBDD4C-EAF0-4A95-B172-EE502D76A725,4,2,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,E46BA45E-6A63-47CD-AF70-2C3016AFF75A,4,0,2,0
System.Threading.Overlapped.dll,A0439CB6-A5E6-4813-A76C-13F92ADDDED5,4,1,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,488CE209-4E5D-40E7-BE8C-F81F2B99F13A,4,0,2,0
System.Globalization.Extensions.dll,1A2B9B2A-02F5-4C78-AB0C-7C6D2795CE2B,4,1,0,0
System.IO.Compression.dll,8DBD1669-97BC-4190-9BD8-738561193741,4,2,0,0
System.Net.Http.dll,41ACE450-8F44-455A-97AC-0679E5462071,4,2,0,0
System.Threading.Overlapped.dll,82D565AC-E41C-4E29-9939-C031C88EDBDD,4,1,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,FD6C8616-C1D8-43F9-AC17-A1C48A45FDA2,4,0,2,0
System.Globalization.Extensions.dll,475DBF02-9F68-44F1-8FB5-C9F69F1BD2B1,4,0,0,0
System.Globalization.Extensions.dll,5FCD54F0-4B97-4259-875D-30E481F02EA2,4,0,1,0
System.Globalization.Extensions.dll,E9FCFF5B-4DE1-4BDC-9CE8-08C640FC78CC,4,0,2,0

24
mono/metadata/image.c
View File

@ -1159,6 +1159,13 @@ static const IgnoredAssembly ignored_assemblies [] = {
IGNORED_ASSEMBLY (0x79F6E37F, SYS_THREADING_OVERLAPPED, "212BEDF2-E3F5-4D59-8C1A-F4D1C58B46CD", "15.5.0-preview-20171027-2 net461"),
IGNORED_ASSEMBLY (0xA3BFE786, SYS_RT_INTEROP_RUNTIME_INFO, "33D296D9-EE6D-404E-BF9F-432A429FF5DA", "15.5.0-preview-20171027-2 net462"),
IGNORED_ASSEMBLY (0x74EA304F, SYS_RT_INTEROP_RUNTIME_INFO, "E5AE3324-2100-4F77-9E41-AEEF226C9649", "15.5.0-preview-20171027-2 net47"),
IGNORED_ASSEMBLY (0x4CC79B26, SYS_GLOBALIZATION_EXT, "28006E9A-74DB-45AC-8A8D-030CEBAA272A", "2.0.0-preview3-20170622-1 net461"),
IGNORED_ASSEMBLY (0xC8D00759, SYS_IO_COMPRESSION, "1332CE2F-1517-4BD7-93FD-7D4BCFBAED66", "2.0.0-preview3-20170622-1 net461"),
IGNORED_ASSEMBLY (0x2706B80, SYS_NET_HTTP, "8E2F55F3-D010-417B-A742-21386EDDD388", "2.0.0-preview3-20170622-1 net461"),
IGNORED_ASSEMBLY (0xA2E8EC53, SYS_RT_INTEROP_RUNTIME_INFO, "6D334D4D-0149-4D07-9DEF-CC52213145CE", "2.0.0-preview3-20170622-1 net461"),
IGNORED_ASSEMBLY (0x90772EB6, SYS_THREADING_OVERLAPPED, "F4FFC4A6-E694-49D9-81B2-12F2C9A29652", "2.0.0-preview3-20170622-1 net461"),
IGNORED_ASSEMBLY (0x16BCA997, SYS_RT_INTEROP_RUNTIME_INFO, "CA2D23DE-55E1-45D8-9720-0EBE3EEC1DF2", "2.0.0-preview3-20170622-1 net462"),
IGNORED_ASSEMBLY (0x786145B9, SYS_RT_INTEROP_RUNTIME_INFO, "0C4BCFB3-F609-4631-93A6-17B19C69D9B6", "2.0.0-preview3-20170622-1 net47"),
IGNORED_ASSEMBLY (0xF9D06E1E, SYS_GLOBALIZATION_EXT, "FC1439FC-C1B8-4DB1-914D-165CCFA77002", "2.1.0-preview1-62414-02 net461"),
IGNORED_ASSEMBLY (0x1EA951BB, SYS_IO_COMPRESSION, "05C07BD4-AFF1-4B12-900B-F0A5EB88DDB4", "2.1.0-preview1-62414-02 net461"),
IGNORED_ASSEMBLY (0x96B5F0BA, SYS_NET_HTTP, "DB06A592-E332-44A1-8B85-20CAB3C3C147", "2.1.0-preview1-62414-02 net461"),
@ -1170,17 +1177,6 @@ static const IgnoredAssembly ignored_assemblies [] = {
IGNORED_ASSEMBLY (0x9DBB28A2, SYS_NET_HTTP, "903A137B-BB3F-464A-94D4-780B89EE5580", "2.1.0-preview1-62414-02 net471"),
IGNORED_ASSEMBLY (0xD00F7419, SYS_THREADING_OVERLAPPED, "3336A2A3-1772-4EF9-A74B-AFDC80A8B21E", "2.1.0-preview1-62414-02 net471"),
IGNORED_ASSEMBLY (0x17A113, SYS_RT_INTEROP_RUNTIME_INFO, "D87389D8-6E9C-48CF-B128-3637018577AF", "2.1.0-preview1-62414-02 net47"),
IGNORED_ASSEMBLY (0x1FB3F8E8, SYS_GLOBALIZATION_EXT, "B9BA8638-25D2-4A3B-B91F-16B3D3799861", "2.1.0-preview1-62516-03 net461"),
IGNORED_ASSEMBLY (0x6AE7C015, SYS_IO_COMPRESSION, "35DD20B5-8766-476B-B5D2-0EA16EF0A946", "2.1.0-preview1-62516-03 net461"),
IGNORED_ASSEMBLY (0x4E906129, SYS_NET_HTTP, "27BBDD4C-EAF0-4A95-B172-EE502D76A725", "2.1.0-preview1-62516-03 net461"),
IGNORED_ASSEMBLY (0x765A8E04, SYS_RT_INTEROP_RUNTIME_INFO, "E46BA45E-6A63-47CD-AF70-2C3016AFF75A", "2.1.0-preview1-62516-03 net461"),
IGNORED_ASSEMBLY (0x66CEDA9, SYS_THREADING_OVERLAPPED, "A0439CB6-A5E6-4813-A76C-13F92ADDDED5", "2.1.0-preview1-62516-03 net461"),
IGNORED_ASSEMBLY (0xD3ABE53A, SYS_RT_INTEROP_RUNTIME_INFO, "488CE209-4E5D-40E7-BE8C-F81F2B99F13A", "2.1.0-preview1-62516-03 net462"),
IGNORED_ASSEMBLY (0xE16ECCCD, SYS_GLOBALIZATION_EXT, "1A2B9B2A-02F5-4C78-AB0C-7C6D2795CE2B", "2.1.0-preview1-62516-03 net471"),
IGNORED_ASSEMBLY (0xE758DAD4, SYS_IO_COMPRESSION, "8DBD1669-97BC-4190-9BD8-738561193741", "2.1.0-preview1-62516-03 net471"),
IGNORED_ASSEMBLY (0xA99E866F, SYS_NET_HTTP, "41ACE450-8F44-455A-97AC-0679E5462071", "2.1.0-preview1-62516-03 net471"),
IGNORED_ASSEMBLY (0x8BFCB05D, SYS_THREADING_OVERLAPPED, "82D565AC-E41C-4E29-9939-C031C88EDBDD", "2.1.0-preview1-62516-03 net471"),
IGNORED_ASSEMBLY (0xFC67D3A7, SYS_RT_INTEROP_RUNTIME_INFO, "FD6C8616-C1D8-43F9-AC17-A1C48A45FDA2", "2.1.0-preview1-62516-03 net47"),
IGNORED_ASSEMBLY (0x1136045D, SYS_GLOBALIZATION_EXT, "475DBF02-9F68-44F1-8FB5-C9F69F1BD2B1", "4.0.0 net46"),
IGNORED_ASSEMBLY (0x358C9723, SYS_GLOBALIZATION_EXT, "5FCD54F0-4B97-4259-875D-30E481F02EA2", "4.0.1 net46"),
IGNORED_ASSEMBLY (0x450A096A, SYS_GLOBALIZATION_EXT, "E9FCFF5B-4DE1-4BDC-9CE8-08C640FC78CC", "4.3.0 net46"),
@ -1219,20 +1215,26 @@ static const IgnoredAssemblyVersion ignored_assembly_versions [] = {
IGNORED_ASM_VER (SYS_GLOBALIZATION_EXT, 4, 0, 0, 0),
IGNORED_ASM_VER (SYS_GLOBALIZATION_EXT, 4, 0, 1, 0),
IGNORED_ASM_VER (SYS_GLOBALIZATION_EXT, 4, 0, 2, 0),
IGNORED_ASM_VER (SYS_GLOBALIZATION_EXT, 4, 1, 0, 0),
IGNORED_ASM_VER (SYS_IO_COMPRESSION, 4, 1, 0, 0),
IGNORED_ASM_VER (SYS_IO_COMPRESSION, 4, 1, 2, 0),
IGNORED_ASM_VER (SYS_IO_COMPRESSION, 4, 2, 0, 0),
IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 0, 0),
IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 0, 1),
IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 1, 0),
IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 1, 1),
IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 1, 2),
IGNORED_ASM_VER (SYS_NET_HTTP, 4, 2, 0, 0),
IGNORED_ASM_VER (SYS_RT_INTEROP_RUNTIME_INFO, 4, 0, 0, 0),
IGNORED_ASM_VER (SYS_RT_INTEROP_RUNTIME_INFO, 4, 0, 1, 0),
IGNORED_ASM_VER (SYS_RT_INTEROP_RUNTIME_INFO, 4, 0, 2, 0),
IGNORED_ASM_VER (SYS_TEXT_ENC_CODEPAGES, 4, 0, 1, 0),
IGNORED_ASM_VER (SYS_TEXT_ENC_CODEPAGES, 4, 0, 2, 0),
IGNORED_ASM_VER (SYS_TEXT_ENC_CODEPAGES, 4, 1, 0, 0),
IGNORED_ASM_VER (SYS_THREADING_OVERLAPPED, 4, 0, 0, 0),
IGNORED_ASM_VER (SYS_THREADING_OVERLAPPED, 4, 0, 1, 0),
IGNORED_ASM_VER (SYS_THREADING_OVERLAPPED, 4, 0, 2, 0),
IGNORED_ASM_VER (SYS_THREADING_OVERLAPPED, 4, 1, 0, 0)
};
gboolean

2
mono/mini/aot-compiler.c.REMOVED.git-id
View File

@ -1 +1 @@
cd6627f9a22c75f14f3aa10c7487987f5c1df67d
10ad19bb2cc2d7117c89b2c35d77608b30dc2c6e

2
mono/mini/aot-runtime.c.REMOVED.git-id
View File

@ -1 +1 @@
baa8be474684ba194394e3441dd3c936b1a7ffce
e31719bf87ac644309f75387f00b04a3ee48cdab

13
mono/mini/aot-runtime.h
View File

@ -82,6 +82,7 @@ typedef enum {
MONO_AOT_TABLE_LLVM_GOT_INFO_OFFSETS,
MONO_AOT_TABLE_EXTRA_METHOD_INFO_OFFSETS,
MONO_AOT_TABLE_EXTRA_METHOD_TABLE,
MONO_AOT_TABLE_WEAK_FIELD_INDEXES,
MONO_AOT_TABLE_NUM
} MonoAotFileTable;
@ -109,6 +110,11 @@ typedef struct MonoAotFileInfo
gpointer jit_code_start;
gpointer jit_code_end;
gpointer method_addresses;
/*
* Data tables.
* One pointer for each entry in MonoAotFileTable.
*/
/* Data blob */
gpointer blob;
gpointer class_name_table;
@ -120,6 +126,9 @@ typedef struct MonoAotFileInfo
gpointer got_info_offsets;
gpointer llvm_got_info_offsets;
gpointer image_table;
/* Points to an array of weak field indexes */
gpointer weak_field_indexes;
gpointer mem_end;
/* The GUID of the assembly which the AOT image was generated from */
gpointer assembly_guid;
@ -148,9 +157,7 @@ typedef struct MonoAotFileInfo
gpointer unbox_trampolines_end;
/* Points to a table of unbox trampoline addresses/offsets */
gpointer unbox_trampoline_addresses;
/* Points to an array of weak field indexes */
gpointer weak_field_indexes;
#define MONO_AOT_FILE_INFO_LAST_SYMBOL weak_field_indexes
#define MONO_AOT_FILE_INFO_LAST_SYMBOL unbox_trampoline_addresses
/* Scalars */
/* The index of the first GOT slot used by the PLT */

2
mono/mini/debugger-agent.c.REMOVED.git-id
View File

@ -1 +1 @@
b7db383454d406058bfe7f22d01e972e9e532f13
e335cd7336eaa9e4f3244dc41f09db17bb90b3f2

2
mono/mini/mini-llvm.c.REMOVED.git-id
View File

@ -1 +1 @@
d823ffb6c5408a2f77f56e4884fe823dc07f79eb
1f777878668f30a90f030b7e0a061a93b283535c

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/a0af42a"
#define FULL_VERSION "explicit/d0c1e9d"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
bc010bb587374a6f3e89fa6eafada32b21696d73
7fe0de82571e3ea6b5eb5de9efe456e4faf046ff

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
5e0e8217bedaebbe399236d2375b7d34cef39ea5
525bf967e5dc6faa384793e8c393748f83c5373c

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
ef8077dbf75103a8106ca15de92c5a577fedf46a
9e1e3e4be04e8d7f74afa714010451fbef7f1b5f

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.107\n"
"Project-Id-Version: mono 5.10.0.116\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-02-14 19:26+0000\n"
"POT-Creation-Date: 2018-02-15 18:49+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
73da5ec3a76a3ca59029c7388f2de35e58a4ff9c
46fc12c742c4131938bca1dd0d795d745e85891a