diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index b75c5e5e71..e123ea821c 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -197,6 +197,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Sln.In EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Sln.Internal.Tests", "test\Microsoft.DotNet.Cli.Sln.Internal.Tests\Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj", "{56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_fsc", "src\tool_fsharp\tool_fsc.csproj", "{602976C5-2477-4B4C-AD9A-1EAFB250529A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1621,5 +1623,6 @@ Global {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3} {C98C7C2E-2C29-4A40-958C-60561ED77791} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} + {602976C5-2477-4B4C-AD9A-1EAFB250529A} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} EndGlobalSection EndGlobal diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets index 9f8802765b..f89553f02e 100644 --- a/build/Microsoft.DotNet.Cli.Compile.targets +++ b/build/Microsoft.DotNet.Cli.Compile.targets @@ -126,6 +126,12 @@ VersionSuffix="$(VersionSuffix)" ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" /> + + @@ -169,6 +175,7 @@ + @@ -194,7 +201,8 @@ JITPath="$(LibCLRJitPath)" CrossgenPath="$(CrossgenPath)" ReadyToRun="True" - PlatformAssemblyPaths="@(PlatformAssemblies); + PlatformAssemblyPaths="%(CrossgenTargets.RootDir)%(CrossgenTargets.Directory); + @(PlatformAssemblies); @(CompileStageSdkDirectories); $(SharedFrameworkNameVersionPath)" /> diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index ed18c5be0a..aaacd11080 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -4,6 +4,7 @@ 1.1.2 15.3.0-preview-000400-01 2.3.0-beta3-61816-04 + 4.2.0-rc-170621-0 1.1.0-alpha-20170615-3 4.3.0-preview3-4168 1.0.0-alpha-20170516-2-509 diff --git a/src/tool_fsharp/RunFsc.cmd b/src/tool_fsharp/RunFsc.cmd new file mode 100644 index 0000000000..3be9b946ff --- /dev/null +++ b/src/tool_fsharp/RunFsc.cmd @@ -0,0 +1,6 @@ +@echo off + +REM Copyright (c) .NET Foundation and contributors. All rights reserved. +REM Licensed under the MIT license. See LICENSE file in the project root for full license information. + +"%~dp0..\..\..\dotnet" "%~dp0fsc.exe" %* diff --git a/src/tool_fsharp/RunFsc.sh b/src/tool_fsharp/RunFsc.sh new file mode 100644 index 0000000000..5ead812869 --- /dev/null +++ b/src/tool_fsharp/RunFsc.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +# +# 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. +# + +set -e + +SOURCE="${BASH_SOURCE[0]}" +while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink + DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + SOURCE="$(readlink "$SOURCE")" + [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + +"$DIR/../../../dotnet" "$DIR/fsc.exe" "$@" diff --git a/src/tool_fsharp/tool_fsc.csproj b/src/tool_fsharp/tool_fsc.csproj new file mode 100644 index 0000000000..2d1f6e8621 --- /dev/null +++ b/src/tool_fsharp/tool_fsc.csproj @@ -0,0 +1,60 @@ + + + + + + $(CliVersionPrefix) + netcoreapp1.1 + true + + + + + + + + + + PreserveNewest + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +