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

Commit6af0ff5

Browse files
dsymedsyme
dsyme
authored and
dsyme
committed
integrate visualfsharp master
2 parents51aaa01 +d903cf6 commit6af0ff5

File tree

132 files changed

+2045
-16051
lines changed

Some content is hidden

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

132 files changed

+2045
-16051
lines changed

‎.gitattributes‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
*.RTFdiff=astextplain
2323

2424
install-shtexteol=lf
25-
*.intexteol=lf
26-
*.actexteol=lf
27-
*.shtexteol=lf
25+
autogen.shtexteol=lf
26+
launcher.intexteol=lf
27+
config.make.intexteol=lf
28+
targets.maketexteol=lf
29+
configure.actexteol=lf
30+
Makefile.intexteol=lf
31+
32+
*.bsllinguist-vendored=true

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,11 @@ source_link.json
227227
/VSRelease/net40/bin
228228
System.ValueTuple.dll
229229
tests/fsharpqa/testenv/bin/System.ValueTuple.dll
230-
lib/netcore/fsc/bin/
231230

232231
!lib/bootstrap/signed/**/*
232+
*/.fake
233+
/fcs/packages/
234+
*/paket-files/
235+
/fcs/TestResult.xml
236+
/tests/fcs/
237+
/fcs/.paket/Paket.Restore.targets

‎CHANGELOG-fsharp.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
4.1.29
2+
* Integrate visualfsharp master to d903cf6277e40646563f24bbe2790e8a292d5f9b
3+
14
4.1.28
25
* Remove FSharp.Core from GAC
36

‎build-everything.proj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,12 @@
5555

5656
<ItemGroupCondition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >
5757
<ProjectsWithNet40Include="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
58+
<ProjectsWithNet40Include="src/fsharp/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
5859
</ItemGroup>
5960

6061
<ItemGroupCondition="'$(TEST_CORECLR_COREUNIT_SUITE)'=='1'">
6162
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
63+
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
6264
</ItemGroup>
6365

6466
<ItemGroupCondition="'$(TEST_NET40_COMPILERUNIT_SUITE)'=='1'" >

‎mono/appveyor.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# the version under development, update after a release
3-
$version='4.1.28'
3+
$version='4.1.29'
44

55
functionisVersionTag($tag){
66
$v=New-Object Version

‎packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<!-- Build infrastructure-->
1111
<packageid="MicroBuild.Core"version="0.2.0" />
12+
<packageid="MicroBuild.Core.Sentinel"version="1.0.0" />
1213

1314
<!-- Actual dependencies of FSharp.Compiler.dll and FSharp.Core.dll-->
1415
<packageid="System.Collections.Immutable"version="1.3.1" />

‎src/FSharpSource.targets‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,9 @@
366366
<UsingTaskTaskName="FSharpEmbedResXSource"
367367
AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build-proto.dll"
368368
Condition="'$(Configuration)' != 'Proto'" />
369+
<UsingTaskTaskName="WriteCodeFragment"
370+
AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build-proto.dll"
371+
Condition="'$(Configuration)' != 'Proto'" />
369372

370373
<TargetName="GenerateFSharpTextResources"
371374
BeforeTargets="CoreResGen;PrepareForBuild"
@@ -396,6 +399,43 @@
396399

397400
</Target>
398401

402+
<PropertyGroupCondition="'$(Configuration)' != 'Proto'">
403+
<GeneratedFSharpInternalsVisibleToFile>$(IntermediateOutputPath)$(MSBuildProjectName).InternalsVisibleTo$(DefaultLanguageSourceExtension)</GeneratedFSharpInternalsVisibleToFile>
404+
</PropertyGroup>
405+
406+
<ItemDefinitionGroup>
407+
<InternalsVisibleTo>
408+
<Visible>false</Visible>
409+
</InternalsVisibleTo>
410+
</ItemDefinitionGroup>
411+
412+
<TargetName="PrepareFSharpGenerateInternalsVisibleToFile"
413+
Condition="'$(Configuration)' != 'Proto' and '@(InternalsVisibleTo)' != ''">
414+
<PropertyGroup>
415+
<_PublicKey>002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293</_PublicKey>
416+
</PropertyGroup>
417+
<ItemGroup>
418+
<_InternalsVisibleToAttributeInclude="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
419+
<_Parameter1Condition="'%(InternalsVisibleTo.Key)' != ''">%(InternalsVisibleTo.Identity), PublicKey=%(InternalsVisibleTo.Key)</_Parameter1>
420+
<_Parameter1Condition="'%(InternalsVisibleTo.Key)' == ''">%(InternalsVisibleTo.Identity), PublicKey=$(_PublicKey)</_Parameter1>
421+
</_InternalsVisibleToAttribute>
422+
</ItemGroup>
423+
</Target>
424+
425+
<TargetName="GenerateFSharpInternalsVisibleToFile"
426+
Inputs="$(MSBuildProjectFile)"
427+
Outputs="$(GeneratedFSharpInternalsVisibleToFile)"
428+
DependsOnTargets="PrepareFSharpGenerateInternalsVisibleToFile;PrepareForBuild"
429+
Condition="'$(Configuration)' != 'Proto' and '@(InternalsVisibleTo)' != ''"
430+
BeforeTargets="CoreCompile">
431+
<WriteCodeFragmentAssemblyAttributes="@(_InternalsVisibleToAttribute)"
432+
Language="$(Language)"
433+
OutputFile="$(GeneratedFSharpInternalsVisibleToFile)">
434+
<OutputTaskParameter="OutputFile"ItemName="CompileBefore" />
435+
<OutputTaskParameter="OutputFile"ItemName="FileWrites" />
436+
</WriteCodeFragment>
437+
</Target>
438+
399439
<!--
400440
<UsingTask TaskName="ReplaceFileText" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
401441
<ParameterGroup>

‎src/assemblyinfo/assemblyinfo.FSharp.Build.dll.fs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@ open System.Reflection
99
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
1010
do()
1111

12-
#if NO_STRONG_NAMES
13-
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Unittests")>]
14-
#endif
15-
#if STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY
16-
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
17-
#endif
18-
1912
// Until dotnet sdk can version assemblies, use this
2013
#if BUILD_FROM_SOURCE
2114
[<assembly: System.Reflection.AssemblyInformationalVersion("4.4.1.0")>]

‎src/assemblyinfo/assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,6 @@ open System.Runtime.InteropServices
1111
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
1212
[<assembly:ComVisible(false)>]
1313

14-
#if NO_STRONG_NAMES
15-
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi")>]
16-
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsiAnyCpu")>]
17-
#endif
18-
19-
#if STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY
20-
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
21-
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsiAnyCpu, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
22-
#endif
23-
24-
#if STRONG_NAME_FSHARP_COMPILER_WITH_TEST_KEY
25-
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
26-
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsiAnyCpu, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
27-
#endif
28-
2914
// Until dotnet sdk can version assemblies, use this
3015
#if BUILD_FROM_SOURCE
3116
[<assembly: System.Reflection.AssemblyInformationalVersion("4.4.1.0")>]

0 commit comments

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