dotnet · VSadov · Sep 23, 2015 · Sep 23, 2015 · Sep 23, 2015 · Sep 23, 2015
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 SHELL = /bin/bash
 OS_NAME = $(shell uname -s)
-NUGET_PACKAGE_NAME = nuget.45
+NUGET_PACKAGE_NAME = nuget.future.5
 BUILD_CONFIGURATION = Debug
 BOOTSTRAP_PATH = $(shell pwd)/Binaries/Bootstrap
 BUILD_LOG_PATH =

diff --git a/Roslyn.sln b/Roslyn.sln
diff --git a/build/Targets/GenerateInternalsVisibleTo.targets b/build/Targets/GenerateInternalsVisibleTo.targets
@@ -25,6 +25,7 @@
   <PropertyGroup Condition="'$(PublicKey)' != '' and '$(SignAssembly)' == 'True'">
     <InternalsVisibleToSuffix>, PublicKey=$(PublicKey)</InternalsVisibleToSuffix>
     <InternalsVisibleToTestSuffix>, PublicKey=$(RoslynInternalKey)</InternalsVisibleToTestSuffix>
+    <InternalsVisibleToMoqSuffix>, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</InternalsVisibleToMoqSuffix>
   </PropertyGroup>
 
   <!-- Dependency on PrepareForBuild is necessary so that we don't accidentally get ordered before it.
@@ -67,7 +68,7 @@
       <Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
     </CreateItem>
     <CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"
-                AdditionalMetadata="_Parameter1=%(InternalsVisibleToMoq.Identity), PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7"
+                AdditionalMetadata="_Parameter1=%(InternalsVisibleToMoq.Identity)$(InternalsVisibleToMoqSuffix)"
                 Condition="'@(InternalsVisibleToMoq)' != ''">
       <Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
     </CreateItem>

diff --git a/build/Targets/VSL.Imports.targets b/build/Targets/VSL.Imports.targets
@@ -1,6 +1,20 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 
+  <!-- Turn off implict binary and project reference copying to prevent projects
+       from racing to copy the same files to the shared build directory -->
+  <ItemDefinitionGroup Condition="'$(CopyReferencesByDefault)' == 'false'">
+
+    <Reference>
+      <Private>false</Private>
+    </Reference>
+
+    <ProjectReference>
+      <Private>false</Private>
+    </ProjectReference>
+
+  </ItemDefinitionGroup>
+
   <!-- This file is imported by all projects at the end of the project files -->
   <!-- Update common properties -->
   <PropertyGroup>

diff --git a/build/Targets/VSL.Versions.targets b/build/Targets/VSL.Versions.targets
@@ -1,6 +1,6 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <RoslynSemanticVersion Condition="'$(RoslynSemanticVersion)' == ''">1.2.0</RoslynSemanticVersion>
+    <RoslynSemanticVersion Condition="'$(RoslynSemanticVersion)' == ''">2.0.0</RoslynSemanticVersion>
     <SystemReflectionMetadataAssemblyVersion Condition="'$(SystemReflectionMetadataAssemblyVersion)' == ''">1.2.0</SystemReflectionMetadataAssemblyVersion>
     <SystemCollectionsImmutableAssemblyVersion Condition="'$(SystemCollectionsImmutableAssemblyVersion)' == ''">1.1.37</SystemCollectionsImmutableAssemblyVersion>
     <NuGetCommandLineAssemblyVersion Condition="'$(NuGetCommandLineAssemblyVersion)' == ''">2.8.5</NuGetCommandLineAssemblyVersion>

diff --git a/build/scripts/VBCSCompiler.exe.config b/build/scripts/VBCSCompiler.exe.config
@@ -6,15 +6,15 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />

diff --git a/build/scripts/csc.exe.config b/build/scripts/csc.exe.config
@@ -6,15 +6,15 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />

diff --git a/build/scripts/vbc.exe.config b/build/scripts/vbc.exe.config
@@ -6,15 +6,15 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />

