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

Commit9f9f0d0

Browse files
committed
Fix up some tests.
1. add icons to fsharp.project.fharp.dll2. Update count of public types 2 were added just after dev 11, test seems to have been permanently broken3. ENsure that dll's are comvisible(false)
1 parent4ea60fb commit9f9f0d0

13 files changed

+159
-114
lines changed

‎src/FSharpSource.msbuildreferences.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<MsBuild_Reference>Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_Reference>
2424
<MsBuild_UtilitiesReference>Microsoft.Build.Utilities.V12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_UtilitiesReference>
2525
<MsBuild_TaskReference>Microsoft.Build.Tasks.V12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_TaskReference>
26-
<MsBuild_ConversionReference>Microsoft.Build.Conversion.V12, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_ConversionReference>
26+
<MsBuild_ConversionReference>Microsoft.Build.Conversion.V12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_ConversionReference>
2727
</PropertyGroup>
2828
</Otherwise>
2929
</Choose>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
#light
44
namespaceMicrosoft.FSharp
55
openSystem.Reflection
6+
openSystem.Runtime.InteropServices
7+
68
[<assembly:AssemblyDescription("FSharp.Compiler.Interactive.Settings.dll")>]
79
[<assembly:AssemblyCompany("Microsoft Corporation")>]
810
[<assembly:AssemblyTitle("FSharp.Compiler.Interactive.Settings.dll")>]
911
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
1012
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
13+
[<assembly:ComVisible(false)>]
1114

1215
#if NO_STRONG_NAMES
1316
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi")>]

‎src/assemblyinfo/assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
#light
44
namespaceMicrosoft.FSharp
55
openSystem.Reflection
6+
openSystem.Runtime.InteropServices
67

78
[<assembly:AssemblyDescription("FSharp.Compiler.Server.Shared.dll")>]
89
[<assembly:AssemblyCompany("Microsoft Corporation")>]
910
[<assembly:AssemblyTitle("FSharp.Compiler.Server.Shared.dll")>]
1011
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
1112
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
13+
[<assembly:ComVisible(false)>]
1214

1315
#if NO_STRONG_NAMES
1416
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi")>]

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
#light
44
namespaceMicrosoft.FSharp
55
openSystem.Reflection
6+
openSystem.Runtime.InteropServices
67

78
[<assembly:AssemblyDescription("FSharp.Compiler.dll")>]
89
[<assembly:AssemblyCompany("Microsoft Corporation")>]
910
[<assembly:AssemblyTitle("FSharp.Compiler.dll")>]
1011
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
1112
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
13+
[<assembly:ComVisible(false)>]
14+
1215
#if NO_STRONG_NAMES
1316
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc")>]
1417
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi")>]

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22

33
namespaceMicrosoft.FSharp
44
openSystem.Reflection
5+
openSystem.Runtime.InteropServices
6+
57
[<assembly:AssemblyDescription("FSharp.Core.dll")>]
68
[<assembly:AssemblyCompany("Microsoft Corporation")>]
79
[<assembly:AssemblyTitle("FSharp.Core.dll")>]
810
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
911
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
12+
#if!FSHARP_CORE_PORTABLE
13+
[<assembly:ComVisible(false)>]
14+
#endif
1015

1116
#if PORTABLE
1217
[<assembly:AssemblyProduct("Microsoft\174 F#")>]

‎src/assemblyinfo/assemblyinfo.FSharp.Data.TypeProviders.dll.fs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
#light
44
namespaceMicrosoft.FSharp
55
openSystem.Reflection
6+
openSystem.Runtime.InteropServices
7+
68
[<assembly:AssemblyDescription("FSharp.Data.TypeProviders.dll")>]
79
[<assembly:AssemblyCompany("Microsoft Corporation")>]
810
[<assembly:AssemblyTitle("FSharp.Data.TypeProviders.dll")>]
911
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All rights reserved.")>]
1012
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
13+
[<assembly:ComVisible(false)>]
1114
do()
1215

1316
#if NO_STRONG_NAMES

‎src/assemblyinfo/assemblyinfo.fsc.exe.fs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
#light
44
namespaceMicrosoft.FSharp
55
openSystem.Reflection
6+
openSystem.Runtime.InteropServices
7+
68
[<assembly:AssemblyDescription("fsc.exe")>]
79
[<assembly:AssemblyCompany("Microsoft Corporation")>]
810
[<assembly:AssemblyTitle("fsc.exe")>]
911
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
1012
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
13+
[<assembly:ComVisible(false)>]
1114

1215
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
1316
do()

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
<DefineConstantsCondition=" '$(TargetFramework)' == 'sl5'">$(DefineConstants);SILVERLIGHT</DefineConstants>
3232
<DefineConstants>$(DefineConstants);EXTENSIONTYPING;$(TargetFramework.ToLower())</DefineConstants>
3333
</PropertyGroup>
34+
<PropertyGroup>
35+
<DefineConstantsCondition=" '$(VisualStudioVersion)' == '12.0'">$(DefineConstants);FX_4_3_1_0</DefineConstants>
36+
<DefineConstantsCondition=" '$(VisualStudioVersion)' == '14.0'">$(DefineConstants);FX_4_4_0_0</DefineConstants>
37+
</PropertyGroup>
3438
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
3539
<DebugSymbols>true</DebugSymbols>
3640
<DebugType>full</DebugType>

‎vsintegration/src/unittests/Tests.LanguageService.General.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ type GeneralTests() =
167167
letlsbase= publicTypesInAsm@"FSharp.LanguageService.Base.dll"
168168
Assert.AreEqual(0, lsbase)
169169
letpsbase= publicTypesInAsm@"FSharp.ProjectSystem.Base.dll"
170-
Assert.AreEqual(14, psbase)
170+
Assert.AreEqual(17, psbase)
171171
letfsi= publicTypesInAsm@"FSharp.VS.FSI.dll"
172172
Assert.AreEqual(1, fsi)
173173

0 commit comments

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