Skip to content

F
fsharp

dotNET Platform / fsharp
12 个月 前同步成功

通知 0
Star 1
Fork 0
F
fsharp

体验新版 GitCode，发现更多精彩内容 >>

提交 bdea8450 编写于 作者: D Don Syme
浏览文件
操作

reorg solution file

上级 0755207b
隐藏空白更改
内联 并排
Showing with 138 addition and 37 deletion
TESTGUIDE.md
浏览文件 @ bdea8450
......@@ -113,7 +113,7 @@ To build the unit test binary, call
msbuild fsharp-vsintegration-unittests-build.proj
```
from the `src` directory. Tests are contained in the binary `Unittests.dll`.
from the `src` directory. Tests are contained in the binary `VisualFSharp.Unittests.dll`.
The IDE unit tests rely on the "Salsa" library, which is a set of Visual Studio mocks. The code for Salsa resides at `vsintegration\src\Salsa`.
......
tests/RunTests.cmd
浏览文件 @ bdea8450
......@@ -292,8 +292,8 @@ set OUTPUTFILE=%RESULTSDIR%\IDEUnit_Output.log
set ERRORFILE=%RESULTSDIR%\IDEUnit_Error.log
pushd %FSCBINPATH%
echo "%NUNIT3_CONSOLE%" --x86 /framework:V4.0 /result="%XMLFILE%;format=nunit2" /output="%OUTPUTFILE%" /err="%ERRORFILE%" /work="%FSCBINPATH%" "%FSCBINPATH%\Unittests.dll"
"%NUNIT3_CONSOLE%" --x86 /framework:V4.0 /result="%XMLFILE%;format=nunit2" /output="%OUTPUTFILE%" /err="%ERRORFILE%" /work="%FSCBINPATH%" "%FSCBINPATH%\Unittests.dll"
echo "%NUNIT3_CONSOLE%" --x86 /framework:V4.0 /result="%XMLFILE%;format=nunit2" /output="%OUTPUTFILE%" /err="%ERRORFILE%" /work="%FSCBINPATH%" "%FSCBINPATH%\VisualFSharp.Unittests.dll"
"%NUNIT3_CONSOLE%" --x86 /framework:V4.0 /result="%XMLFILE%;format=nunit2" /output="%OUTPUTFILE%" /err="%ERRORFILE%" /work="%FSCBINPATH%" "%FSCBINPATH%\VisualFSharp.Unittests.dll"
popd
call :UPLOAD_XML "%XMLFILE%"
......
vsintegration/fsharp-vsintegration-unittests-build.proj
浏览文件 @ bdea8450
......@@ -5,8 +5,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectFiles Include="src\salsa\Salsa.fsproj"/>
<ProjectFiles Include="src\unittests\unittests.fsproj"/>
<ProjectFiles Include="src\salsa\VisualFSharp.Salsa.fsproj"/>
<ProjectFiles Include="src\unittests\VisualFSharp.Unittests.fsproj"/>
<ProjectFiles Include="src\unittests\Resources.MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj" />
<ProjectFiles Include="src\unittests\Resources.MockTypeProviders\DefinitionLocationAttributeFileDoesnotExist\DefinitionLocationAttributeFileDoesnotExist.csproj" />
<ProjectFiles Include="src\unittests\Resources.MockTypeProviders\DefinitionLocationAttributeLineDoesnotExist\DefinitionLocationAttributeLineDoesnotExist.csproj" />
......
vsintegration/src/Deployment.sln
浏览文件 @ bdea8450
......@@ -27,7 +27,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WDExpressDeployTemplates",
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler", "..\..\src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSHarp.VS.FSI", "vs\FsPkgs\FSharp.VS.FSI\FSharp.VS.FSI.fsproj", "{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.VS.FSI", "vs\FsPkgs\FSharp.VS.FSI\FSharp.VS.FSI.fsproj", "{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Server.Shared", "..\..\src\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj", "{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}"
EndProject
......@@ -55,9 +55,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Salsa", "Salsa\Salsa.fsproj", "{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "VisualFSharp.Salsa", "Salsa\VisualFSharp.Salsa.fsproj", "{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Unittests", "unittests\Unittests.fsproj", "{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "VisualFSharp.Unittests", "unittests\VisualFSharp.Unittests.fsproj", "{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DefinitionLocationAttribute", "unittests\Resources.MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj", "{DA39AD38-4A58-47BF-9215-E49768295169}"
EndProject
......@@ -95,6 +95,20 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsiAnyCPU", "..\..\src\fsha
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsi", "..\..\src\fsharp\fsi\Fsi.fsproj", "{D0E98C0D-490B-4C61-9329-0862F6E87645}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Tests", "..\..\tests\fsharp\FSharp.Tests.fsproj", "{C163E892-5BF7-4B59-AA99-B0E8079C67C4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualTools.Unittests Support", "VisualTools.Unittests Support", "{3F044931-FB83-4433-B934-AE66AB27B278}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Unittests", "..\..\src\fsharp\FSharp.Compiler.Unittests\FSharp.Compiler.Unittests.fsproj", "{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Core.Unittests", "..\..\src\fsharp\FSharp.Core.Unittests\FSharp.Core.Unittests.fsproj", "{88E2D422-6852-46E3-A740-83E391DC7973}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualFSharp", "VisualFSharp", "{4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F7876C9B-FB6A-4EFB-B058-D6967DB75FB2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -988,11 +1002,72 @@ Global
{D0E98C0D-490B-4C61-9329-0862F6E87645}.VSRelease|Any CPU.Build.0 = VSRelease|Any CPU
{D0E98C0D-490B-4C61-9329-0862F6E87645}.VSRelease|x86.ActiveCfg = VSRelease|Any CPU
{D0E98C0D-490B-4C61-9329-0862F6E87645}.VSRelease|x86.Build.0 = VSRelease|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Debug|x86.ActiveCfg = Debug|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Debug|x86.Build.0 = Debug|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Proto|Any CPU.Build.0 = Proto|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Proto|x86.ActiveCfg = Proto|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Proto|x86.Build.0 = Proto|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Release|Any CPU.Build.0 = Release|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Release|x86.ActiveCfg = Release|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Release|x86.Build.0 = Release|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.VSDebug|Any CPU.ActiveCfg = VSDebug|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.VSDebug|Any CPU.Build.0 = VSDebug|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.VSDebug|x86.ActiveCfg = VSDebug|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.VSDebug|x86.Build.0 = VSDebug|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.VSRelease|Any CPU.ActiveCfg = VSRelease|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.VSRelease|Any CPU.Build.0 = VSRelease|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.VSRelease|x86.ActiveCfg = VSRelease|Any CPU
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.VSRelease|x86.Build.0 = VSRelease|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Debug|x86.ActiveCfg = Debug|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Debug|x86.Build.0 = Debug|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Proto|Any CPU.Build.0 = Proto|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Proto|x86.ActiveCfg = Proto|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Proto|x86.Build.0 = Proto|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Release|Any CPU.Build.0 = Release|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Release|x86.ActiveCfg = Release|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Release|x86.Build.0 = Release|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.VSDebug|Any CPU.ActiveCfg = VSDebug|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.VSDebug|Any CPU.Build.0 = VSDebug|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.VSDebug|x86.ActiveCfg = VSDebug|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.VSDebug|x86.Build.0 = VSDebug|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.VSRelease|Any CPU.ActiveCfg = VSRelease|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.VSRelease|Any CPU.Build.0 = VSRelease|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.VSRelease|x86.ActiveCfg = VSRelease|Any CPU
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.VSRelease|x86.Build.0 = VSRelease|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|Any CPU.Build.0 = Debug|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|x86.ActiveCfg = Debug|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|x86.Build.0 = Debug|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.Proto|Any CPU.Build.0 = Proto|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.Proto|x86.ActiveCfg = Proto|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.Proto|x86.Build.0 = Proto|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|Any CPU.ActiveCfg = Release|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|Any CPU.Build.0 = Release|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|x86.ActiveCfg = Release|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|x86.Build.0 = Release|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.VSDebug|Any CPU.ActiveCfg = VSDebug|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.VSDebug|Any CPU.Build.0 = VSDebug|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.VSDebug|x86.ActiveCfg = VSDebug|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.VSDebug|x86.Build.0 = VSDebug|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.VSRelease|Any CPU.ActiveCfg = VSRelease|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.VSRelease|Any CPU.Build.0 = VSRelease|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.VSRelease|x86.ActiveCfg = VSRelease|Any CPU
{88E2D422-6852-46E3-A740-83E391DC7973}.VSRelease|x86.Build.0 = VSRelease|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4D7BE558-E6BF-44DA-8CE2-46AA6E0DC2E7} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
{CE3EB47C-F7E7-4A5A-9F92-29A22DE218C6} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
{15A57828-F9F5-4FB4-8E1E-AE7622A10F70} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
......@@ -1003,21 +1078,45 @@ Global
{493D19F9-35A4-4D0B-9B25-CA948823B709} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
{530DF8CA-7996-407A-B533-D0C2873257AF} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
{98ABDE09-9E08-49C7-B006-FB3CB5365B54} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{DED3BBD7-53F4-428A-8C9F-27968E768605} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{A437A6EC-5323-47C2-8F86-E2CAC54FF152} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
{65E0E82A-EACE-4787-8994-888674C2FE87} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
{FCFB214C-462E-42B3-91CA-FC557EFEE74F} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
{D9D95330-3626-4199-B7AF-17B8E4AF6D87} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{DA39AD38-4A58-47BF-9215-E49768295169} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{8C2439BD-0E49-4929-A8B1-29CEE228191E} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{F47196DC-186D-4055-BAF2-658282A12F33} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{D4C88934-5893-467E-A55C-A11ECD6479FE} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{6AFF752D-E991-4A08-9ED2-5BF46B0E0F8B} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{0B9CDEAF-EE8F-45E0-A4E0-34A8ED6DD09E} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{004982C6-93EA-4E70-B4F0-BE7D7219926A} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{243A81AC-A954-4601-833A-60EEEFB00FCD} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{B4595EB6-053A-400E-AA1B-7727F1BC900F} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{A559D7E8-7EFD-473A-B618-A10B41AB523B} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{AC85EE6D-033C-45F9-B8BA-884BC22EC6D9} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{956BBE41-ABD1-4DBA-9F3B-BA1C9821C98C} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{C9B1D3F5-4971-4F04-9C26-37E3AC809AB4} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
{CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7} = {F7876C9B-FB6A-4EFB-B058-D6967DB75FB2}
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F} = {F7876C9B-FB6A-4EFB-B058-D6967DB75FB2}
{DA39AD38-4A58-47BF-9215-E49768295169} = {3F044931-FB83-4433-B934-AE66AB27B278}
{8C2439BD-0E49-4929-A8B1-29CEE228191E} = {3F044931-FB83-4433-B934-AE66AB27B278}
{F47196DC-186D-4055-BAF2-658282A12F33} = {3F044931-FB83-4433-B934-AE66AB27B278}
{D4C88934-5893-467E-A55C-A11ECD6479FE} = {3F044931-FB83-4433-B934-AE66AB27B278}
{6AFF752D-E991-4A08-9ED2-5BF46B0E0F8B} = {3F044931-FB83-4433-B934-AE66AB27B278}
{0B9CDEAF-EE8F-45E0-A4E0-34A8ED6DD09E} = {3F044931-FB83-4433-B934-AE66AB27B278}
{004982C6-93EA-4E70-B4F0-BE7D7219926A} = {3F044931-FB83-4433-B934-AE66AB27B278}
{243A81AC-A954-4601-833A-60EEEFB00FCD} = {3F044931-FB83-4433-B934-AE66AB27B278}
{B4595EB6-053A-400E-AA1B-7727F1BC900F} = {3F044931-FB83-4433-B934-AE66AB27B278}
{A559D7E8-7EFD-473A-B618-A10B41AB523B} = {3F044931-FB83-4433-B934-AE66AB27B278}
{AC85EE6D-033C-45F9-B8BA-884BC22EC6D9} = {3F044931-FB83-4433-B934-AE66AB27B278}
{956BBE41-ABD1-4DBA-9F3B-BA1C9821C98C} = {3F044931-FB83-4433-B934-AE66AB27B278}
{702A7979-BCF9-4C41-853E-3ADFC9897890} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{C94C257C-3C0A-4858-B5D8-D746498D1F08} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{CB7D20C4-6506-406D-9144-5342C3595F03} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{649FA588-F02E-457C-9FCF-87E46407481E} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{D0E98C0D-490B-4C61-9329-0862F6E87645} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{C163E892-5BF7-4B59-AA99-B0E8079C67C4} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{3F044931-FB83-4433-B934-AE66AB27B278} = {F7876C9B-FB6A-4EFB-B058-D6967DB75FB2}
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{88E2D422-6852-46E3-A740-83E391DC7973} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{F7876C9B-FB6A-4EFB-B058-D6967DB75FB2} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
EndGlobalSection
EndGlobal
vsintegration/src/Salsa/Salsa.fsproj → vsintegration/src/Salsa/VisualFSharp.Salsa.fsproj
浏览文件 @ bdea8450
......@@ -5,6 +5,7 @@
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
<ProjectLanguage>FSharp</ProjectLanguage>
<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>
<Name>VisualFSharp.Salsa</Name>
</PropertyGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
<PropertyGroup>
......@@ -13,7 +14,7 @@
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{fbd4b354-dc6e-4032-8ec7-c81d8dfb1af7}</ProjectGuid>
<OutputType>Library</OutputType>
<AssemblyName>Salsa</AssemblyName>
<AssemblyName>VisualFSharp.Salsa</AssemblyName>
<NoWarn>$(NoWarn);45;47;52;58;75</NoWarn>
<DefineConstants>FX_ATLEAST_45;$(DefineConstants)</DefineConstants>
</PropertyGroup>
......
vsintegration/src/deployment/EnableOpenSource/EnableOpenSource.csproj
浏览文件 @ bdea8450
......@@ -188,9 +188,9 @@
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\vs\FsPkgs\FSharp.VS.FSI\FSHarp.VS.FSI.fsproj">
<ProjectReference Include="..\..\vs\FsPkgs\FSharp.VS.FSI\FSharp.VS.FSI.fsproj">
<Project>{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}</Project>
<Name>FSHarp.VS.FSI</Name>
<Name>FSharp.VS.FSI</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
......@@ -207,4 +207,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
\ No newline at end of file
vsintegration/src/unittests/Unittests.fsproj → vsintegration/src/unittests/VisualFSharp.Unittests.fsproj
浏览文件 @ bdea8450
......@@ -5,6 +5,7 @@
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
<ProjectLanguage>FSharp</ProjectLanguage>
<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>
<Name>VisualFSharp.Unittests</Name>
</PropertyGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
<PropertyGroup>
......@@ -12,7 +13,7 @@
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}</ProjectGuid>
<OutputType>Library</OutputType>
<AssemblyName>Unittests</AssemblyName>
<AssemblyName>VisualFSharp.Unittests</AssemblyName>
<TargetType>LIBRARY</TargetType>
<NoWarn>58;75</NoWarn>
<PlatformTarget>x86</PlatformTarget>
......@@ -144,6 +145,11 @@
<Project>{a437a6ec-5323-47c2-8f86-e2cac54ff152}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\Salsa\VisualFSharp.Salsa.fsproj">
<Name>VisualFSharp.Salsa</Name>
<Project>{fbd4b354-dc6e-4032-8ec7-c81d8dfb1af7}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\vs\FsPkgs\FSharp.LanguageService\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj">
<Name>FSharp.LanguageService.Base</Name>
<Project>{1c5c163c-37ea-4a3c-8ccc-0d34b74bf8ef}</Project>
......@@ -164,11 +170,6 @@
<Project>{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\Salsa\Salsa.fsproj">
<Name>Salsa</Name>
<Project>{fbd4b354-dc6e-4032-8ec7-c81d8dfb1af7}</Project>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
</Project>
\ No newline at end of file
vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
浏览文件 @ bdea8450
......@@ -41,7 +41,7 @@
<ItemGroup>
<ProjectReference Include="..\..\FSharp.VS.FSI\FSharp.VS.FSI.fsproj">
<Project>{991dcf75-c2eb-42b6-9a0d-aa1d2409d519}</Project>
<Name>FSHarp.VS.FSI</Name>
<Name>FSharp.VS.FSI</Name>
</ProjectReference>
<Reference Include="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Engine, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
......
vsintegration/update-vsintegration.cmd
浏览文件 @ bdea8450
......@@ -117,8 +117,8 @@ rem Disable strong-name validation for F# binaries built from open source that a
%SN32% -Vr FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a
%SN32% -Vr FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a
%SN32% -Vr FSharp.VS.FSI,b03f5f7f11d50a3a
%SN32% -Vr Unittests,b03f5f7f11d50a3a
%SN32% -Vr Salsa,b03f5f7f11d50a3a
%SN32% -Vr VisualFSharp.Unittests,b03f5f7f11d50a3a
%SN32% -Vr VisualFSharp.Salsa,b03f5f7f11d50a3a
if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
%SN64% -Vr FSharp.Core,b03f5f7f11d50a3a
......@@ -136,8 +136,8 @@ if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
%SN64% -Vr FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a
%SN64% -Vr FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a
%SN64% -Vr FSharp.VS.FSI,b03f5f7f11d50a3a
%SN64% -Vr Unittests,b03f5f7f11d50a3a
%SN64% -Vr Salsa,b03f5f7f11d50a3a
%SN64% -Vr VisualFSharp.Unittests,b03f5f7f11d50a3a
%SN64% -Vr VisualFSharp.Salsa,b03f5f7f11d50a3a
)
%GACUTIL% /if %BINDIR%\FSharp.Compiler.Interactive.Settings.dll
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或