WIP: SRM and SCI update

build/Targets/GenerateCompilerExecutableBindingRedirects.targets

@@ -25,7 +25,7 @@
       <MaxVersion>$(AssemblyVersion)</MaxVersion>
     </SuggestedBindingRedirects>
     <SuggestedBindingRedirects Include="System.Collections.Immutable, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <MaxVersion>1.2.1.0</MaxVersion>
+      <MaxVersion>1.2.3.0</MaxVersion>
     </SuggestedBindingRedirects>
     <SuggestedBindingRedirects Include="System.Console, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <MaxVersion>4.0.1.0</MaxVersion>
@@ -49,7 +49,7 @@
       <MaxVersion>4.0.1.0</MaxVersion>
     </SuggestedBindingRedirects>
     <SuggestedBindingRedirects Include="System.Reflection.Metadata, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <MaxVersion>1.4.1.0</MaxVersion>
+      <MaxVersion>1.4.3.0</MaxVersion>
     </SuggestedBindingRedirects>
     <SuggestedBindingRedirects Include="System.Threading.Thread, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <MaxVersion>4.0.1.0</MaxVersion>

build/Targets/Packages.props

@@ -40,18 +40,18 @@
     <MicrosoftCSharpVersion>4.3.0</MicrosoftCSharpVersion>
     <MicrosoftDiagnosticsRuntimeVersion>0.8.31-beta</MicrosoftDiagnosticsRuntimeVersion>
     <MicrosoftDiagnosticsTracingTraceEventVersion>1.0.35</MicrosoftDiagnosticsTracingTraceEventVersion>
-    <MicrosoftDiaSymReaderVersion>1.2.0</MicrosoftDiaSymReaderVersion>
-    <MicrosoftDiaSymReaderConverterVersion>1.1.0-beta1-62628-01</MicrosoftDiaSymReaderConverterVersion>
-    <MicrosoftDiaSymReaderConverterXmlVersion>1.1.0-beta1-62628-01</MicrosoftDiaSymReaderConverterXmlVersion>
+    <MicrosoftDiaSymReaderVersion>1.3.0-beta-62801-02</MicrosoftDiaSymReaderVersion>
+    <MicrosoftDiaSymReaderConverterVersion>1.1.0-beta1-62801-01</MicrosoftDiaSymReaderConverterVersion>
+    <MicrosoftDiaSymReaderConverterXmlVersion>1.1.0-beta1-62801-01</MicrosoftDiaSymReaderConverterXmlVersion>
     <MicrosoftDiaSymReaderNativeVersion>1.7.0</MicrosoftDiaSymReaderNativeVersion>
-    <MicrosoftDiaSymReaderPortablePdbVersion>1.4.0</MicrosoftDiaSymReaderPortablePdbVersion>
+    <MicrosoftDiaSymReaderPortablePdbVersion>1.5.0-beta-62801-02</MicrosoftDiaSymReaderPortablePdbVersion>
     <MicrosoftDotNetIBCMerge>4.7.2-alpha-00001</MicrosoftDotNetIBCMerge>
     <MicrosoftDotNetVersionToolsVersion>1.0.27-prerelease-01811-02</MicrosoftDotNetVersionToolsVersion>
     <MicrosoftDotNetBuildTasksFeedVersion>2.1.0-prerelease-02419-02</MicrosoftDotNetBuildTasksFeedVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryVersion>3.13.8</MicrosoftIdentityModelClientsActiveDirectoryVersion>
     <MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>15.0.26730-alpha</MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>
     <MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion>14.3.25407-alpha</MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion>
-    <MicrosoftMetadataVisualizerVersion>1.0.0-beta1-61531-03</MicrosoftMetadataVisualizerVersion>
+    <MicrosoftMetadataVisualizerVersion>1.0.0-beta1-62801-01</MicrosoftMetadataVisualizerVersion>
     <MicrosoftMSXMLVersion>8.0.0.0-alpha</MicrosoftMSXMLVersion>
     <!-- Using a private build of Microsoft.Net.Test.SDK to work around issue https://github.com/Microsoft/vstest/issues/373 -->
     <MicrosoftNETTestSdkVersion>15.6.0-dev</MicrosoftNETTestSdkVersion>
@@ -158,7 +158,7 @@
     <SystemAppContextVersion>4.3.0</SystemAppContextVersion>
     <SystemCollectionsVersion>4.3.0</SystemCollectionsVersion>
     <SystemCollectionsConcurrentVersion>4.3.0</SystemCollectionsConcurrentVersion>
