fix fsfromfsviacs build

Author: eiriktsarpalis

tests/fsharp/core/fsfromfsviacs/lib.fs

@@ -42,7 +42,15 @@ let tup3 = (2,3,4)
 let tup4 = (2,3,4,5)
 
 
+type OptionalParameterTests =
+    static member MethodWithOptionalParams<'T>(?value1 : 'T, ?value2 : int) = (value1, value2)
 
+    static member FSharpMethodThatConsumesOptionalParams() = 
+        let _ = OptionalParameterTests.MethodWithOptionalParams<int>()
+        let _ = OptionalParameterTests.MethodWithOptionalParams<int>(42)
+        let _ = OptionalParameterTests.MethodWithOptionalParams<int>(value2 = 42)
+        let _ = OptionalParameterTests.MethodWithOptionalParams<int>(42, ?value2 = None)
+        ()
 
 
 module StructUnionsTests =
@@ -111,17 +119,4 @@ module NestedStructUnionsTests =
     let testPattern3mut(u2:U2) = 
         let mutable u2 = u2
         match u2 with
-        | U2(U1(dt1,"a"),U1(dt2,"b")) -> (dt1 = dt2) 
-
-
-module OptionalParameterTests =
-
-    type API =
-        static member MethodWithOptionalParams<'T>(?value1 : 'T, ?value2 : int) = (value1, value2)
-
-        static member FSharpMethodThatConsumesOptionalParams() = 
-            let _ = API.MethodWithOptionalParams<int>()
-            let _ = API.MethodWithOptionalParams<int>(42)
-            let _ = API.MethodWithOptionalParams<int>(value2 = 42)
-            let _ = API.MethodWithOptionalParams<int>(42, ?value2 = None)
-            ()
+        | U2(U1(dt1,"a"),U1(dt2,"b")) -> (dt1 = dt2) 

tests/fsharp/core/fsfromfsviacs/lib2.cs

@@ -1,3 +1,4 @@
+using System;
 using Microsoft.FSharp;
 using Microsoft.FSharp.Core;
 using Microsoft.FSharp.Collections;
@@ -67,7 +68,7 @@ public class ApiWrapper
     {
         public static Tuple<FSharpOption<T>, FSharpOption<int>> MethodWithOptionalParams<T>(T value1, int value2)
         {
-            return OptionalParameterTests.API.MethodWithOptionalParams<T>(value1 = value1, value2 = value2);
+            return Lib.OptionalParameterTests.MethodWithOptionalParams<T>(value1 = value1, value2 = value2);
         }
 
         public static int MethodThatImplicitlyConvertsFSharpOption(int x)