Fix up the unit tests

src/Compilers/CSharp/Test/Semantic/Semantics/ScriptSemanticsTests.cs

@@ -711,6 +711,7 @@ public void HostObjectBinding_InStaticContext()
                 Diagnostic(ErrorCode.ERR_ObjectRequired, "Y").WithArguments(typeName + ".C.Y"),
                 // (3,49): error CS0120: An object reference is required for the non-static field, method, or property 'Roslyn.Compilers.CSharp.UnitTests.Symbols.Source.InteractiveSessionTests.C.Z()'
                 Diagnostic(ErrorCode.ERR_ObjectRequired, "Z").WithArguments(typeName + ".C.Z()"));
+
         }
 
         [Fact]

src/Compilers/Test/Utilities/CSharp.Desktop/CSharpCompilerTestUtilities.Desktop.csproj

@@ -65,6 +65,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MockCSharpCompiler.cs" />
+    <Compile Include="ScriptTestFixtures.cs" />
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.CommandLine.UnitTests" />

src/Compilers/Test/Utilities/CSharp/ScriptTestFixtures.cs → src/Compilers/Test/Utilities/CSharp.Desktop/ScriptTestFixtures.cs

@@ -44,4 +44,4 @@ public class B2
             public int x = 1, w = 4;
         }
     }
-}
+}
\ No newline at end of file

src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj

@@ -34,7 +34,6 @@
     <Compile Include="Extensions.cs" />
     <Compile Include="LocalVariableDeclaratorsCollector.cs" />
     <Compile Include="MetadataTestHelpers.cs" />
-    <Compile Include="ScriptTestFixtures.cs" />
     <Compile Include="SemanticModelTestBase.cs" />
     <Compile Include="SymbolUtilities.cs" />
     <Compile Include="SyntaxTreeExtensions.cs" />
@@ -82,4 +81,4 @@
       <UserProperties project_1json__JSONSchema="http://json.schemastore.org/launchsettings" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file

src/EditorFeatures/CSharpTest/ExtractMethod/SelectionValidatorTests.cs

@@ -1332,7 +1332,7 @@ static void Main()
         [Fact, Trait(Traits.Feature, Traits.Features.ExtractMethod)]
         public async Task DontCrash()
         {
-            await IterateAllAsync(TestResource.AllInOneCSharpCode);
+            await IterateAllAsync(TestResource.AllInOneCSharpCodeVersion6);
         }
 
         [WorkItem(9931, "DevDiv_Projects/Roslyn")]

src/Test/Utilities/Portable/TestResource.Designer.cs

