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

Commitc2708eb

Browse files
committed
1. Teach runtests.cmd about location of nunit
2. remove Microsoft.Build binding redirect to ide unittests.dll3. Retarget enableopensource vsix at VS 12.0 and up4. Remove tabs from enableopensource vsix, which seems to have made it not build on dev 12, and not install in dev 14
1 parentcbfd1df commitc2708eb

File tree

4 files changed

+34
-66
lines changed

4 files changed

+34
-66
lines changed

‎appveyor-build.cmd‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,12 @@ REM @if ERRORLEVEL 1 echo Error: library net20 debug build failed && goto :eof
5454
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
5555
@if ERRORLEVEL1echo Error: library portable7 debug build failed&&goto :eof
5656

57-
5857
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
5958
@if ERRORLEVEL1echo Error: library portable78 debug build failed&&goto :eof
6059

6160
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable259
6261
@if ERRORLEVEL1echo Error: library portable259 debug build failed&&goto :eof
6362

64-
65-
66-
6763
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true
6864
@if ERRORLEVEL1echo Error: library unittests debug build failed&&goto :eof
6965

@@ -96,7 +92,6 @@ REM Disabled while working out perl problem, see https://github.com/Microsoft/vi
9692
REM call RunTests.cmd debug fsharpqa Smoke
9793
REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd debug fsharpqa Smoke' failed && goto :eof
9894

99-
setPATH=%PATH%;%~dp0%packages\NUnit.Runners.2.6.3\tools\
10095
call RunTests.cmd debug coreunit
10196
@if ERRORLEVEL1echo Error: 'RunTests.cmd debug coreunit' failed&&goto :eof
10297

‎tests/RunTests.cmd‎

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ goto :USAGE
1010

1111
:flavor_ok
1212

13+
setnunitpath=%~dp0%..\packages\NUnit.Runners.2.6.3\tools\
14+
1315
rem "ttags" indicates what test areas will be run, based on the tags in the test.lst files
1416
setTTAGS_ARG=
1517
set_tmp=%3
@@ -184,13 +186,8 @@ set XMLFILE=CoreUnit_%coreunitsuffix%_Xml.xml
184186
setOUTPUTFILE=CoreUnit_%coreunitsuffix%_Output.log
185187
setERRORFILE=CoreUnit_%coreunitsuffix%_Error.log
186188

187-
where.exe nunit-console.exe>NUL2>NUL
188-
iferrorlevel1 (
189-
echo Error: nunit-console.exe is not in the PATH
190-
exit /b1
191-
)
192-
echo nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll
193-
nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll
189+
echo%nunitpath%\nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll
190+
%nunitpath%\nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll
194191

195192
goto :EOF
196193

@@ -200,13 +197,8 @@ set XMLFILE=ComplierUnit_%compilerunitsuffix%_Xml.xml
200197
setOUTPUTFILE=ComplierUnit_%compilerunitsuffix%_Output.log
201198
setERRORFILE=ComplierUnit_%compilerunitsuffix%_Error.log
202199

203-
where.exe nunit-console.exe>NUL2>NUL
204-
iferrorlevel1 (
205-
echo Error: nunit-console.exe is not in the PATH
206-
exit /b1
207-
)
208-
echo nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\..\..\%compilerunitsuffix%\bin\FSharp.Compiler.Unittests.dll
209-
nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\..\..\%compilerunitsuffix%\bin\FSharp.Compiler.Unittests.dll
200+
echo%nunitpath%\nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\..\..\%compilerunitsuffix%\bin\FSharp.Compiler.Unittests.dll
201+
%nunitpath%\nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\..\..\%compilerunitsuffix%\bin\FSharp.Compiler.Unittests.dll
210202

211203
goto :EOF
212204

@@ -216,16 +208,7 @@ set XMLFILE=IDEUnit_Xml.xml
216208
setOUTPUTFILE=IDEUnit_Output.log
217209
setERRORFILE=IDEUnit_Error.log
218210

219-
where.exe nunit-console-x86.exe>NUL2>NUL
220-
iferrorlevel1 (
221-
echo Error: nunit-console-x86.exe is not in the PATH
222-
exit /b1
223-
)
224-
225-
for /f"tokens=*"%%ain ('where.exe nunit-console-x86.exe')do (set nunitlocation=%%~dpa)
226-
xcopy /y"%nunitlocation%\lib\*.dll""%FSCBINPATH%"
227-
228-
echo nunit-console-x86.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\Unittests.dll
229-
nunit-console-x86.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\Unittests.dll
211+
echo%nunitpath%\nunit-console-x86.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\Unittests.dll
212+
%nunitpath%\nunit-console-x86.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\Unittests.dll
230213

231214
goto :EOF
Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- 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.-->
33
<PackageManifestVersion="2.0.0"xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
4-
<Metadata>
5-
<IdentityId="EnableOpenSource..4c74b903-4a32-44da-8c3f-c004633ab0f2"Version="4.0"Language="en-US"Publisher="Microsoft.VisualFSharpTools" />
6-
<DisplayName>Microsoft.VisualFSharpTools.EnableOpenSource</DisplayName>
7-
<Descriptionxml:space="preserve">Enable FSharp.VS.FSI. </Description>
8-
<License>License.txt</License>
9-
</Metadata>
10-
<Installation>
11-
<InstallationTargetId="Microsoft.VisualStudio.Community"Version="[14.0)" />
12-
</Installation>
13-
<Dependencies>
14-
<DependencyId="Microsoft.Framework.NDP"DisplayName="Microsoft .NET Framework"d:Source="Manual"Version="[4.5,)" />
15-
</Dependencies>
16-
<Assets>
17-
<AssetType="Microsoft.VisualStudio.VsPackage"d:Source="File"Path="EnableOpenSource.pkgdef" />
18-
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSHarp.VS.FSI"Path="|FSHarp.VS.FSI|"AssemblyName="|FSHarp.VS.FSI;AssemblyName|" />
19-
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.Compiler"Path="|FSharp.Compiler|"AssemblyName="|FSharp.Compiler;AssemblyName|" />
20-
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.Compiler.Server.Shared"Path="|FSharp.Compiler.Server.Shared|"AssemblyName="|FSharp.Compiler.Server.Shared;AssemblyName|" />
21-
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.Core"Path="|FSharp.Core|"AssemblyName="|FSharp.Core;AssemblyName|" />
22-
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.LanguageService.Compiler"Path="|FSharp.LanguageService.Compiler|"AssemblyName="|FSharp.LanguageService.Compiler;AssemblyName|" />
23-
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.LanguageService"Path="|FSharp.LanguageService|"AssemblyName="|FSharp.LanguageService;AssemblyName|" />
24-
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.LanguageService.Base"Path="|FSharp.LanguageService.Base|"AssemblyName="|FSharp.LanguageService.Base;AssemblyName|" />
25-
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.Editor"Path="|FSharp.Editor|"AssemblyName="|FSharp.Editor;AssemblyName|" />
26-
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="ProjectSystem.Base"Path="|ProjectSystem.Base|"AssemblyName="|ProjectSystem.Base;AssemblyName|" />
27-
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.PropertiesPages"Path="|FSharp.PropertiesPages|"AssemblyName="|FSharp.PropertiesPages;AssemblyName|" />
28-
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="ProjectSystem"Path="|ProjectSystem|"AssemblyName="|ProjectSystem;AssemblyName|" />
29-
</Assets>
4+
<Metadata>
5+
<IdentityId="EnableOpenSource..4c74b903-4a32-44da-8c3f-c004633ab0f2"Version="4.0"Language="en-US"Publisher="Microsoft.VisualFSharpTools" />
6+
<DisplayName>Microsoft.VisualFSharpTools.EnableOpenSource</DisplayName>
7+
<Descriptionxml:space="preserve">Enable FSharp.VS.FSI. </Description>
8+
<License>License.txt</License>
9+
</Metadata>
10+
<Installation>
11+
<InstallationTargetId="Microsoft.VisualStudio.Pro"Version="[12.0,]" />
12+
</Installation>
13+
<Dependencies>
14+
<DependencyId="Microsoft.Framework.NDP"DisplayName="Microsoft .NET Framework"d:Source="Manual"Version="[4.5,)" />
15+
</Dependencies>
16+
<Assets>
17+
<AssetType="Microsoft.VisualStudio.VsPackage"d:Source="File"Path="EnableOpenSource.pkgdef" />
18+
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSHarp.VS.FSI"Path="|FSHarp.VS.FSI|"AssemblyName="|FSHarp.VS.FSI;AssemblyName|" />
19+
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.Compiler"Path="|FSharp.Compiler|"AssemblyName="|FSharp.Compiler;AssemblyName|" />
20+
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.Compiler.Server.Shared"Path="|FSharp.Compiler.Server.Shared|"AssemblyName="|FSharp.Compiler.Server.Shared;AssemblyName|" />
21+
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.Core"Path="|FSharp.Core|"AssemblyName="|FSharp.Core;AssemblyName|" />
22+
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.LanguageService.Compiler"Path="|FSharp.LanguageService.Compiler|"AssemblyName="|FSharp.LanguageService.Compiler;AssemblyName|" />
23+
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.LanguageService"Path="|FSharp.LanguageService|"AssemblyName="|FSharp.LanguageService;AssemblyName|" />
24+
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.LanguageService.Base"Path="|FSharp.LanguageService.Base|"AssemblyName="|FSharp.LanguageService.Base;AssemblyName|" />
25+
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.Editor"Path="|FSharp.Editor|"AssemblyName="|FSharp.Editor;AssemblyName|" />
26+
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="ProjectSystem.Base"Path="|ProjectSystem.Base|"AssemblyName="|ProjectSystem.Base;AssemblyName|" />
27+
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="FSharp.PropertiesPages"Path="|FSharp.PropertiesPages|"AssemblyName="|FSharp.PropertiesPages;AssemblyName|" />
28+
<AssetType="Microsoft.VisualStudio.Assembly"d:Source="Project"d:ProjectName="ProjectSystem"Path="|ProjectSystem|"AssemblyName="|ProjectSystem;AssemblyName|" />
29+
</Assets>
3030
</PackageManifest>

