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

Imported Upstream version 5.4.0.167

Browse Source 
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
external/corefx/src/System.Configuration.ConfigurationManager/dir.props vendored
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<AssemblyVersion>4.0.1.0</AssemblyVersion>
<AssemblyKey>Open</AssemblyKey>
</PropertyGroup>
</Project>
</Project>

1
external/corefx/src/System.Configuration.ConfigurationManager/pkg/System.Configuration.ConfigurationManager.pkgproj vendored
View File

@@ -6,7 +6,6 @@
<SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Configuration.ConfigurationManager.csproj" />
<InboxOnTargetFramework Include="net461" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>

1
external/corefx/src/System.Configuration.ConfigurationManager/ref/Configurations.props vendored
View File

@@ -3,6 +3,7 @@
<PropertyGroup>
<BuildConfigurations>
netstandard;
netfx;
</BuildConfigurations>
</PropertyGroup>
</Project>

12
external/corefx/src/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj vendored
View File

@@ -4,13 +4,23 @@
<PropertyGroup>
<ProjectGuid>{FD6AA2B9-56DB-4BCC-85E0-7727506562B0}</ProjectGuid>
<!-- UAP10.1 is not yet mapped to netstandard2.0, manually duplicate this ref -->
<PackageTargetFramework>netstandard2.0;uap10.1</PackageTargetFramework>
<PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;uap10.1</PackageTargetFramework>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<SuppressPackageTargetFrameworkCompatibility Include="uap10.1" />
<Compile Include="System.Configuration.cs" />
</ItemGroup>
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'">
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>

3
external/corefx/src/System.Configuration.ConfigurationManager/src/ApiCompatBaseline.netfx.txt vendored Normal file
View File

@@ -0,0 +1,3 @@
Compat issues with assembly System.Configuration.ConfigurationManager:
InterfacesShouldHaveSameMembers : Implementation interface member 'System.Configuration.Internal.IInternalConfigHost.GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord, System.Security.PermissionSet, System.Boolean)' is not in the contract.
Total Issues: 1

1
external/corefx/src/System.Configuration.ConfigurationManager/src/Configurations.props vendored
View File

@@ -3,6 +3,7 @@
<PropertyGroup>
<BuildConfigurations>
netstandard;
netfx;
</BuildConfigurations>
</PropertyGroup>
</Project>

10
external/corefx/src/System.Configuration.ConfigurationManager/src/Resources/System.Configuration.ConfigurationManager.rd.xml vendored Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
<Library Name="*System.Configuration.ConfigurationManager*">
<Assembly Name="System.Configuration.ConfigurationManager">
<!--Both types are instantiated using CreateInstance from TypeUtil.CreateInstance -->
<Type Name="System.Configuration.ClientConfigurationHost" Dynamic="Required All" />
<Type Name="System.Configuration.ProtectedConfigurationSection" Dynamic="Required All" />
</Assembly>
</Library>
</Directives>

26
external/corefx/src/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj vendored
View File

@@ -1,13 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<ProjectGuid>{B7697463-7C98-4462-BA09-67B7BF3842B6}</ProjectGuid>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly>
<BlockReflectionAttribute>false</BlockReflectionAttribute>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<!-- Default configurations to help VS understand the options -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" />
<ItemGroup>
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
<Compile Include="System\Configuration\DictionarySectionHandler.cs" />
<Compile Include="System\Configuration\DpapiProtectedConfigurationProvider.cs" />
<Compile Include="System\Configuration\IConfigurationSystem.cs" />
@@ -251,8 +255,18 @@
<Link>Common\System\IO\TempFileCollection.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
<Reference Include="System.Security.Cryptography.ProtectedData" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" />
</ItemGroup>
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'">
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Configuration" />
<Reference Include="System.Xml" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
</Project>

10
external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ClientConfigPaths.cs vendored
View File

