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

Imported Upstream version 5.16.0.100

Browse Source 
Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
external/corefx/src/System.Composition.Runtime/src/System/Composition/CompositionContext.cs vendored
View File

@@ -34,7 +34,7 @@ namespace System.Composition
/// <exception cref="CompositionFailedException" />
public TExport GetExport<TExport>()
{
return GetExport<TExport>((string)null);
return GetExport<TExport>(null);
}
/// <summary>
@@ -55,13 +55,12 @@ namespace System.Composition
/// <see cref="CompositionContext"/>.
/// </summary>
/// <param name="exportType">The type of the export to retrieve.</param>
/// <param name="contractName">Optionally, a discriminator that constrains the selection of the export.</param>
/// <returns>An instance of the export.</returns>
/// <param name="export">The export if available, otherwise, null.</param>
/// <exception cref="CompositionFailedException" />
public bool TryGetExport(Type exportType, string contractName, out object export)
public bool TryGetExport(Type exportType, out object export)
{
return TryGetExport(new CompositionContract(exportType, contractName), out export);
return TryGetExport(exportType, null, out export);
}
/// <summary>
@@ -69,12 +68,17 @@ namespace System.Composition
/// <see cref="CompositionContext"/>.
/// </summary>
/// <param name="exportType">The type of the export to retrieve.</param>
/// <param name="contractName">Optionally, a discriminator that constrains the selection of the export.</param>
/// <returns>An instance of the export.</returns>
/// <param name="export">The export if available, otherwise, null.</param>
/// <exception cref="CompositionFailedException" />
public bool TryGetExport(Type exportType, out object export)
public bool TryGetExport(Type exportType, string contractName, out object export)
{
return TryGetExport(exportType, null, out export);
if (TryGetExport(new CompositionContract(exportType, contractName), out export))
return true;
export = default;
return false;
}
/// <summary>
@@ -87,7 +91,7 @@ namespace System.Composition
/// <exception cref="CompositionFailedException" />
public bool TryGetExport<TExport>(out TExport export)
{
return TryGetExport<TExport>(null, out export);
return TryGetExport(null, out export);
}
/// <summary>
@@ -101,10 +105,9 @@ namespace System.Composition
/// <exception cref="CompositionFailedException" />
public bool TryGetExport<TExport>(string contractName, out TExport export)
{
object untypedExport;
if (!TryGetExport(typeof(TExport), contractName, out untypedExport))
if (!TryGetExport(typeof(TExport), contractName, out object untypedExport))
{
export = default(TExport);
export = default;
return false;
}
@@ -121,7 +124,7 @@ namespace System.Composition
/// <exception cref="CompositionFailedException" />
public object GetExport(Type exportType)
{
return GetExport(exportType, (string)null);
return GetExport(exportType, null);
}
/// <summary>
@@ -146,12 +149,10 @@ namespace System.Composition
/// <exception cref="CompositionFailedException" />
public object GetExport(CompositionContract contract)
{
object export;
if (!TryGetExport(contract, out export))
throw new CompositionFailedException(
string.Format(SR.CompositionContext_NoExportFoundForContract, contract));
if (TryGetExport(contract, out object export))
return export;
return export;
throw new CompositionFailedException(SR.Format(SR.CompositionContext_NoExportFoundForContract, contract));
}
/// <summary>
@@ -162,7 +163,7 @@ namespace System.Composition
/// <exception cref="CompositionFailedException" />
public IEnumerable<object> GetExports(Type exportType)
{
return GetExports(exportType, (string)null);
return GetExports(exportType, null);
}
/// <summary>
@@ -192,7 +193,7 @@ namespace System.Composition
/// <exception cref="CompositionFailedException" />
public IEnumerable<TExport> GetExports<TExport>()
{
return GetExports<TExport>((string)null);
return GetExports<TExport>(null);
}
/// <summary>

6
external/corefx/src/System.Composition.Runtime/tests/CompositionContextTests.cs vendored
View File

@@ -61,9 +61,8 @@ namespace System.Composition.Tests
Assert.False(context.TryGetExport(out int export1));
Assert.Equal(0, export1);
// Failure leaks through.
Assert.False(context.TryGetExport(typeof(int), out object export2));
Assert.Equal(10, export2);
Assert.Equal(null, export2);
}
else
{
@@ -73,9 +72,8 @@ namespace System.Composition.Tests
Assert.False(context.TryGetExport(contractName, out int export1));
Assert.Equal(0, export1);
// Failure leaks through.
Assert.False(context.TryGetExport(typeof(int), contractName, out object export2));
Assert.Equal(10, export2);
Assert.Equal(null, export2);
}
}
}