Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc22ae78

Browse files
authored
Merge branch 'dev15.8' into merges/dev15.7-to-dev15.8
2 parents2527e68 +a4d7236 commitc22ae78

File tree

1,677 files changed

+71675
-6605
lines changed

Some content is hidden

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

1,677 files changed

+71675
-6605
lines changed

‎.vsts-ci.yaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,15 @@ steps:
5252
continueOnError:true
5353

5454
# Create static drop
55-
-task:ms-vseng.MicroBuildTasks.bd4b789e-7292-4b73-a8ee-612d3dd615f1.MicroBuildStaticDrop@1
55+
-task:PublishBuildArtifacts@1
5656
displayName:Create static drop
5757
inputs:
58-
CopyRoot:'$(MSBuildConfiguration)'
59-
Contents:'**'
60-
ArtifactName:Binaries
61-
TargetPath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Binaries'
58+
PathtoPublish:'$(MSBuildConfiguration)'
59+
ArtifactName:'$(Build.BuildNumber)'
60+
publishLocation:FilePath
61+
TargetPath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)'
62+
Parallel:true
63+
ParallelCount:64
6264
condition:and(succeeded(), contains(variables['PB_PublishType'], 'drop'))
6365

6466
# Publish symbols

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The Visual F# team is proud to be a contributor to F#, and urge you to join in too. F# users and the F# community are grateful for all contributions to F#.
44

5-
Besides this overview, we recommend["Becoming a contributor"](http://mrange.wordpress.com/2014/12/11/becoming-an-fsharp-contributor/), acommunity blog postbyMårten Rånge.
5+
Besides this overview, we recommend["A journey into the F~ compiler"](https://skillsmatter.com/skillscasts/11629-a-journey-into-the-f-sharp-compiler/), atalkbySteffen Forkmann.
66
For those contributing to the core of the F# compiler, we recommend["The F# Compiler Technical Overview"](http://fsharp.github.io/2015/09/29/fsharp-compiler-guide.html)
77

88
###Getting Started

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.3-servicing-007056
1+
2.1.300-rtm-008707

‎FSharp.Directory.Build.props‎

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,6 @@
11
<Project>
22

3-
<ImportProject="build\targets\PackageVersions.props" />
4-
<ImportProject="build\targets\CommonPackages.targets" />
5-
6-
<!-- directory locations-->
7-
<PropertyGroup>
8-
<ConfigurationCondition="'$(Configuration)' == ''">Debug</Configuration>
9-
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
10-
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
11-
<ToolsRoot>$(RepoRoot)Tools</ToolsRoot>
12-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
13-
<ProtoOutputPath>$(RepoRoot)Proto\net40\bin</ProtoOutputPath>
14-
</PropertyGroup>
15-
16-
<!-- nuget-->
17-
<PropertyGroup>
18-
<!-- default NuGet package restore location-->
19-
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot>
20-
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(MSBuildThisFileDirectory)packages</NuGetPackageRoot>
21-
<!-- ensure there is a trailing slash-->
22-
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot>
23-
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot>
24-
</PropertyGroup>
25-
26-
<!-- signing-->
27-
<PropertyGroup>
28-
<SkipSigning>false</SkipSigning>
29-
<SignAssembly>true</SignAssembly>
30-
<AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
31-
<StrongNames>true</StrongNames>
32-
<DelaySign>true</DelaySign>
33-
</PropertyGroup>
34-
35-
<!-- mono-->
36-
<PropertyGroup>
37-
<MonoPackagingCondition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</MonoPackaging>
38-
</PropertyGroup>
39-
40-
<!-- localization-->
41-
<PropertyGroup>
42-
<EnableXlfLocalizationCondition="'$(Configuration)' == 'Proto' or '$(MonoPackaging)' == 'true'">false</EnableXlfLocalization>
43-
<UpdateXlfOnBuildCondition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
44-
</PropertyGroup>
45-
46-
<!-- other-->
47-
<PropertyGroup>
48-
<DebugType>portable</DebugType>
49-
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
50-
<UseStandardResourceNames>false</UseStandardResourceNames>
51-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
52-
</PropertyGroup>
53-
54-
<!-- SDK targets override-->
55-
<PropertyGroupCondition="'$(Configuration)' != 'Proto'">
56-
<ProtoFSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</ProtoFSharpTargetsShim>
57-
<FSharpTargetsShimCondition="Exists('$(ProtoFSharpTargetsShim)')">$(ProtoFSharpTargetsShim)</FSharpTargetsShim>
58-
</PropertyGroup>
3+
<ImportProject="FSharpBuild.Directory.Build.props" Condition =" '$(FSharpTestCompilerVersion)' == ''"/>
4+
<ImportProject="FSharpTests.Directory.Build.props" Condition =" '$(FSharpTestCompilerVersion)' != ''"/>
595

606
</Project>

‎FSharp.Directory.Build.targets‎

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,6 @@
11
<Project>
22

3-
<PropertyGroup>
4-
<XlfLanguages>en;$(XlfLanguages)</XlfLanguages>
5-
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp'))">coreclr</TargetDotnetProfile>
6-
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('net4'))">net40</TargetDotnetProfile>
7-
<ActualOutputPathCondition="'$(Language)' != 'VB'">$(MSBuildProjectDirectory)\$(OutputPath)</ActualOutputPath>
8-
<ActualOutputPathCondition="'$(Language)' == 'VB'">$(OutputPath)</ActualOutputPath>
9-
<FinalOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</FinalOutputPath>
10-
<FinalIntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj</FinalIntermediateOutputPath>
11-
</PropertyGroup>
12-
13-
<TargetName="HACK_CopyOutputsToTheProperLocation"
14-
AfterTargets="AfterBuild"
15-
Condition="'$(DisableOutputPathCopying)' != 'true'">
16-
<!--
17-
Ideally we'd set <OutputPath> to `$(Configuration)\[net40|coreclr]\bin`, but the calculation of `[net40|coreclr]`
18-
depends on the `$(TargetFramework)` variable which is set by the individual project files, but by the time we have
19-
that value (e.g., in this file) it's too late; some targets, particularly from the VsSDK have already used the
20-
values of $(OutputPath)/$(OutDir).
21-
22-
The fix is to not set `$(Outputpath)` and simply copy stuff there after the fact.
23-
-->
24-
25-
<ItemGroup>
26-
<OutputFilesToCopyInclude="$(ActualOutputPath)**" />
27-
<IntermediateFilesToCopyInclude="$(IntermediateOutputPath)\**" />
28-
</ItemGroup>
29-
30-
<MessageText="Copying build artifacts to $(FinalOutputPath)" />
31-
<MakeDirDirectories="$(FinalOutputPath);$(FinalIntermediateOutputPath)" />
32-
<CopySourceFiles="@(OutputFilesToCopy)"DestinationFolder="$(FinalOutputPath)" />
33-
<CopySourceFiles="@(IntermediateFilesToCopy)"DestinationFolder="$(FinalIntermediateOutputPath)" />
34-
</Target>
35-
36-
<ImportProject="build\targets\AssemblyVersions.props" />
37-
<ImportProject="build\targets\ConvertPortablePdbs.targets" />
38-
<ImportProject="build\targets\GenerateAssemblyAttributes.targets" />
39-
<ImportProject="build\targets\GenerateInternalsVisibleTo.targets" />
3+
<ImportProject="FSharpBuild.Directory.Build.targets" Condition =" '$(FSharpTestCompilerVersion)' == ''"/>
4+
<ImportProject="FSharpTests.Directory.Build.targets" Condition =" '$(FSharpTestCompilerVersion)' != ''"/>
405

416
</Project>

‎FSharpBuild.Directory.Build.props‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<Project>
2+
3+
<ImportProject="build\targets\PackageVersions.props" />
4+
<ImportProject="build\targets\CommonPackages.targets" />
5+
6+
<!-- directory locations-->
7+
<PropertyGroup>
8+
<ConfigurationCondition="'$(Configuration)' == ''">Debug</Configuration>
9+
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
10+
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
11+
<ToolsRoot>$(RepoRoot)Tools</ToolsRoot>
12+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
13+
<ProtoOutputPath>$(RepoRoot)Proto\net40\bin</ProtoOutputPath>
14+
</PropertyGroup>
15+
16+
<!-- nuget-->
17+
<PropertyGroup>
18+
<!-- default NuGet package restore location-->
19+
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot>
20+
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(MSBuildThisFileDirectory)packages</NuGetPackageRoot>
21+
<!-- ensure there is a trailing slash-->
22+
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot>
23+
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot>
24+
</PropertyGroup>
25+
26+
<!-- signing-->
27+
<PropertyGroup>
28+
<SkipSigning>false</SkipSigning>
29+
<SignAssembly>true</SignAssembly>
30+
<AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
31+
<StrongNames>true</StrongNames>
32+
<DelaySign>true</DelaySign>
33+
</PropertyGroup>
34+
35+
<!-- mono-->
36+
<PropertyGroup>
37+
<MonoPackagingCondition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</MonoPackaging>
38+
</PropertyGroup>
39+
40+
<!-- localization-->
41+
<PropertyGroup>
42+
<EnableXlfLocalizationCondition="'$(Configuration)' == 'Proto' or '$(MonoPackaging)' == 'true'">false</EnableXlfLocalization>
43+
<UpdateXlfOnBuildCondition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
44+
</PropertyGroup>
45+
46+
<!-- other-->
47+
<PropertyGroup>
48+
<DebugType>portable</DebugType>
49+
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
50+
<UseStandardResourceNames>false</UseStandardResourceNames>
51+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
52+
</PropertyGroup>
53+
54+
<!-- SDK targets override-->
55+
<PropertyGroupCondition="'$(Configuration)' != 'Proto'">
56+
<ProtoFSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</ProtoFSharpTargetsShim>
57+
<FSharpTargetsShimCondition="Exists('$(ProtoFSharpTargetsShim)')">$(ProtoFSharpTargetsShim)</FSharpTargetsShim>
58+
</PropertyGroup>
59+
60+
</Project>
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<XlfLanguages>en;$(XlfLanguages)</XlfLanguages>
5+
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp'))">coreclr</TargetDotnetProfile>
6+
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('net4'))">net40</TargetDotnetProfile>
7+
<ActualOutputPathCondition="'$(Language)' != 'VB'">$(MSBuildProjectDirectory)\$(OutputPath)</ActualOutputPath>
8+
<ActualOutputPathCondition="'$(Language)' == 'VB'">$(OutputPath)</ActualOutputPath>
9+
<FinalOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</FinalOutputPath>
10+
<FinalIntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj</FinalIntermediateOutputPath>
11+
</PropertyGroup>
12+
13+
<TargetName="HACK_CopyOutputsToTheProperLocation"
14+
AfterTargets="AfterBuild"
15+
Condition="'$(DisableOutputPathCopying)' != 'true'">
16+
<!--
17+
Ideally we'd set <OutputPath> to `$(Configuration)\[net40|coreclr]\bin`, but the calculation of `[net40|coreclr]`
18+
depends on the `$(TargetFramework)` variable which is set by the individual project files, but by the time we have
19+
that value (e.g., in this file) it's too late; some targets, particularly from the VsSDK have already used the
20+
values of $(OutputPath)/$(OutDir).
21+
22+
The fix is to not set `$(Outputpath)` and simply copy stuff there after the fact.
23+
-->
24+
25+
<ItemGroup>
26+
<OutputFilesToCopyInclude="$(ActualOutputPath)**" />
27+
<IntermediateFilesToCopyInclude="$(IntermediateOutputPath)\**" />
28+
</ItemGroup>
29+
30+
<MessageText="Copying build artifacts to $(FinalOutputPath)" />
31+
<MakeDirDirectories="$(FinalOutputPath);$(FinalIntermediateOutputPath)" />
32+
<CopySourceFiles="@(OutputFilesToCopy)"DestinationFolder="$(FinalOutputPath)" />
33+
<CopySourceFiles="@(IntermediateFilesToCopy)"DestinationFolder="$(FinalIntermediateOutputPath)" />
34+
</Target>
35+
36+
<ImportProject="build\targets\AssemblyVersions.props" />
37+
<ImportProject="build\targets\ConvertPortablePdbs.targets" />
38+
<ImportProject="build\targets\GenerateAssemblyAttributes.targets" />
39+
<ImportProject="build\targets\GenerateInternalsVisibleTo.targets" />
40+
41+
</Project>

‎FSharpTests.Directory.Build.props‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project>
2+
3+
<!-- SDK targets override-->
4+
<PropertyGroupCondition=" '$(FSharpTestCompilerVersion)' == 'net40'">
5+
<_FSharpCompilerPath>$(MSBuildThisFileDirectory)$(Configuration)/net40/bin</_FSharpCompilerPath>
6+
7+
<FscToolPath>$(_FSharpCompilerPath)</FscToolPath>
8+
<FscToolExe>fsc.exe</FscToolExe>
9+
<DotnetFscCompilerPath></DotnetFscCompilerPath>
10+
</PropertyGroup>
11+
12+
<!-- SDK targets override-->
13+
<PropertyGroupCondition=" '$(FSharpTestCompilerVersion)' == 'coreclr'">
14+
<_FSharpCompilerPath>$(MSBuildThisFileDirectory)$(Configuration)/coreclr/bin</_FSharpCompilerPath>
15+
16+
<FscToolPath>$(MSBuildThisFileDirectory)Tools/dotnet20</FscToolPath>
17+
<FscToolExeCondition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe>
18+
<FscToolExeCondition="'$(OS)' == 'Unix'">dotnet</FscToolExe>
19+
<DotnetFscCompilerPath>$(_FSharpCompilerPath)/fsc.exe</DotnetFscCompilerPath>
20+
</PropertyGroup>
21+
22+
<!-- SDK targets override-->
23+
<PropertyGroup>
24+
<FSharpPropsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
25+
<FSharpTargetsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
26+
<FSharpOverridesTargetsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
27+
</PropertyGroup>
28+
29+
30+
<!-- 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-->
31+
<PropertyGroup>
32+
<FSharpBuildAssemblyFile Condition =" '$(DOTNET_HOST_PATH)' != ''">$(MSBuildThisFileDirectory)$(Configuration)\coreclr\bin\FSharp.Build.dll</FSharpBuildAssemblyFile>
33+
<FSharpBuildAssemblyFile Condition =" '$(DOTNET_HOST_PATH)' == ''">$(MSBuildThisFileDirectory)$(Configuration)\net40\bin\FSharp.Build.dll</FSharpBuildAssemblyFile>
34+
</PropertyGroup>
35+
36+
</Project>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
3+
<TargetName="HACK_CopyFscDependenciesToReleaseDirectory"
4+
BeforeTargets="CoreCompile"
5+
Condition=" '$(FSharpTestCompilerVersion)' == 'coreclr'">
6+
<!--
7+
When the build is done using correct netsdk projects this won't be necessary
8+
-->
9+
10+
<PropertyGroup>
11+
<DotnetSdkVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)DotnetCLIToolsVersion.txt').Trim())</DotnetSdkVersion>
12+
</PropertyGroup>
13+
<ItemGroup>
14+
<CompilerFilesToCopyInclude="$(MSBuildThisFileDirectory)Tools/dotnet20/sdk/$(DotnetSdkVersion)/FSharp/*.json" />
15+
</ItemGroup>
16+
17+
<MessageText="Copying compiler files to $(_FSharpCompilerPath)" />
18+
<CopySourceFiles="@(CompilerFilesToCopy)"DestinationFolder="$(_FSharpCompilerPath)" SkipUnchangedFiles ="true" />
19+
</Target>
20+
21+
</Project>

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.8.0-beta1-62707-12
1+
2.8.0

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp