Merge remote-tracking branch 'upstream/master' into 1028624

src/.nuget/packages.config

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Open Technologies, Inc.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <packages>
-  <package id="Microsoft.Net.ToolsetCompilers" version="1.0.0-rc2-20150319-05" targetFramework="net45" />
-  <package id="Microsoft.Net.RoslynDiagnostics" version="1.0.0-rc2-20150319-05" targetFramework="net45" />
+  <package id="Microsoft.Net.ToolsetCompilers" version="1.0.0-rc2-20150413-02" targetFramework="net45" />
+  <package id="Microsoft.Net.RoslynDiagnostics" version="1.0.0-rc2-20150413-02" targetFramework="net45" />
   <package id="FakeSign" version="0.9.2" targetFramework="net45" />
 </packages>

src/EditorFeatures/CSharpTest/EditAndContinue/RudeEditTopLevelTests.cs

@@ -3136,6 +3136,42 @@ public void MethodUpdate_Iterator_YieldBreak()
             VerifyPreserveLocalVariables(edits, preserveLocalVariables: true);
         }
 
+        [WorkItem(1087305)]
+        [Fact]
+        public void MethodUpdate_LabeledStatement()
+        {
+            string src1 = @"
+class C
+{
+    static void Main(string[] args)
+    {
+        goto Label1;
+ 
+    Label1:
+        {
+            Console.WriteLine(1);
+        }
+    }
+}";
+            string src2 = @"
+class C
+{
+    static void Main(string[] args)
+    {
+        goto Label1;
+ 
+    Label1:
+        {
+            Console.WriteLine(2);
+        }
+    }
+}";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifyRudeDiagnostics();
+        }
+
         #endregion
 
         #region Operators

src/Features/CSharp/EditAndContinue/StatementSyntaxComparer.cs

@@ -767,6 +767,7 @@ private bool TryComputeWeightedDistance(BlockSyntax leftBlock, BlockSyntax right
                     return true;
 
                 case SyntaxKind.Block:
+                case SyntaxKind.LabeledStatement:
                     distance = ComputeWeightedBlockDistance(leftBlock, rightBlock);
                     return true;
 

src/Tools/Microsoft.CodeAnalysis.Toolset.Open/Targets/VSL.Settings.targets

@@ -54,8 +54,8 @@
   <!-- Import the global NuGet packages -->
   <PropertyGroup>
     <ToolsetCompilerPackageName>Microsoft.Net.ToolsetCompilers</ToolsetCompilerPackageName>
-    <ToolsetCompilerPropsFilePath>$(NuGetPackagesPath)\Microsoft.Net.ToolsetCompilers.1.0.0-rc2-20150319-05\build\Microsoft.Net.ToolsetCompilers.props</ToolsetCompilerPropsFilePath>
-    <RoslynDiagnosticsPropsFilePath>$(NuGetPackagesPath)\Microsoft.Net.RoslynDiagnostics.1.0.0-rc2-20150319-05\build\Microsoft.Net.RoslynDiagnostics.props</RoslynDiagnosticsPropsFilePath>
+    <ToolsetCompilerPropsFilePath>$(NuGetPackagesPath)\Microsoft.Net.ToolsetCompilers.1.0.0-rc2-20150413-02\build\Microsoft.Net.ToolsetCompilers.props</ToolsetCompilerPropsFilePath>
+    <RoslynDiagnosticsPropsFilePath>$(NuGetPackagesPath)\Microsoft.Net.RoslynDiagnostics.1.0.0-rc2-20150413-02\build\Microsoft.Net.RoslynDiagnostics.props</RoslynDiagnosticsPropsFilePath>
     <AdditionalFileItemNames>$(AdditionalFileItemNames);PublicAPI</AdditionalFileItemNames>
   </PropertyGroup>