Merge pull request #3 from xamarin/net6

Allow building with .NET 6
xamarin · Dec 17, 2021 · 074fabe · 074fabe
2 parents 495405a + fb5f153
commit 074fabe
Show file tree

Hide file tree

Showing 12 changed files with 765 additions and 51 deletions.
diff --git a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
diff --git a/ICSharpCode.NRefactory.CSharp/OutputVisitor/CodeDomConvertVisitor.cs b/ICSharpCode.NRefactory.CSharp/OutputVisitor/CodeDomConvertVisitor.cs
@@ -16,6 +16,8 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+#if !NET6_0
+
 using System;
 using System.CodeDom;
 using System.Collections.Generic;
@@ -1427,3 +1429,5 @@ CodeObject IAstVisitor<CodeObject>.VisitDocumentationReference(DocumentationRefe
 		}
 	}
 }
+
+#endif
diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/assembly.cs b/ICSharpCode.NRefactory.CSharp/Parser/mcs/assembly.cs
@@ -462,7 +462,11 @@ public virtual ModuleBuilder CreateModuleBuilder ()
 			// but returned ISymbolWriter does not have all what we need therefore some
 			// adaptor will be needed for now we alwayas emit MDB format when generating
 			// debug info
+#if NET6_0
+			return Builder.DefineDynamicModule(module_name);
+#else
 			return Builder.DefineDynamicModule (module_name, module_name, false);
+#endif
 		}
 
 		public virtual void Emit ()
@@ -787,11 +791,13 @@ public void EmbedResources ()
 			//
 			// Add Win32 resources
 			//
+#if !NET6_0
 			if (Compiler.Settings.Win32ResourceFile != null) {
 				Builder.DefineUnmanagedResource (Compiler.Settings.Win32ResourceFile);
 			} else {
 				Builder.DefineVersionInfoResource (vi_product, vi_product_version, vi_company, vi_copyright, vi_trademark);
 			}
+#endif
 
 			if (Compiler.Settings.Win32IconFile != null) {
 				builder_extra.DefineWin32IconResource (Compiler.Settings.Win32IconFile);
@@ -819,9 +825,13 @@ public void EmbedResources ()
 								stream = new MemoryStream (File.ReadAllBytes (res.FileName));
 							}
 
+#if !NET6_0
 							module.Builder.DefineManifestResource (res.Name, stream, res.Attributes);
+#endif
 						} else {
+#if !NET6_0
 							Builder.AddResourceFile (res.Name, Path.GetFileName (res.FileName), res.Attributes);
+#endif
 						}
 					}
 				}
@@ -871,7 +881,11 @@ public void Save ()
 				if (Compiler.Settings.Target == Target.Module) {
 					SaveModule (pekind, machine);
 				} else {
+#if NET6_0
+					throw new NotSupportedException();
+#else
 					Builder.Save (module.Builder.ScopeName, pekind, machine);
+#endif
 				}
 			} catch (Exception e) {
 				Report.Error (16, "Could not write to file `" + name + "', cause: " + e.Message);
@@ -964,7 +978,9 @@ void SetEntryPoint ()
 				return;
 			}
 
+#if !NET6_0
 			Builder.SetEntryPoint (entry_point.MethodBuilder, file_kind);
+#endif
 		}
 
 		void Error_ObsoleteSecurityAttribute (Attribute a, string option)
@@ -1043,14 +1059,14 @@ public AssemblyResource (string fileName, string name, bool isPrivate)
 		public string FileName { get; private set; }
 		public bool IsEmbeded { get; set; }
 
-		#region IEquatable<AssemblyResource> Members
+#region IEquatable<AssemblyResource> Members
 
 		public bool Equals (AssemblyResource other)
 		{
 			return Name == other.Name;
 		}
 
-		#endregion
+#endregion
 	}
 
 	//
@@ -1258,4 +1274,16 @@ protected void LoadReferencesCore (ModuleContainer module, out T corlib_assembly
 			compiler.TimeReporter.Stop (TimeReporter.TimerType.ReferencesLoading);
 		}
 	}
