Movatterモバイル変換

Skip to content

Pateldisolution/visualfsharpPublic

forked fromdotnet/fsharp

NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit0030835

latkin

committed

Fix tests for portable 7, 78, 259 so they run (changeset 1302499)

1 parentd673d31 commit0030835Copy full SHA for 0030835

File tree

10 files changed

+19

-17

lines changed

tests
- RunTests.cmd
- config.bat
- fsharp/core/netcore
  - netcore259
    - build.bat
    - run.bat
  - netcore78
    - build.bat
    - run.bat
  - netcore7
    - build.bat
    - run.bat
  - netcoreautomationhelperlibrary
    - netcoreautomationhelperlibrary.fsproj
- test.lst

10 files changed

+19

-17

lines changed

`‎tests/RunTests.cmd‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,17 +96,17 @@ set FSCOREDLLPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETF`
`96`	`96`	`setFSCOREDLL20PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v2.0\2.3.0.0`
`97`	`97`	`setFSCOREDLLPORTABLEPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETPortable\2.3.5.1`
`98`	`98`	`setFSCOREDLLNETCOREPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.3.1.0`
`99`		`-setFSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.4.78.310`
`100`		`-setFSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.4.259.310`
	`99`	`+setFSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.78.3.1`
	`100`	`+setFSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.259.3.1`
`101`	`101`	`setFSDATATPPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\Type Providers`
`102`	`102`
`103`	`103`	`REM == open source logic`
`104`	`104`	`ifexist"%FSCBinPath%\FSharp.Core.dll"setFSCOREDLLPATH=%FSCBinPath%`
`105`	`105`	`ifexist"%FSCBinPath%\..\..\net20\bin\FSharp.Core.dll"setFSCOREDLL20PATH=%FSCBinPath%\..\..\net20\bin`
`106`	`106`	`ifexist"%FSCBinPath%\..\..\portable47\bin\FSharp.Core.dll"setFSCOREDLLPORTABLEPATH=%FSCBinPath%\..\..\portable47\bin`
`107`	`107`	`ifexist"%FSCBinPath%\..\..\portable7\bin\FSharp.Core.dll"setFSCOREDLLNETCOREPATH=%FSCBinPath%\..\..\portable7\bin`
`108`		`-IFEXIST"%FSCBinPath%\..\..\portable78\bin\FSharp.Core.dll"setFSCOREDLLNETCORE78PATH=%FSCBinPath%\..\..\portable78\bin`
`109`		`-IFEXIST"%FSCBinPath%\..\..\portable259\bin\FSharp.Core.dll"setFSCOREDLLNETCORE259PATH=%FSCBinPath%\..\..\portable259\bin`
	`108`	`+IFexist"%FSCBinPath%\..\..\portable78\bin\FSharp.Core.dll"setFSCOREDLLNETCORE78PATH=%FSCBinPath%\..\..\portable78\bin`
	`109`	`+IFexist"%FSCBinPath%\..\..\portable259\bin\FSharp.Core.dll"setFSCOREDLLNETCORE259PATH=%FSCBinPath%\..\..\portable259\bin`
`110`	`110`	`ifexist"%FSCBinPath%\FSharp.Data.TypeProviders.dll"setFSDATATPPATH=%FSCBinPath%`
`111`	`111`
`112`	`112`	`setFSCOREDLLPATH=%FSCOREDLLPATH%\FSharp.Core.dll`

`‎tests/config.bat‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -261,8 +261,8 @@ set FSCOREDLLPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETF`
`261`	`261`	`setFSCOREDLL20PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v2.0\2.3.0.0`
`262`	`262`	`setFSCOREDLLPORTABLEPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETPortable\2.3.5.1`
`263`	`263`	`setFSCOREDLLNETCOREPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.3.1.0`
`264`		`-setFSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.4.78.310`
`265`		`-setFSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.4.259.310`
	`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`
`266`	`266`	`setFSDATATPPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\Type Providers`
`267`	`267`
`268`	`268`	`REM == Check if using open build instead`

`‎tests/fsharp/core/netcore/netcore259/build.bat‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (`
`6`	`6`	`exit /b0`
`7`	`7`	`)`
`8`	`8`
`9`		`-"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug`
	`9`	`+"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug /p:TestProfile=Profile259`
`10`	`10`	`exit /b%ERRORLEVEL%`

`‎tests/fsharp/core/netcore/netcore259/run.bat‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (`
`9`	`9`	`exit /b0`
`10`	`10`	`)`
`11`	`11`
`12`		`-setCONTROL_FAILURES_LOG=%~dp0\control_failures.log`
	`12`	`+setCONTROL_FAILURES_LOG=%~dp0..\ConsoleApplication1\bin\Debug\Profile259\control_failures.log`