diff --git a/cibuild.cmd b/cibuild.cmd
@@ -3,7 +3,7 @@
 REM Parse Arguments.
 
 set NugetZipUrlRoot=https://dotnetci.blob.core.windows.net/roslyn
-set NugetZipUrl=%NuGetZipUrlRoot%/nuget.45.zip
+set NugetZipUrl=%NuGetZipUrlRoot%/nuget.future.5.zip
 set RoslynRoot=%~dp0
 set BuildConfiguration=Debug
 set BuildRestore=false

diff --git a/docs/features/local-functions.md b/docs/features/local-functions.md
@@ -0,0 +1,58 @@
+Local Functions
+===============
+
+This feature is to support the definition of functions in block scope.
+
+Local functions may use variables defined in the enclosing scope. The current implementation requires that every variable read inside a local function be definitely assigned, as if executing the local function at its point of definition. Also, the local function definition must have been "executed" at any use point.
+
+After experimenting with that a bit (for example, it is not possible to define two mutually recursive local functions), we've since revised how we want the definite assignment to work. The revision (not yet implemented) is that all local variables read in a local function must be definitely assigned at each invocation of the local function. That's actually more subtle than it sounds, and there is a bunch of work remaining to make it work. Once it is done you'll be able to move your local functions to the end of its enclosing block.
+
+The new definite assignment rules are incompatible with inferring the return type of a local function, so we'll likely be removing support for inferring the return type.
+
+Unless you convert a local function to a delegate, capturing is done into frames that are value types. That means you don't get any GC pressure from using local functions with capturing.
+
+We don't have a spec yet, but the feature is fairly straightforward.
+
+--------------------
+
+Below is a checklist of work on the feature
+- [ ] Parser ambiguity research
+	- Some thought done, not complete
+	- Currently thought to be unambiguous past the parameter list (starting at `{` or `=>`), but that requires lots of lookahead.
+	- See LanguageParser.cs for comments on both ambiguity in standard parsing, and ambiguity in error recovery.
+- [x] N-level nested local functions
+- [x] Capture
+	- Works alongside lambdas and behaves very similarly in fallback cases
+	- Has zero-allocation closures (struct frames by ref) on functions never converted to a delegate and are not an iterator/async
+- [x] Standard parameter features
+	- params
+	- ref/out
+	- named/optional
+- [x] Visibility
+	- May revisit design (currently shadows, may do overloads)
+- [x] Generics
+	- Nongeneric local functions in generic methods (same as lambdas).
+	- Generic local functions in nongeneric methods.
+	- Generic local functions in generic methods.
+	- Arbitrary nesting of generic local functions.
+	- Generic local functions with constraints.
+- [x] Inferred return type
+- [x] Iterators
+- [x] Async
+- [ ] API
+- [ ] Editor
+	- [x] Basic features (variable highlight, rename, etc.)
+	- [ ] Advanced features (refactorings, analyzers)
+
+Intentionally disabled features that might eventually be in the end result:
+- Calling a local function with a dynamic argument (due to name mangling and potential conflicts with closures and possibly overloads/shadows)
+- Referring to a local function in an expression tree (note that defining a local function itself in an expression tree is impossible)
+- Definite assignment rules: Currently, all captured variables must be assigned at point of local function declaration. Might change to requiring assignment at point of local function use, not declaration (would allow mutually recursive local functions without nesting, etc.). Related to "Visibility" point in main list.
+
+TODO:
+
+- Update error messages.
+	- `LocalScopeBinder.ReportConflictWithLocal()` (twice)
+- `LocalScopeBinder.EnsureSingleDefinition()`, handle case where 'name' exists in both `localsMap` and `localFunctionsMap`. Might be related to `LocalFunctionTests.NameConflictLocalVarLast()`
+- Defining a local function with a dynamic parameter doesn't work at runtime.
+- Return type of `var` is broken - see LocalFunctionSymbol.cs for an explanation. Fixing it will require a large rewrite of much of return type analysis, as the current system assumes that all return types are known (mostly) without examining the method body.