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

Commit5caef3c

Browse files
committed
Update tests to F# 4.0
1 parentd2de9b8 commit5caef3c

File tree

16 files changed

+39
-45
lines changed

16 files changed

+39
-45
lines changed

‎tests/BuildTestTools.cmd‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ exit /b 1
1111

1212
:ok
1313

14-
msbuild%~dp0\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj /p:Configuration=%1 /t:Build
15-
xcopy /Y%~dp0\fsharpqa\testenv\src\ILComparer\bin\%1\*%~dp0\fsharpqa\testenv\bin
14+
msbuild"%~dp0\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj" /p:Configuration=%1 /t:Build
15+
xcopy /Y"%~dp0\fsharpqa\testenv\src\ILComparer\bin\%1\*""%~dp0\fsharpqa\testenv\bin"
1616

17-
msbuild%~dp0\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj /p:Configuration=%1 /t:Build
18-
xcopy /Y%~dp0\fsharpqa\testenv\src\HostedCompilerServer\bin\%1\*%~dp0\fsharpqa\testenv\bin
17+
msbuild"%~dp0\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj" /p:Configuration=%1 /t:Build
18+
xcopy /Y"%~dp0\fsharpqa\testenv\src\HostedCompilerServer\bin\%1\*""%~dp0\fsharpqa\testenv\bin"
1919

