NET Framework 3.0 Change

.gitignore

@@ -36,3 +36,6 @@ Makefile.in
 /configure
 /install-sh
 /missing
+
+#Jetbrains stuff
+.idea/

Mono.Addins/Mono.Addins.Database/AddinDatabase.cs

@@ -551,16 +551,18 @@ public void DisableAddin (string domain, string id, bool exactVersionMatch = fal
 		public void UpdateEnabledStatus ()
 		{
 			// Ensure that all enabled addins that have dependencies also have their dependencies enabled.
-			HashSet<Addin> updatedAddins = new HashSet<Addin> ();
+			List<Addin> updatedAddins = new List<Addin> ();
 			var allAddins = GetInstalledAddins (registry.CurrentDomain, AddinSearchFlagsInternal.IncludeAddins | AddinSearchFlagsInternal.LatestVersionsOnly).ToList ();
 			foreach (Addin addin in allAddins)
 				UpdateEnabledStatus (registry.CurrentDomain, addin, allAddins, updatedAddins);
 		}
 
-		void UpdateEnabledStatus (string domain, Addin addin, List<Addin> allAddins, HashSet<Addin> updatedAddins)
+		void UpdateEnabledStatus (string domain, Addin addin, List<Addin> allAddins, List<Addin> updatedAddins)
 		{
-			if (!updatedAddins.Add (addin))
+			if (updatedAddins.Contains(addin))
 				return;
+
+			updatedAddins.Add(addin);
 
 			if (!addin.Enabled)
 				return;
@@ -1027,21 +1029,21 @@ internal void ResetCachedData ()
 				addinEngine.ResetCachedData ();
 		}
 
-		Dictionary<string, HashSet<string>> dependsOnCache = new Dictionary<string, HashSet<string>> ();
+		Dictionary<string, List<string>> dependsOnCache = new Dictionary<string, List<string>> ();
 		public bool AddinDependsOn (string domain, string id1, string id2)
 		{
 			var depTree = GetOrCreateAddInDependencyTree (domain, id1);
 			return depTree.Contains (id2);
 		}
 
-		HashSet<string> GetOrCreateAddInDependencyTree (string domain, string addin)
+		List<string> GetOrCreateAddInDependencyTree (string domain, string addin)
 		{
-			HashSet<string> cache;
+			List<string> cache;
 			if (dependsOnCache.TryGetValue (addin, out cache)) {
 				return cache;
-			}
+			} 
 
-			dependsOnCache [addin] = cache = new HashSet<string> ();
+			dependsOnCache [addin] = cache = new List<string> ();
 
 			Addin addin1 = GetInstalledAddin (domain, addin, false);
 
@@ -1058,7 +1060,7 @@ HashSet<string> GetOrCreateAddInDependencyTree (string domain, string addin)
 				cache.Add (depid);
 
 				var recursiveDependencies = GetOrCreateAddInDependencyTree (domain, depid);
-				cache.UnionWith (recursiveDependencies);
+				return cache.Union(recursiveDependencies).Distinct().ToList();
 			}
 			return cache;
 		}
