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

Commit64109c5

Browse files
committed
Open sourcing the IDE unit tests (changeset 1294310)
1 parent78abbd4 commit64109c5

File tree

164 files changed

+53084
-83
lines changed

Some content is hidden

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

164 files changed

+53084
-83
lines changed

‎DEVGUIDE.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,8 @@ <h3>6. [Optional] Build Visual Studio components </h3>
425425
To build the VS components:
426426
</p>
427427
<pre>
428-
msbuild ..\vsintegration\src\deployment.sln /p:Configuration=Debug /t:Rebuild
428+
cd ..\vsintegration
429+
msbuild fsharp-vsintegration-build.proj
429430
</pre>
430431

431432
<h3>6. [Optional] Build and install Visual Studio components</h3>

‎src/FSharpSource.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@
611611

612612
<FscToolPath>$(FSharpSourcesRoot)\..\Proto\$(protoCLIDir)\bin</FscToolPath>
613613
<FscToolExe>fsc-proto.exe</FscToolExe>
614-
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin</OutputPath>
614+
<OutputPathCondition=" '$(CustomOutputPath)' != 'true'">$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin</OutputPath>
615615
</PropertyGroup>
616616

617617
<Choose>
@@ -709,7 +709,7 @@
709709
Outputs="@(CustomCopyLocal->'$(OutDir)%(TargetFilename)')"
710710
Condition="'$(targetCLIDir)'!='Silverlight/4.0/'"
711711
>
712-
<ExecCommand="$(FSharpSourcesRoot)\fsharp\FSharp.Build\subst.exe{LkgVersion} $(LkgVersion) {BuildSuffix}&quot;$(FsBuildSuffix)&quot; {FSharpTargetsDir}&quot;%24(MSBuildThisFileDirectory)&quot;&quot;%(CustomCopyLocal.FullPath)&quot;&gt; $(OutDir)%(CustomCopyLocal.TargetFilename)"/>
712+
<ExecCommand="$(FSharpSourcesRoot)\fsharp\FSharp.Build\subst.exe&quot;%(CustomCopyLocal.FullPath)&quot; {FinalDir}&quot;$([System.IO.Path]::GetFullPath('$(OutputPath)'))\&quot; {LkgVersion} $(LkgVersion) {BuildSuffix}&quot;$(FsBuildSuffix)&quot; {FSharpTargetsDir}&quot;%24(MSBuildThisFileDirectory)&quot;&gt; $(OutDir)%(CustomCopyLocal.TargetFilename)"/>
713713
<!-- Make sure it will get cleaned-->
714714
<CreateItemInclude="$(OutDir)%(CustomCopyLocal.TargetFilename)">
715715
<OutputTaskParameter="Include"ItemName="FileWrites"/>

‎src/fsharp/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<FsSrGenInclude="FSBuild.txt">
1818
<Link>FSBuild.txt</Link>
1919
</FsSrGen>
20+
<CompileInclude="InternalsVisibleTo.fs" />
2021
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs">
2122
<Link>assemblyinfo.FSharp.Build.dll.fs</Link>
2223
</Compile>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
2+
3+
namespaceMicrosoft.FSharp
4+
openSystem.Reflection
5+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
6+
7+
8+
do()
9+

‎src/fsharp/FSharp.Build/subst.exe‎

423 KB
Binary file not shown.

‎src/fsharp/FSharp.Build/subst.fsx‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
// Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
22

3-
letx1,y1,x2,y2,x3,y3,file=
4-
match System.Environment.GetCommandLineArgs()with
5-
|[|_; x1;y1;x2;y2;x3;y3;file|]-> x1,y1,x2,y2,x3,y3,file
6-
|_->
7-
eprintfn"Invalid command line args. usage 'subst.exe origtext1 replacetext1 origtext2 replacetext2 origtext3 replacetext3 file'"
8-
exit1
9-
10-
file
11-
|> System.IO.File.ReadAllText
12-
|>(fun s-> s.Replace(x1,y1))
13-
|>(fun s-> s.Replace(x2,y2))
14-
|>(fun s-> s.Replace(x3,y3))
15-
|> printfn"%s"
3+
openSystem.IO
4+
5+
moduleSeq=
6+
letevens s= s|> Seq.mapi(fun i x->(i, x))|> Seq.choose(function(i, x)when i%2=0-> Some(x)|_-> None)
7+
letodds s= s|> Seq.mapi(fun i x->(i, x))|> Seq.choose(function(i, x)when i%2=1-> Some(x)|_-> None)
8+
9+
letrawArgs= System.Environment.GetCommandLineArgs()
10+
11+
if rawArgs.Length<4|| rawArgs.Length%2<>0then
12+
eprintfn"Invalid command line args. usage 'subst.exe file origtext1 replacetext1 ... origtextN replacetextN'"
13+
exit1
14+
else
15+
16+
(rawArgs|> Seq.evens, rawArgs|> Seq.odds)
17+
||> Seq.zip
18+
|> Seq.skip1
19+
|> Seq.fold(fun(content:string)(orig,replace)-> content.Replace(orig, replace))(File.ReadAllText(rawArgs.[1]))
20+
|> printfn"%s"
21+
1622
exit0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<FsSrGenInclude="..\FSInteractiveSettings.txt">
1919
<Link>FSInteractiveSettings.txt</Link>
2020
</FsSrGen>
21+
<CompileInclude="InternalsVisibleTo.fs"/>
2122
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs">
2223
<Link>assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs</Link>
2324
</Compile>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
2+
3+
namespaceMicrosoft.FSharp
4+
openSystem.Reflection
5+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Fsi, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
6+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FsiAnyCPU, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
7+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
8+
9+
do()
10+

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<FsSrGenInclude="..\fsiserver\FSServerShared.txt">
1818
<Link>FSServerShared.txt</Link>
1919
</FsSrGen>
20+
<CompileInclude="InternalsVisibleTo.fs" />
2021
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs">
2122
<Link>assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs</Link>
2223
</Compile>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
2+
3+
namespaceMicrosoft.FSharp
4+
openSystem.Reflection
5+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Fsi, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
6+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FsiAnyCPU, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
7+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.VS.FSI, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
8+
9+
do()
10+

0 commit comments

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