You've already forked linux-packaging-mono
Imported Upstream version 5.4.0.167
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
parent
e49d6f06c0
commit
536cd135cc
12
external/corefx/src/netfx.force.conflict/dir.props
vendored
Normal file
12
external/corefx/src/netfx.force.conflict/dir.props
vendored
Normal file
@@ -0,0 +1,12 @@
|
||||
<?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>
|
||||
<!-- this assembly is not versioned, it only contains type forwards and will never be referenced by another assembly -->
|
||||
<AssemblyVersion>0.0.0.0</AssemblyVersion>
|
||||
<AssemblyKey>Open</AssemblyKey>
|
||||
<!-- this assembly only appears in ref -->
|
||||
<IsNetFxNETStandard>false</IsNetFxNETStandard>
|
||||
<IsNetFxNETStandardRef>true</IsNetFxNETStandardRef>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
26
external/corefx/src/netfx.force.conflict/netfx.force.conflict.sln
vendored
Normal file
26
external/corefx/src/netfx.force.conflict/netfx.force.conflict.sln
vendored
Normal file
@@ -0,0 +1,26 @@
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.25420.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "netfx.force.conflicts", "ref\netfx.force.conflicts.csproj", "{85139F71-BF0C-4DC2-8306-53CE1D10E351}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{85139F71-BF0C-4DC2-8306-53CE1D10E351}.Debug|Any CPU.ActiveCfg = netfx-Debug|Any CPU
|
||||
{85139F71-BF0C-4DC2-8306-53CE1D10E351}.Debug|Any CPU.Build.0 = netfx-Debug|Any CPU
|
||||
{85139F71-BF0C-4DC2-8306-53CE1D10E351}.Release|Any CPU.ActiveCfg = netfx-Release|Any CPU
|
||||
{85139F71-BF0C-4DC2-8306-53CE1D10E351}.Release|Any CPU.Build.0 = netfx-Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{85139F71-BF0C-4DC2-8306-53CE1D10E351} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
8
external/corefx/src/netfx.force.conflict/ref/Configurations.props
vendored
Normal file
8
external/corefx/src/netfx.force.conflict/ref/Configurations.props
vendored
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<BuildConfigurations>
|
||||
netfx;
|
||||
</BuildConfigurations>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
117
external/corefx/src/netfx.force.conflict/ref/TypeForwards.cs
vendored
Normal file
117
external/corefx/src/netfx.force.conflict/ref/TypeForwards.cs
vendored
Normal file
@@ -0,0 +1,117 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System.Runtime.CompilerServices;
|
||||
// Microsoft.CSharp
|
||||
[assembly: TypeForwardedTo(typeof(Microsoft.CSharp.RuntimeBinder.Binder))]
|
||||
// Microsoft.VisualBasic
|
||||
[assembly: TypeForwardedTo(typeof(Microsoft.VisualBasic.Strings))]
|
||||
// System.Collections
|
||||
[assembly: TypeForwardedTo(typeof(System.Collections.Generic.List<>))]
|
||||
// System.Collections.Concurrent
|
||||
[assembly: TypeForwardedTo(typeof(System.Collections.Concurrent.ConcurrentDictionary<,>))]
|
||||
// System.ComponentModel
|
||||
[assembly: TypeForwardedTo(typeof(System.ComponentModel.CancelEventArgs))]
|
||||
// System.ComponentModel.Annotations
|
||||
[assembly: TypeForwardedTo(typeof(System.ComponentModel.DataAnnotations.ValidationResult))]
|
||||
// System.ComponentModel.EventBasedAsync
|
||||
[assembly: TypeForwardedTo(typeof(System.ComponentModel.AsyncCompletedEventArgs))]
|
||||
// System.Diagnostics.Contracts
|
||||
[assembly: TypeForwardedTo(typeof(System.Diagnostics.Contracts.Contract))]
|
||||
// System.Diagnostics.Debug
|
||||
[assembly: TypeForwardedTo(typeof(System.Diagnostics.Debug))]
|
||||
// System.Diagnostics.Tools
|
||||
[assembly: TypeForwardedTo(typeof(System.CodeDom.Compiler.GeneratedCodeAttribute))]
|
||||
// System.Diagnostics.Tracing
|
||||
[assembly: TypeForwardedTo(typeof(System.Diagnostics.Tracing.EventSource))]
|
||||
// System.Dynamic.Runtime
|
||||
[assembly: TypeForwardedTo(typeof(System.Dynamic.DynamicObject))]
|
||||
// System.Globalization
|
||||
[assembly: TypeForwardedTo(typeof(System.Globalization.CultureInfo))]
|
||||
// System.IO
|
||||
[assembly: TypeForwardedTo(typeof(System.IO.Stream))]
|
||||
// System.IO.Compression
|
||||
[assembly: TypeForwardedTo(typeof(System.IO.Compression.GZipStream))]
|
||||
// System.Linq
|
||||
[assembly: TypeForwardedTo(typeof(System.Linq.Enumerable))]
|
||||
// System.Linq.Expressions
|
||||
[assembly: TypeForwardedTo(typeof(System.Linq.Expressions.Expression))]
|
||||
// System.Linq.Parallel
|
||||
[assembly: TypeForwardedTo(typeof(System.Linq.ParallelEnumerable))]
|
||||
// System.Linq.Queryable
|
||||
[assembly: TypeForwardedTo(typeof(System.Linq.Queryable))]
|
||||
// System.Net.Http
|
||||
[assembly: TypeForwardedTo(typeof(System.Net.Http.HttpClient))]
|
||||
// System.Net.Http.Rtc
|
||||
// not supported on desktop
|
||||
// System.Net.NetworkInformation
|
||||
[assembly: TypeForwardedTo(typeof(System.Net.NetworkInformation.NetworkInterface))]
|
||||
// System.Net.Primitives
|
||||
[assembly: TypeForwardedTo(typeof(System.Net.HttpStatusCode))]
|
||||
// System.Net.Requests
|
||||
[assembly: TypeForwardedTo(typeof(System.Net.HttpWebRequest))]
|
||||
// System.ObjectModel
|
||||
[assembly: TypeForwardedTo(typeof(System.ComponentModel.INotifyPropertyChanged))]
|
||||
// System.Reflection
|
||||
[assembly: TypeForwardedTo(typeof(System.Reflection.MethodInfo))]
|
||||
// System.Reflection.Context
|
||||
[assembly: TypeForwardedTo(typeof(System.Reflection.Context.CustomReflectionContext))]
|
||||
// System.Reflection.Extensions
|
||||
[assembly: TypeForwardedTo(typeof(System.Reflection.InterfaceMapping))]
|
||||
// System.Reflection.Primitives
|
||||
[assembly: TypeForwardedTo(typeof(System.Reflection.TypeAttributes))]
|
||||
// System.Resources.ResourceManager
|
||||
[assembly: TypeForwardedTo(typeof(System.Resources.ResourceManager))]
|
||||
// System.Runtime
|
||||
[assembly: TypeForwardedTo(typeof(string))]
|
||||
// System.Runtime.Extensions
|
||||
[assembly: TypeForwardedTo(typeof(System.Environment))]
|
||||
// System.Runtime.InteropServices
|
||||
[assembly: TypeForwardedTo(typeof(System.Runtime.InteropServices.DllImportAttribute))]
|
||||
// System.Runtime.InteropServices.WindowsRuntime
|
||||
[assembly: TypeForwardedTo(typeof(System.Runtime.InteropServices.WindowsRuntime.ReadOnlyArrayAttribute))]
|
||||
// System.Runtime.Numerics
|
||||
[assembly: TypeForwardedTo(typeof(System.Numerics.BigInteger))]
|
||||
// System.Runtime.Serialization.Json
|
||||
[assembly: TypeForwardedTo(typeof(System.Runtime.Serialization.Json.DataContractJsonSerializer))]
|
||||
// System.Runtime.Serialization.Primitives
|
||||
[assembly: TypeForwardedTo(typeof(System.Runtime.Serialization.DataContractAttribute))]
|
||||
// System.Runtime.Serialization.Xml
|
||||
[assembly: TypeForwardedTo(typeof(System.Runtime.Serialization.DataContractSerializer))]
|
||||
// System.Runtime.WindowsRuntime
|
||||
// not supported on desktop
|
||||
// System.Runtime.WindowsRuntime.UI.Xaml
|
||||
// not supported on desktop
|
||||
// System.Security.Principal
|
||||
[assembly: TypeForwardedTo(typeof(System.Security.Principal.IPrincipal))]
|
||||
// System.ServiceModel.Duplex
|
||||
[assembly: TypeForwardedTo(typeof(System.ServiceModel.DuplexClientBase<>))]
|
||||
// System.ServiceModel.Http
|
||||
[assembly: TypeForwardedTo(typeof(System.ServiceModel.BasicHttpBinding))]
|
||||
// System.ServiceModel.NetTcp
|
||||
[assembly: TypeForwardedTo(typeof(System.ServiceModel.NetTcpBinding))]
|
||||
// System.ServiceModel.Primitives
|
||||
[assembly: TypeForwardedTo(typeof(System.ServiceModel.ClientBase<>))]
|
||||
// System.ServiceModel.Security
|
||||
[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.LocalClientSecuritySettings))]
|
||||
// System.Text.Encoding
|
||||
[assembly: TypeForwardedTo(typeof(System.Text.Encoding))]
|
||||
// System.Text.Encoding.Extensions
|
||||
[assembly: TypeForwardedTo(typeof(System.Text.UTF8Encoding))]
|
||||
// System.Text.RegularExpressions
|
||||
[assembly: TypeForwardedTo(typeof(System.Text.RegularExpressions.Regex))]
|
||||
// System.Threading
|
||||
[assembly: TypeForwardedTo(typeof(System.Threading.Mutex))]
|
||||
// System.Threading.Tasks
|
||||
[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.Task))]
|
||||
// System.Threading.Tasks.Parallel
|
||||
[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.Parallel))]
|
||||
// System.Threading.Timer
|
||||
[assembly: TypeForwardedTo(typeof(System.Threading.Timer))]
|
||||
// System.Xml.ReaderWriter
|
||||
[assembly: TypeForwardedTo(typeof(System.Xml.XmlReader))]
|
||||
// System.Xml.XDocument
|
||||
[assembly: TypeForwardedTo(typeof(System.Xml.Linq.XDocument))]
|
||||
// System.Xml.XmlSerializer
|
||||
[assembly: TypeForwardedTo(typeof(System.Xml.Serialization.XmlSerializer))]
|
||||
15
external/corefx/src/netfx.force.conflict/ref/netfx.force.conflicts.csproj
vendored
Normal file
15
external/corefx/src/netfx.force.conflict/ref/netfx.force.conflicts.csproj
vendored
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>{85139F71-BF0C-4DC2-8306-53CE1D10E351}</ProjectGuid>
|
||||
<AssemblyName>netfx.force.conflicts</AssemblyName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netfx-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netfx-Release|AnyCPU'" />
|
||||
<ItemGroup>
|
||||
<Compile Include="TypeForwards.cs" />
|
||||
<ProjectReference Include="..\..\..\external\netfx-conflicts\netfx-conflicts.depproj" />
|
||||
</ItemGroup>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
|
||||
</Project>
|
||||
Reference in New Issue
Block a user