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

Commit20d4479

Browse files
committed
Enable Profile 78 and 259. Add Templates to allow users to use them. (changeset 1296994)
1 parent166c9fd commit20d4479

File tree

36 files changed

+635
-583
lines changed

36 files changed

+635
-583
lines changed

‎changelist.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
Changelist for Visual F# Tools 3.1.2
1212
====================================
1313

14+
* Update internal packager, and build files to support the new profiles
15+
* Fix some bugs in the open source Profile 7, 78 and 259, improve build support for it.
16+
- Open source the Visual Studio Fsharp UI tests and test harnesses
1417
- Open source project system, language service, editor, vs_fsi
1518
* #! treated as a comment when it is at the start of an fsharp file
1619
* Fix for #78 - allow space characters in active pattern case identifiers

‎src/FSharpSource.targets‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,16 @@
77
<WhenCondition="'$(ProjectLanguage)' == 'FSharp'">
88
<Choose>
99
<WhenCondition="'$(AssemblyName)' == 'FSharp.Core'">
10+
<PropertyGroupCondition="'$(TargetFramework)' == 'Portable7' or '$(TargetFramework)' == 'Portable78' or '$(TargetFramework)' == 'Portable259'">
11+
<IsPortableProfile>true</IsPortableProfile>
12+
</PropertyGroup>
1013
<PropertyGroup>
11-
<OtherFlagsCondition="'$(TargetFramework)' != 'net20'AND '$(TargetFramework)' != 'portable47' AND '$(TargetFramework)' != 'portable7'">$(OtherFlags) --version:4.3.1.9055</OtherFlags>
14+
<OtherFlagsCondition="'$(TargetFramework)' != 'net20'and $(IsPortableProfile) != 'true'">$(OtherFlags) --version:4.3.1.9055</OtherFlags>
1215
<OtherFlagsCondition="'$(TargetFramework)' == 'net20'">$(OtherFlags) --version:2.3.1.9055</OtherFlags>
13-
<OtherFlagsCondition="'$(TargetFramework)' == 'portable47'">$(OtherFlags) --version:2.3.5.9055</OtherFlags>
1416
<OtherFlagsCondition="'$(TargetFramework)' == 'portable7'">$(OtherFlags) --version:3.3.1.9055</OtherFlags>
17+
<OtherFlagsCondition="'$(TargetFramework)' == 'portable47'">$(OtherFlags) --version:2.3.5.9055</OtherFlags>
18+
<OtherFlagsCondition="'$(TargetFramework)' == 'portable78'">$(OtherFlags) --version:3.4.78.9055</OtherFlags>
19+
<OtherFlagsCondition="'$(TargetFramework)' == 'portable259'">$(OtherFlags) --version:3.4.259.9055</OtherFlags>
1520
<OtherFlags>$(OtherFlags) --delaysign+ --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
1621
<DefineConstants>STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)</DefineConstants>
1722
<StrongNames>true</StrongNames>
@@ -140,7 +145,6 @@
140145
<DefineConstants>$(DefineConstants);FX_SIMPLE_SECURITY_PERMISSIONS</DefineConstants>
141146
<DefineConstants>$(DefineConstants);FX_NO_TRUNCATE</DefineConstants>
142147
<DefineConstants>$(DefineConstants);FX_NO_CULTURE_INFO_ARGS</DefineConstants>
143-
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_MODULES</DefineConstants>
144148
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
145149
<DefineConstants>$(DefineConstants);FX_NO_TO_LOWER_INVARIANT</DefineConstants>
146150
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
@@ -184,23 +188,21 @@
184188

185189
<!-- Target Portable Profile 7-->
186190
<PropertyGroupCondition="'$(TargetFramework)'=='portable7'">
187-
<DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
188191
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
192+
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE7</DefineConstants>
193+
<DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
189194
<DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
190195
<DefineConstants>$(DefineConstants);FX_ATLEAST_PORTABLE</DefineConstants>
191196
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
192197
<DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
193198
<DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
194199
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
195200
<DefineConstants>$(DefineConstants);FX_SIMPLE_SECURITY_PERMISSIONS</DefineConstants>
196-
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_MODULES</DefineConstants>
197201
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
198202
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
199-
<DefineConstants>$(DefineConstants);FX_NO_BASED_ARRAYS</DefineConstants>
200203
<DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
201204
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
202205
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
203-
<DefineConstants>$(DefineConstants);FX_NO_ICLONEABLE</DefineConstants>
204206
<DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
205207
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
206208
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_KEY_SORT</DefineConstants>
@@ -221,13 +223,16 @@
221223
</PropertyGroup>
222224