`13`	`13`
`14`		`-..\ConsoleApplication1\bin\Debug\profile359\PortableTestEntry.exe`
	`14`	`+..\ConsoleApplication1\bin\Debug\Profile259\PortableTestEntry.exe`
`15`	`15`	`endlocal`
`16`	`16`	`exit /b%ERRORLEVEL%`
`17`	`17`

`‎tests/fsharp/core/netcore/netcore7/build.bat‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (`
`6`	`6`	`exit /b0`
`7`	`7`	`)`
`8`	`8`
`9`		`-"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug`
	`9`	`+"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug /p:TestProfile=Profile7`
`10`	`10`	`exit /b%ERRORLEVEL%`

`‎tests/fsharp/core/netcore/netcore7/run.bat‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (`
`9`	`9`	`exit /b0`
`10`	`10`	`)`
`11`	`11`
`12`		`-setCONTROL_FAILURES_LOG=%~dp0\control_failures.log`
	`12`	`+setCONTROL_FAILURES_LOG=%~dp0..\ConsoleApplication1\bin\Debug\profile7\control_failures.log`
`13`	`13`
`14`	`14`	`..\ConsoleApplication1\bin\Debug\profile7\PortableTestEntry.exe`
`15`	`15`	`endlocal`

`‎tests/fsharp/core/netcore/netcore78/build.bat‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (`
`6`	`6`	`exit /b0`
`7`	`7`	`)`
`8`	`8`
`9`		`-"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug`
	`9`	`+"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug /p:TestProfile=Profile78`
`10`	`10`	`exit /b%ERRORLEVEL%`

`‎tests/fsharp/core/netcore/netcore78/run.bat‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (`
`9`	`9`	`exit /b0`
`10`	`10`	`)`
`11`	`11`
`12`		`-setCONTROL_FAILURES_LOG=%~dp0\control_failures.log`
	`12`	`+setCONTROL_FAILURES_LOG=%~dp0..\ConsoleApplication1\bin\Debug\profile78\control_failures.log`
`13`	`13`
`14`	`14`	`..\ConsoleApplication1\bin\Debug\profile78\PortableTestEntry.exe`
`15`	`15`	`endlocal`

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

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,19 +17,19 @@`
`17`	`17`	`<SccAuxPath>SAK</SccAuxPath>`
`18`	`18`	`<SccLocalPath>SAK</SccLocalPath>`
`19`	`19`	`</PropertyGroup>`
`20`		`- <PropertyGroupCondition=" '$(TestProfile)'=='' or'$(TestProfile)'=='Profile7'">`
	`20`	`+ <PropertyGroupCondition="'$(TestProfile)'=='Profile7'">`
`21`	`21`	`<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>`
`22`	`22`	`<TargetFSharpCoreVersion>3.3.1.0</TargetFSharpCoreVersion>`
`23`	`23`	`<ProfileCorePath>$(FSCOREDLLNETCOREPATH)</ProfileCorePath>`
`24`	`24`	`</PropertyGroup>`
`25`	`25`	`<PropertyGroupCondition=" '$(TestProfile)'=='Profile78'">`
`26`	`26`	`<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>`
`27`		`- <TargetFSharpCoreVersion>3.4.78.310</TargetFSharpCoreVersion>`
	`27`	`+ <TargetFSharpCoreVersion>3.78.3.1</TargetFSharpCoreVersion>`
`28`	`28`	`<ProfileCorePath>$(FSCOREDLLNETCORE78PATH)</ProfileCorePath>`
`29`	`29`	`</PropertyGroup>`
`30`	`30`	`<PropertyGroupCondition=" '$(TestProfile)'=='Profile259'">`
`31`	`31`	`<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>`
`32`		`- <TargetFSharpCoreVersion>3.4.259.310</TargetFSharpCoreVersion>`
	`32`	`+ <TargetFSharpCoreVersion>3.259.3.1</TargetFSharpCoreVersion>`
`33`	`33`	`<ProfileCorePath>$(FSCOREDLLNETCORE259PATH)</ProfileCorePath>`
`34`	`34`	`</PropertyGroup>`
`35`	`35`	`<PropertyGroupCondition=" '$(Configuration)\|$(Platform)' == 'Debug\|AnyCPU'">`

`‎tests/test.lst‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,9 @@ Core04fsharp\core\members\ops`
`52`	`52`	`Core05..\testsprivate\fsharp\core\mscorlib`
`53`	`53`	`Core05fsharp\core\namespaces`
`54`	`54`	`Core05fsharp\core\nested`
`55`		`-Core05fsharp\core\netcore`
	`55`	`+Core05fsharp\core\netcore7`
	`56`	`+Core05fsharp\core\netcore78`
	`57`	`+Core05fsharp\core\netcore259`
`56`	`58`	`Core05fsharp\core\parsing`
`57`	`59`	`Core05fsharp\core\patterns`
`58`	`60`	`Core05fsharp\core\pinvoke`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp