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

Some files were not shown because too many files have changed in this diff Show More