[Project] Rename 'Gac' refs to 'Package' refs

This is a couple of years overdue because the "gac" name is wrong, misleading and
confusing.

13 files changed, 52 insertions, 49 deletions

diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1CustomDataItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1CustomDataItem.cs
index f16db10ed6..d5464056c9 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1CustomDataItem.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1CustomDataItem.cs
@@ -85,7 +85,7 @@ namespace MonoDevelop.Projects.Formats.MD1
 				if (pref.ReferenceType == ReferenceType.Assembly) {
 					string basePath = Path.GetDirectoryName (handler.SerializationContext.BaseFile);
 					refto = FileService.AbsoluteToRelativePath (basePath, refto);
-				} else if (pref.ReferenceType == ReferenceType.Gac && pref.LoadedReference != null)
+				} else if (pref.ReferenceType == ReferenceType.Package && pref.LoadedReference != null)
 					refto = pref.LoadedReference;
 	
 				data.Add (new DataValue ("refto", refto));
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
index 0c16ab3b8d..803501a0c3 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
@@ -550,7 +550,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 							if (MSBuildProjectService.IsAbsoluteMSBuildPath (hintPath))
 								pref.ExtendedProperties ["_OriginalMSBuildReferenceIsAbsolute"] = true;
 						} else {
-							pref = new ProjectReference (ReferenceType.Gac, buildItem.Include);
+							pref = new ProjectReference (ReferenceType.Package, buildItem.Include);
 							pref.ExtendedProperties ["_OriginalMSBuildReferenceHintPath"] = hintPath;
 						}
 						pref.LocalCopy = !buildItem.GetMetadataIsFalse ("Private");
@@ -563,7 +563,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 							asm = "System.Xml";
 						else if (asm == "system")
 							asm = "System";
-						pref = new ProjectReference (ReferenceType.Gac, asm);
+						pref = new ProjectReference (ReferenceType.Package, asm);
 						pref.LocalCopy = false;
 					}
 					pref.Condition = buildItem.Condition;
@@ -1120,7 +1120,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 				else
 					buildItem.UnsetMetadata ("Private");
 			}
