Merge branch 'master' of github.com:icsharpcode/ILSpy into string-interpolation

# Conflicts:
#	ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

Author: siegfriedpammer

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') {
-	$branch = "-$env:APPVEYOR_REPO_BRANCH";
-} else {
+if ($masterBranches -contains $env:APPVEYOR_REPO_BRANCH) {
 	$branch = "";
+} else {
+	$branch = "-$env:APPVEYOR_REPO_BRANCH";
 }
 if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {
 	$suffix = "-pr$env:APPVEYOR_PULL_REQUEST_NUMBER";

BuildTools/update-assemblyinfo.ps1

@@ -3,6 +3,8 @@
 $baseCommit = "d779383cb85003d6dabeb976f0845631e07bf463";
 $baseCommitRev = 1;
 
+$masterBranches = @("master", "3.0.x");
+
 $globalAssemblyInfoTemplateFile = "ILSpy/Properties/AssemblyInfo.template.cs";
 
 function Test-File([string]$filename) {
@@ -96,10 +98,11 @@ try {
     $branchName = gitBranch;
     $gitCommitHash = gitCommitHash;
 
-    $postfixBranchName = "";
-    if ($branchName -ne "master") {
+    if ($masterBranches -contains $branchName) {
+        $postfixBranchName = "";
+    } else {
         $postfixBranchName = "-$branchName";
-    }
+	}
 
     if ($versionName -eq "null") {
         $versionName = "";

DecompilerNuGetDemos.workbook

@@ -6,7 +6,7 @@ platforms:
 - DotNetCore
 packages:
 - id: ICSharpCode.Decompiler
-  version: 3.0.0.3403-beta4 
+  version: 3.0.0.3447
 ---
 
 Setup: load the references required to work with the decompiler

ICSharpCode.Decompiler.Console/ICSharpCode.Decompiler.Console.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.0.1" />
-    <PackageReference Include="ICSharpCode.Decompiler" Version="3.0.0.3403-beta4" />
+    <PackageReference Include="ICSharpCode.Decompiler" Version="3.0.0.3447" />
 
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />

ICSharpCode.Decompiler.Console/Program.cs

@@ -75,9 +75,14 @@ static int Main(string[] args)
 			return app.Execute(args);
 		}
 
+		static CSharpDecompiler GetDecompiler(string assemblyFileName)
+		{
+			return new CSharpDecompiler(assemblyFileName, new DecompilerSettings() {  ThrowOnAssemblyResolveErrors = false });
+		}
+
 		static void ListContent(string assemblyFileName, TextWriter output, ISet<TypeKind> kinds)
 		{
-			CSharpDecompiler decompiler = new CSharpDecompiler(assemblyFileName, new DecompilerSettings());
+			CSharpDecompiler decompiler = GetDecompiler(assemblyFileName);
 
 			foreach (var type in decompiler.TypeSystem.Compilation.MainAssembly.GetAllTypeDefinitions()) {
 				if (!kinds.Contains(type.Kind))
@@ -95,7 +100,7 @@ static void DecompileAsProject(string assemblyFileName, string outputDirectory)
 
 		static void Decompile(string assemblyFileName, TextWriter output, string typeName = null)
 		{
-			CSharpDecompiler decompiler = new CSharpDecompiler(assemblyFileName, new DecompilerSettings());
+			CSharpDecompiler decompiler = GetDecompiler(assemblyFileName);
 
 			if (typeName == null) {
 				output.Write(decompiler.DecompileWholeModuleAsString());

ICSharpCode.Decompiler.PowerShell/Demo.ps1

@@ -10,7 +10,11 @@ Import-Module $modulePath
 $version = Get-DecompilerVersion
 Write-Output $version
 
-$decompiler = Get-Decompiler $modulePath
+# different test assemblies - it makes a difference wrt .deps.json so there are two netstandard tests here
+$asm_netstdWithDepsJson = $basePath + '\bin\Debug\netstandard2.0\ICSharpCode.Decompiler.Powershell.dll'
+$asm_netstd = $basePath + '\bin\Debug\netstandard2.0\ICSharpCode.Decompiler.dll'
+
+$decompiler = Get-Decompiler $asm_netstdWithDepsJson
 
 $classes = Get-DecompiledTypes $decompiler -Types class
 $classes.Count

ICSharpCode.Decompiler.PowerShell/GetDecompilerCmdlet.cs

@@ -20,7 +20,9 @@ protected override void ProcessRecord()
             string path = GetUnresolvedProviderPathFromPSPath(LiteralPath);
 
             try {
-                var decompiler = new CSharpDecompiler(path, new DecompilerSettings());
+                var decompiler = new CSharpDecompiler(path, new DecompilerSettings() {
+					ThrowOnAssemblyResolveErrors = false
+                });
                 WriteObject(decompiler);
 
             } catch (Exception e) {

ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="PowerShellStandard.Library" Version="3.0.0-preview-01" />
-    <PackageReference Include="ICSharpCode.Decompiler" Version="3.0.0.3403-beta4" />
+    <PackageReference Include="ICSharpCode.Decompiler" Version="3.0.0.3447" />
   </ItemGroup>
 
 </Project>

ICSharpCode.Decompiler.Tests/Helpers/Tester.cs

@@ -187,7 +187,7 @@ public static CompilerResults CompileCSharp(string sourceFileName, CompilerOptio
 			var preprocessorSymbols = GetPreprocessorSymbols(flags);
 
 			if (flags.HasFlag(CompilerOptions.UseRoslyn)) {
-				var parseOptions = new CSharpParseOptions(preprocessorSymbols: preprocessorSymbols.ToArray());
+				var parseOptions = new CSharpParseOptions(preprocessorSymbols: preprocessorSymbols.ToArray(), languageVersion: LanguageVersion.Latest);
 				var syntaxTrees = sourceFileNames.Select(f => SyntaxFactory.ParseSyntaxTree(File.ReadAllText(f), parseOptions, path: f));
 				var compilation = CSharpCompilation.Create(Path.GetFileNameWithoutExtension(sourceFileName),
 					syntaxTrees, defaultReferences.Value,

ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@@ -3,6 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net46</TargetFramework>
+    <LangVersion>latest</LangVersion>
 
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 
@@ -62,6 +63,8 @@
     <Compile Include="TestCases\Correctness\MiniJSON.cs" />
     <Compile Include="TestCases\Correctness\FloatingPointArithmetic.cs" />
     <Compile Include="TestCases\ILPretty\Issue982.cs" />
+    <Compile Include="TestCases\Pretty\AsyncMain.cs" />
+    <Compile Include="TestCases\Pretty\CS72_PrivateProtected.cs" />
     <Compile Include="TestCases\Pretty\CS6_StringInterpolation.cs" />
     <Compile Include="TestCases\Pretty\ExpressionTrees.cs" />
     <Compile Include="TestCases\Pretty\VariableNaming.cs" />