@@ -1165,8 +1167,7 @@ void RunPendingUninstalls (IProgressStatus monitor)
 			bool changesDone = false;
 
 			foreach (var adn in Configuration.GetPendingUninstalls ()) {
-				HashSet<string> files = new HashSet<string> (adn.Files);
-				if (AddinManager.CheckAssembliesLoaded (files))
+				if (AddinManager.CheckAssembliesLoaded (adn.Files))
 					continue;
 
 				if (monitor.LogLevel > 1)
@@ -1381,7 +1382,7 @@ void InternalScanFolders2 (IProgressStatus monitor, AddinScanResult scanResult)
 
 			// Check if any of the previously scanned folders has been deleted
 
-			foreach (string file in Directory.EnumerateFiles (AddinFolderCachePath, "*.data")) {
+			foreach (string file in Directory.GetFiles (AddinFolderCachePath, "*.data")) {
 				AddinScanFolderInfo folderInfo;
 				bool res = ReadFolderInfo (monitor, file, out folderInfo);
 				bool validForDomain = scanResult.Domain == null || folderInfo.Domain == GlobalDomain || folderInfo.Domain == scanResult.Domain;
@@ -1946,7 +1947,7 @@ public string FindCondition (AddinDescription desc, ModuleDescription mod, strin
 
 		public List<AddinDescription> GetSortedAddins ()
 		{
-			var inserted = new HashSet<string> ();
+			var inserted = new List<string> ();
 			var lists = new Dictionary<string,List<AddinDescription>> ();
 
 			foreach (List<AddinDescription> dlist in addins.Values) {
@@ -1970,12 +1971,14 @@ public List<AddinDescription> GetSortedAddins ()
 			return sortedAddins;
 		}
 
-		void InsertSortedAddin (HashSet<string> inserted, Dictionary<string,List<AddinDescription>> lists, AddinDescription desc)
+		void InsertSortedAddin (List<string> inserted, Dictionary<string,List<AddinDescription>> lists, AddinDescription desc)
 		{
 			string sid = desc.AddinId + " " + desc.Domain;
-			if (!inserted.Add (sid))
+			if (inserted.Contains (sid))
 				return;
 
+			inserted.Add(sid);
+
 			foreach (ModuleDescription mod in desc.AllModules) {
 				foreach (Dependency dep in mod.Dependencies) {
 					AddinDependency adep = dep as AddinDependency;

Mono.Addins/Mono.Addins.Database/AddinFileSystemExtension.cs

@@ -94,7 +94,7 @@ public virtual bool FileExists (string path)
 		/// </param>
 		public virtual System.Collections.Generic.IEnumerable<string> GetFiles (string path)
 		{
-			return Directory.EnumerateFiles (path);
+			return Directory.GetFiles (path);
 		}
 
 		/// <summary>
@@ -108,7 +108,7 @@ public virtual System.Collections.Generic.IEnumerable<string> GetFiles (string p
 		/// </param>
 		public virtual System.Collections.Generic.IEnumerable<string> GetDirectories (string path)
 		{
-			return Directory.EnumerateDirectories (path);
+			return Directory.GetDirectories (path);
 		}
 
 		/// <summary>

Mono.Addins/Mono.Addins.Database/AddinFolderVisitor.cs

@@ -35,7 +35,7 @@ namespace Mono.Addins.Database
 	class AddinFolderVisitor
 	{
 		AddinDatabase database;
-		HashSet<string> visitedFolders = new HashSet<string> ();
+		List<string> visitedFolders = new List<string> ();
 
 		public ScanContext ScanContext { get; set; } = new ScanContext();
 
@@ -56,7 +56,12 @@ public void VisitFolder (IProgressStatus monitor, string path, string domain, bo
 		void VisitFolderInternal (IProgressStatus monitor, string path, string domain, bool recursive)
 		{
 			// Avoid folders including each other
-			if (!visitedFolders.Add (path) || ScanContext.IgnorePath (path))
+			if (visitedFolders.Contains(path))
+				return;
+
+			visitedFolders.Add(path);
+
+			if (ScanContext.IgnorePath (path))
 				return;
 
 			OnVisitFolder (monitor, path, domain, recursive);

Mono.Addins/Mono.Addins.Database/AddinScanResult.cs

@@ -124,13 +124,14 @@ class FileToScan
 
 	class ScanContext
 	{
-		HashSet<string> filesToIgnore;
+		List<string> filesToIgnore;
 
 		public void AddPathToIgnore (string path)
 		{
 			if (filesToIgnore == null)
-				filesToIgnore = new HashSet<string> ();
+				filesToIgnore = new List<string> ();
 			filesToIgnore.Add (path);
+			filesToIgnore = filesToIgnore.Distinct().ToList();
 		}
 
 		public bool IgnorePath (string file)

Mono.Addins/Mono.Addins.Database/AddinScanner.cs

@@ -512,14 +512,14 @@ bool ScanDescription (IProgressStatus monitor, IAssemblyReflector reflector, Add
 			if (!config.IsRoot) {
 				foreach (ModuleDescription mod in config.OptionalModules) {
 					try {
-						var asmList = new List<Tuple<string,object>> ();
+						var asmList = new List<object[]> ();
 						for (int n=0; n<mod.Assemblies.Count; n++) {
 							string s = mod.Assemblies [n];
 							if (mod.IgnorePaths.Contains (s))
 								continue;
 							string asmFile = Path.Combine (config.BasePath, Util.NormalizePath (s));
 							object asm = reflector.LoadAssembly (asmFile);
-							asmList.Add (new Tuple<string,object> (asmFile,asm));
+							asmList.Add(new[] {asmFile, asm});
 							scanContext.AddPathToIgnore (Path.GetFullPath (asmFile));
 							ScanAssemblyImports (reflector, mod, asm);
 						}
@@ -535,7 +535,7 @@ bool ScanDescription (IProgressStatus monitor, IAssemblyReflector reflector, Add
 						}
 
 						foreach (var asm in asmList)
-							ScanSubmodule (monitor, mod, reflector, config, asm.Item1, asm.Item2);
+							ScanSubmodule (monitor, mod, reflector, config, (string)asm[0], asm[1]);
 
 					} catch (Exception ex) {
 						ReportReflectionException (monitor, ex, config);
@@ -781,7 +781,7 @@ void ScanAssemblyContents (IAssemblyReflector reflector, AddinDescription config
 
 				//condition attributes apply independently but identically to all extension attributes on this node
 				//depending on ordering is too messy due to inheritance etc
-				var conditionAtts = new Lazy<List<CustomAttribute>> (() => reflector.GetRawCustomAttributes (t, typeof (CustomConditionAttribute), false));
+				var conditionAtts =  reflector.GetRawCustomAttributes (t, typeof (CustomConditionAttribute), false);
 
 				// Look for extensions
 
@@ -807,7 +807,7 @@ void ScanAssemblyContents (IAssemblyReflector reflector, AddinDescription config
 							path = eatt.Path;
 						}
 
-						ExtensionNodeDescription elem = AddConditionedExtensionNode (module, path, nodeName, conditionAtts.Value);
+						ExtensionNodeDescription elem = AddConditionedExtensionNode (module, path, nodeName, conditionAtts);
 						nodes [path] = elem;
 						uniqueNode = elem;
 
@@ -873,7 +873,7 @@ void ScanAssemblyContents (IAssemblyReflector reflector, AddinDescription config
 					else {
 						// Look for custom extension attribtues
 						foreach (CustomAttribute att in reflector.GetRawCustomAttributes (t, typeof(CustomExtensionAttribute), false)) {
-							ExtensionNodeDescription elem = AddCustomAttributeExtension (module, att, "Type", conditionAtts.Value);
+							ExtensionNodeDescription elem = AddCustomAttributeExtension (module, att, "Type", conditionAtts);
 							elem.SetAttribute ("type", typeQualifiedName);
 							if (string.IsNullOrEmpty (elem.GetAttribute ("id")))
 								elem.SetAttribute ("id", typeQualifiedName);

Mono.Addins/Mono.Addins.Database/Util.cs

@@ -220,15 +220,22 @@ public static string GetGacPath (string fullName)
 					foreach (var dir in Directory.GetDirectories (asmDir, "v*_" + versionDirName)) {
 						var dirName = Path.GetFileName (dir);
 						i = dirName.IndexOf ('_');
-						Version av;
-						if (Version.TryParse (dirName.Substring (1, i - 1), out av)) {
+
+						try
+						{
+							Version av = new Version(dirName.Substring(1, i - 1));
 							if (av == currentVersion)
 								return dir;
-							else if (av < currentVersion && av > bestVersion) {
+
+							if (av < currentVersion && av > bestVersion) {
 								bestDir = dir;
 								bestVersion = av;
 							}
 						}
+						catch
+						{
+
+						}
 					}
 					if (bestDir != null)
 						return bestDir;

Mono.Addins/Mono.Addins.Description/AddinDescription.cs

@@ -1272,10 +1272,19 @@ internal StringCollection Verify (AddinFileSystemExtension fs)
 			// Ensure that there are no duplicated properties
 
 			if (properties != null) {
-				HashSet<string> props = new HashSet<string> ();
-				foreach (var prop in properties) {
-					if (!props.Add (prop.Name + " " + prop.Locale))
+				List<string> props = new List<string> ();
+				foreach (var prop in properties)
+				{
+					var stringToCheck = prop.Name + " " + prop.Locale;
+					if (props.Contains(stringToCheck))
+					{
 						errors.Add (string.Format ("Property {0} specified more than once", prop.Name + (prop.Locale != null ? " (" + prop.Locale + ")" : "")));
+					}
+					else
+					{
+						props.Add(stringToCheck);	
+					}
+
 				}
 			}
 

Mono.Addins/Mono.Addins.csproj

@@ -16,6 +16,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -46,6 +47,7 @@
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
+    <PackageReference Include="LinqBridge" Version="1.3.0" />
     <PackageReference Include="NuGet.Build.Packaging" Version="0.2.0" />
   </ItemGroup>
   <ItemGroup>

Mono.Addins/Mono.Addins/AddinEngine.cs

@@ -805,7 +805,7 @@ internal void ActivateRoots ()
 
 		void CheckHostAssembly (Assembly asm)
 		{
-			if (AddinDatabase.RunningSetupProcess || asm is System.Reflection.Emit.AssemblyBuilder || asm.IsDynamic)
+			if (AddinDatabase.RunningSetupProcess || asm is System.Reflection.Emit.AssemblyBuilder || asm.ManifestModule is System.Reflection.Emit.ModuleBuilder)
 				return;
 			string codeBase;
 			try {

Mono.Addins/Mono.Addins/AddinManager.cs

@@ -828,7 +828,7 @@ public static event AddinEventHandler AddinAssembliesLoaded {
 			remove { AddinEngine.AddinAssembliesLoaded -= value; }
 		}
 
-		internal static bool CheckAssembliesLoaded (HashSet<string> files)
+		internal static bool CheckAssembliesLoaded (List<string> files)
 		{
 			foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies ()) {
 				if (asm is System.Reflection.Emit.AssemblyBuilder)

Mono.Addins/Mono.Addins/AddinRegistry.cs

@@ -760,7 +760,7 @@ internal bool CreateHostAddinsFile (string hostFile)
 			if (!Directory.Exists (database.HostsPath))
 				Directory.CreateDirectory (database.HostsPath);
 
-			foreach (string s in Directory.EnumerateFiles (database.HostsPath, baseName + "*.addins")) {
+			foreach (string s in Directory.GetFiles (database.HostsPath, baseName + "*.addins")) {
 				try {
 					using (StreamReader sr = new StreamReader (s)) {
 						XmlTextReader tr = new XmlTextReader (sr);

Mono.Addins/Mono.Addins/RuntimeAddin.cs

@@ -558,40 +558,6 @@ public Stream GetResource (string resourceName, bool throwIfNotFound)
 			return null;
 		}
 
-		/// <summary>
-		/// Returns information about how the given resource has been persisted
-		/// </summary>
-		/// <param name="resourceName">
-		/// Name of the resource
-		/// </param>
-		/// <returns>
-		/// Resource information, or null if the resource doesn't exist
-		/// </returns>
-		public ManifestResourceInfo GetResourceInfo (string resourceName)
-		{
-			EnsureAssembliesLoaded ();
-
-			// Look in the addin assemblies
-
-			foreach (Assembly asm in GetAllAssemblies ()) {
-				var res = asm.GetManifestResourceInfo (resourceName);
-				if (res != null) {
-					// Mono doesn't set the referenced assembly
-					if (res.ReferencedAssembly == null)
-						return new ManifestResourceInfo (asm, res.FileName, res.ResourceLocation);
-					return res;
-				}
-			}
-
-			// Look in the dependent add-ins
-			foreach (RuntimeAddin addin in GetAllDependencies ()) {
-				var res = addin.GetResourceInfo (resourceName);
-				if (res != null)
-					return res;
-			}
-
-			return null;
-		}
 
 		/// <summary>
 		/// Localizer which can be used to localize strings defined in this add-in
@@ -696,7 +662,7 @@ void LoadModule (ModuleDescription module)
 					// Sorry, you can't load addins from
 					// dynamic assemblies as get_Location
 					// throws a NotSupportedException
-                    if (a is System.Reflection.Emit.AssemblyBuilder || a.IsDynamic) {
+                    if (a is System.Reflection.Emit.AssemblyBuilder || a.ManifestModule is System.Reflection.Emit.ModuleBuilder) {
 						continue;
 					}