-}
+
+#if NET6_0
+
+	enum PEFileKinds
+	{
+		Dll = 1,
+		ConsoleApplication = 2,
+		WindowApplication = 3
+	}
+
+#endif
+
+	}
diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/class.cs b/ICSharpCode.NRefactory.CSharp/Parser/mcs/class.cs
@@ -2766,7 +2766,7 @@ public override void Emit ()
 				foreach (var de in declarative_security) {
 #if STATIC
 					TypeBuilder.__AddDeclarativeSecurity (de);
-#else
+#elif !NET6_0
 					TypeBuilder.AddDeclarativeSecurity (de.Key, de.Value);
 #endif
 				}

diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/driver.cs b/ICSharpCode.NRefactory.CSharp/Parser/mcs/driver.cs
@@ -357,8 +357,10 @@ public bool Compile ()
 			if (!ctx.BuiltinTypes.CheckDefinitions (module))
 				return false;
 
+#if !NET6_0
 			if (!assembly.Create (AppDomain.CurrentDomain, AssemblyBuilderAccess.Save))
 				return false;
+#endif
 
 			module.CreateContainer ();
 

diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/eval.cs b/ICSharpCode.NRefactory.CSharp/Parser/mcs/eval.cs
@@ -686,7 +686,11 @@ CompiledMethod CompileBlock (Class host, Undo undo, Report Report)
 			AssemblyBuilderAccess access;
 
 			if (Environment.GetEnvironmentVariable ("SAVE") != null) {
+#if NET6_0
+				access = AssemblyBuilderAccess.Run;
+#else
 				access = AssemblyBuilderAccess.RunAndSave;
+#endif
 				assembly = new AssemblyDefinitionDynamic (module, current_debug_name, current_debug_name);
 				assembly.Importer = importer;
 			} else {
@@ -786,8 +790,10 @@ CompiledMethod CompileBlock (Class host, Undo undo, Report Report)
 			if (host != null)
 				host.CloseContainer ();
 
+#if !NET6_0
 			if (access == AssemblyBuilderAccess.RunAndSave)
 				assembly.Save ();
+#endif
 
 			if (host == null)
 				return null;

diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/method.cs b/ICSharpCode.NRefactory.CSharp/Parser/mcs/method.cs
@@ -711,7 +711,7 @@ public override void Emit ()
 				foreach (var de in declarative_security) {
 #if STATIC
 					MethodBuilder.__AddDeclarativeSecurity (de);
-#else
+#elif !NET6_0
 					MethodBuilder.AddDeclarativeSecurity (de.Key, de.Value);
 #endif
 				}
@@ -1801,7 +1801,7 @@ public override void Emit ()
 				foreach (var de in declarative_security) {
 #if STATIC
 					ConstructorBuilder.__AddDeclarativeSecurity (de);
-#else
+#elif !NET6_0
 					ConstructorBuilder.AddDeclarativeSecurity (de.Key, de.Value);
 #endif
 				}
@@ -1861,6 +1861,7 @@ public override void WriteDebugSymbol (MonoSymbolFile file)
 			if (debug_builder == null)
 				return;
 
+#if !NET6_0
 			var token = ConstructorBuilder.GetToken ();
 			int t = token.Token;
 #if STATIC
@@ -1869,9 +1870,10 @@ public override void WriteDebugSymbol (MonoSymbolFile file)
 #endif
 
 			debug_builder.DefineMethod (file, t);
+#endif
 		}
 
-		#region IMethodData Members
+#region IMethodData Members
 
 		public MemberName MethodName {
 			get {
@@ -1890,7 +1892,7 @@ EmitContext IMethodData.CreateEmitContext (ILGenerator ig, SourceMethodBuilder s
 			throw new NotImplementedException ();
 		}
 
-		#endregion
+#endregion
 	}
 
 	/// <summary>
@@ -2191,6 +2193,7 @@ public void WriteDebugSymbol (MonoSymbolFile file)
 			if (debug_builder == null)
 				return;
 
+#if !NET6_0
 			var token = builder.GetToken ();
 			int t = token.Token;
 #if STATIC
@@ -2199,6 +2202,7 @@ public void WriteDebugSymbol (MonoSymbolFile file)
 #endif
 
 			debug_builder.DefineMethod (file, t);
+#endif
 		}
 	}
 
