Skip to content

Commit 02eb8ff

Browse files
baronfelbaronfel
authored
Integrate fsharp aug 11 2019 (#908)
Integrate fsharp aug 11 2019
2 parents bf4c548 + c53a006 commit 02eb8ff

File tree

154 files changed

+3804
-5797
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+3804
-5797
lines changed

‎FSharpBuild.Directory.Build.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
<PropertyGroup>
1212
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
1313
<SymStoreDirectory>$(ArtifactsDir)\SymStore</SymStoreDirectory>
14-
<ProtoOutputPath Condition="'$(OS)' != 'Unix'">$(ArtifactsDir)\Bootstrap</ProtoOutputPath>
15-
<ProtoOutputPath Condition="'$(OS)' == 'Unix'">$(ArtifactsDir)/fsc/Proto/netcoreapp2.1</ProtoOutputPath>
14+
<ProtoOutputPath>$(ArtifactsDir)\Bootstrap</ProtoOutputPath>
1615
<ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>
1716
<WarningsAsErrors>1182;0025;$(WarningsAsErrors)</WarningsAsErrors>
1817
</PropertyGroup>
@@ -76,6 +75,7 @@
7675
<RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/Microsoft/visualfsharp</RepositoryUrl>
7776
<RepositoryType Condition="'$(RepositoryType)' == ''">git</RepositoryType>
7877
</PropertyGroup>
78+
7979
<PropertyGroup Condition="'$(FSharpSourceBuild)' == 'true' AND '$(RepositoryCommit)' == ''">
8080
<_DotGitDir>$(RepoRoot).git</_DotGitDir>
8181
<_HeadFileContent Condition="Exists('$(_DotGitDir)/HEAD')">$([System.IO.File]::ReadAllText('$(_DotGitDir)/HEAD').Trim())</_HeadFileContent>
@@ -88,18 +88,18 @@
8888
<PropertyGroup>
8989
<NoWarn Condition="'$(Language)' == 'F#'">$(NoWarn);FS2003</NoWarn><!-- warning when AssemblyInformationalVersion looks like '1.2.3-dev' -->
9090
<NoCompilerStandardLib>true</NoCompilerStandardLib><!-- necessary for resource generation using csc.exe -->
91-
<DebugType>portable</DebugType>
91+
<DebugType>embedded</DebugType>
9292
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
9393
<UseStandardResourceNames>false</UseStandardResourceNames>
9494
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9595
</PropertyGroup>
9696

9797
<!-- SDK targets override -->
9898
<PropertyGroup Condition="'$(Configuration)' != 'Proto' AND '$(DisableCompilerRedirection)'!='true' AND Exists('$(ProtoOutputPath)')">
99-
<FSharpTargetsPath>$(ProtoOutputPath)\Microsoft.FSharp.Targets</FSharpTargetsPath>
100-
<FSharpPropsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
101-
<FSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
102-
<FSharpOverridesTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
99+
<FSharpTargetsPath>$(ProtoOutputPath)\fsc\Microsoft.FSharp.Targets</FSharpTargetsPath>
100+
<FSharpPropsShim>$(ProtoOutputPath)\fsc\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
101+
<FSharpTargetsShim>$(ProtoOutputPath)\fsc\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
102+
<FSharpOverridesTargetsShim>$(ProtoOutputPath)\fsc\Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
103103
</PropertyGroup>
104104

105105
</Project>

‎FSharpTests.Directory.Build.props‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<BUILD_IN_FSHARP_REPOSITORY>true</BUILD_IN_FSHARP_REPOSITORY>
5+
</PropertyGroup>
6+
7+
<PropertyGroup Condition="'$(FSharpTestCompilerVersion)' == 'net40'">
8+
<DisableAutoSetFscCompilerPath>true</DisableAutoSetFscCompilerPath>
9+
10+
<FscToolPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net472</FscToolPath>
11+
<FscToolExe>fsc.exe</FscToolExe>
12+
<DotnetFscCompilerPath></DotnetFscCompilerPath>
13+
14+
<FsiToolPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net472</FsiToolPath>
15+
<FsiToolExe>fsi.exe</FsiToolExe>
16+
<DotnetFsiCompilerPath></DotnetFsiCompilerPath>
17+
</PropertyGroup>
18+
19+
<PropertyGroup Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">
20+
<DisableAutoSetFscCompilerPath>true</DisableAutoSetFscCompilerPath>
21+
22+
<FscToolPath>$([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)'))</FscToolPath>
23+
<FscToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe>
24+
<FscToolExe Condition="'$(OS)' == 'Unix'">dotnet</FscToolExe>
25+
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\netcoreapp2.1\fsc.exe</DotnetFscCompilerPath>
26+
27+
<FsiToolPath>$([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)'))</FsiToolPath>
28+
<FsiToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FsiToolExe>
29+
<FsiToolExe Condition="'$(OS)' == 'Unix'">dotnet</FsiToolExe>
30+
<DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\netcoreapp2.1\fsi.exe</DotnetFsiCompilerPath>
31+
</PropertyGroup>
32+
33+
<!-- SDK targets override -->
34+
<PropertyGroup>
35+
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'!='Core'">net472</_FSharpBuildTargetFramework>
36+
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">netcoreapp2.1</_FSharpBuildTargetFramework>
37+
<_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework)</_FSharpBuildBinPath>
38+
39+
<FSharpBuildAssemblyFile>$(_FSharpBuildBinPath)\FSharp.Build.dll</FSharpBuildAssemblyFile>
40+
41+
<FSharpTargetsPath>$(_FSharpBuildBinPath)/Microsoft.FSharp.Targets</FSharpTargetsPath>
42+
<FSharpPropsShim>$(_FSharpBuildBinPath)/Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
43+
<FSharpTargetsShim>$(_FSharpBuildBinPath)/Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
44+
<FSharpOverridesTargetsShim>$(_FSharpBuildBinPath)/Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
45+
</PropertyGroup>
46+
47+
</Project>

‎NuGet.config‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<solution>
44
<add key="disableSourceControlIntegration" value="true" />
@@ -8,6 +8,26 @@
88
<clear />
99
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1010
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
11+
<add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
12+
<add key="roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
13+
<add key="myget-dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
14+
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
15+
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
16+
<add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
17+
<add key="symreader-converter" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
18+
<add key="interactive-window" value="https://dotnet.myget.org/F/interactive-window/api/v3/index.json" />
19+
<add key="vs-devcore" value="https://myget.org/F/vs-devcore/api/v3/index.json" />
20+
<add key="vs-editor" value="https://myget.org/F/vs-editor/api/v3/index.json" />
21+
<add key="vssdk" value="https://vside.myget.org/F/vssdk/api/v3/index.json" />
22+
<add key="vs-impl" value="https://vside.myget.org/F/vs-impl/api/v3/index.json" />
23+
<add key="roslyn_concord" value="https://myget.org/F/roslyn_concord/api/v3/index.json" />
24+
<add key="devcore" value="https://vside.myget.org/F/devcore/api/v3/index.json" />
25+
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
26+
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
27+
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
28+
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
29+
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
30+
<add key="gRPC repository" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
1131
</packageSources>
1232
<disabledPackageSources>
1333
<clear />

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.0-beta3-19222-02
1+
3.2.0-beta4-19312-15

0 commit comments

Comments
 (0)