Improved Solution File Handling

Samples/IntegratedDependencies.Unity/MSBuild/settings.json

@@ -1 +1 @@
-{"autoGenerateEnabled":true}
+{"version":3,"autoGenerateEnabled":true,"dependenciesProjectGuid":"0d77ab82-d4eb-4034-ac54-4ca04d06906c","assemblyCSharpGuid":"4989d6c6-d8b3-4556-b4a9-06093ded68ad","assemblyCSharpEditorGuid":"0cd3f705-4fb4-4a60-8d09-89dc9f0b38a2","assemblyCSharpFirstPassGuid":"5c2fd87a-9877-4af1-ace8-1eed615617c0","assemblyCSharpFirstPassEditorGuid":"eea5290c-d0ca-4efa-b53c-69b3606c8bf2","builtInPackagesFolderGuid":"f78b56e6-cdfd-4bf5-9c51-6a8989cb7c6d","importedPackagesFolderGuid":"f0962e2e-3201-42a4-90a4-4bd07b8d0413","externalPackagesFolderGuid":"02cfe9b1-8003-483f-802b-f2acc2e2c82b","solutionGuid":"6e6cc69e-a194-4f01-9182-ce7b0f63f375"}

Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template

@@ -12,6 +12,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <ProjectGuid><!--PROJECT_GUID_TOKEN--></ProjectGuid>
     <UnityConfiguration>InEditor</UnityConfiguration>
     <!-- Make sure Unity ignores the contents of the intermediate output path. -->
     <BaseIntermediateOutputPath>$(MSBuildForUnityGeneratedOutputDirectory)\..\Output\obj\Dependencies</BaseIntermediateOutputPath>

Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/SolutionTemplate.sln.template

@@ -2,12 +2,18 @@
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.539
 MinimumVisualStudioVersion = 10.0.40219.1
-# This file is generated by MSBuildForUnity, it will get updated when the assembly definitions change.
 #PROJECT_TEMPLATE_START
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "<PROJECT_NAME_TOKEN>", "<PROJECT_RELATIVE_PATH_TOKEN>", "{<PROJECT_GUID_TOKEN>}"
+#PROJECT_SECTION_TEMPLATE_START
 	ProjectSection(ProjectDependencies) = postProject
 #PROJECT_DEPENDENCY_TEMPLATE 		{<DEPENDENCY_GUID_TOKEN>} = {<DEPENDENCY_GUID_TOKEN>}
 	EndProjectSection
+#PROJECT_SECTION_TEMPLATE_END
+#EXTRA_PROJECT_SECTION_TEMPLATE_START
+	ProjectSection(<SECTION_NAME_TOKEN>) = <PRE_POST_SECTION_TOKEN>
+#EXTRA_SECTION_LINE_TEMPLATE 		<SECTION_LINE_TOKEN>
+	EndProjectSection
+#EXTRA_PROJECT_SECTION_TEMPLATE_END
 EndProject
 #PROJECT_TEMPLATE_END
 #FOLDER_TEMPLATE_START
@@ -19,16 +25,23 @@ Global
 #CONFIGURATION_PLATFORM_TEMPLATE 		<CONFIGURATION_TOKEN>|<PLATFORM_TOKEN> = <CONFIGURATION_TOKEN>|<PLATFORM_TOKEN>
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-#CONFIGURATION_PLATFORM_MAPPING_TEMPLATE 		{<PROJECT_GUID_TOKEN>}.<PROJECT_CONFIGURATION_TOKEN>|<PROJECT_PLATFORM_TOKEN>.ActiveCfg = <SOLUTION_CONFIGURATION_TOKEN>|<SOLUTION_PLATFORM_TOKEN>
-#CONFIGURATION_PLATFORM_ENABLED_TEMPLATE 		{<PROJECT_GUID_TOKEN>}.<PROJECT_CONFIGURATION_TOKEN>|<PROJECT_PLATFORM_TOKEN>.Build.0 = <SOLUTION_CONFIGURATION_TOKEN>|<SOLUTION_PLATFORM_TOKEN>
+#CONFIGURATION_PLATFORM_PROPERTY_TEMPLATE 		{<PROJECT_GUID_TOKEN>}.<SOLUTION_CONFIGURATION_TOKEN>|<SOLUTION_PLATFORM_TOKEN>.<PROPERTY_TOKEN> = <PROJECT_CONFIGURATION_TOKEN>|<PROJECT_PLATFORM_TOKEN>
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
+#SOLUTION_PROPERTIES_TEMPLATE 		<PROPERTY_KEY_TOKEN> = <PROPERTY_VALUE_TOKEN>
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 #FOLDER_NESTED_PROJECTS_TEMPLATE 		{<CHILD_GUID_TOKEN>} = {<FOLDER_GUID_TOKEN>}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {89752EEF-6413-4D53-BA9D-DCA0707F134E}
+#EXTENSIBILITY_GLOBALS_TEMPLATE 		<PROPERTY_KEY_TOKEN> = <PROPERTY_VALUE_TOKEN>
+	EndGlobalSection
+	GlobalSection(SolutionNotes) = postSolution
+#SOLUTION_NOTES_TEMPLATE 		<PROPERTY_KEY_TOKEN> = <PROPERTY_VALUE_TOKEN>
+	EndGlobalSection
+#EXTRA_GLOBAL_SECTION_TEMPLATE_START
+	GlobalSection(<SECTION_NAME_TOKEN>) = <PRE_POST_SECTION_TOKEN>
+#EXTRA_SECTION_LINE_TEMPLATE 		<SECTION_LINE_TOKEN>
 	EndGlobalSection
+#EXTRA_GLOBAL_SECTION_TEMPLATE_END
 EndGlobal

Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/AssemblyDefinitionInfo.cs

@@ -23,10 +23,11 @@ public class AssemblyDefinitionInfo
         /// Creates an instance of <see cref="AssemblyDefinitionInfo"/> for the default projects (such as Assembly-CSharp)
         /// </summary>
         /// <param name="assembly">The Unity assembly reference.</param>
+        /// <param name="guid">The guid for this assembly reference.</param>
         /// <returns>A new instance.</returns>
-        public static AssemblyDefinitionInfo GetDefaultAssemblyCSharpInfo(Assembly assembly)
+        public static AssemblyDefinitionInfo GetDefaultAssemblyCSharpInfo(Assembly assembly, Guid guid)
         {
-            AssemblyDefinitionInfo toReturn = new AssemblyDefinitionInfo() { IsDefaultAssembly = true, Guid = Guid.NewGuid(), Directory = new DirectoryInfo(Utilities.AssetPath) };
+            AssemblyDefinitionInfo toReturn = new AssemblyDefinitionInfo() { IsDefaultAssembly = true, Guid = guid, Directory = new DirectoryInfo(Utilities.AssetPath) };
             toReturn.assembly = assembly;
             toReturn.name = assembly.name;
             toReturn.references = assembly.assemblyReferences.Select(t => t.name).ToArray();

Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/IProjectExporter.cs

@@ -36,7 +36,8 @@ public interface IProjectExporter
         /// Exports the MSBuild solution given the <see cref="UnityProjectInfo"/> information.
         /// </summary>
         /// <param name="unityProjectInfo">This contains parsed data about the current Unity project.</param>
-        void ExportSolution(UnityProjectInfo unityProjectInfo);
+        /// <param name="config">Configuration for MSBuild tools.</param>
+        void ExportSolution(UnityProjectInfo unityProjectInfo, MSBuildToolsConfig config);
 
         /// <summary>
         /// Generates the Directory.Build.props file that is expected to be used by both generated and non-generated projects alike.