223225
<!-- Target Portable-->
224-
<PropertyGroupCondition="'$(TargetFramework)'=='netcore78'">
226+
<PropertyGroupCondition="'$(TargetFramework)'=='portable78'">
227+
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
228+
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE78</DefineConstants>
225229
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
226230
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
227231
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
228232
<DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
229233
<DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
230234
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
235+
<DefineConstants>$(DefineConstants);FX_SIMPLE_SECURITY_PERMISSIONS</DefineConstants>
231236
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
232237
<DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
233238
<DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
@@ -237,29 +242,31 @@
237242
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
238243
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
239244
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
240-
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
245+
<DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
241246
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
242247
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
243248
<DefineConstants>$(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE</DefineConstants>
244249
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
245250
<DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
246251
<DefineConstants>$(DefineConstants);FX_NO_THREADPOOL</DefineConstants>
252+
<DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE</DefineConstants>
247253
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
248-
<DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
249254
<DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
250255
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
251256
<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
252257
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
253-
<OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
254258
</PropertyGroup>
255259

256-
<PropertyGroupCondition="'$(TargetFramework)'=='netcore259'">
260+
<PropertyGroupCondition="'$(TargetFramework)'=='portable259'">
261+
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
262+
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE259</DefineConstants>
257263
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
258264
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
259265
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
260266
<DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
261267
<DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
262268
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
269+
<DefineConstants>$(DefineConstants);FX_SIMPLE_SECURITY_PERMISSIONS</DefineConstants>
263270
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
264271
<DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
265272
<DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
@@ -269,20 +276,19 @@
269276
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
270277
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
271278
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
272-
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
279+
<DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
273280
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
274281
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
275282
<DefineConstants>$(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE</DefineConstants>
276283
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
277284
<DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
278285
<DefineConstants>$(DefineConstants);FX_NO_THREADPOOL</DefineConstants>
286+
<DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE</DefineConstants>
279287
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
280-
<DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
281288
<DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
282289
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
283290
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
284291
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
285-
<OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
286292
</PropertyGroup>
287293

288294
<!-- Target Silverlight 3.0-->
@@ -620,7 +626,7 @@
620626
<FSharpTargetsPath>..\Proto\$(protoCLIDir)\bin\Microsoft.Portable.FSharp-proto.Targets</FSharpTargetsPath>
621627
</PropertyGroup>
622628
</When>
623-
<WhenCondition="'$(TargetFramework)'=='netcore78' or '$(TargetFramework)'=='netcore259'">
629+
<WhenCondition="'$(TargetFramework)'=='portable78' or '$(TargetFramework)'=='portable259'">
624630
<PropertyGroup>
625631
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets</FSharpTargetsPath>
626632
</PropertyGroup>
@@ -686,15 +692,15 @@
686692
Text="Configuration '$(Configuration)' is not one of the supported configurations: Debug, Release, Proto"
687693
Condition="'$(Configuration)'!='Release' and '$(Configuration)'!='Debug' and '$(Configuration)'!='VSRelease' and '$(Configuration)'!='VSDebug' and '$(Configuration)'!='Proto'"/>
688694
<Error
689-
Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, sl3-wp, sl5, sl5-compiler, portable47, portable7,netcore78, netcore259"
695+
Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, sl3-wp, sl5, sl5-compiler, portable47, portable7,portable78, portable259"
690696
Condition="! ('$(TargetFramework)' == 'net40' or
691697
'$(TargetFramework)' == 'net20' or
692698
'$(TargetFramework)' == 'sl5' or
693699
'$(TargetFramework)' == 'sl3-wp' or
694700
'$(TargetFramework)' == 'portable47' or
695701
'$(TargetFramework)' == 'portable7' or
696-
'$(TargetFramework)' == 'netcore78' or
697-
'$(TargetFramework)' == 'netcore259')"/>
702+
'$(TargetFramework)' == 'portable78' or
703+
'$(TargetFramework)' == 'portable259')"/>
698704
<Error
699705
Text="TargetFramework '$(TargetFramework)' is only supported when building FSharp.Core.dll. All other components must be built with TargetFramework=net40"
700706
Condition="'$(AssemblyName)' != 'FSharp.Core' and '$(TargetFramework)' != 'net40'"/>