@@ -60,7 +60,9 @@ namespace System.Configuration
// used for local paths and "file://" for UNCs. Simply removing the prefix will make
// local paths relative on Unix (e.g. "file:///home" will become "home" instead of
// "/home").
Uri uri = new Uri(exeAssembly.CodeBase);
string configBasePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, exeAssembly.ManifestModule.Name);
Uri uri = new Uri(configBasePath);
if (uri.IsFile)
{
ApplicationUri = uri.LocalPath;
@@ -68,7 +70,7 @@ namespace System.Configuration
}
else
{
ApplicationUri = exeAssembly.EscapedCodeBase;
ApplicationUri = Uri.EscapeDataString(configBasePath);
}
}
@@ -201,7 +203,7 @@ namespace System.Configuration
if (assembly != null)
{
AssemblyName assemblyName = assembly.GetName();
Uri codeBase = new Uri(assembly.CodeBase);
Uri codeBase = new Uri(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, assembly.ManifestModule.Name));
hash = IdentityHelper.GetNormalizedStrongNameHash(assemblyName);
if (hash != null)
@@ -329,4 +331,4 @@ namespace System.Configuration
return validated;
}
}
}
}

2
external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ClientConfigurationHost.cs vendored
View File

@@ -46,7 +46,7 @@ namespace System.Configuration
{
if (s_machineConfigFilePath == null)
{
string directory = RuntimeEnvironment.GetRuntimeDirectory();
string directory = AppDomain.CurrentDomain.BaseDirectory;
s_machineConfigFilePath = Path.Combine(Path.Combine(directory, MachineConfigSubdirectory),
MachineConfigFilename);
}

60
external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationErrorsException.cs vendored
View File

@@ -104,37 +104,7 @@ namespace System.Configuration
protected ConfigurationErrorsException(SerializationInfo info, StreamingContext context) :
base(info, context)
{
int firstLine;
int count;
// Retrieve out members
string firstFilename = info.GetString(SerializationParamFilename);
firstLine = info.GetInt32(SerializationParamLine);
Init(firstFilename, firstLine);
// Retrieve errors for _errors object
count = info.GetInt32(SerializationParamErrorCount);
if (count == 0) return;
_errors = new ConfigurationException[count];
for (int i = 0; i < count; i++)
{
string numPrefix = i.ToString(CultureInfo.InvariantCulture);
string currentType = info.GetString(numPrefix + SerializationParamErrorType);
Type currentExceptionType = Type.GetType(currentType, true);
// Only allow our exception types
if ((currentExceptionType != typeof(ConfigurationException)) &&
(currentExceptionType != typeof(ConfigurationErrorsException)))
throw ExceptionUtil.UnexpectedError("ConfigurationErrorsException");
_errors[i] = (ConfigurationException)
info.GetValue(numPrefix + SerializationParamErrorData,
currentExceptionType);
}
throw new PlatformNotSupportedException();
}
// The message includes the file/line number information.
@@ -197,35 +167,7 @@ namespace System.Configuration
public override void GetObjectData(SerializationInfo info, StreamingContext context)
{
int subErrors = 0;
// call base implementation
base.GetObjectData(info, context);
// Serialize our members
info.AddValue(SerializationParamFilename, Filename);
info.AddValue(SerializationParamLine, Line);
// Serialize rest of errors, along with count
// (since first error duplicates this error, only worry if
// there is more than one)
if ((_errors != null) &&
(_errors.Length > 1))
{
subErrors = _errors.Length;
for (int i = 0; i < _errors.Length; i++)
{
string numPrefix = i.ToString(CultureInfo.InvariantCulture);
info.AddValue(numPrefix + SerializationParamErrorData,
_errors[i]);
info.AddValue(numPrefix + SerializationParamErrorType,
_errors[i].GetType());
}
}
info.AddValue(SerializationParamErrorCount, subErrors);
}
// Get file and linenumber from an XML Node in a DOM

4
external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationException.cs vendored
View File

@@ -26,7 +26,7 @@ namespace System.Configuration
protected ConfigurationException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
Init(info.GetString("filename"), info.GetInt32("line"));
throw new PlatformNotSupportedException();
}
[Obsolete("This class is obsolete, to create a new exception create a System.Configuration!System.Configuration.ConfigurationErrorsException")]
@@ -93,8 +93,6 @@ namespace System.Configuration
public override void GetObjectData(SerializationInfo info, StreamingContext context)
{
base.GetObjectData(info, context);
info.AddValue("filename", _filename);
info.AddValue("line", _line);
}
[Obsolete("This class is obsolete, use System.Configuration!System.Configuration.ConfigurationErrorsException.GetFilename instead")]

