Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

external/cecil/rocks/Mono.Cecil.Rocks.csproj

@@ -4,7 +4,6 @@
     <ProjectGuid>{FBC6DD59-D09D-499C-B03C-99C1C78FF2AC}</ProjectGuid>
     <RootNamespace>Mono.Cecil.Rocks</RootNamespace>
     <AssemblyName>Mono.Cecil.Rocks</AssemblyName>
-    <DefineConstants>$(DefineConstants);INSIDE_ROCKS</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\ProjectInfo.cs" />
@@ -17,5 +16,8 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="..\Mono.Cecil.props" />
-  <Import Project="$(MSBuildCSharpTargets)" />
+  <Import Project="$(MSBuildCSharpTargets)" Condition=" ! $(NetStandard) " />
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);INSIDE_ROCKS</DefineConstants>
+  </PropertyGroup>
 </Project>

external/cecil/rocks/Mono.Cecil.Rocks/DocCommentId.cs

@@ -111,7 +111,7 @@ namespace Mono.Cecil.Rocks {
 					id.Append (((GenericParameter) type).Position);
 					break;
 				case MetadataType.OptionalModifier:
-					WriteModiferTypeSignature ((RequiredModifierType) type, '!');
+					WriteModiferTypeSignature ((OptionalModifierType) type, '!');
 					break;
 				case MetadataType.RequiredModifier:
 					WriteModiferTypeSignature ((RequiredModifierType) type, '|');

external/cecil/rocks/Mono.Cecil.Rocks/SecurityDeclarationRocks.cs

@@ -8,6 +8,8 @@
 // Licensed under the MIT/X11 license.
 //
 
+#if !NET_CORE
+
 using System;
 using System.Security;
 using SSP = System.Security.Permissions;
@@ -150,3 +152,5 @@ namespace Mono.Cecil.Rocks {
 		}
 	}
 }
+
+#endif

external/cecil/rocks/Test/Mono.Cecil.Tests/TypeReferenceRocksTests.cs

@@ -1,3 +1,4 @@
+#if !READ_ONLY
 using System;
 
 using Mono.Cecil.Rocks;
@@ -121,4 +122,5 @@ namespace Mono.Cecil.Tests {
 			return ModuleDefinition.ReadModule (typeof (TypeReferenceRocksTests).Module.FullyQualifiedName).ImportReference (type);
 		}
 	}
-}
+}
+#endif