‎src/fsharp/FSharp.Core/FSharp.Core.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<OtherFlagsCondition=" '$(TargetFramework)'=='net20'">$(OtherFlags) --compiling-fslib-20:"$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll" </OtherFlags>
2121
<OtherFlagsCondition=" '$(TargetFramework)'=='net40'">$(OtherFlags) --compiling-fslib-40</OtherFlags>
2222
<OtherFlagsCondition=" '$(TargetFramework)'=='portable7'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
23+
<OtherFlagsCondition=" '$(TargetFramework)'=='portable78'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
24+
<OtherFlagsCondition=" '$(TargetFramework)'=='portable259'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
2325
</PropertyGroup>
2426

2527

‎tests/RunTests.cmd‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,25 @@ set FSCOREDLLPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETF
9696
setFSCOREDLL20PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v2.0\2.3.0.0
9797
setFSCOREDLLPORTABLEPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETPortable\2.3.5.1
9898
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
99101
setFSDATATPPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\Type Providers
100102

101103
REM == open source logic
102104
ifexist"%FSCBinPath%\FSharp.Core.dll"setFSCOREDLLPATH=%FSCBinPath%
103105
ifexist"%FSCBinPath%\..\..\net20\bin\FSharp.Core.dll"setFSCOREDLL20PATH=%FSCBinPath%\..\..\net20\bin
104106
ifexist"%FSCBinPath%\..\..\portable47\bin\FSharp.Core.dll"setFSCOREDLLPORTABLEPATH=%FSCBinPath%\..\..\portable47\bin
105107
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
106110
ifexist"%FSCBinPath%\FSharp.Data.TypeProviders.dll"setFSDATATPPATH=%FSCBinPath%
107111

108112
setFSCOREDLLPATH=%FSCOREDLLPATH%\FSharp.Core.dll
109113
setFSCOREDLL20PATH=%FSCOREDLL20PATH%\FSharp.Core.dll
110114
setFSCOREDLLPORTABLEPATH=%FSCOREDLLPORTABLEPATH%\FSharp.Core.dll
111115
setFSCOREDLLNETCOREPATH=%FSCOREDLLNETCOREPATH%\FSharp.Core.dll
116+
setFSCOREDLLNETCORE78PATH=%FSCOREDLLNETCORE78PATH%\FSharp.Core.dll
117+
setFSCOREDLLNETCORE259PATH=%FSCOREDLLNETCORE259PATH%\FSharp.Core.dll
112118
setFSDATATPPATH=%FSDATATPPATH%\FSharp.Data.TypeProviders.dll
113119

114120
for /d%%iin (%WINDIR%\Microsoft.NET\Framework\v4.0.?????)dosetCORDIR=%%i

‎tests/config.bat‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,9 @@ echo FSCBinPath =%FSCBinPath%
208208
echo FSCOREDLL20PATH =%FSCOREDLL20PATH%
209209
echo FSCOREDLLPATH =%FSCOREDLLPATH%
210210
echo FSCOREDLLPORTABLEPATH =%FSCOREDLLPORTABLEPATH%
211-
echo FSCOREDLLNETCOREPATH =%FSCOREDLLNETCOREPATH%
211+
echo FSCOREDLLNETCOREPATH=%FSCOREDLLNETCOREPATH%
212+
echo FSCOREDLLNETCORE78PATH=%FSCOREDLLNETCORE78PATH%
213+
echo FSCOREDLLNETCORE259PATH=%FSCOREDLLNETCORE259PATH%
212214
echo FSDATATPPATH =%FSDATATPPATH%
213215
echo FSDIFF =%FSDIFF%
214216
echo FSI =%FSI%
@@ -259,17 +261,23 @@ set FSCOREDLLPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETF
259261
setFSCOREDLL20PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v2.0\2.3.0.0
260262
setFSCOREDLLPORTABLEPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETPortable\2.3.5.1
261263
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
262266
setFSDATATPPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\Type Providers
263267

264268
REM == Check if using open build instead
265269
IFEXIST"%FSCBinPath%\FSharp.Core.dll"setFSCOREDLLPATH=%FSCBinPath%
266270
IFEXIST"%FSCBinPath%\..\..\net20\bin\FSharp.Core.dll"setFSCOREDLL20PATH=%FSCBinPath%\..\..\net20\bin
267271
IFEXIST"%FSCBinPath%\..\..\portable47\bin\FSharp.Core.dll"setFSCOREDLLPORTABLEPATH=%FSCBinPath%\..\..\portable47\bin
268272
IFEXIST"%FSCBinPath%\..\..\portable7\bin\FSharp.Core.dll"setFSCOREDLLNETCOREPATH=%FSCBinPath%\..\..\portable7\bin
273+
IFEXIST"%FSCBinPath%\..\..\portable78\bin\FSharp.Core.dll"setFSCOREDLLNETCORE78PATH=%FSCBinPath%\..\..\portable78\bin
274+
IFEXIST"%FSCBinPath%\..\..\portable259\bin\FSharp.Core.dll"setFSCOREDLLNETCORE259PATH=%FSCBinPath%\..\..\portable259\bin
269275
IFEXIST"%FSCBinPath%\FSharp.Data.TypeProviders.dll"setFSDATATPPATH=%FSCBinPath%
270276

