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

Commit7ac8931

Browse files
committed
integrate visualfsharp master
2 parents76d5288 +7bcbd1a commit7ac8931

File tree

1,786 files changed

+84484
-13791
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,786 files changed

+84484
-13791
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*.rtfdiff=astextplain
2222
*.RTFdiff=astextplain
2323

24-
mono/install-shtexteol=lf
2524
mono/launchertexteol=lf
2625
mono/config.maketexteol=lf
26+
targets.maketexteol=lf
2727

2828
*.bsllinguist-vendored=true

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ scripts/*.patch
6363
/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
6464
/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
6565
/tests/Xnet40-fsharpqa-suite-failures.log.*
66+
/tests/fsharp/typeProviders/splitAssemblyTools/provider.dll
67+
/tests/fsharp/typeProviders/splitAssemblyTypeproviders/provider.dll
6668
/vsintegration/src/service/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
6769
/vsintegration/src/service/FsPkgs/FSharp.Project/FS/ctofiles/
6870
/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
@@ -203,7 +205,6 @@ tests/fsharpqa/Source/*FSharpQA_Failures.lst
203205
*.csproj.user
204206
*.fsproj.user
205207
*.sln.DotSettings.user
206-
*.ide
207208
*.log
208209
*.jrs
209210
*.chk

‎.vsts-ci.yaml‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
queue:
2+
name:VSEng-MicroBuildVS2017
3+
timeoutInMinutes:300
4+
demands:
5+
-visualstudio
6+
-DotNetFramework
7+
-msbuild
8+
9+
variables:
10+
MSBuildConfiguration:'Release'
11+
12+
steps:
13+
# Install Signing Plugin
14+
-task:ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
15+
displayName:Install Signing Plugin
16+
inputs:
17+
signType:real
18+
condition:and(succeeded(), in(variables['PB_SignType'], 'test', 'real'))
19+
20+
# Install Swix Plugin
21+
-task:ms-vseng.MicroBuildTasks.32f78468-e895-4f47-962c-58a699361df8.MicroBuildSwixPlugin@1
22+
displayName:Install Swix Plugin
23+
24+
# Run build.cmd
25+
-task:CmdLine@1
26+
displayName:Run build.cmd
27+
inputs:
28+
filename:build.cmd
29+
arguments:microbuild
30+
31+
# Publish nightly package to MyGet
32+
-task:PowerShell@1
33+
displayName:Publish nightly package to MyGet
34+
inputs:
35+
scriptName:'setup\publish-assets.ps1'
36+
arguments:'-binariesPath $(MSBuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
37+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'myget'), in(variables['Build.SourceBranchName'], 'master', 'dev15.7', 'dev15.8'))
38+
39+
# Publish packages to Azure Blob Storage
40+
-task:MSBuild@1
41+
displayName:Publish packages to Azure Blob Storage
42+
inputs:
43+
solution:PublishToBlob.proj
44+
msbuildArguments:'/t:Build /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:AccountKey=$(PB_PublishBlobFeedKey) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion) /p:ManifestBuildId=$(OfficialBuildId)'
45+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
46+
47+
# Run BinSkim
48+
-task:securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@3
49+
displayName:Run BinSkim
50+
inputs:
51+
arguments:'analyze "$(MSBuildConfiguration)\*.dll" "$(MSBuildConfiguration)\*.exe" --recurse --output "$(MSBuildConfiguration)\artifacts"'
52+
continueOnError:true
53+
54+
# Create static drop
55+
-task:PublishBuildArtifacts@1
56+
displayName:Create static drop
57+
inputs:
58+
PathtoPublish:'$(MSBuildConfiguration)'
59+
ArtifactName:'$(Build.BuildNumber)'
60+
publishLocation:FilePath
61+
TargetPath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)'
62+
Parallel:true
63+
ParallelCount:64
64+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'drop'))
65+
66+
# Publish symbols
67+
-task:PublishSymbols@1
68+
displayName:Publish symbols
69+
inputs:
70+
SymbolsPath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
71+
SearchPattern:'**\*.dll;**\*.exe;**\*.pdb'
72+
SymbolsFolder:'$(Build.SourcesDirectory)\$(MSBuildConfiguration)'
73+
TreatNotIndexedAsWarning:true
74+
SymbolsProduct:'$(Build.DefinitionName)'
75+
SymbolsVersion:'$(Build.BuildNumber)'
76+
continueOnError:true
77+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'symbols'))
78+
79+
# Upload VSTS Drop
80+
-task:ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
81+
displayName:Upload VSTS Drop
82+
inputs:
83+
DropFolder:'$(Build.SourcesDirectory)\$(MSBuildConfiguration)\insertion'
84+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))
85+
86+
# Execute cleanup tasks
87+
-task:ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
88+
displayName:Execute cleanup tasks
89+
condition:succeededOrFailed()
90+
91+
# Publish Artifact: MicroBuildOutputs
92+
-task:PublishBuildArtifacts@1
93+
displayName:'Publish Artifact: MicroBuildOutputs'
94+
inputs:
95+
PathtoPublish:'$(Build.StagingDirectory)\MicroBuild\Output'
96+
ArtifactName:MicroBuildOutputs
97+
publishLocation:Container
98+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'microbuild'))
99+
100+
# Publish Symbols to Symweb
101+
-task:ms-vscs-artifact.build-tasks.artifactSymbolTask-1.artifactSymbolTask@0
102+
displayName:Publish symbols to SymWeb
103+
inputs:
104+
symbolServiceURI:'https://microsoft.artifacts.visualstudio.com/DefaultCollection'
105+
sourcePath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
106+
usePat:false
107+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'symweb'))

‎CHANGELOG-visualfsharp.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,3 +228,4 @@ Includes commits up to `3385e58aabc91368c8e1f551650ba48705aaa285`
228228
[4.0.0]:http://fsharp.org
229229
[3.1.2]:http://blogs.msdn.com/b/fsharpteam/archive/2014/08/20/announcing-the-release-of-visual-f-tools-3-1-2.aspx
230230
[3.1.1]:http://blogs.msdn.com/b/fsharpteam/archive/2014/01/22/announcing-visual-f-3-1-1-and-support-for-desktop-express.aspx
231+

‎FSharp.Compiler.Tools.Nuget/FSharp.Compiler.Tools.nuspec‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
</metadata>
2626
<files>
2727
<!-- use signed FSharp.Core in package-->
28-
<filesrc="..\lib\bootstrap\signed\.NETFramework\v4.0\4.4.1.0\FSharp.Core.dll"target="tools\FSharp.Core.dll" />
29-
<filesrc="..\lib\bootstrap\signed\.NETFramework\v4.0\4.4.1.0\FSharp.Core.optdata"target="tools\FSharp.Core.optdata" />
30-
<filesrc="..\lib\bootstrap\signed\.NETFramework\v4.0\4.4.1.0\FSharp.Core.sigdata"target="tools\FSharp.Core.sigdata" />
31-
<filesrc="..\lib\bootstrap\signed\.NETFramework\v4.0\4.4.1.0\FSharp.Core.xml"target="tools\FSharp.Core.xml" />
28+
<filesrc="..\lib\bootstrap\signed\.NETFramework\v4.0\4.4.3.0\FSharp.Core.dll"target="tools\FSharp.Core.dll" />
29+
<filesrc="..\lib\bootstrap\signed\.NETFramework\v4.0\4.4.3.0\FSharp.Core.xml"target="tools\FSharp.Core.xml" />
3230
<filesrc="..\Release\net40\bin\fsc.exe"target="tools\fsc.exe" />
3331
<filesrc="..\Release\net40\bin\fsc.exe.config"target="tools\fsc.exe.config" />
3432
<filesrc="..\Release\net40\bin\fsc.xml"target="tools\fsc.xml" />

‎FSharp.Directory.Build.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
3+
<ImportProject="FSharpBuild.Directory.Build.props" Condition =" '$(FSharpTestCompilerVersion)' == ''"/>
4+
<ImportProject="FSharpTests.Directory.Build.props" Condition =" '$(FSharpTestCompilerVersion)' != ''"/>
5+
6+
</Project>

‎FSharp.Directory.Build.targets‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
3+
<ImportProject="FSharpBuild.Directory.Build.targets" Condition =" '$(FSharpTestCompilerVersion)' == ''"/>
4+
<ImportProject="FSharpTests.Directory.Build.targets" Condition =" '$(FSharpTestCompilerVersion)' != ''"/>
5+
6+
</Project>

‎FSharpBuild.Directory.Build.props‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
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+
<ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>
15+
</PropertyGroup>
16+
17+
<!-- nuget-->
18+
<PropertyGroup>
19+
<!-- default NuGet package restore location-->
20+
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot>
21+
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(MSBuildThisFileDirectory)packages</NuGetPackageRoot>
22+
<!-- ensure there is a trailing slash-->
23+
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot>
24+
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot>
25+
</PropertyGroup>
26+
27+
<!-- signing-->
28+
<PropertyGroup>
29+
<SkipSigning>false</SkipSigning>
30+
<SignAssembly>true</SignAssembly>
31+
<AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
32+
<StrongNames>true</StrongNames>
33+
<DelaySign>true</DelaySign>
34+
</PropertyGroup>
35+
36+
<!-- mono-->
37+
<PropertyGroup>
38+
<MonoPackagingCondition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</MonoPackaging>
39+
</PropertyGroup>
40+
41+
<!-- localization-->
42+
<PropertyGroup>
43+
<EnableXlfLocalizationCondition="'$(Configuration)' == 'Proto' or '$(MonoPackaging)' == 'true'">false</EnableXlfLocalization>
44+
<UpdateXlfOnBuildCondition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
45+
</PropertyGroup>
46+
47+
<!-- other-->
48+
<PropertyGroup>
49+
<DebugType>portable</DebugType>
50+
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
51+
<UseStandardResourceNames>false</UseStandardResourceNames>
52+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
53+
</PropertyGroup>
54+
55+
<!-- SDK targets override-->
56+
<PropertyGroupCondition="'$(Configuration)' != 'Proto'">
57+
<FSharpPropsShimCondition="Exists('$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props')">$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
58+
<FSharpTargetsShimCondition="Exists('$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets')">$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
59+
<FSharpOverridesTargetsShimCondition="Exists('$(ProtoOutputPath)\Microsoft.FSharp.Overrides.NetSdk.targets')">$(ProtoOutputPath)\Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
60+
</PropertyGroup>
61+
62+
</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>

0 commit comments

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