-			else if (pref.ReferenceType == ReferenceType.Gac) {
+			else if (pref.ReferenceType == ReferenceType.Package) {
 				string include = pref.StoredReference;
 				SystemPackage pkg = pref.Package;
 				if (pkg != null && pkg.IsFrameworkPackage) {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs
index 7cf1676935..7f494dff50 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs
@@ -125,7 +125,7 @@ namespace MonoDevelop.Projects
 				else if (File.Exists (asm + ".exe"))
 					References.Add (new ProjectReference (ReferenceType.Assembly, asm + ".exe"));
 				else
-					References.Add (new ProjectReference (ReferenceType.Gac, aref.FullName));
+					References.Add (new ProjectReference (ReferenceType.Package, aref.FullName));
 			}*/
 		}
 		
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs
index d0665cb316..c3d9bd7f6d 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs
@@ -983,7 +983,7 @@ namespace MonoDevelop.Projects
 		void UpdateSystemReferences ()
 		{
 			foreach (ProjectReference pref in References) {
-				if (pref.ReferenceType == ReferenceType.Gac) {
+				if (pref.ReferenceType == ReferenceType.Package) {
 					string newRef = AssemblyContext.GetAssemblyNameForVersion (pref.Reference, pref.Package != null ? pref.Package.Name : null, this.TargetFramework);
 					if (newRef == null) {
 						pref.ResetReference ();
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs
index 786ff52581..843ef9c765 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs
@@ -43,8 +43,10 @@ namespace MonoDevelop.Projects
 	public enum ReferenceType {
 		Assembly,
 		Project,
-		Gac,
-		Custom
+		Package,
+		Custom,
+		[Obsolete]
+		Gac = Package
 	}
 	
 	/// <summary>
@@ -95,7 +97,7 @@ namespace MonoDevelop.Projects
 		internal void SetOwnerProject (DotNetProject project)
 		{
 			ownerProject = project;
-			UpdateGacReference ();
+			UpdatePackageReference ();
 		}
 		
 		public ProjectReference (ReferenceType referenceType, string reference)
@@ -104,7 +106,7 @@ namespace MonoDevelop.Projects
 				specificVersion = false;
 			this.referenceType = referenceType;
 			this.reference     = reference;
-			UpdateGacReference ();
+			UpdatePackageReference ();
 		}
 		
 		public ProjectReference (Project referencedProject)
@@ -116,14 +118,14 @@ namespace MonoDevelop.Projects
 		
 		public ProjectReference (SystemAssembly asm)
 		{
-			referenceType = ReferenceType.Gac;
+			referenceType = ReferenceType.Package;
 			reference = asm.FullName;
 			localCopy = false;
 			if (asm.Package.IsFrameworkPackage)
 				specificVersion = false;
 			if (!asm.Package.IsGacPackage)
 				package = asm.Package.Name;
-			UpdateGacReference ();
+			UpdatePackageReference ();
 		}
 		
 		protected void InitCustomReference (string reference)
@@ -155,7 +157,7 @@ namespace MonoDevelop.Projects
 			}
 			internal set {
 				reference = value;
-				UpdateGacReference ();
+				UpdatePackageReference ();
 			}
 		}
 		
@@ -205,7 +207,7 @@ namespace MonoDevelop.Projects
 			get {
 				if (ReferenceType == ReferenceType.Project || ReferenceType == ReferenceType.Custom)
 					return false;
-				if (ReferenceType == ReferenceType.Gac && Package != null && Package.IsFrameworkPackage)
+				if (ReferenceType == ReferenceType.Package && Package != null && Package.IsFrameworkPackage)
 					return false;
 				return true;
 			}
@@ -220,7 +222,7 @@ namespace MonoDevelop.Projects
 			get {
 				if (customError != null)
 					return customError;
-				if (ReferenceType == ReferenceType.Gac) {
+				if (ReferenceType == ReferenceType.Package) {
 					if (!IsExactVersion && SpecificVersion)
 						return GettextCatalog.GetString ("Specified version not found: expected {0}, found {1}", GetVersionNum (StoredReference), GetVersionNum (Reference));
 					if (notFound) {
@@ -253,7 +255,7 @@ namespace MonoDevelop.Projects
 		
 		public bool IsExactVersion {
 			get {
-				if (ReferenceType == ReferenceType.Gac) {
+				if (ReferenceType == ReferenceType.Package) {
 					string r1 = MonoDevelop.Core.Assemblies.AssemblyContext.NormalizeAsmName (StoredReference);
 					string r2 = MonoDevelop.Core.Assemblies.AssemblyContext.NormalizeAsmName (Reference);
 					return r1 == r2;
@@ -287,7 +289,7 @@ namespace MonoDevelop.Projects
 				case ReferenceType.Assembly:
 					return reference;
 				
-				case ReferenceType.Gac:
+				case ReferenceType.Package:
 					string file = AssemblyContext.GetAssemblyLocation (Reference, package, ownerProject != null? ownerProject.TargetFramework : null);
 					return file == null ? reference : file;
 				case ReferenceType.Project:
@@ -307,7 +309,7 @@ namespace MonoDevelop.Projects
 		public virtual string[] GetReferencedFileNames (ConfigurationSelector configuration)
 		{
 			string s = GetReferencedFileName (configuration);
-	/*		if (referenceType == ReferenceType.Gac) {
+	/*		if (referenceType == ReferenceType.Package) {
 				List<string> result = new List<string> ();
 				result.Add (s);
 				AddRequiredPackages (result, Package);
@@ -337,9 +339,9 @@ namespace MonoDevelop.Projects
 			}
 		}*/
 		
-		void UpdateGacReference ()
+		void UpdatePackageReference ()
 		{
-			if (referenceType == ReferenceType.Gac && ownerProject != null) {
+			if (referenceType == ReferenceType.Package && ownerProject != null) {
 				notFound = false;
 				string cref = AssemblyContext.FindInstalledAssembly (reference, package, ownerProject.TargetFramework);
 				if (cref == null)
@@ -388,7 +390,7 @@ namespace MonoDevelop.Projects
 		
 		public SystemPackage Package {
 			get {
-				if (referenceType == ReferenceType.Gac) {
+				if (referenceType == ReferenceType.Package) {
 					if (cachedPackage != null)
 						return cachedPackage;
 					
@@ -424,9 +426,9 @@ namespace MonoDevelop.Projects
 			if (loadedReference != null) {
 				reference = loadedReference;
 				loadedReference = null;
-				UpdateGacReference ();
+				UpdatePackageReference ();
 			} else
-				UpdateGacReference ();
+				UpdatePackageReference ();
 		}
 		
 		public object Clone()
diff --git a/main/src/core/MonoDevelop.Ide/Makefile.am b/main/src/core/MonoDevelop.Ide/Makefile.am
index 877e144c51..ff6b173cdc 100644
--- a/main/src/core/MonoDevelop.Ide/Makefile.am
+++ b/main/src/core/MonoDevelop.Ide/Makefile.am
@@ -626,7 +626,7 @@ FILES =  \
 	MonoDevelop.Ide.Projects/ExportProjectDialog.cs \
 	MonoDevelop.Ide.Projects/ExportProjectPolicyDialog.cs \
 	MonoDevelop.Ide.Projects/FeatureSelectorDialog.cs \
-	MonoDevelop.Ide.Projects/GacReferencePanel.cs \
+	MonoDevelop.Ide.Projects/PackageReferencePanel.cs \
 	MonoDevelop.Ide.Projects/ImportProjectPolicyDialog.cs \
 	MonoDevelop.Ide.Projects/IncludeNewFilesDialog.cs \
 	MonoDevelop.Ide.Projects/NewConfigurationDialog.cs \
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ReferenceNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ReferenceNodeBuilder.cs
index e3cebf2af9..62879fee16 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ReferenceNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ReferenceNodeBuilder.cs
@@ -68,7 +68,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 				case ReferenceType.Assembly:
 					label = Path.GetFileName(pref.Reference);
 					break;
-				case ReferenceType.Gac:
+				case ReferenceType.Package:
 					label = pref.Reference.Split(',')[0];
 					break;
 				default:
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs
index e1f7a341bf..20b577d5dc 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs
@@ -68,7 +68,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 					label = Path.GetFileName(pref.Reference);
 					icon = Context.GetIcon ("md-reference-folder");
 					break;
-				case ReferenceType.Gac:
+				case ReferenceType.Package:
 					label = pref.Reference.Split(',')[0];
 					icon = Context.GetIcon ("md-reference-package");
 					break;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GacReferencePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GacReferencePanel.cs
index 6800063574..ac6d233c8f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GacReferencePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GacReferencePanel.cs
@@ -1,4 +1,4 @@
-// GacReferencePanel.cs
+// PackageReferencePanel.cs
 //
 // Author:
 //     Todd Berman <tberman@sevenl.net>
@@ -40,7 +40,7 @@ using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Ide.Projects
 {
-    internal class GacReferencePanel : VBox, IReferencePanel 
+    internal class PackageReferencePanel : VBox, IReferencePanel 
     {
         ListStore store = null;
         private TreeView treeView = null;
@@ -63,7 +63,7 @@ namespace MonoDevelop.Ide.Projects
 		const int ColMatchRank = 7;
 		const int ColType = 8;
         
-        public GacReferencePanel (SelectReferenceDialog selectDialog, bool showAll)
+        public PackageReferencePanel (SelectReferenceDialog selectDialog, bool showAll)
         {
             this.selectDialog = selectDialog;
 			this.showAll = showAll;
@@ -138,7 +138,7 @@ namespace MonoDevelop.Ide.Projects
                 if (systemAssembly.Package.IsFrameworkPackage && systemAssembly.Name == "mscorlib")
                     continue;
 				
-				bool selected = IsSelected (ReferenceType.Gac, systemAssembly.FullName, systemAssembly.Package.Name);
+				bool selected = IsSelected (ReferenceType.Package, systemAssembly.FullName, systemAssembly.Package.Name);
 				int matchRank = 0;
 				string name, version;
 				
@@ -165,7 +165,7 @@ namespace MonoDevelop.Ide.Projects
 					pkg,
 					MonoDevelop.Ide.Gui.Stock.Package,
 					matchRank,
-					ReferenceType.Gac);
+					ReferenceType.Package);
 			}
 			
 			if (showAll) {
@@ -257,7 +257,7 @@ namespace MonoDevelop.Ide.Projects
 
         public void SignalRefChange (ProjectReference refInfo, bool newState)
         {
-			if (!showAll && refInfo.ReferenceType != ReferenceType.Gac)
+			if (!showAll && refInfo.ReferenceType != ReferenceType.Package)
 				return;
 			
             TreeIter iter;
@@ -267,7 +267,7 @@ namespace MonoDevelop.Ide.Projects
                 do {
 					if (refInfo.ReferenceType == (ReferenceType) store.GetValue(iter, ColType)) {
 						switch (refInfo.ReferenceType) {
-						case ReferenceType.Gac:
+						case ReferenceType.Package:
 							SystemAssembly systemAssembly = store.GetValue(iter, ColAssembly) as SystemAssembly;
 							if ((refInfo.Reference == systemAssembly.FullName) && (refInfo.Package == systemAssembly.Package) )
 								found = true;
@@ -328,7 +328,7 @@ namespace MonoDevelop.Ide.Projects
 			string fullName = (string)store.GetValue (iter, ColFullName);
             if ((bool)store.GetValue (iter, ColSelected) == false) {
                 store.SetValue (iter, ColSelected, true);
-				if (rt == ReferenceType.Gac)
+				if (rt == ReferenceType.Package)
 					selectDialog.AddReference (new ProjectReference ((SystemAssembly)store.GetValue (iter, ColAssembly)));
 				else
 					selectDialog.AddReference (new ProjectReference (rt, fullName));
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectReferencePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectReferencePanel.cs
index 1c14bd0057..07b7e05e9c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectReferencePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectReferencePanel.cs
@@ -191,7 +191,7 @@ namespace MonoDevelop.Ide.Projects {
 					if (!stringMatcher.CalcMatchRank (projectEntry.Name, out matchRank))
 						continue;
 					int[] match = stringMatcher.GetMatch (projectEntry.Name);
-					txt = GacReferencePanel.GetMatchMarkup (treeView, projectEntry.Name, match, 0);
+					txt = PackageReferencePanel.GetMatchMarkup (treeView, projectEntry.Name, match, 0);
 				} else {
 					txt = GLib.Markup.EscapeText (projectEntry.Name);
 				}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs
index 8e4a89c09e..cff9db41b8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs
@@ -52,8 +52,8 @@ namespace MonoDevelop.Ide.Projects
 	{
 		ListStore refTreeStore;
 		
-		GacReferencePanel gacRefPanel;
-		GacReferencePanel allRefPanel;
+		PackageReferencePanel packageRefPanel;
+		PackageReferencePanel allRefPanel;
 		ProjectReferencePanel projectRefPanel;
 		AssemblyReferencePanel assemblyRefPanel;
 		DotNetProject configureProject;
@@ -115,8 +115,8 @@ namespace MonoDevelop.Ide.Projects
 					return AddAssemplyReference (refInfo);
 				case ReferenceType.Project:
 					return AddProjectReference (refInfo);
-				case ReferenceType.Gac:
-					return AddGacReference (refInfo);
+				case ReferenceType.Package:
+					return AddPackageReference (refInfo);
 				default:
 					return TreeIter.Zero;
 			}
@@ -142,7 +142,7 @@ namespace MonoDevelop.Ide.Projects
 			return refTreeStore.AppendValues (txt, GetTypeText (refInfo), p.BaseDirectory.ToString (), refInfo, ImageService.GetPixbuf ("md-project", IconSize.Dnd));
 		}
 
-		TreeIter AddGacReference (ProjectReference refInfo)
+		TreeIter AddPackageReference (ProjectReference refInfo)
 		{
 			string txt = GLib.Markup.EscapeText (System.IO.Path.GetFileNameWithoutExtension (refInfo.Reference));
 			int i = refInfo.Reference.IndexOf (',');
@@ -176,11 +176,11 @@ namespace MonoDevelop.Ide.Projects
 //			ReferencesTreeView.AppendColumn (GettextCatalog.GetString ("Location"), new CellRendererText (), "text", LocationColumn);
 			
 			projectRefPanel = new ProjectReferencePanel (this);
-			gacRefPanel = new GacReferencePanel (this, false);
-			allRefPanel = new GacReferencePanel (this, true);
+			packageRefPanel = new PackageReferencePanel (this, false);
+			allRefPanel = new PackageReferencePanel (this, true);
 			assemblyRefPanel = new AssemblyReferencePanel (this);
 			panels.Add (allRefPanel);
-			panels.Add (gacRefPanel);
+			panels.Add (packageRefPanel);
 			panels.Add (projectRefPanel);
 			panels.Add (assemblyRefPanel);
 			
@@ -198,7 +198,7 @@ namespace MonoDevelop.Ide.Projects
 			tab.PackStart (new Label (GettextCatalog.GetString ("_Packages")), true, true, 0);
 			tab.BorderWidth = 3;
 			tab.ShowAll ();
-			mainBook.AppendPage (gacRefPanel, tab);
+			mainBook.AppendPage (packageRefPanel, tab);
 			
 			tab = new HBox (false, 3);
 //			tab.PackStart (new Image (ImageService.GetPixbuf (MonoDevelop.Ide.Gui.Stock.Project, IconSize.Menu)), false, false, 0);
@@ -321,7 +321,7 @@ namespace MonoDevelop.Ide.Projects
 		string GetTypeText (ProjectReference pref)
 		{
 			switch (pref.ReferenceType) {
-				case ReferenceType.Gac: return GettextCatalog.GetString ("Package");
+				case ReferenceType.Package: return GettextCatalog.GetString ("Package");
 				case ReferenceType.Assembly: return GettextCatalog.GetString ("Assembly");
 				case ReferenceType.Project: return GettextCatalog.GetString ("Project");
 				default: return "";
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
index 3f15bd1508..930af4f71c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
@@ -87,7 +87,8 @@ namespace MonoDevelop.Ide.Templates
 			if (xmlElement["References"] != null) {
 				foreach (XmlNode xmlNode in xmlElement["References"].ChildNodes) {
 					XmlElement elem = (XmlElement)xmlNode;
-					ProjectReference projectReference = new ProjectReference ((ReferenceType)Enum.Parse (typeof(ReferenceType), elem.GetAttribute ("type")), elem.GetAttribute ("refto"));
+					var refType = elem.GetAttribute ("type");
+					ProjectReference projectReference = new ProjectReference ((ReferenceType)Enum.Parse (typeof(ReferenceType), refType), elem.GetAttribute ("refto"));
 					string specificVersion = elem.GetAttribute ("SpecificVersion");
 					if (!string.IsNullOrEmpty (specificVersion))
 						projectReference.SpecificVersion = bool.Parse (specificVersion);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
index 85f3757947..44e1e5212e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
@@ -133,7 +133,7 @@ namespace MonoDevelop.Ide.Templates
 						string res = netProject.AssemblyContext.GetAssemblyFullName (aref, netProject.TargetFramework);
 						res = netProject.AssemblyContext.GetAssemblyNameForVersion (res, netProject.TargetFramework);
 						if (!ContainsReference (netProject, res))
-							netProject.References.Add (new ProjectReference (ReferenceType.Gac, aref));
+							netProject.References.Add (new ProjectReference (ReferenceType.Package, aref));
 					}
 				}
 				
@@ -151,8 +151,8 @@ namespace MonoDevelop.Ide.Templates
 			else
 				aname = aref.Substring (0, i);
 			foreach (ProjectReference pr in project.References) {
-				if (pr.ReferenceType == ReferenceType.Gac && (pr.Reference == aname || pr.Reference.StartsWith (aname + ",")) || 
-					pr.ReferenceType != ReferenceType.Gac && pr.Reference.Contains (aname))
+				if (pr.ReferenceType == ReferenceType.Package && (pr.Reference == aname || pr.Reference.StartsWith (aname + ",")) || 
+					pr.ReferenceType != ReferenceType.Package && pr.Reference.Contains (aname))
 					return true;
 			}
 			return false;