271277
setFSCOREDLLPATH=%FSCOREDLLPATH%\FSharp.Core.dll
272278
setFSCOREDLL20PATH=%FSCOREDLL20PATH%\FSharp.Core.dll
273279
setFSCOREDLLPORTABLEPATH=%FSCOREDLLPORTABLEPATH%\FSharp.Core.dll
274280
setFSCOREDLLNETCOREPATH=%FSCOREDLLNETCOREPATH%\FSharp.Core.dll
281+
setFSCOREDLLNETCORE78PATH=%FSCOREDLLNETCORE78PATH%\FSharp.Core.dll
282+
setFSCOREDLLNETCORE259PATH=%FSCOREDLLNETCORE259PATH%\FSharp.Core.dll
275283
setFSDATATPPATH=%FSDATATPPATH%\FSharp.Data.TypeProviders.dll

‎tests/fsharp/core/libtest/test.fsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2294,7 +2294,8 @@ do check "generic format d" "1us" (sprintf "%A" 1us)
22942294
docheck "genericformate" "1"(sprintf"%A" 1)
22952295
docheck "genericformatf" "1u"(sprintf"%A" 1ul)
22962296
docheck "genericformatg" "1L"(sprintf"%A" 1L)
2297-
docheck "genericformati"("1"+ bigintsuffix)(sprintf"%A" 1I)
2297+
docheck "genericformati"("1"+ bigintsuffix)( printf"%A" 1I
2298+
sprintf"%A" 1I)
22982299
docheck "genericformatj" "1.0"(sprintf"%A" 1.0)
22992300
docheck "genericformatk" "1.01"(sprintf"%A" 1.01)
23002301
docheck "genericformatl" "1000.0"(sprintf"%A" 1000.0)

‎tests/fsharp/core/netcore/ConsoleApplication1/portabletestentry.csproj‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<DebugSymbols>true</DebugSymbols>
2222
<DebugType>full</DebugType>
2323
<Optimize>false</Optimize>
24-
<OutputPath>bin\Debug\</OutputPath>
2524
<DefineConstants>DEBUG;TRACE</DefineConstants>
2625
<ErrorReport>prompt</ErrorReport>
2726
<WarningLevel>4</WarningLevel>
@@ -30,15 +29,28 @@
3029
<PlatformTarget>AnyCPU</PlatformTarget>
3130
<DebugType>pdbonly</DebugType>
3231
<Optimize>true</Optimize>
33-
<OutputPath>bin\Release\</OutputPath>
3432
<DefineConstants>TRACE</DefineConstants>
3533
<ErrorReport>prompt</ErrorReport>
3634
<WarningLevel>4</WarningLevel>
3735
</PropertyGroup>
36+
<PropertyGroup>
37+
<OutputPath>bin\$(Configuration)\$(TestProfile)\</OutputPath>
38+
<IntermediateOutputPath>obj\$(Configuration)\$(TestProfile)\</IntermediateOutputPath>
39+
</PropertyGroup>
40+
<PropertyGroupCondition=" '$(TestProfile)'=='' or '$(TestProfile)'=='Profile7'">
41+
<ProfileCorePath>$(FSCOREDLLNETCOREPATH)</ProfileCorePath>
42+
</PropertyGroup>
43+
<PropertyGroupCondition=" '$(TestProfile)'=='Profile78'">
44+
<ProfileCorePath>$(FSCOREDLLNETCORE78PATH)</ProfileCorePath>
45+
</PropertyGroup>
46+
<PropertyGroupCondition=" '$(TestProfile)'=='Profile259'">
47+
<ProfileCorePath>$(FSCOREDLLNETCORE259PATH)</ProfileCorePath>
48+
</PropertyGroup>
3849
<ItemGroup>
3950
<ReferenceInclude="FSharp.Core">
4051
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>$(FSCOREDLLNETCOREPATH)</HintPath>
52+
<HintPath>$(ProfileCorePath)</HintPath>
53+
<Private>True</Private>
4254
</Reference>
4355
<ReferenceInclude="System" />
4456
<ReferenceInclude="System.Core" />

0 commit comments

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