@@ -2337,7 +2341,7 @@ public void UpdateName (InterfaceMemberBase member)
 			SetMemberName (SetupName (prefix, member, Location));
 		}
 
-		#region IMethodData Members
+#region IMethodData Members
 
 		public ToplevelBlock Block {
 			get {
@@ -2387,7 +2391,7 @@ MethodBase IMethodDefinition.Metadata {
 		public abstract ParametersCompiled ParameterInfo { get ; }
 		public abstract TypeSpec ReturnType { get; }
 
-		#endregion
+#endregion
 
 		public override void ApplyAttributeBuilder (Attribute a, MethodSpec ctor, byte[] cdata, PredefinedAttributes pa)
 		{
@@ -2454,7 +2458,7 @@ public virtual void Emit (TypeDefinition parent)
 				foreach (var de in declarative_security) {
 #if STATIC
 					method_data.MethodBuilder.__AddDeclarativeSecurity (de);
-#else
+#elif !NET6_0
 					method_data.MethodBuilder.AddDeclarativeSecurity (de.Key, de.Value);
 #endif
 				}

diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/reflection.cs b/ICSharpCode.NRefactory.CSharp/Parser/mcs/reflection.cs
@@ -209,17 +209,21 @@ public Module IncludeModule (string moduleFile)
 		public override ModuleBuilder CreateModuleBuilder ()
 		{
 			if (file_name == null)
+#if NET6_0
+				return Builder.DefineDynamicModule(Name);
+#else
 				return Builder.DefineDynamicModule (Name, false);
+#endif
 
 			return base.CreateModuleBuilder ();
 		}
 #endif
-		//
-		// Initializes the code generator
-		//
+				//
+				// Initializes the code generator
+				//
 		public bool Create (AppDomain domain, AssemblyBuilderAccess access)
 		{
-#if STATIC || FULL_AOT_RUNTIME
+#if STATIC || FULL_AOT_RUNTIME || NETCOREAPP
 			throw new NotSupportedException ();
 #else
 			ResolveAssemblySecurityAttributes ();
@@ -261,10 +265,12 @@ protected override void SaveModule (PortableExecutableKinds pekind, ImageFileMac
 				base.SaveModule (pekind, machine);
 			}
 
+#if !NETCOREAPP
 			Builder.Save (file_name, pekind, machine);
+#endif
 		}
 #endif
-	}
+		}
 
 	//
 	// Extension to System.Reflection.Emit.AssemblyBuilder to have fully compatible

diff --git a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
@@ -182,7 +182,7 @@ public IUnresolvedAssembly LoadModule(ModuleDefinition moduleDefinition)
 			moduleAttributes = interningProvider.InternList(moduleAttributes);
 
 			this.currentAssembly = new CecilUnresolvedAssembly(assemblyDefinition != null ? assemblyDefinition.Name.FullName : moduleDefinition.Name, this.DocumentationProvider);
-			currentAssembly.Location = moduleDefinition.FullyQualifiedName;
+			currentAssembly.Location = moduleDefinition.FileName;
 			currentAssembly.AssemblyAttributes.AddRange(assemblyAttributes);
 			currentAssembly.ModuleAttributes.AddRange(assemblyAttributes);
 

diff --git a/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj b/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -18,7 +18,12 @@
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DocumentationFile>$(IntermediateOutputPath)ICSharpCode.NRefactory.Cecil.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
-  </PropertyGroup>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
+    <EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
+    <TargetFramework>net472</TargetFramework>
+    <Configurations>Debug;Release;net_4_5_Debug;net_4_5_Release</Configurations>
+</PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>Full</DebugType>
@@ -27,7 +32,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>PdbOnly</DebugType>
@@ -36,7 +40,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -99,11 +102,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="CecilLoader.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
     </ProjectReference>
   </ItemGroup>
 </Project>