-    <SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
+    <SystemCollectionsImmutableVersion>1.5.0-preview2-26401-03</SystemCollectionsImmutableVersion>
     <SystemConsoleVersion>4.3.0</SystemConsoleVersion>
     <SystemDataCommonVersion>4.3.0</SystemDataCommonVersion>
     <SystemDiagnosticsContractsVersion>4.3.0</SystemDiagnosticsContractsVersion>
@@ -191,7 +191,7 @@
     <SystemObjectModelVersion>4.3.0</SystemObjectModelVersion>
     <SystemReflectionVersion>4.3.0</SystemReflectionVersion>
     <SystemReflectionExtensionsVersion>4.3.0</SystemReflectionExtensionsVersion>
-    <SystemReflectionMetadataVersion>1.4.2</SystemReflectionMetadataVersion>
+    <SystemReflectionMetadataVersion>1.6.0-preview2-26401-03</SystemReflectionMetadataVersion>
     <SystemReflectionPrimitivesVersion>4.3.0</SystemReflectionPrimitivesVersion>
     <SystemReflectionTypeExtensionsVersion>4.3.0</SystemReflectionTypeExtensionsVersion>
     <SystemResourcesResourceManagerVersion>4.3.0</SystemResourcesResourceManagerVersion>

build/Targets/Roslyn.Toolsets.Xunit.targets

@@ -20,7 +20,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <ForceGenerationOfBindingRedirects>true</ForceGenerationOfBindingRedirects>
 
-    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net461' AND '$(RuntimeIdentifier)' == '' AND '$(OS)' == 'Windows_NT'">$(RoslynDesktopRuntimeIdentifier)</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net46' AND '$(RuntimeIdentifier)' == '' AND '$(OS)' == 'Windows_NT'">$(RoslynDesktopRuntimeIdentifier)</RuntimeIdentifier>
   </PropertyGroup>
 
   <Target Name="Test" DependsOnTargets="Build">

build/Targets/Settings.props

@@ -37,8 +37,7 @@
     <!-- Disable analyzers if NuGet deviated from the expected restore location (e.g. by changing case on a case-sensitive file system) -->
     <UseRoslynAnalyzers Condition="!Exists('$(NuGetPackageRoot)\Microsoft.CodeQuality.Analyzers\$(RoslynDiagnosticsNugetPackageVersion)\analyzers\dotnet\cs\Microsoft.CodeQuality.Analyzers.dll')">False</UseRoslynAnalyzers>
     <RoslynDiagnosticsPropsFilePath>$(NuGetPackageRoot)/microsoft.net.roslyndiagnostics/$(RoslynDiagnosticsNugetPackageVersion)/build/Microsoft.Net.RoslynDiagnostics.props</RoslynDiagnosticsPropsFilePath>
-    <RoslynPortableTargetFrameworks>net461;netcoreapp2.0</RoslynPortableTargetFrameworks>
-    <RoslynPortableTargetFrameworks46>net46;netcoreapp2.0</RoslynPortableTargetFrameworks46>
+    <RoslynPortableTargetFrameworks>net46;netcoreapp2.0</RoslynPortableTargetFrameworks>
     <RoslynPortableRuntimeIdentifiers>win;win-x64;linux-x64;osx-x64</RoslynPortableRuntimeIdentifiers>
     <RoslynDesktopRuntimeIdentifier>win</RoslynDesktopRuntimeIdentifier>
     <RoslynDesktopRuntimeIdentifierX86>win-x86</RoslynDesktopRuntimeIdentifierX86>

build/ToolsetPackages/RoslynToolset.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="RoslynTools.ReferenceAssemblies" Version="$(RoslynToolsReferenceAssembliesVersion)" ExcludeAssets="all" />
     <PackageReference Include="Microsoft.DiaSymReader.Pdb2Pdb" Version="$(MicrosoftDiaSymReaderPdb2PdbVersion)" ExcludeAssets="all" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
     <PackageReference Include="FakeSign" Version="$(FakeSignVersion)" ExcludeAssets="all" />
     <PackageReference Include="MicroBuild.Core.Sentinel" Version="$(MicroBuildCoreSentinelVersion)" ExcludeAssets="all" />
     <PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)" ExcludeAssets="all" />

build/config/SignToolData.json