@@ -8,171 +8,206 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-using System.Reflection;
-
-/// <summary>
-///   A strongly-typed resource class, for looking up localized strings, etc.
-/// </summary>
-// This class was auto-generated by the StronglyTypedResourceBuilder
-// class via a tool like ResGen or Visual Studio.
-// To add or remove a member, edit your .ResX file then rerun ResGen
-// with the /str option, or rebuild your VS project.
-[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-internal class TestResource {
-    
-    private static global::System.Resources.ResourceManager resourceMan;
+namespace Roslyn.Test.Utilities {
+    using System;
+    using System.Reflection;
     
-    private static global::System.Globalization.CultureInfo resourceCulture;
-    
-    [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-    internal TestResource() {
-    }
     
     /// <summary>
-    ///   Returns the cached ResourceManager instance used by this class.
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
-    [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-    internal static global::System.Resources.ResourceManager ResourceManager {
-        get {
-            if (object.ReferenceEquals(resourceMan, null)) {
-                global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TestResource", typeof(TestResource).GetTypeInfo().Assembly);
-                resourceMan = temp;
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class TestResource {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal TestResource() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TestResource", typeof(TestResource).GetTypeInfo().Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
             }
-            return resourceMan;
         }
-    }
-    
-    /// <summary>
-    ///   Overrides the current thread's CurrentUICulture property for all
-    ///   resource lookups using this strongly typed resource class.
-    /// </summary>
-    [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-    internal static global::System.Globalization.CultureInfo Culture {
-        get {
-            return resourceCulture;
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
         }
-        set {
-            resourceCulture = value;
+        
+        /// <summary>
+        ///   Looks up a localized string similar to #error Error message
+        ///#warning Warning message
+        ///#pragma warning disable 414, 3021
+        ///#pragma warning restore 3021
+        ///#pragma checksum &quot;file.txt&quot; &quot;{00000000-0000-0000-0000-000000000000}&quot; &quot;2453&quot;
+        ///#define foo
+        ///#if foo
+        ///#else
+        ///#endif
+        ///#undef foo
+        ///
+        ///extern alias Foo;
+        ///
+        ///using System;
+        ///using System.Collections.Generic;
+        ///using System.Linq;
+        ///using System.Linq.Expressions;
+        ///using System.Text;
+        ///using M = System.Math;
+        ///
+        ///#if DEBUG || TRACE
+        ///using System.Diagnostics;
+        ///#elif SILVERLIGHT &amp;&amp; WINDOWS_PHONE || DEBUG || foo == t [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string AllInOneCSharpCode {
+            get {
+                return ResourceManager.GetString("AllInOneCSharpCode", resourceCulture);
+            }
         }
-    }
-    
-    /// <summary>
-    ///   Looks up a localized string similar to #error Error message
-    ///#warning Warning message
-    ///#pragma warning disable 414, 3021
-    ///#pragma warning restore 3021
-    ///#pragma checksum &quot;file.txt&quot; &quot;{00000000-0000-0000-0000-000000000000}&quot; &quot;2453&quot;
-    ///#define foo
-    ///#if foo
-    ///#else
-    ///#endif
-    ///#undef foo
-    ///
-    ///extern alias Foo;
-    ///
-    ///using System;
-    ///using System.Collections.Generic;
-    ///using System.Linq;
-    ///using System.Linq.Expressions;
-    ///using System.Text;
-    ///using M = System.Math;
-    ///
-    ///#if DEBUG || TRACE
-    ///using System.Diagnostics;
-    ///#elif SILVERLIGHT &amp;&amp; WINDOWS_PHONE || DEBUG || foo == t [rest of string was truncated]&quot;;.
-    /// </summary>
-    internal static string AllInOneCSharpCode {
-        get {
-            return ResourceManager.GetString("AllInOneCSharpCode", resourceCulture);
+        
+        /// <summary>
+        ///   Looks up a localized string similar to #error Error message
+        ///#warning Warning message
+        ///#pragma warning disable 414, 3021
+        ///#pragma warning restore 3021
+        ///#pragma checksum &quot;file.txt&quot; &quot;{00000000-0000-0000-0000-000000000000}&quot; &quot;2453&quot;
+        ///#define foo
+        ///#if foo
+        ///#else
+        ///#endif
+        ///#undef foo
+        ///
+        ///extern alias Foo;
+        ///
+        ///using System;
+        ///using System.Collections.Generic;
+        ///using System.Linq;
+        ///using System.Linq.Expressions;
+        ///using System.Text;
+        ///using M = System.Math;
+        ///
+        ///#if DEBUG || TRACE
+        ///using System.Diagnostics;
+        ///#elif SILVERLIGHT &amp;&amp; WINDOWS_PHONE || DEBUG || foo == t [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string AllInOneCSharpCodeVersion6 {
+            get {
+                return ResourceManager.GetString("AllInOneCSharpCodeVersion6", resourceCulture);
+            }
         }
-    }
-    
-    /// <summary>
-    ///   Looks up a localized string similar to Option Infer On
-    ///Option Explicit Off
-    ///
-    ///Imports System
-    ///Imports System.Collections.Generic
-    ///Imports System.Linq
-    ///Imports System.Linq.Expressions
-    ///Imports System.Text
-    ///Imports M = System.Math
-    ///Imports System.Collections
-    ///Imports &lt;xmlns:ns=&quot;foo&quot;&gt;
-    ///Imports &lt;xmlns=&quot;foo&quot;&gt;
-    ///#Const line = 6
-    ///#Const foo = True
-    ///#If foo Then
-    ///#Else
-    ///#End If
-    ///&apos; There is no equivalent to #undef in VB.NET:
-    ///&apos;#undef foo
-    ///&apos;#warning foo
-    ///&apos;#error foo
-    ///&apos; There is no equivalent to &apos;extern alias&apos; in VB:
-    ///&apos;extern alias Foo;
-    ///#If DEBUG OrElse T [rest of string was truncated]&quot;;.
-    /// </summary>
-    internal static string AllInOneVisualBasicBaseline {
-        get {
-            return ResourceManager.GetString("AllInOneVisualBasicBaseline", resourceCulture);
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Option Infer On
+        ///Option Explicit Off
+        ///
+        ///Imports System
+        ///Imports System.Collections.Generic
+        ///Imports System.Linq
+        ///Imports System.Linq.Expressions
+        ///Imports System.Text
+        ///Imports M = System.Math
+        ///Imports System.Collections
+        ///Imports &lt;xmlns:ns=&quot;foo&quot;&gt;
+        ///Imports &lt;xmlns=&quot;foo&quot;&gt;
+        ///#Const line = 6
+        ///#Const foo = True
+        ///#If foo Then
+        ///#Else
+        ///#End If
+        ///&apos; There is no equivalent to #undef in VB.NET:
+        ///&apos;#undef foo
+        ///&apos;#warning foo
+        ///&apos;#error foo
+        ///&apos; There is no equivalent to &apos;extern alias&apos; in VB:
+        ///&apos;extern alias Foo;
+        ///#If DEBUG OrElse T [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string AllInOneVisualBasicBaseline {
+            get {
+                return ResourceManager.GetString("AllInOneVisualBasicBaseline", resourceCulture);
+            }
         }
-    }
-    
-    /// <summary>
-    ///   Looks up a localized string similar to Option Infer On
-    ///Option Explicit Off
-    ///
-    ///Imports System
-    ///Imports System.Collections.Generic
-    ///Imports System.Linq
-    ///Imports System.Linq.Expressions
-    ///Imports System.Text
-    ///Imports M = System.Math
-    ///Imports System.Collections
-    ///Imports &lt;xmlns:ns=&quot;foo&quot;&gt;
-    ///Imports &lt;xmlns=&quot;foo&quot;&gt;
-    ///
-    ///#Const line = 6
-    ///#Const foo = True
-    ///#If foo Then
-    ///#Else
-    ///#End If
-    ///&apos; There is no equivalent to #undef in VB.NET:
-    ///&apos;#undef foo
-    ///&apos;#warning foo
-    ///&apos;#error foo
-    ///&apos; There is no equivalent to &apos;extern alias&apos; in VB:
-    ///&apos;extern alias Foo;
-    ///
-    ///#If DEBUG OrEl [rest of string was truncated]&quot;;.
-    /// </summary>
-    internal static string AllInOneVisualBasicCode {
-        get {
-            return ResourceManager.GetString("AllInOneVisualBasicCode", resourceCulture);
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Option Infer On
+        ///Option Explicit Off
+        ///
+        ///Imports System
+        ///Imports System.Collections.Generic
+        ///Imports System.Linq
+        ///Imports System.Linq.Expressions
+        ///Imports System.Text
+        ///Imports M = System.Math
+        ///Imports System.Collections
+        ///Imports &lt;xmlns:ns=&quot;foo&quot;&gt;
+        ///Imports &lt;xmlns=&quot;foo&quot;&gt;
+        ///
+        ///#Const line = 6
+        ///#Const foo = True
+        ///#If foo Then
+        ///#Else
+        ///#End If
+        ///&apos; There is no equivalent to #undef in VB.NET:
+        ///&apos;#undef foo
+        ///&apos;#warning foo
+        ///&apos;#error foo
+        ///&apos; There is no equivalent to &apos;extern alias&apos; in VB:
+        ///&apos;extern alias Foo;
+        ///
+        ///#If DEBUG OrEl [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string AllInOneVisualBasicCode {
+            get {
+                return ResourceManager.GetString("AllInOneVisualBasicCode", resourceCulture);
+            }
         }
-    }
-    
-    /// <summary>
-    ///   Looks up a localized string similar to Imports System
-    ///Imports System.Collections.Generic
-    ///Imports System.Linq
-    ///
-    ///&apos;&apos;&apos; &lt;summary&gt;
-    ///&apos;&apos;&apos; Sample Documentation
-    ///&apos;&apos;&apos; &lt;/summary&gt;
-    ///Module Program
-    ///    Sub Main(args As String())
-    ///        &apos; User Comments
-    ///        Console.WriteLine(5)
-    ///    End Sub
-    ///End Module.
-    /// </summary>
-    internal static string HelloWorldVisualBasicCode {
-        get {
-            return ResourceManager.GetString("HelloWorldVisualBasicCode", resourceCulture);
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Imports System
+        ///Imports System.Collections.Generic
+        ///Imports System.Linq
+        ///
+        ///&apos;&apos;&apos; &lt;summary&gt;
+        ///&apos;&apos;&apos; Sample Documentation
+        ///&apos;&apos;&apos; &lt;/summary&gt;
+        ///Module Program
+        ///    Sub Main(args As String())
+        ///        &apos; User Comments
+        ///        Console.WriteLine(5)
+        ///    End Sub
+        ///End Module.
+        /// </summary>
+        public static string HelloWorldVisualBasicCode {
+            get {
+                return ResourceManager.GetString("HelloWorldVisualBasicCode", resourceCulture);
+            }
         }
     }
 }

src/Test/Utilities/Portable/project.json

@@ -9,7 +9,7 @@
     "System.Diagnostics.Debug": "4.3.0",
     "System.Diagnostics.Tools": "4.3.0",
     "System.Diagnostics.TraceSource": "4.3.0",
-    "System.Diagnostics.Process": "4.1.0",
+    "System.Diagnostics.Process": "4.3.0",
     "System.IO.FileSystem": "4.3.0",
     "System.Reflection.TypeExtensions": "4.3.0",
     "System.Text.RegularExpressions": "4.3.0",