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

Commitecfa21c

Browse files
committed
Merge branch 'master' into fsharp4
Conflicts:.gitignoretests/BuildTestTools.cmdvsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.Base/Properties/AssemblyInfo.cs
2 parentsbb40a68 +5c51d49 commitecfa21c

File tree

66 files changed

+382
-97
lines changed

Some content is hidden

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

66 files changed

+382
-97
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,6 @@ tests/XFSharpQA_Failures.log.*
7979
vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
8080
vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
8181
tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
82-
tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
82+
tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
83+
84+
*.csproj.user

‎DEVGUIDE.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,9 @@ <h3>3. Full Steps Before Running Tests</h3>
399399
</pre>
400400

401401
<h3>4. [Optional] Build and Install the Visual F# IDE Tools</h3>
402+
<p>
403+
Prerequisites:<ahref="http://msdn.microsoft.com/en-us/library/bb166441.aspx">Visual Studio Software Development Kit (SDK)</a>
404+
</p>
402405
<p>
403406
To build the VS components:
404407
</p>

‎src/FSharpSource.Settings.targets‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@
1010
<LkgVersion>4.0.30319.1</LkgVersion>
1111
<FsLexUnicode>true</FsLexUnicode>
1212
<ProjectLanguageCondition="'$(ProjectLanguage)' == ''">FSharp</ProjectLanguage>
13+
<DebugSymbols>true</DebugSymbols>
14+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
15+
<WarningsAsErrors />
16+
</PropertyGroup>
17+
18+
<PropertyGroupCondition=" '$(ProjectLanguage)' == 'FSharp'">
1319
<OtherFlags>$(OtherFlags) --times</OtherFlags>
1420
<NoWarn>$(NoWarn);69;65;54;61;75</NoWarn>
15-
<DebugSymbols>true</DebugSymbols>
1621
</PropertyGroup>
1722

1823
<!-- Standard interpretations of Debug and Release configurations-->

‎src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<OutputType>Library</OutputType>
1212
<AssemblyName>FSharp.Compiler</AssemblyName>
1313
<DefineConstants>EXTENSIONTYPING;COMPILER;INCLUDE_METADATA_READER;INCLUDE_METADATA_WRITER;EXTENSIBLE_DUMPER;TYPE_PROVIDER_SECURITY;$(DefineConstants)</DefineConstants>
14-
<NoWarn>$(NoWarn);44;62;9</NoWarn>
14+
<NoWarn>$(NoWarn);62;9</NoWarn>
1515
<ProjectGuid>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</ProjectGuid>
1616
<AllowCrossTargeting>true</AllowCrossTargeting>
1717
<BaseAddress>0x06800000</BaseAddress>
@@ -517,4 +517,4 @@
517517
</ItemGroup>
518518
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
519519
<ImportProject="$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin\FSharp.PowerPack.targets" />
520-
</Project>
520+
</Project>

‎src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Reflection/FSharpReflection.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ module PrimReflectionAdapters =
3838
memberthis.GetProperties()= this.GetRuntimeProperties()|> Array.ofSeq
3939
memberthis.GetMethod(name,parameterTypes)= this.GetRuntimeMethod(name, parameterTypes)
4040
memberthis.GetCustomAttributes(attrTy:Type,inherits:bool):obj[]=
41-
unbox(box(CustomAttributeExtensions.GetCustomAttributes(this.GetTypeInfo(), attrTy,false).ToArray()))
41+
unbox(box(CustomAttributeExtensions.GetCustomAttributes(this.GetTypeInfo(), attrTy,inherits).ToArray()))
4242

4343
typeSystem.Reflection.MemberInfowith
4444
memberthis.ReflectedType= this.DeclaringType

