Migrate all the .csproj files to SDK format

- Created convertToSDK script in Build folder
- Updated mkall.targets RestoreNuGet to use dotnet restore
- Update mkall.targets to use dotnet restore instead of old NuGet restore
- Update build scripts to use RestorePackages target

Author: jasonleenaylor

Build/FieldWorks.proj

@@ -36,5 +36,4 @@
   <Import Project="Installer.targets" Condition="'$(OS)'=='Windows_NT'"/>
   <Import Project="LocalLibrary.targets"/>
   <Import Project="Localize.targets"/>
-  <Import Project="NuGet.targets"/>
 </Project>

Build/NuGet.targets

@@ -24,12 +24,26 @@ public override bool Execute()
 		{
 			try
 			{
+				Log.LogMessage(MessageImportance.Normal, "Starting GenerateFwTargets task...");
 				var gen = new CollectTargets(Log, ToolsVersion);
 				gen.Generate();
+				Log.LogMessage(MessageImportance.Normal, "GenerateFwTargets task completed successfully.");
 				return true;
 			}
-			catch (CollectTargets.StopTaskException)
+			catch (CollectTargets.StopTaskException ex)
 			{
+				Log.LogError("GenerateFwTargets task failed.");
+				if (ex.InnerException != null)
+				{
+					Log.LogError("Inner exception: {0}", ex.InnerException.Message);
+					Log.LogError("Stack trace: {0}", ex.InnerException.StackTrace);
+				}
+				return false;
+			}
+			catch (Exception ex)
+			{
+				Log.LogError("GenerateFwTargets task failed with unexpected exception: {0}", ex.Message);
+				Log.LogError("Stack trace: {0}", ex.StackTrace);
 				return false;
 			}
 		}
@@ -82,16 +96,22 @@ public CollectTargets(TaskLoggingHelper log, string toolsVersion)
 		/// </summary>
 		public void Generate()
 		{
+			Log.LogMessage(MessageImportance.Normal, "Collecting project information from Src directory...");
 			var infoSrc = new DirectoryInfo(Path.Combine(m_fwroot, "Src"));
 			CollectInfo(infoSrc);
+
 			// These projects from Lib had nant targets.  They really should be under Src.
+			Log.LogMessage(MessageImportance.Normal, "Collecting project information from Lib directories...");
 			var infoEth = new DirectoryInfo(Path.Combine(m_fwroot, "Lib/src/Ethnologue"));
 			CollectInfo(infoEth);
 			var infoScr2 = new DirectoryInfo(Path.Combine(m_fwroot, "Lib/src/ScrChecks"));
 			CollectInfo(infoScr2);
 			var infoObj = new DirectoryInfo(Path.Combine(m_fwroot, "Lib/src/ObjectBrowser"));
 			CollectInfo(infoObj);
+
+			Log.LogMessage(MessageImportance.Normal, "Found {0} projects. Writing target files...", m_mapProjFile.Count);
 			WriteTargetFiles();
+			Log.LogMessage(MessageImportance.Normal, "Target file generation completed.");
 		}
 
 		/// <summary>
