more Fsc task args (#88)

- pass properties to Fsc task, like skip compilation and fsc args
- use `FSharp.Compiler.Tools` v4.1.1
- reenable `dotnet new` tests

NuGet.Config

@@ -3,6 +3,5 @@
   <packageSources>
     <clear />
     <add key="nuget-org" value="https://api.nuget.org/v3/index.json" />
-    <add key="deps" value="https://www.myget.org/F/netcorecli-fsc-rc1-deps/api/v3/index.json" />
   </packageSources>
 </configuration>

build.proj

@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <FSharpNETSdkVersion>1.0.2</FSharpNETSdkVersion>
+    <FSharpNETSdkVersion>1.0.2-rc4-001</FSharpNETSdkVersion>
     <FSharpSdkVersion>1.0.0</FSharpSdkVersion>
   </PropertyGroup>
 

src/FSharp.NET.Sdk/FSharp.NET.Sdk.csproj

@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Compiler.Tools" Version="4.1.0" PrivateAssets="Compile" />
+    <PackageReference Include="FSharp.Compiler.Tools" Version="4.1.1" PrivateAssets="Compile" />
   </ItemGroup>
 
 </Project>

src/FSharp.NET.Sdk/build/FSharp.NET.Core.Sdk.targets

@@ -207,7 +207,10 @@ this file.
               HighEntropyVA="$(HighEntropyVA)"
               TargetProfile="$(TargetProfile)"
               DotnetFscCompilerPath="$(_FscTask_DotnetFscCompilerPath)"
-        />
+              SkipCompilerExecution="$(SkipCompilerExecution)"
+              ProvideCommandLineArgs="$(ProvideCommandLineArgs)">
+          <Output TaskParameter="CommandLineArgs" ItemName="FscCommandLineArgs" />
+        </Fsc>
 
     </Target>
 

test/dotnet-new.Tests/GivenThatIWantANewFSharp.cs

@@ -13,11 +13,13 @@ namespace NetcoreCliFsc.Tests
 {
     public class GivenThatIWantANewFSApp : TestBase
     {
-        // [Theory]
-        // [InlineData("console")]
-        // [InlineData("lib")]
-        // [InlineData("web")]
-        public void When_dotnet_build_is_invoked_Then_project_builds_without_warnings(string type)
+        [Theory]
+        [InlineData("console")]
+        [InlineData("lib")]
+        [InlineData("mvc")]
+        [InlineData("mstest")]
+        [InlineData("xunit")]
+        public void Check_default_templates(string type)
         {
             var rootPath = Temp.CreateDirectory().Path;
 
@@ -41,8 +43,16 @@ namespace NetcoreCliFsc.Tests
                     .Execute($"run {LogArgs}")
                     .Should().Pass();
             }
+
+            if (type == "mstest" || type == "xunit")
+            {
+                test("dotnet")
+                    .Execute($"test {LogArgs}")
+                    .Should().Pass();
+            }
         }
 
+
         /*
         [Fact]
         public void When_NewtonsoftJson_dependency_added_Then_project_restores_and_runs()

test/testAssets/TestSuiteProps/TestSuite.props

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(FSharpCorePkgVersion)' == '' ">
-    <FSharpCorePkgVersion>4.1.0</FSharpCorePkgVersion>
+    <FSharpCorePkgVersion>4.1.*</FSharpCorePkgVersion>
   </PropertyGroup>