Merge branch '3.0.x' of github.com:icsharpcode/ILSpy

# Conflicts:
#	ILSpy/Properties/AssemblyInfo.template.cs
#	appveyor.yml

BuildTools/appveyor-install.ps1

@@ -3,6 +3,8 @@ $ErrorActionPreference = "Stop"
 $baseCommit = "d779383cb85003d6dabeb976f0845631e07bf463";
 $baseCommitRev = 1;
 
+$masterBranches = @("master", "3.0.x");
+
 $globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs";
 
 $versionParts = @{};
@@ -18,10 +20,10 @@ if ($versionName -ne "null") {
 } else {
     $versionName = "";
 }
-if ($env:APPVEYOR_REPO_BRANCH -ne 'master') {
+if ($masterBranches -contains $env:APPVEYOR_REPO_BRANCH) {
-	$branch = "-$env:APPVEYOR_REPO_BRANCH";
-} else {
 	$branch = "";
+} else {
+	$branch = "-$env:APPVEYOR_REPO_BRANCH";
 }
 if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {
 	$suffix = "-pr$env:APPVEYOR_PULL_REQUEST_NUMBER";

ICSharpCode.Decompiler/DotNetCore/DotNetCorePathFinderExtensions.cs

@@ -43,6 +43,21 @@ namespace ICSharpCode.Decompiler
 			}
 		}
 
+		public void AddMessageOnce(string fullName, MessageKind kind, string message)
+		{
+			lock (loadedAssemblyReferences) {
+				if (!loadedAssemblyReferences.TryGetValue(fullName, out var referenceInfo)) {
+					referenceInfo = new UnresolvedAssemblyNameReference(fullName);
+					loadedAssemblyReferences.Add(fullName, referenceInfo);
+					referenceInfo.Messages.Add((kind, message));
+				} else {
+					var lastMsg = referenceInfo.Messages.LastOrDefault();
+					if (kind != lastMsg.Item1 && message != lastMsg.Item2)
+						referenceInfo.Messages.Add((kind, message));
+				}
+			}
+		}
+
 		public bool TryGetInfo(string fullName, out UnresolvedAssemblyNameReference info)
 		{
 			lock (loadedAssemblyReferences) {

ILSpy.AddIn/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="a9120dbe-164a-4891-842f-fb7829273838" Version="1.7.1.0" Language="en-US" Publisher="ic#code" />
+    <Identity Id="a9120dbe-164a-4891-842f-fb7829273838" Version="1.7.2.0" Language="en-US" Publisher="ic#code" />
     <DisplayName>ILSpy</DisplayName>
     <Description xml:space="preserve">Integrates the ILSpy decompiler into Visual Studio.</Description>
     <MoreInfo>http://www.ilspy.net</MoreInfo>

ILSpy/LoadedAssembly.cs

@@ -267,13 +267,11 @@ namespace ICSharpCode.ILSpy
 				foreach (LoadedAssembly loaded in assemblyList.GetAssemblies()) {
 					var asmDef = loaded.GetAssemblyDefinitionOrNull();
 					if (asmDef != null && data.fullName.Equals(data.isWinRT ? asmDef.Name.Name : asmDef.FullName, StringComparison.OrdinalIgnoreCase)) {
+						LoadedAssemblyReferencesInfo.AddMessageOnce(data.fullName, MessageKind.Info, "Success - Found in Assembly List");
 						return loaded;
 					}
 				}
 
-				if (assemblyLoadDisableCount > 0)
-					return null;
-
 				if (data.isWinRT) {
 					file = Path.Combine(Environment.SystemDirectory, "WinMetadata", data.fullName + ".winmd");
 				} else {
@@ -291,11 +289,14 @@ namespace ICSharpCode.ILSpy
 				if (file != null && loadingAssemblies.TryGetValue(file, out asm))
 					return asm;
 
+				if (assemblyLoadDisableCount > 0)
+					return null;
+
 				if (file != null) {
 					LoadedAssemblyReferencesInfo.AddMessage(data.fullName, MessageKind.Info, "Success - Loading from: " + file);
 					asm = new LoadedAssembly(assemblyList, file) { IsAutoLoaded = true };
 				} else {
-					LoadedAssemblyReferencesInfo.AddMessage(data.fullName, MessageKind.Error, "Could not find reference: " + data.fullName);
+					LoadedAssemblyReferencesInfo.AddMessageOnce(data.fullName, MessageKind.Error, "Could not find reference: " + data.fullName);
 					return null;
 				}
 				loadingAssemblies.Add(file, asm);

ILSpy/TreeNodes/EventTreeNode.cs

@@ -90,6 +90,8 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 		public override FilterResult Filter(FilterSettings settings)
 		{
+			if (!settings.ShowInternalApi && !IsPublicAPI)
+				return FilterResult.Hidden;
 			if (settings.SearchTermMatches(EventDefinition.Name) && settings.Language.ShowMember(EventDefinition))
 				return FilterResult.Match;
 			else

ILSpy/TreeNodes/FieldTreeNode.cs

@@ -104,6 +104,8 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 		public override FilterResult Filter(FilterSettings settings)
 		{
+			if (!settings.ShowInternalApi && !IsPublicAPI)
+				return FilterResult.Hidden;
 			if (settings.SearchTermMatches(FieldDefinition.Name) && settings.Language.ShowMember(FieldDefinition))
 				return FilterResult.Match;
 			else

ILSpy/TreeNodes/MethodTreeNode.cs

@@ -126,6 +126,8 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 		public override FilterResult Filter(FilterSettings settings)
 		{
+			if (!settings.ShowInternalApi && !IsPublicAPI)
+				return FilterResult.Hidden;
 			if (settings.SearchTermMatches(MethodDefinition.Name) && settings.Language.ShowMember(MethodDefinition))
 				return FilterResult.Match;
 			else

ILSpy/TreeNodes/PropertyTreeNode.cs

@@ -158,6 +158,8 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 		public override FilterResult Filter(FilterSettings settings)
 		{
+			if (!settings.ShowInternalApi && !IsPublicAPI)
+				return FilterResult.Hidden;
 			if (settings.SearchTermMatches(PropertyDefinition.Name) && settings.Language.ShowMember(PropertyDefinition))
 				return FilterResult.Match;
 			else

appveyor.yml

@@ -36,6 +36,6 @@ for:
     - path: ILSpy_binaries.zip
       name: ILSpy %APPVEYOR_REPO_BRANCH% %ILSPY_VERSION_NUMBER% binaries
     - path: '**\*.vsix'
-      name: ILSpy %APPVEYOR_REPO_BRANCH% %ILSPY_VERSION_NUMBER% VS AddIn
+      name: ILSpy AddIn for Visual Studio
     - path: '**\*.nupkg'
       name: ICSharpCode.Decompiler %APPVEYOR_REPO_BRANCH% %ILSPY_VERSION_NUMBER% NuGet