1
external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSectionCollection.cs vendored
View File

@@ -31,6 +31,7 @@ namespace System.Configuration
private ConfigurationSectionCollection(SerializationInfo serializationInfo, StreamingContext streamingContext)
: base(serializationInfo, streamingContext)
{
throw new PlatformNotSupportedException();
}
public ConfigurationSection this[string name] => Get(name);

7
external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSectionGroupCollection.cs vendored
View File

@@ -28,11 +28,6 @@ namespace System.Configuration
}
}
private ConfigurationSectionGroupCollection(SerializationInfo serializationInfo, StreamingContext streamingContext)
: base(serializationInfo, streamingContext)
{
}
// Indexer via name
public ConfigurationSectionGroup this[string name] => Get(name);
@@ -141,4 +136,4 @@ namespace System.Configuration
Remove(GetKey(index));
}
}
}
}

7
external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/PropertyInformationCollection.cs vendored
View File

@@ -20,11 +20,6 @@ namespace System.Configuration
IsReadOnly = true;
}
private PropertyInformationCollection(SerializationInfo serializationInfo, StreamingContext streamingContext)
: base(serializationInfo, streamingContext)
{
}
public PropertyInformation this[string propertyName]
{
get
@@ -62,4 +57,4 @@ namespace System.Configuration
for (int i = 0; i < c; i++) yield return this[i];
}
}
}
}

2
external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/ProtectedConfigurationSection.cs vendored
View File

@@ -34,6 +34,8 @@ namespace System.Configuration
s_properties = new ConfigurationPropertyCollection { s_propProviders, s_propDefaultProvider };
}
public ProtectedConfigurationSection(){}
protected internal override ConfigurationPropertyCollection Properties => s_properties;
private ProtectedProviderSettings ProtectedProviders => (ProtectedProviderSettings)base[s_propProviders];

4
external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/Provider/ProviderException.cs vendored
View File

@@ -21,6 +21,8 @@ namespace System.Configuration.Provider
protected ProviderException(SerializationInfo info, StreamingContext context)
: base(info, context)
{ }
{
throw new PlatformNotSupportedException();
}
}
}

1
external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/SettingsAttributeDictionary.cs vendored
View File

@@ -17,6 +17,7 @@ namespace System.Configuration
protected SettingsAttributeDictionary(SerializationInfo serializationInfo, StreamingContext streamingContext)
: base(serializationInfo, streamingContext)
{
throw new PlatformNotSupportedException();
}
}
}

1
external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/SettingsContext.cs vendored
View File

@@ -15,6 +15,7 @@ namespace System.Configuration
protected SettingsContext(SerializationInfo serializationInfo, StreamingContext streamingContext)
: base(serializationInfo, streamingContext)
{
throw new PlatformNotSupportedException();
}
}
}

1
external/corefx/src/System.Configuration.ConfigurationManager/src/System/Configuration/SettingsPropertyIsReadOnlyException.cs vendored
View File

@@ -22,6 +22,7 @@ namespace System.Configuration
protected SettingsPropertyIsReadOnlyException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
throw new PlatformNotSupportedException();
}
public SettingsPropertyIsReadOnlyException()

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