‎vsintegration/src/unittests/Unittests.dll.config‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
<addkey="fsharp-compiler-location"value="{FinalDir}" />
66
</appSettings>
77
<runtime>
8-
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
9-
<dependentAssembly>
10-
<assemblyIdentityname="Microsoft.Build.Framework"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
11-
<bindingRedirectoldVersion="0.0.0.0-99.9.9.9"newVersion="12.0.0.0"/>
12-
</dependentAssembly>
13-
</assemblyBinding>
148
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
159
<dependentAssembly>
1610
<assemblyIdentityname="EnvDTE"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
@@ -24,10 +18,6 @@
2418
<assemblyIdentityname="Microsoft.VisualStudio.Shell.10.0"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
2519
<bindingRedirectoldVersion="2.0.0.0-10.0.0.0"newVersion="11.0.0.0"/>
2620
</dependentAssembly>
27-
<dependentAssembly>
28-
<assemblyIdentityname="Microsoft.Build"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
29-
<bindingRedirectoldVersion="0.0.0.0-12.0.0.0"newVersion="12.0.0.0" />
30-
</dependentAssembly>
3121
<dependentAssembly>
3222
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
3323
<bindingRedirectoldVersion="2.0.0.0-4.4.0.0"newVersion="4.4.0.9055"/>

0 commit comments

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