‎src/fsharp/FSharp.Core/FSharp.Core.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<OutputType>Library</OutputType>
1313
<AssemblyName>FSharp.Core</AssemblyName>
1414
<DefineConstants>RUNTIME;$(DefineConstants)</DefineConstants>
15-
<NoWarn>44;45;55;62;75;1204</NoWarn>
15+
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
1616
<BaseAddress>0x05000000</BaseAddress>
1717
<CompilingFsLib>true</CompilingFsLib>
1818
<AllowCrossTargeting>true</AllowCrossTargeting>

‎src/fsharp/FSharp.Core/prim-types.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ namespace Microsoft.FSharp.Core
398398
member inlinethis.GetProperty(name)= this.GetRuntimeProperty(name)
399399
member inlinethis.GetMethod(name,parameterTypes)= this.GetRuntimeMethod(name, parameterTypes)
400400
member inlinethis.GetCustomAttributes(attrTy:Type,inherits:bool):obj[]=
401-
unboxPrim<_>(box(CustomAttributeExtensions.GetCustomAttributes(this.GetTypeInfo(), attrTy,false).ToArray()))
401+
unboxPrim<_>(box(CustomAttributeExtensions.GetCustomAttributes(this.GetTypeInfo(), attrTy,inherits).ToArray()))
402402

403403
openPrimReflectionAdapters
404404

‎src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<DefineConstants>NO_PDB_READER;$(DefineConstants)</DefineConstants>
2222
<DefineConstants>NO_PDB_WRITER;$(DefineConstants)</DefineConstants>
2323
<DefineConstants>NO_INLINE_IL_PARSER;$(DefineConstants)</DefineConstants>
24-
<NoWarn>$(NoWarn);62;44;9;75</NoWarn>
24+
<NoWarn>$(NoWarn);62;9;75</NoWarn>
2525
<ProjectGuid>{a437a6ec-5323-47c2-8f86-e2cac54ff152}</ProjectGuid>
2626
<AllowCrossTargeting>true</AllowCrossTargeting>
2727
<BaseAddress>0x06800000</BaseAddress>

‎src/fsharp/Fsc/Fsc.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PlatformTarget>x86</PlatformTarget>
1515
<ProjectGuid>{C94C257C-3C0A-4858-B5D8-D746498D1F08}</ProjectGuid>
1616
<OutputType>Exe</OutputType>
17-
<NoWarn>$(NoWarn);62;44</NoWarn>
17+
<NoWarn>$(NoWarn);62</NoWarn>
1818
<AssemblyName>fsc</AssemblyName>
1919
<DefineConstants>EXTENSIONTYPING;COMPILER;$(DefineConstants)</DefineConstants>
2020
<AllowCrossTargeting>true</AllowCrossTargeting>

‎src/fsharp/build.fs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3953,6 +3953,10 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
39533953
letphase2()=
39543954
#if EXTENSIONTYPING
39553955
ccuinfo.TypeProviders<- tcImports.ImportTypeProviderExtensions(tpApprovals, displayPSTypeProviderSecurityDialogBlockingUI, tcConfig, filename, ilScopeRef, ilModule.ManifestOfAssembly.CustomAttrs.AsList, ccu.Contents, invalidateCcu, m)
3956+
#else
3957+
// to prevent unused parameter warning
3958+
ignore tpApprovals
3959+
ignore displayPSTypeProviderSecurityDialogBlockingUI
39563960
#endif
39573961
[ResolvedImportedAssembly(ccuinfo)]
39583962
phase2
@@ -4079,6 +4083,10 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
40794083
#if EXTENSIONTYPING
40804084
ccuinfo.TypeProviders<- tcImports.ImportTypeProviderExtensions(tpApprovals, displayPSTypeProviderSecurityDialogBlockingUI, tcConfig, filename, ilScopeRef, ilModule.ManifestOfAssembly.CustomAttrs.AsList, ccu.Contents, invalidateCcu, m)
40814085
#else
4086+
// to prevent unused parameter warning
4087+
ignore tpApprovals
4088+
ignore displayPSTypeProviderSecurityDialogBlockingUI
4089+
40824090
()
40834091
#endif
40844092
data,ccuinfo,phase2)

0 commit comments

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