@@ -100,11 +120,20 @@ public void Generate()
 		private void CollectInfo(DirectoryInfo dirInfo)
 		{
 			if (dirInfo == null || !dirInfo.Exists)
+			{
+				Log.LogMessage(MessageImportance.Low, "Directory does not exist: {0}", dirInfo?.FullName ?? "null");
 				return;
+			}
+
+			Log.LogMessage(MessageImportance.Low, "Scanning directory: {0}", dirInfo.FullName);
+
 			foreach (var fi in dirInfo.GetFiles())
 			{
 				if (fi.Name.EndsWith(".csproj") && fi.Exists)
+				{
+					Log.LogMessage(MessageImportance.Low, "Processing project file: {0}", fi.FullName);
 					ProcessCsProjFile(fi.FullName);
+				}
 			}
 			foreach (var diSub in dirInfo.GetDirectories())
 				CollectInfo(diSub);
@@ -165,7 +194,7 @@ private void ProcessCsProjFile(string filename)
 							// here: we use the same .csproj file on both Windows and Linux
 							// and so it contains backslashes in the name which is a valid
 							// character on Linux.
-							var i0 = projectName.LastIndexOfAny(new[] {'\\', '/'});
+							var i0 = projectName.LastIndexOfAny(new[] { '\\', '/' });
 							if (i0 >= 0)
 								projectName = projectName.Substring(i0 + 1);
 							projectName = projectName.Replace(".csproj", "");
@@ -212,14 +241,62 @@ private string AssemblyName
 		{
 			get
 			{
-				var name = m_csprojFile.SelectSingleNode("/c:Project/c:PropertyGroup/c:AssemblyName",
-					m_namespaceMgr);
-				var type = m_csprojFile.SelectSingleNode("/c:Project/c:PropertyGroup/c:OutputType",
-					m_namespaceMgr);
+				// Try SDK-style project first (no namespace)
+				var name = m_csprojFile.SelectSingleNode("/Project/PropertyGroup/AssemblyName");
+				var type = m_csprojFile.SelectSingleNode("/Project/PropertyGroup/OutputType");
+
+				// If not found, try old-style project with namespace
+				if (name == null)
+				{
+					name = m_csprojFile.SelectSingleNode("/c:Project/c:PropertyGroup/c:AssemblyName", m_namespaceMgr);
+					type = m_csprojFile.SelectSingleNode("/c:Project/c:PropertyGroup/c:OutputType", m_namespaceMgr);
+				}
+
+				// Default extension is .dll (for Library output type or when OutputType is not specified)
 				string extension = ".dll";
-				if (type.InnerText == "WinExe" || type.InnerText == "Exe")
+				if (type != null && (type.InnerText == "WinExe" || type.InnerText == "Exe"))
 					extension = ".exe";
-				return name.InnerText + extension;
+
+				if (name != null)
+					return name.InnerText + extension;
+
+				// If AssemblyName is not found, this shouldn't happen but return a safe default
+				Log.LogWarning("AssemblyName not found in project file, using default");
+				return "Unknown" + extension;
+			}
+		}
+
+		/// <summary>
+		/// Gets the assembly name for a specific project by name.
+		/// </summary>
+		/// <param name="projectName">The name of the project</param>
+		/// <returns>The assembly name with extension</returns>
+		private string GetAssemblyNameForProject(string projectName)
+		{
+			if (!m_mapProjFile.ContainsKey(projectName))
+			{
+				Log.LogWarning($"Project {projectName} not found in project map");
+				return projectName + ".dll";
+			}
+
+			var projectPath = m_mapProjFile[projectName];
+			var savedCsprojFile = m_csprojFile;
+
+			try
+			{
+				// Load the specific project file
+				LoadProjectFile(projectPath);
+				return AssemblyName;
+			}
+			catch (Exception ex)
+			{
+				Log.LogWarning($"Failed to load project file {projectPath}: {ex.Message}");
+				return projectName + ".dll";
+			}
+			finally
+			{
+				// Restore the original project file
+				m_csprojFile = savedCsprojFile;
 			}
 		}
 
@@ -230,12 +307,33 @@ private XmlNodeList ConfigNodes
 		{
 			get
 			{
+				// Try SDK-style first (no namespace)
+				var nodes = m_csprojFile.SelectNodes("//PropertyGroup[DefineConstants]");
+				if (nodes.Count > 0)
+					return nodes;
+
+				// Fall back to legacy format with namespace
 				return m_csprojFile.SelectNodes("/c:Project/c:PropertyGroup[c:DefineConstants]",
 					m_namespaceMgr);
 			}
 		}
 
-		private string GetProjectSubDir(string project)
+		/// <summary>
+		/// Get DefineConstants value from a PropertyGroup node
+		/// </summary>
+		private string GetDefineConstants(XmlNode node)
+		{
+			// Try SDK-style first (no namespace)
+			var defineConstantsElement = node.SelectSingleNode("DefineConstants");
+			if (defineConstantsElement != null)
+				return defineConstantsElement.InnerText;
+
+			// Fall back to legacy format with namespace
+			var legacyElement = node.SelectSingleNode("c:DefineConstants", m_namespaceMgr);
+			return legacyElement?.InnerText ?? "";
+		}
+
+		public string GetProjectSubDir(string project)
 		{
 			var projectSubDir = Path.GetDirectoryName(m_mapProjFile[project]);
 			projectSubDir = projectSubDir.Substring(m_fwroot.Length);
@@ -275,6 +373,7 @@ private static bool IsMono
 		private void WriteTargetFiles()
 		{
 			var targetsFile = Path.Combine(m_fwroot, "Build/FieldWorks.targets");
+			string currentProject = null;
 			try
 			{
 				// Write all the C# targets and their dependencies.
@@ -289,6 +388,7 @@ private void WriteTargetFiles()
 					writer.WriteLine();
 					foreach (var project in m_mapProjFile.Keys)
 					{
+						currentProject = project;
 						LoadProjectFile(m_mapProjFile[project]);
 
 						var isTestProject = project.EndsWith("Tests") || project == "TestManager";
@@ -300,22 +400,26 @@ private void WriteTargetFiles()
 						var configs = new Dictionary<string, string>();
 						foreach (XmlNode node in ConfigNodes)
 						{
-							var condition = node.Attributes["Condition"].InnerText;
+							var condition = node.Attributes["Condition"]?.InnerText;
+							if (condition == null)
+							{
+								continue;
+							}
 							var tmp = condition.Substring(condition.IndexOf("==") + 2).Trim().Trim('\'');
 							var configuration = tmp.Substring(0, tmp.IndexOf("|"));
 
 							// Add configuration only once even if same configuration is contained
 							// for multiple platforms, e.g. for AnyCpu and x64.
 							if (configs.ContainsKey(configuration))
 							{
-								if (configs[configuration] != node.SelectSingleNode("c:DefineConstants", m_namespaceMgr).InnerText.Replace(";", " "))
+								if (configs[configuration] != GetDefineConstants(node).Replace(";", " "))
 								{
 									Log.LogError("Configuration {0} for project {1} is defined several times " +
 										"but contains differing values for DefineConstants.", configuration, project);
 								}
 								continue;
 							}
-							configs.Add(configuration, node.SelectSingleNode("c:DefineConstants", m_namespaceMgr).InnerText.Replace(";", " "));
+							configs.Add(configuration, GetDefineConstants(node).Replace(";", " "));
 
 							writer.WriteLine("\t\t<When Condition=\" '$(config-capital)' == '{0}' \">", configuration);
 							writer.WriteLine("\t\t\t<PropertyGroup>");
@@ -328,7 +432,7 @@ private void WriteTargetFiles()
 								otherwiseBldr.AppendLine("\t\t<Otherwise>");
 								otherwiseBldr.AppendLine("\t\t\t<PropertyGroup>");
 								otherwiseBldr.AppendLine(string.Format("\t\t\t\t<{0}Defines>{1} CODE_ANALYSIS</{0}Defines>", project,
-									node.SelectSingleNode("c:DefineConstants", m_namespaceMgr).InnerText.Replace(";", " ")));
+									GetDefineConstants(node).Replace(";", " ")));
 								otherwiseBldr.AppendLine("\t\t\t</PropertyGroup>");
 								otherwiseBldr.AppendLine("\t\t</Otherwise>");
 								otherwiseAdded = true;
@@ -372,7 +476,7 @@ private void WriteTargetFiles()
 						writer.WriteLine("\t\t\tProperties=\"$(msbuild-props);IntermediateOutputPath=$(dir-fwobj){0}{1}{0};DefineConstants=$({2}Defines);$(warningsAsErrors);WarningLevel=4;LcmArtifactsDir=$(LcmArtifactsDir)\"/>",
 							Path.DirectorySeparatorChar, GetProjectSubDir(project), project);
 						// <Clouseau> verification task
-						writer.WriteLine($"\t\t<Clouseau Condition=\"'$(Configuration)' == 'Debug'\" AssemblyPathname=\"$(dir-outputBase)/{AssemblyName}\"/>");
+						writer.WriteLine($"\t\t<Clouseau Condition=\"'$(Configuration)' == 'Debug'\" AssemblyPathname=\"$(dir-outputBase)/{GetAssemblyNameForProject(project)}\"/>");
 
 						if (isTestProject)
 						{
@@ -396,7 +500,7 @@ private void WriteTargetFiles()
 							writer.WriteLine($"\t\t<Message Text=\"Finished building {project}.\" Condition=\"'$(action)'!='test'\"/>");
 							writer.WriteLine($"\t\t<Message Text=\"Finished building {project} and running tests.\" Condition=\"'$(action)'=='test'\"/>");
 							// Generate dotCover task
-							GenerateDotCoverTask(writer, new[] {project}, $"{project}.coverage.xml");
+							GenerateDotCoverTask(writer, new[] { project }, $"{project}.coverage.xml");
 						}
 						else
 						{
@@ -448,12 +552,56 @@ private void WriteTargetFiles()
 					writer.Close();
 				}
 				Console.WriteLine("Created {0}", targetsFile);
+
+				// Always output the generated file content for debugging
+				if (File.Exists(targetsFile))
+				{
+					Log.LogMessage(MessageImportance.High, "Generated targets file content:");
+					try
+					{
+						var content = File.ReadAllText(targetsFile);
+						Log.LogMessage(MessageImportance.High, content);
+					}
+					catch (Exception readEx)
+					{
+						Log.LogError("Failed to read targets file for debugging: {0}", readEx.Message);
+					}
+				}
 			}
 			catch (Exception e)
 			{
+				Log.LogError("Error occurred while writing target file {0}: {1}", currentProject, e.Message);
+				Log.LogError("Stack trace: {0}", e.StackTrace);
+
+				// Output the generated file content for debugging
+				if (File.Exists(targetsFile))
+				{
+					Log.LogError("Generated targets file content:");
+					try
+					{
+						var content = File.ReadAllText(targetsFile);
+						Log.LogError(content);
+					}
+					catch (Exception readEx)
+					{
+						Log.LogError("Failed to read targets file for debugging: {0}", readEx.Message);
+					}
+				}
+
 				var badFile = targetsFile + ".bad";
-				File.Move(targetsFile, badFile);
-				Console.WriteLine("Failed to Create FieldWorks.targets bad result stored in {0}", badFile);
+				try
+				{
+					if (File.Exists(badFile))
+						File.Delete(badFile);
+					File.Move(targetsFile, badFile);
+					Log.LogMessage(MessageImportance.High, "Failed to create FieldWorks.targets, bad result stored in {0}", badFile);
+					Console.WriteLine("Failed to Create FieldWorks.targets bad result stored in {0}", badFile);
+				}
+				catch (Exception moveEx)
+				{
+					Log.LogError("Failed to move bad targets file: {0}", moveEx.Message);
+				}
+
 				throw new StopTaskException(e);
 			}
 		}
@@ -494,7 +642,7 @@ int TimeoutForProject(string project)
 					}
 				}
 			}
-			return (m_timeoutMap.ContainsKey(project) ? m_timeoutMap[project] : m_timeoutMap["default"])*1000;
+			return (m_timeoutMap.ContainsKey(project) ? m_timeoutMap[project] : m_timeoutMap["default"]) * 1000;
 		}
 	}
 }