@@ -106,7 +106,7 @@
       "strongName": null,
       "values": [
         "Dlls\\ServicesTestUtilities\\Roslyn.Services.Test.Utilities.dll",
-        "Dlls\\TestUtilities\\net461\\Roslyn.Test.Utilities.dll",
+        "Dlls\\TestUtilities\\net46\\Roslyn.Test.Utilities.dll",
         "Dlls\\VisualStudioIntegrationTestUtilities\\Microsoft.VisualStudio.IntegrationTest.Utilities.dll",
         "Vsix\\VisualStudioIntegrationTestSetup\\Microsoft.VisualStudio.IntegrationTest.Setup.dll"
       ]
@@ -144,7 +144,9 @@
         "Vsix\\VisualStudioSetup.Next\\Roslyn.VisualStudio.Setup.Next.vsix",
         "Vsix\\VisualStudioSetup\\Roslyn.VisualStudio.Setup.vsix",
         "Vsix\\Roslyn\\RoslynDeployment.vsix",
-        "Vsix\\VisualStudioIntegrationTestSetup\\Microsoft.VisualStudio.IntegrationTest.Setup.vsix"
+        "Vsix\\VisualStudioIntegrationTestSetup\\Microsoft.VisualStudio.IntegrationTest.Setup.vsix",
+        "Vsix\\CodeAnalysisCompilers\\Microsoft.CodeAnalysis.Compilers.vsix",
+        "Vsix\\PortableFacades\\PortableFacades.vsix"
       ]
     },
     {
@@ -224,14 +226,19 @@
     "System.IO.Pipes.AccessControl.dll",
     "System.IO.Pipes.dll",
     "System.IO.dll",
+    "System.Net.Security.dll",
+    "System.Net.Sockets.dll",
     "System.Reflection.Metadata.1.0.21.nupkg",
     "System.Reflection.Metadata.dll",
+    "System.Reflection.TypeExtensions.dll",
     "System.Reflection.dll",
     "System.Resources.Reader.dll",
     "System.Runtime.InteropServices.RuntimeInformation.dll",
+    "System.Runtime.Serialization.Primitives.dll",
     "System.Security.AccessControl.dll",
     "System.Security.Claims.dll",
     "System.Security.Cryptography.Algorithms.dll",
+    "System.Security.Cryptography.Csp.dll",
     "System.Security.Cryptography.Encoding.dll",
     "System.Security.Cryptography.Primitives.dll",
     "System.Security.Cryptography.X509Certificates.dll",

build/scripts/build-utils.ps1

@@ -136,7 +136,6 @@ function Ensure-NuGet() {
 # Ensure the proper SDK in installed in our %PATH%. This is how MSBuild locates the 
 # SDK. Returns the location to the dotnet exe
 function Ensure-DotnetSdk() {
-
     # Check to see if the specified dotnet installations meets our build requirements
     function Test-DotnetDir([string]$dotnetDir, [string]$runtimeVersion, [string]$sdkVersion) {
         $sdkPath = Join-Path $dotnetDir "sdk\$sdkVersion"
@@ -180,6 +179,9 @@ function Ensure-DotnetSdk() {
         Exec-Block { & $destFile -Version $sdkVersion -InstallDir $cliDir } | Out-Null
         Exec-Block { & $destFile -Version $runtimeVersion -SharedRuntime -InstallDir $cliDir } | Out-Null
     }
+    else {
+        ${env:PATH} = "$cliDir;${env:PATH}"
+    }
 
     return (Join-Path $cliDir "dotnet.exe")
 }

build/scripts/build.ps1

@@ -180,7 +180,10 @@ function Restore-Packages() {
         Write-Host "Restoring $($both[0])"
         $projectFilePath = $both[1]
         $projectFileName = [IO.Path]::GetFileNameWithoutExtension($projectFilePath)
-        $logFilePath = Join-Path $logsDir "Restore-$($projectFileName).binlog"
+        $logFilePath = ""
+        if ($binaryLog) { 
+            $logFilePath = Join-Path $logsDir "Restore-$($projectFileName).binlog"
+        }
         Restore-Project $dotnet $both[1] $logFilePath
     }
 }
@@ -283,6 +286,10 @@ function Build-ExtraSignArtifacts() {
         Run-MSBuild "..\Compilers\Server\VBCSCompiler\VBCSCompiler.csproj" "/p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding"
         Write-Host "Publishing MSBuildTask"
         Run-MSBuild "..\Compilers\Core\MSBuildTask\MSBuildTask.csproj" "/p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding"
+        Write-Host "Building PortableFacades Swix"
+        Run-MSBuild "DevDivVsix\PortableFacades\PortableFacades.swixproj"
+        Write-Host "Building CompilersCodeAnalysis Swix"
+        Run-MSBuild "DevDivVsix\CompilersPackage\Microsoft.CodeAnalysis.Compilers.swixproj"
 
         $dest = @($configDir)
         foreach ($dir in $dest) { 

build/scripts/tests.sh

@@ -22,7 +22,7 @@ if [[ "${runtime}" == "dotnet" ]]; then
     target_framework=netcoreapp2.0
     xunit_console="${nuget_dir}"/xunit.runner.console/"${xunit_console_version}"/tools/${target_framework}/xunit.console.dll
 elif [[ "${runtime}" == "mono" ]]; then
-    target_framework=net461
+    target_framework=net46
     xunit_console="${nuget_dir}"/xunit.runner.console/"${xunit_console_version}"/tools/net452/xunit.console.exe
 else
     echo "Unknown runtime: ${runtime}"

src/Compilers/CSharp/Portable/Binder/Binder.ValueChecks.cs

@@ -2328,8 +2328,20 @@ internal static uint GetValEscape(BoundExpression expr, uint scopeOfTheContainin
                     // Unsafe code will always be allowed to escape.
                     return Binder.ExternalScope;
 
+                case BoundKind.AsOperator:
+                case BoundKind.AwaitExpression:
+                case BoundKind.ConditionalAccess:
+                case BoundKind.NullCoalescingOperator:
+                case BoundKind.ArrayAccess:
+                    // only possible in error cases (if possible at all)
+                    return scopeOfTheContainingExpression;
+
                 default:
-                    throw ExceptionUtilities.UnexpectedValue($"{expr.Kind} expression of {expr.Type} type");
+                    // in error situations some unexpected nodes could make here
+                    // returning "scopeOfTheContainingExpression" seems safer than throwing.
+                    // we will still assert to make sure that all nodes are accounted for. 
+                    Debug.Assert(false, $"{expr.Kind} expression of {expr.Type} type");
+                    return scopeOfTheContainingExpression;
             }
         }
 
@@ -2643,20 +2655,28 @@ internal static bool CheckValEscape(SyntaxNode node, BoundExpression expr, uint
                     var operandExpression = ((BoundPointerIndirectionOperator)expr).Operand;
                     return CheckValEscape(operandExpression.Syntax, operandExpression, escapeFrom, escapeTo, checkingReceiver, diagnostics);
 
+                case BoundKind.AsOperator:
+                case BoundKind.AwaitExpression:
+                case BoundKind.ConditionalAccess:
+                case BoundKind.NullCoalescingOperator:
+                case BoundKind.ArrayAccess:
+                    // only possible in error cases (if possible at all)
+                    return false;
+
                 default:
-                    throw ExceptionUtilities.UnexpectedValue($"{expr.Kind} expression of {expr.Type} type");
+                    // in error situations some unexpected nodes could make here
+                    // returning "false" seems safer than throwing.
+                    // we will still assert to make sure that all nodes are accounted for. 
+                    Debug.Assert(false, $"{expr.Kind} expression of {expr.Type} type");
+                    return false;
 
                 #region "cannot produce ref-like values"
 //                case BoundKind.ThrowExpression:
 //                case BoundKind.ArgListOperator:
 //                case BoundKind.ArgList:
 //                case BoundKind.RefTypeOperator:
 //                case BoundKind.AddressOfOperator:
-//                case BoundKind.AsOperator:
 //                case BoundKind.TypeOfOperator:
-//                case BoundKind.ArrayAccess:
-//                case BoundKind.NullCoalescingOperator:
-//                case BoundKind.AwaitExpression:
 //                case BoundKind.IsOperator:
 //                case BoundKind.SizeOfOperator:
 //                case BoundKind.DynamicMemberAccess:
@@ -2674,7 +2694,6 @@ internal static bool CheckValEscape(SyntaxNode node, BoundExpression expr, uint
 //                case BoundKind.NoPiaObjectCreationExpression:
 //                case BoundKind.BaseReference:
 //                case BoundKind.Literal:
-//                case BoundKind.ConditionalAccess:
 //                case BoundKind.IsPatternExpression:
 //                case BoundKind.DeconstructionAssignmentOperator:
 //                case BoundKind.EventAccess:

src/Compilers/CSharp/Portable/Binder/Binder_Statements.cs

@@ -492,50 +492,61 @@ private BoundStatement BindLocalFunctionStatement(LocalFunctionStatementSyntax n
             var hasErrors = localSymbol.ScopeBinder
                 .ValidateDeclarationNameConflictsInScope(localSymbol, diagnostics);
 
-            BoundBlock block;
+            BoundBlock blockBody = null;
+            BoundBlock expressionBody = null;
             if (node.Body != null)
             {
-                block = BindEmbeddedBlock(node.Body, diagnostics);
+                blockBody = runAnalysis(BindEmbeddedBlock(node.Body, diagnostics), diagnostics);
+
+                if (node.ExpressionBody != null)
+                {
+                    var expressionBodyDiagnostics = new DiagnosticBag();
+                    expressionBody = runAnalysis(BindExpressionBodyAsBlock(node.ExpressionBody, expressionBodyDiagnostics), expressionBodyDiagnostics);
+                }
             }
             else if (node.ExpressionBody != null)
             {
-                block = BindExpressionBodyAsBlock(node.ExpressionBody, diagnostics);
+                expressionBody = runAnalysis(BindExpressionBodyAsBlock(node.ExpressionBody, diagnostics), diagnostics);
             }
             else
             {
-                block = null;
                 hasErrors = true;
                 diagnostics.Add(ErrorCode.ERR_LocalFunctionMissingBody, localSymbol.Locations[0], localSymbol);
             }
 
-            if (block != null)
-            {
-                localSymbol.ComputeReturnType();
-
-                // Have to do ControlFlowPass here because in MethodCompiler, we don't call this for synthed methods
-                // rather we go directly to LowerBodyOrInitializer, which skips over flow analysis (which is in CompileMethod)
-                // (the same thing - calling ControlFlowPass.Analyze in the lowering - is done for lambdas)
-                // It's a bit of code duplication, but refactoring would make things worse.
-                var endIsReachable = ControlFlowPass.Analyze(localSymbol.DeclaringCompilation, localSymbol, block, diagnostics);
-                if (endIsReachable)
-                {
-                    if (ImplicitReturnIsOkay(localSymbol))
-                    {
-                        block = FlowAnalysisPass.AppendImplicitReturn(block, localSymbol);
-                    }
-                    else
-                    {
-                        diagnostics.Add(ErrorCode.ERR_ReturnExpected, localSymbol.Locations[0], localSymbol);
-                    }
-                }
-            }
+            Debug.Assert(blockBody != null || expressionBody != null || hasErrors);
 
             localSymbol.GetDeclarationDiagnostics(diagnostics);
 
             Symbol.CheckForBlockAndExpressionBody(
                 node.Body, node.ExpressionBody, node, diagnostics);
 
-            return new BoundLocalFunctionStatement(node, localSymbol, block, hasErrors);
+            return new BoundLocalFunctionStatement(node, localSymbol, blockBody, expressionBody, hasErrors);
+
+            BoundBlock runAnalysis(BoundBlock block, DiagnosticBag blockDiagnostics)
+            {
+                if (block != null)
+                {
+                    // Have to do ControlFlowPass here because in MethodCompiler, we don't call this for synthed methods
+                    // rather we go directly to LowerBodyOrInitializer, which skips over flow analysis (which is in CompileMethod)
+                    // (the same thing - calling ControlFlowPass.Analyze in the lowering - is done for lambdas)
+                    // It's a bit of code duplication, but refactoring would make things worse.
+                    var endIsReachable = ControlFlowPass.Analyze(localSymbol.DeclaringCompilation, localSymbol, block, blockDiagnostics);
+                    if (endIsReachable)
+                    {
+                        if (ImplicitReturnIsOkay(localSymbol))
+                        {
+                            block = FlowAnalysisPass.AppendImplicitReturn(block, localSymbol);
+                        }
+                        else
+                        {
+                            blockDiagnostics.Add(ErrorCode.ERR_ReturnExpected, localSymbol.Locations[0], localSymbol);
+                        }
+                    }
+                }
+
+                return block;
+            }
         }
 
         private bool ImplicitReturnIsOkay(MethodSymbol method)

src/Compilers/CSharp/Portable/BoundTree/BoundLocalFunctionStatement.cs

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.CodeAnalysis.CSharp
+{
+    internal partial class BoundLocalFunctionStatement
+    {
+        public BoundBlock Body { get => BlockBody ?? ExpressionBody; }
+    }
+}

src/Compilers/CSharp/Portable/BoundTree/BoundNodes.xml

@@ -742,7 +742,8 @@
   -->
   <Node Name="BoundLocalFunctionStatement" Base="BoundStatement">
     <Field Name="Symbol" Type="LocalFunctionSymbol"/>
-    <Field Name="Body" Type="BoundBlock" Null="allow"/>
+    <Field Name="BlockBody" Type="BoundBlock" Null="allow"/>
+    <Field Name="ExpressionBody" Type="BoundBlock" Null="allow"/>
   </Node>
 
   <!--