Obsolete some unused properties

5 files changed, 0 insertions, 81 deletions

diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/MonoDevelop.Packaging.Tests/AddPlatformImplementationTests.cs b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/MonoDevelop.Packaging.Tests/AddPlatformImplementationTests.cs
index 0438bc825d..f8a199ba7f 100644
--- a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/MonoDevelop.Packaging.Tests/AddPlatformImplementationTests.cs
+++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/MonoDevelop.Packaging.Tests/AddPlatformImplementationTests.cs
@@ -398,10 +398,6 @@ namespace MonoDevelop.Packaging.Tests
 			Assert.AreEqual (expectedBaseDirectory.Combine ("MyProject.iOS", "MyProject.iOS.csproj"), iosProject.FileName);
 			Assert.AreEqual (expectedBaseDirectory.Combine ("MyProject.NuGet", "MyProject.NuGet.nuproj"), nugetProject.FileName);
 			Assert.AreEqual (expectedBaseDirectory.Combine ("MyProject.Shared", "MyProject.Shared.shproj"), sharedProject.FileName);
-
-			Assert.IsTrue (androidProject.GetFlavor<DotNetProjectPackagingExtension> ().GetRequiresMSBuild ());
-			Assert.IsTrue (nugetProject.GetFlavor<DotNetProjectPackagingExtension> ().GetRequiresMSBuild ());
-			Assert.IsTrue (iosProject.GetFlavor<DotNetProjectPackagingExtension> ().GetRequiresMSBuild ());
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/MonoDevelop.Packaging.Tests/ProjectTemplateTests.cs b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/MonoDevelop.Packaging.Tests/ProjectTemplateTests.cs
index 573adfe06b..ac3a0688e1 100644
--- a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/MonoDevelop.Packaging.Tests/ProjectTemplateTests.cs
+++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/MonoDevelop.Packaging.Tests/ProjectTemplateTests.cs
@@ -145,11 +145,9 @@ namespace MonoDevelop.Packaging.Tests
 
 			var project = solution.GetAllProjects ().OfType<DotNetProject> ().FirstOrDefault (p => p.FileName.FileName == "ProjectName.NuGet.nuproj");
 			Assert.IsNotNull (project);
-			Assert.IsTrue (project.GetFlavor<DotNetProjectPackagingExtension> ().GetRequiresMSBuild ());
 
 			var androidProject = solution.GetAllProjects ().OfType<DotNetProject> ().FirstOrDefault (p => p.FileName.FileName == "ProjectName.Android.csproj");
 			Assert.IsNotNull (androidProject);
-			Assert.IsTrue (androidProject.GetFlavor<DotNetProjectPackagingExtension> ().GetRequiresMSBuild ());
 
 			var sharedProject = solution.GetAllProjects ().OfType<SharedAssetsProject> ().FirstOrDefault (p => p.FileName.FileName == "ProjectName.Shared.shproj");
 			Assert.IsNotNull (sharedProject);
diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/DotNetProjectPackagingExtension.cs b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/DotNetProjectPackagingExtension.cs
index 5ecb927df0..13ba3716f2 100644
--- a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/DotNetProjectPackagingExtension.cs
+++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/DotNetProjectPackagingExtension.cs
@@ -36,82 +36,14 @@ namespace MonoDevelop.Packaging
 	{
 		public bool InstallBuildPackagingNuGetAfterWrite { get; set; }
 
-		// Used by unit tests only.
-		internal bool GetRequiresMSBuild ()
-		{
-			return RequiresMicrosoftBuild;
-		}
-
-		protected override void OnReadProjectHeader (ProgressMonitor monitor, MSBuildProject msproject)
-		{
-			base.OnReadProjectHeader (monitor, msproject);
-
-			UpdateRequiresMSBuildSetting (msproject);
-		}
-
 		protected override void OnWriteProject (ProgressMonitor monitor, MSBuildProject msproject)
 		{
 			base.OnWriteProject (monitor, msproject);
 
-			UpdateRequiresMSBuildSetting (msproject, true);
-
 			if (InstallBuildPackagingNuGetAfterWrite) {
 				InstallBuildPackagingNuGetAfterWrite = false;
 				Project.InstallBuildPackagingNuGetPackage ();
 			}
 		}
-
-		void UpdateRequiresMSBuildSetting (MSBuildProject msproject, bool reloadProjectBuilder = false)
-		{
-			if (!RequiresMicrosoftBuild) {
-				RequiresMicrosoftBuild = msproject.HasNuGetMetadata ();
-				if (reloadProjectBuilder && RequiresMicrosoftBuild) {
-					Project.ReloadProjectBuilder ();
-					EnsureReferencedProjectsRequireMSBuild (reloadProjectBuilder);
-				}
-			}
-		}
-
-		protected override void OnReferenceAddedToProject (ProjectReferenceEventArgs e)
-		{
-			base.OnReferenceAddedToProject (e);
-
-			if (Project.Loading)
-				return;
-
-			if (RequiresMicrosoftBuild && e.ProjectReference.ReferenceType == ReferenceType.Project) {
-				EnsureReferencedProjectsRequireMSBuild (true);
-			}
-		}
-
-		protected override void OnItemReady ()
-		{
-			if (RequiresMicrosoftBuild) {
-				EnsureReferencedProjectsRequireMSBuild ();
-			}
-		}
-
-		internal void EnsureReferencedProjectsRequireMSBuild (bool reloadProjectBuilder = false)
-		{
-			if (Project.ParentSolution == null)
-				return;
-
-			try {
-				foreach (var reference in Project.References.Where (projectReference => projectReference.ReferenceType == ReferenceType.Project)) {
-					var referencedProject = reference.ResolveProject (Project.ParentSolution);
-					if (referencedProject != null) {
-						var flavor = referencedProject.GetFlavor<DotNetProjectPackagingExtension> ();
-						if (flavor?.RequiresMicrosoftBuild == false) {
-							flavor.RequiresMicrosoftBuild = true;
-							flavor.EnsureReferencedProjectsRequireMSBuild (reloadProjectBuilder);
-							if (reloadProjectBuilder)
-								referencedProject.ReloadProjectBuilder ();
-						}
-					}
-				}
-			} catch (Exception ex) {
-				LoggingService.LogError ("Unable to update RequiresMicrosoftBuild.", ex);
-			}
-		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/PackagingProject.cs b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/PackagingProject.cs
index d0b8730e05..4718375346 100644
--- a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/PackagingProject.cs
+++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/PackagingProject.cs
@@ -50,7 +50,6 @@ namespace MonoDevelop.Packaging
 		public PackagingProject ()
 		{
 			UsePartialTypes = false;
-			RequiresMicrosoftBuild = true;
 		}
 
 		[ItemProperty ("PackageId")]
diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/PackagingProjectFlavor.cs b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/PackagingProjectFlavor.cs
index 9c80b5540d..e7a7d1af08 100644
--- a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/PackagingProjectFlavor.cs
+++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/PackagingProjectFlavor.cs
@@ -40,12 +40,6 @@ namespace MonoDevelop.Packaging
 			reason = null;
 			return true;
 		}
-
-		protected override void Initialize ()
-		{
-			RequiresMicrosoftBuild = true;
-			base.Initialize ();
-		}
 	}
 }