diff options
| author | Marek Safar <marek.safar@gmail.com> | 2018-01-23 14:02:31 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2018-01-23 14:04:57 +0300 |
| commit | 87364ac8d0e981d4ff2a576074381f1b3c04593e (patch) | |
| tree | 27f7a16586c33607fa58985e210f6d4e9f41536a /src/System.ComponentModel.TypeConverter | |
| parent | a91f66cda2e4b2beec97a8a6515898bdeac2aeb7 (diff) | |
| parent | 09b3cc02d85c5c963af50567cb89b6d67beebc49 (diff) | |
Merge remote-tracking branch 'upstream/release/2.1'
Diffstat (limited to 'src/System.ComponentModel.TypeConverter')
| -rw-r--r-- | src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.cs | 1 | ||||
| -rw-r--r-- | src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.cs b/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.cs index 4611ef0189..817c6c13fb 100644 --- a/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.cs +++ b/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.cs @@ -1440,6 +1440,7 @@ namespace System.ComponentModel.Design.Serialization [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct MemberRelationship { + private readonly object _dummy; public static readonly System.ComponentModel.Design.Serialization.MemberRelationship Empty; public MemberRelationship(object owner, System.ComponentModel.MemberDescriptor member) { throw null; } public bool IsEmpty { get { throw null; } } diff --git a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj index d97e5492c6..2d7b02cd61 100644 --- a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj +++ b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj @@ -259,7 +259,6 @@ <Reference Include="System.Collections.Specialized" /> <Reference Include="System.ComponentModel" /> <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Diagnostics.Contracts" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Diagnostics.Tools" /> <Reference Include="System.Diagnostics.TraceSource" /> @@ -282,4 +281,4 @@ <Reference Include="System.Threading.Timer" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> |