20-
ifexist%~dp0\..\%1\net40\bin (
21-
xcopy /Y%~dp0\..\%1\net40\bin\FSharp.Core.sigdata fsharpqa\testenv\bin
22-
xcopy /Y%~dp0\..\%1\net40\bin\FSharp.Core.optdata fsharpqa\testenv\bin
20+
ifexist"%~dp0\..\%1\net40\bin" (
21+
xcopy /Y"%~dp0\..\%1\net40\bin\FSharp.Core.sigdata" fsharpqa\testenv\bin
22+
xcopy /Y"%~dp0\..\%1\net40\bin\FSharp.Core.optdata" fsharpqa\testenv\bin
2323
)

‎tests/RunTests.cmd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@ set FSC=%FSCBINPATH%\fsc.exe
111111
setPATH=%FSCBINPATH%;%PATH%
112112

113113
REM == VS-installed paths to FSharp.Core.dll
114-
setFSCOREDLLPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.1.0
114+
setFSCOREDLLPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.4.0.0
115115
setFSCOREDLL20PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v2.0\2.3.0.0
116-
setFSCOREDLLPORTABLEPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETPortable\2.3.5.1
117-
setFSCOREDLLNETCOREPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.3.1.0
118-
setFSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.78.3.1
119-
setFSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.259.3.1
116+
setFSCOREDLLPORTABLEPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETPortable\3.47.4.0
117+
setFSCOREDLLNETCOREPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.7.4.0
118+
setFSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.78.4.0
119+
setFSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.259.4.0
120120
setFSDATATPPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\Type Providers
121121

122122
REM == open source logic

‎tests/config.bat‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ IF NOT DEFINED PSH_FLAGS SET PSH_FLAGS=-nologo -noprofile -executionpolicy bypas
167167
ifDEFINED _UNATTENDEDLOGexit /b0
168168

169169
rem first see if we have got msbuild installed
170-
ifexist"%X86_PROGRAMFILES%\MSBuild\12.0\Bin\MSBuild.exe"SETMSBuildToolsPath=%X86_PROGRAMFILES%\MSBuild\12.0\Bin\
170+
ifexist"%X86_PROGRAMFILES%\MSBuild\14.0\Bin\MSBuild.exe"SETMSBuildToolsPath=%X86_PROGRAMFILES%\MSBuild\14.0\Bin\
171171
ifnot"%MSBuildToolsPath%"==""goto done_MsBuildToolsPath
172172

173173
IFNOT"%CORDIR%"==""IFEXIST"%CORDIR%\msbuild.exe"SETMSBuildToolsPath=%CORDIR%
@@ -176,17 +176,17 @@ IF "%CORDIR40%"=="" IF NOT "%CORDIR%"=="" IF EXIST "%CORDIR%\..\V3.5\msbuild
176176
IFNOT"%CORDIR%"==""FOR /f%%jIN ("%MSBuildToolsPath%")doSETMSBuildToolsPath=%%~fj
177177
:done_MsBuildToolsPath
178178

179-
regquery"%REG_SOFTWARE%\Microsoft\VisualStudio\12.0\Setup"|findstr /r /c:"Express .* for Windows Desktop">NUL
179+
regquery"%REG_SOFTWARE%\Microsoft\VisualStudio\14.0\Setup"|findstr /r /c:"Express .* for Windows Desktop">NUL
180180
ifNOTERRORLEVEL1 (
181181
setINSTALL_SKU=DESKTOP_EXPRESS
182182
goto :done_SKU
183183
)
184-
regquery"%REG_SOFTWARE%\Microsoft\VisualStudio\12.0\Setup"|findstr /r /c:"Express .* for Web">NUL
184+
regquery"%REG_SOFTWARE%\Microsoft\VisualStudio\14.0\Setup"|findstr /r /c:"Express .* for Web">NUL
185185
ifNOTERRORLEVEL1 (
186186
setINSTALL_SKU=WEB_EXPRESS
187187
goto :done_SKU
188188
)
189-
regquery"%REG_SOFTWARE%\Microsoft\VisualStudio\12.0\Setup"|findstr /r /c:"Ultimate">NUL
189+
regquery"%REG_SOFTWARE%\Microsoft\VisualStudio\14.0\Setup"|findstr /r /c:"Ultimate">NUL
190190
ifNOTERRORLEVEL1 (
191191
setINSTALL_SKU=ULTIMATE
192192
goto :done_SKU
@@ -235,9 +235,9 @@ REM === Works on 32bit and 64 bit, no matter what cmd prompt it is invoked from
235235
REM ===
236236
:SetFSCBinPath45
237237

238-
FOR /F"tokens=1-2*"%%aIN ('regquery"%REG_SOFTWARE%\Microsoft\FSharp\3.1\Runtime\v4.0" /ve')DOsetFSCBinPath=%%c
238+
FOR /F"tokens=1-2*"%%aIN ('regquery"%REG_SOFTWARE%\Microsoft\FSharp\4.0\Runtime\v4.0" /ve')DOsetFSCBinPath=%%c
239239
IFEXIST"%FSCBinPath%"goto :EOF
240-
FOR /F"tokens=1-3*"%%aIN ('regquery"%REG_SOFTWARE%\Microsoft\FSharp\3.1\Runtime\v4.0" /ve')DOsetFSCBinPath=%%d
240+
FOR /F"tokens=1-3*"%%aIN ('regquery"%REG_SOFTWARE%\Microsoft\FSharp\4.0\Runtime\v4.0" /ve')DOsetFSCBinPath=%%d
241241
goto :EOF
242242

243243
REM ===
@@ -257,12 +257,12 @@ IF /I "%OSARCH%"=="IA64" set X86_PROGRAMFILES=%ProgramFiles(x86)%
257257
IF /I"%OSARCH%"=="AMD64"setX86_PROGRAMFILES=%ProgramFiles(x86)%
258258

259259
REM == Default VS install locations
260-
setFSCOREDLLPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.1.0
260+
setFSCOREDLLPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.4.0.0
261261
setFSCOREDLL20PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v2.0\2.3.0.0
262-
setFSCOREDLLPORTABLEPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETPortable\2.3.5.1
263-
setFSCOREDLLNETCOREPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.3.1.0
264-
setFSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.78.3.1
265-
setFSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.259.3.1
262+
setFSCOREDLLPORTABLEPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETPortable\3.47.4.0
263+
setFSCOREDLLNETCOREPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.7.4.0
264+
setFSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.78.4.0
265+
setFSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.259.4.0
266266
setFSDATATPPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\Type Providers
267267

268268
REM == Check if using open build instead

‎tests/fsharp/core/netcore/netcoreautomationhelperlibrary/netcoreautomationhelperlibrary.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
</PropertyGroup>
2020
<PropertyGroupCondition="'$(TestProfile)'=='Profile7'">
2121
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
22-
<TargetFSharpCoreVersion>3.3.1.0</TargetFSharpCoreVersion>
22+
<TargetFSharpCoreVersion>3.7.4.0</TargetFSharpCoreVersion>
2323
<ProfileCorePath>$(FSCOREDLLNETCOREPATH)</ProfileCorePath>
2424
</PropertyGroup>
2525
<PropertyGroupCondition=" '$(TestProfile)'=='Profile78'">
2626
<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
27-
<TargetFSharpCoreVersion>3.78.3.1</TargetFSharpCoreVersion>
27+
<TargetFSharpCoreVersion>3.78.4.0</TargetFSharpCoreVersion>
2828
<ProfileCorePath>$(FSCOREDLLNETCORE78PATH)</ProfileCorePath>
2929
</PropertyGroup>
3030
<PropertyGroupCondition=" '$(TestProfile)'=='Profile259'">
3131
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
32-
<TargetFSharpCoreVersion>3.259.3.1</TargetFSharpCoreVersion>
32+
<TargetFSharpCoreVersion>3.259.4.0</TargetFSharpCoreVersion>
3333
<ProfileCorePath>$(FSCOREDLLNETCORE259PATH)</ProfileCorePath>
3434
</PropertyGroup>
3535
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">

‎tests/fsharp/core/netcore/netcorelibrary1/netcoretestinglibrary.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020
<PropertyGroupCondition=" '$(TestProfile)'=='' or '$(TestProfile)'=='Profile7'">
2121
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
22-
<TargetFSharpCoreVersion>3.3.1.0</TargetFSharpCoreVersion>
22+
<TargetFSharpCoreVersion>3.7.4.0</TargetFSharpCoreVersion>
2323
<ProfileCorePath>$(FSCOREDLLNETCOREPATH)</ProfileCorePath>
2424
</PropertyGroup>
2525
<PropertyGroupCondition=" '$(TestProfile)'=='Profile78'">

‎tests/fsharp/tools/FSharp.PowerPack/fsppack/src/CodePlex.Settings.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44
<PropertyGroup>

‎tests/fsharp/tools/FSharp.PowerPack/fsppack/src/CodePlex.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44

‎tests/fsharp/tools/FSharp.PowerPack/fsppack/src/FSharp.Compiler.CodeDom/Test.Compiler.CodeDom.fsproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,5 @@
4545
<ReferenceInclude="FSharp.Core" />
4646
</ItemGroup>
4747
<ImportProject="$(FSharpPowerPackSourcesRoot)\CodePlex.targets" />
48-
<ImportProject="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets"Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')" />
49-
<ImportProject="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets"Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets'))" />
50-
<ImportProject="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets"Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')) And (!Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets'))" />
48+
<ImportProject="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets" />
5149
</Project>

‎tests/fsharp/tools/FSharp.PowerPack/fsppack/src/FSharp.PowerPack.Linq/Test.PowerPack.Linq.fsproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,5 @@
5050
<CompileInclude="Assembly.fs" />
5151
</ItemGroup>
5252
<ImportProject="$(FSharpPowerPackSourcesRoot)\CodePlex.targets" />
53-
<ImportProject="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets"Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')" />
54-
<ImportProject="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets"Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets'))" />
55-
<ImportProject="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets"Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')) And (!Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets'))" />
53+
<ImportProject="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets" />
5654
</Project>

‎tests/fsharp/tools/FSharp.PowerPack/fsppack/src/FSharp.PowerPack/Test.PowerPack.fsproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,5 @@
246246
<ReferenceInclude="FSharp.Core" />
247247
</ItemGroup>
248248
<ImportProject="$(FSharpPowerPackSourcesRoot)\CodePlex.targets" />
249-
<ImportProject="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets"Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')" />
250-
<ImportProject="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets"Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets'))" />
251-
<ImportProject="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets"Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')) And (!Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets'))" />
249+
<ImportProject="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets" />
252250
</Project>

0 commit comments

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