diff --git a/TestAssets/TestProjects/FSharpTestAppSimple/Program.fs b/TestAssets/TestProjects/FSharpTestAppSimple/Program.fs new file mode 100644 index 000000000..65479d645 --- /dev/null +++ b/TestAssets/TestProjects/FSharpTestAppSimple/Program.fs @@ -0,0 +1,10 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +module ConsoleApplication.Program + +open System + +[] +let main argv = + printfn "Hello World!" + 0 diff --git a/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj b/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj new file mode 100644 index 000000000..e504e9b9d --- /dev/null +++ b/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj @@ -0,0 +1,15 @@ + + + + + netcoreapp2.0 + Exe + + true + + + + + + + diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index 8a1c9daaf..5e12f441c 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -37,13 +37,6 @@ namespace Microsoft.DotNet.New.Tests bool useNuGetConfigForAspNet, bool skipSpaWebpackSteps) { - if (language == "F#" && !EnvironmentInfo.HasSharedFramework("netcoreapp1.0")) - { - // F# requires netcoreapp1.0 to be present in order to build - // https://github.com/dotnet/netcorecli-fsc/issues/76 - return; - } - string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName; new TestCommand("dotnet") { WorkingDirectory = rootPath } diff --git a/test/dotnet-pack.Tests/PackTests.cs b/test/dotnet-pack.Tests/PackTests.cs index 117b6bcc8..cceb09ec1 100644 --- a/test/dotnet-pack.Tests/PackTests.cs +++ b/test/dotnet-pack.Tests/PackTests.cs @@ -157,10 +157,12 @@ namespace Microsoft.DotNet.Tools.Pack.Tests .And.Contain(e => e.FullName == "lib/netstandard1.5/MyLibrary.pdb"); } - [Fact] - public void PackWorksWithLocalProject() + [Theory] + [InlineData("C#", "TestAppSimple")] + [InlineData("F#", "FSharpTestAppSimple")] + public void PackWorksWithLocalProject(string language, string projectName) { - var testInstance = TestAssets.Get("TestAppSimple") + var testInstance = TestAssets.Get(projectName) .CreateInstance() .WithSourceFiles() .WithRestoreFiles();