-
Notifications
You must be signed in to change notification settings - Fork 802
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into match-bang
- Loading branch information
Showing
182 changed files
with
18,058 additions
and
1,717 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2.0.3-servicing-007056 | ||
| 2.1.300-preview3-008433 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,6 @@ | ||
| <Project> | ||
|
|
||
| <Import Project="build\targets\PackageVersions.props" /> | ||
| <Import Project="build\targets\CommonPackages.targets" /> | ||
|
|
||
| <!-- directory locations --> | ||
| <PropertyGroup> | ||
| <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> | ||
| <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot> | ||
| <FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot> | ||
| <ToolsRoot>$(RepoRoot)Tools</ToolsRoot> | ||
| <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> | ||
| <ProtoOutputPath>$(RepoRoot)Proto\net40\bin</ProtoOutputPath> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- nuget --> | ||
| <PropertyGroup> | ||
| <!-- default NuGet package restore location --> | ||
| <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot> | ||
| <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == ''">$(MSBuildThisFileDirectory)packages</NuGetPackageRoot> | ||
| <!-- ensure there is a trailing slash --> | ||
| <NuGetPackageRoot Condition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot> | ||
| <NuGetPackageRoot Condition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- signing --> | ||
| <PropertyGroup> | ||
| <SkipSigning>false</SkipSigning> | ||
| <SignAssembly>true</SignAssembly> | ||
| <AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile> | ||
| <StrongNames>true</StrongNames> | ||
| <DelaySign>true</DelaySign> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- mono --> | ||
| <PropertyGroup> | ||
| <MonoPackaging Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</MonoPackaging> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- localization --> | ||
| <PropertyGroup> | ||
| <EnableXlfLocalization Condition="'$(Configuration)' == 'Proto' or '$(MonoPackaging)' == 'true'">false</EnableXlfLocalization> | ||
| <UpdateXlfOnBuild Condition="'$(CI)' != '1'">true</UpdateXlfOnBuild> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- other --> | ||
| <PropertyGroup> | ||
| <DebugType>portable</DebugType> | ||
| <MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage> | ||
| <UseStandardResourceNames>false</UseStandardResourceNames> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- SDK targets override --> | ||
| <PropertyGroup Condition="'$(Configuration)' != 'Proto'"> | ||
| <ProtoFSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</ProtoFSharpTargetsShim> | ||
| <FSharpTargetsShim Condition="Exists('$(ProtoFSharpTargetsShim)')">$(ProtoFSharpTargetsShim)</FSharpTargetsShim> | ||
| </PropertyGroup> | ||
| <Import Project="FSharpBuild.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' == '' "/> | ||
| <Import Project="FSharpTests.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' != '' "/> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,6 @@ | ||
| <Project> | ||
|
|
||
| <PropertyGroup> | ||
| <XlfLanguages>en;$(XlfLanguages)</XlfLanguages> | ||
| <TargetDotnetProfile Condition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp'))">coreclr</TargetDotnetProfile> | ||
| <TargetDotnetProfile Condition="$(TargetFramework.StartsWith('net4'))">net40</TargetDotnetProfile> | ||
| <ActualOutputPath Condition="'$(Language)' != 'VB'">$(MSBuildProjectDirectory)\$(OutputPath)</ActualOutputPath> | ||
| <ActualOutputPath Condition="'$(Language)' == 'VB'">$(OutputPath)</ActualOutputPath> | ||
| <FinalOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</FinalOutputPath> | ||
| <FinalIntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj</FinalIntermediateOutputPath> | ||
| </PropertyGroup> | ||
|
|
||
| <Target Name="HACK_CopyOutputsToTheProperLocation" | ||
| AfterTargets="AfterBuild" | ||
| Condition="'$(DisableOutputPathCopying)' != 'true'"> | ||
| <!-- | ||
| Ideally we'd set <OutputPath> to `$(Configuration)\[net40|coreclr]\bin`, but the calculation of `[net40|coreclr]` | ||
| depends on the `$(TargetFramework)` variable which is set by the individual project files, but by the time we have | ||
| that value (e.g., in this file) it's too late; some targets, particularly from the VsSDK have already used the | ||
| values of $(OutputPath)/$(OutDir). | ||
| The fix is to not set `$(Outputpath)` and simply copy stuff there after the fact. | ||
| --> | ||
|
|
||
| <ItemGroup> | ||
| <OutputFilesToCopy Include="$(ActualOutputPath)**" /> | ||
| <IntermediateFilesToCopy Include="$(IntermediateOutputPath)\**" /> | ||
| </ItemGroup> | ||
|
|
||
| <Message Text="Copying build artifacts to $(FinalOutputPath)" /> | ||
| <MakeDir Directories="$(FinalOutputPath);$(FinalIntermediateOutputPath)" /> | ||
| <Copy SourceFiles="@(OutputFilesToCopy)" DestinationFolder="$(FinalOutputPath)" /> | ||
| <Copy SourceFiles="@(IntermediateFilesToCopy)" DestinationFolder="$(FinalIntermediateOutputPath)" /> | ||
| </Target> | ||
|
|
||
| <Import Project="build\targets\AssemblyVersions.props" /> | ||
| <Import Project="build\targets\ConvertPortablePdbs.targets" /> | ||
| <Import Project="build\targets\GenerateAssemblyAttributes.targets" /> | ||
| <Import Project="build\targets\GenerateInternalsVisibleTo.targets" /> | ||
| <Import Project="FSharpBuild.Directory.Build.targets" Condition = " '$(FSharpTestCompilerVersion)' == '' "/> | ||
| <Import Project="FSharpTests.Directory.Build.targets" Condition = " '$(FSharpTestCompilerVersion)' != '' "/> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| <Project> | ||
|
|
||
| <Import Project="build\targets\PackageVersions.props" /> | ||
| <Import Project="build\targets\CommonPackages.targets" /> | ||
|
|
||
| <!-- directory locations --> | ||
| <PropertyGroup> | ||
| <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> | ||
| <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot> | ||
| <FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot> | ||
| <ToolsRoot>$(RepoRoot)Tools</ToolsRoot> | ||
| <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> | ||
| <ProtoOutputPath>$(RepoRoot)Proto\net40\bin</ProtoOutputPath> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- nuget --> | ||
| <PropertyGroup> | ||
| <!-- default NuGet package restore location --> | ||
| <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot> | ||
| <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == ''">$(MSBuildThisFileDirectory)packages</NuGetPackageRoot> | ||
| <!-- ensure there is a trailing slash --> | ||
| <NuGetPackageRoot Condition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot> | ||
| <NuGetPackageRoot Condition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- signing --> | ||
| <PropertyGroup> | ||
| <SkipSigning>false</SkipSigning> | ||
| <SignAssembly>true</SignAssembly> | ||
| <AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile> | ||
| <StrongNames>true</StrongNames> | ||
| <DelaySign>true</DelaySign> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- mono --> | ||
| <PropertyGroup> | ||
| <MonoPackaging Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</MonoPackaging> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- localization --> | ||
| <PropertyGroup> | ||
| <EnableXlfLocalization Condition="'$(Configuration)' == 'Proto' or '$(MonoPackaging)' == 'true'">false</EnableXlfLocalization> | ||
| <UpdateXlfOnBuild Condition="'$(CI)' != '1'">true</UpdateXlfOnBuild> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- other --> | ||
| <PropertyGroup> | ||
| <DebugType>portable</DebugType> | ||
| <MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage> | ||
| <UseStandardResourceNames>false</UseStandardResourceNames> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- SDK targets override --> | ||
| <PropertyGroup Condition="'$(Configuration)' != 'Proto'"> | ||
| <ProtoFSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</ProtoFSharpTargetsShim> | ||
| <FSharpTargetsShim Condition="Exists('$(ProtoFSharpTargetsShim)')">$(ProtoFSharpTargetsShim)</FSharpTargetsShim> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <Project> | ||
|
|
||
| <PropertyGroup> | ||
| <XlfLanguages>en;$(XlfLanguages)</XlfLanguages> | ||
| <TargetDotnetProfile Condition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp'))">coreclr</TargetDotnetProfile> | ||
| <TargetDotnetProfile Condition="$(TargetFramework.StartsWith('net4'))">net40</TargetDotnetProfile> | ||
| <ActualOutputPath Condition="'$(Language)' != 'VB'">$(MSBuildProjectDirectory)\$(OutputPath)</ActualOutputPath> | ||
| <ActualOutputPath Condition="'$(Language)' == 'VB'">$(OutputPath)</ActualOutputPath> | ||
| <FinalOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</FinalOutputPath> | ||
| <FinalIntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj</FinalIntermediateOutputPath> | ||
| </PropertyGroup> | ||
|
|
||
| <Target Name="HACK_CopyOutputsToTheProperLocation" | ||
| AfterTargets="AfterBuild" | ||
| Condition="'$(DisableOutputPathCopying)' != 'true'"> | ||
| <!-- | ||
| Ideally we'd set <OutputPath> to `$(Configuration)\[net40|coreclr]\bin`, but the calculation of `[net40|coreclr]` | ||
| depends on the `$(TargetFramework)` variable which is set by the individual project files, but by the time we have | ||
| that value (e.g., in this file) it's too late; some targets, particularly from the VsSDK have already used the | ||
| values of $(OutputPath)/$(OutDir). | ||
| The fix is to not set `$(Outputpath)` and simply copy stuff there after the fact. | ||
| --> | ||
|
|
||
| <ItemGroup> | ||
| <OutputFilesToCopy Include="$(ActualOutputPath)**" /> | ||
| <IntermediateFilesToCopy Include="$(IntermediateOutputPath)\**" /> | ||
| </ItemGroup> | ||
|
|
||
| <Message Text="Copying build artifacts to $(FinalOutputPath)" /> | ||
| <MakeDir Directories="$(FinalOutputPath);$(FinalIntermediateOutputPath)" /> | ||
| <Copy SourceFiles="@(OutputFilesToCopy)" DestinationFolder="$(FinalOutputPath)" /> | ||
| <Copy SourceFiles="@(IntermediateFilesToCopy)" DestinationFolder="$(FinalIntermediateOutputPath)" /> | ||
| </Target> | ||
|
|
||
| <Import Project="build\targets\AssemblyVersions.props" /> | ||
| <Import Project="build\targets\ConvertPortablePdbs.targets" /> | ||
| <Import Project="build\targets\GenerateAssemblyAttributes.targets" /> | ||
| <Import Project="build\targets\GenerateInternalsVisibleTo.targets" /> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <Project> | ||
|
|
||
| <!-- SDK targets override --> | ||
| <PropertyGroup Condition=" '$(FSharpTestCompilerVersion)' == 'net40' "> | ||
| <_FSharpCompilerPath>$(MSBuildThisFileDirectory)$(Configuration)/net40/bin</_FSharpCompilerPath> | ||
|
|
||
| <FscToolPath>$(_FSharpCompilerPath)</FscToolPath> | ||
| <FscToolExe>fsc.exe</FscToolExe> | ||
| <DotnetFscCompilerPath></DotnetFscCompilerPath> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- SDK targets override --> | ||
| <PropertyGroup Condition=" '$(FSharpTestCompilerVersion)' == 'coreclr' "> | ||
| <_FSharpCompilerPath>$(MSBuildThisFileDirectory)$(Configuration)/coreclr/bin</_FSharpCompilerPath> | ||
|
|
||
| <FscToolPath>$(MSBuildThisFileDirectory)Tools/dotnet20</FscToolPath> | ||
| <FscToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe> | ||
| <FscToolExe Condition="'$(OS)' == 'Unix'">dotnet</FscToolExe> | ||
| <DotnetFscCompilerPath>$(_FSharpCompilerPath)/fsc.exe</DotnetFscCompilerPath> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- SDK targets override --> | ||
| <PropertyGroup> | ||
| <FSharpPropsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.NetSdk.props</FSharpPropsShim> | ||
| <FSharpTargetsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim> | ||
| <FSharpOverridesTargetsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim> | ||
| </PropertyGroup> | ||
|
|
||
|
|
||
| <!-- We are running under netcore so even though we will use the fsc compiler we can't use the desktop version of the fsharp.build tasks --> | ||
| <PropertyGroup> | ||
| <FSharpBuildAssemblyFile Condition = " '$(DOTNET_HOST_PATH)' != '' ">$(MSBuildThisFileDirectory)$(Configuration)\coreclr\bin\FSharp.Build.dll</FSharpBuildAssemblyFile> | ||
| <FSharpBuildAssemblyFile Condition = " '$(DOTNET_HOST_PATH)' == '' ">$(MSBuildThisFileDirectory)$(Configuration)\net40\bin\FSharp.Build.dll</FSharpBuildAssemblyFile> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <Project> | ||
|
|
||
| <Target Name="HACK_CopyFscDependenciesToReleaseDirectory" | ||
| BeforeTargets="CoreCompile" | ||
| Condition=" '$(FSharpTestCompilerVersion)' == 'coreclr' "> | ||
| <!-- | ||
| When the build is done using correct netsdk projects this won't be necessary | ||
| --> | ||
|
|
||
| <PropertyGroup> | ||
| <DotnetSdkVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)DotnetCLIToolsVersion.txt').Trim())</DotnetSdkVersion> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <CompilerFilesToCopy Include="$(MSBuildThisFileDirectory)Tools/dotnet20/sdk/$(DotnetSdkVersion)/FSharp/*.json" /> | ||
| <CompilerFilesToCopy Include="$(MSBuildThisFileDirectory)Tools/dotnet20/sdk/$(DotnetSdkVersion)/FSharp/Microsoft.DiaSymReader.dll" /> | ||
| <CompilerFilesToCopy Include="$(MSBuildThisFileDirectory)Tools/dotnet20/sdk/$(DotnetSdkVersion)/FSharp/Microsoft.DiaSymReader.PortablePdb.dll" /> | ||
| </ItemGroup> | ||
|
|
||
| <Message Text="Copying compiler files to $(_FSharpCompilerPath)" /> | ||
| <Copy SourceFiles="@(CompilerFilesToCopy)" DestinationFolder="$(_FSharpCompilerPath)" SkipUnchangedFiles = "true" /> | ||
| </Target> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2.6.0-vs-for-mac-62329-05 | ||
| 2.7.0-beta3-62720-08 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.