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

Commit54942ba

Browse files
committed
Merge branch 'profile78' ofhttps://git01.codeplex.com/forks/vladima/primary into pr
Conflicts:src/FSharpSource.targets
2 parentsb777f04 +6f18752 commit54942ba

File tree

12 files changed

+185
-72
lines changed

12 files changed

+185
-72
lines changed

‎src/FSharpSource.targets‎

Lines changed: 85 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,71 @@
159159
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
160160
</PropertyGroup>
161161

162+
<!-- Target Portable-->
163+
<PropertyGroupCondition="'$(TargetFramework)'=='netcore78'">
164+
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
165+
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
166+
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
167+
<DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
168+
<DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
169+
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
170+
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
171+
<DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
172+
<DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
173+
<DefineConstants>$(DefineConstants);FX_ATLEAST_PORTABLE</DefineConstants>
174+
<DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
175+
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_KEY_SORT</DefineConstants>
176+
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
177+
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
178+
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
179+
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
180+
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
181+
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
182+
<DefineConstants>$(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE</DefineConstants>
183+
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
184+
<DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
185+
<DefineConstants>$(DefineConstants);FX_NO_THREADPOOL</DefineConstants>
186+
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
187+
<DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
188+
<DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
189+
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
190+
<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
191+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
192+
<OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
193+
</PropertyGroup>
194+
195+
<PropertyGroupCondition="'$(TargetFramework)'=='netcore259'">
196+
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
197+
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
198+
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
199+
<DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
200+
<DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
201+
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
202+
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
203+
<DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
204+
<DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
205+
<DefineConstants>$(DefineConstants);FX_ATLEAST_PORTABLE</DefineConstants>
206+
<DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
207+
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_KEY_SORT</DefineConstants>
208+
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
209+
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
210+
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
211+
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
212+
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
213+
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
214+
<DefineConstants>$(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE</DefineConstants>
215+
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
216+
<DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
217+
<DefineConstants>$(DefineConstants);FX_NO_THREADPOOL</DefineConstants>
218+
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
219+
<DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
220+
<DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
221+
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
222+
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
223+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
224+
<OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
225+
</PropertyGroup>
226+
162227
<!-- Target Silverlight 3.0-->
163228
<PropertyGroupCondition="'$(TargetFramework)'=='sl3'">
164229
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
@@ -492,7 +557,12 @@
492557
<FSharpTargetsPath>..\Proto\$(protoCLIDir)\bin\Microsoft.Portable.FSharp-proto.Targets</FSharpTargetsPath>
493558
</PropertyGroup>
494559
</When>
495-
<WhenCondition="'$(TargetFramework)'=='sl3' or '$(TargetFramework)'=='sl4' or '$(TargetFramework)'=='sl5'">
560+
<WhenCondition="'$(TargetFramework)'=='netcore78' or '$(TargetFramework)'=='netcore259'">
561+
<PropertyGroup>
562+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets</FSharpTargetsPath>
563+
</PropertyGroup>
564+
</When>
565+
<WhenCondition="'$(TargetFramework)'=='sl3' or '$(TargetFramework)'=='sl4' or '$(TargetFramework)'=='sl5' or '$(TargetFramework)'=='sl5-compiler'">
496566
<PropertyGroup>
497567
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\Silverlight\$(SilverlightVersion)\FSharpSource.Silverlight.Common.targets</FSharpTargetsPath>
498568
</PropertyGroup>
@@ -553,12 +623,14 @@
553623
Text="Configuration '$(Configuration)' is not one of the supported configurations: Debug, Release, Proto"
554624
Condition="'$(Configuration)'!='Release' and '$(Configuration)'!='Debug' and '$(Configuration)'!='Proto'"/>
555625
<Error
556-
Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, sl3-wp, sl5, portable47"
626+
Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, sl3-wp, sl5,sl5-compiler,portable47, netcore78, netcore259"
557627
Condition="! ('$(TargetFramework)' == 'net40' or
558628
'$(TargetFramework)' == 'net20' or
559629
'$(TargetFramework)' == 'sl5' or
560630
'$(TargetFramework)' == 'sl3-wp' or
561-
'$(TargetFramework)' == 'portable47')"/>
631+
'$(TargetFramework)' == 'portable47' or
632+
'$(TargetFramework)' == 'netcore78' or
633+
'$(TargetFramework)' == 'netcore259')"/>
562634
<Error
563635
Text="TargetFramework '$(TargetFramework)' is only supported when building FSharp.Core.dll. All other components must be built with TargetFramework=net40"
564636
Condition="'$(AssemblyName)' != 'FSharp.Core' and '$(TargetFramework)' != 'net40'"/>
@@ -581,4 +653,14 @@
581653
</Target>
582654

583655
<ImportProject="..\lkg\FSharp-$(LkgVersion)\bin\FSharp.SRGen.targets" />
656+
657+
<TargetName="ReorderCompileItems"
658+
BeforeTargets="CoreCompile"
659+
Condition="'$(GenerateTargetFrameworkAttribute)' == 'true' AND ('$(TargetFramework)' == 'netcore78' OR '$(TargetFramework)' == 'netcore259')">
660+
<ItemGroup>
661+
<!-- Infrastructure puts AssemblyAttributes.fs at the beginning of the list and this will result and error when compiling FSharp.Core because all primitive types are not defined yet - fixup is required-->
662+
<CompileAfterInclude="@(CompileBefore)"/>
663+
<CompileBeforeRemove="@(CompileBefore)"/>
664+
</ItemGroup>
665+
</Target>
584666
</Project>

‎src/absil/il.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2474,7 +2474,7 @@ type IPrimaryAssemblyTraits =
24742474
abstractContextStaticAttributeScopeRef :ILScopeRefoption
24752475
abstractNonSerializedAttributeScopeRef :ILScopeRefoption
24762476

2477-
abstractSystemRuntimeInteropServicesScopeRef :Lazy<ILScopeRef>
2477+
abstractSystemRuntimeInteropServicesScopeRef :Lazy<ILScopeRefoption>
24782478
abstractSystemLinqExpressionsScopeRef :Lazy<ILScopeRef>
24792479
abstractSystemCollectionsScopeRef :Lazy<ILScopeRef>
24802480
abstractSystemReflectionScopeRef :Lazy<ILScopeRef>
@@ -4416,7 +4416,7 @@ let mkMscorlibBasedTraits mscorlibRef =
44164416
memberthis.SerializationInfoTypeScopeRef= ecmaMscorlibScopeRef
44174417
memberthis.SecurityPermissionAttributeTypeScopeRef= ecmaMscorlibScopeRef
44184418
memberthis.SystemDiagnosticsDebugScopeRef= lazyRef
4419-
memberthis.SystemRuntimeInteropServicesScopeRef=lazyRef
4419+
memberthis.SystemRuntimeInteropServicesScopeRef=lazy(Some mscorlibRef)
44204420
memberthis.IDispatchConstantAttributeScopeRef= ecmaMscorlibScopeRef
44214421
memberthis.IUnknownConstantAttributeScopeRef= ecmaMscorlibScopeRef
44224422
memberthis.ContextStaticAttributeScopeRef= ecmaMscorlibScopeRef

‎src/absil/il.fsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1667,7 +1667,7 @@ type IPrimaryAssemblyTraits =
16671667
abstract ContextStaticAttributeScopeRef:ILScopeRef option
16681668
abstract NonSerializedAttributeScopeRef:ILScopeRef option
16691669

1670-
abstract SystemRuntimeInteropServicesScopeRef:Lazy<ILScopeRef>
1670+
abstract SystemRuntimeInteropServicesScopeRef:Lazy<ILScopeRefoption>
16711671
abstract SystemLinqExpressionsScopeRef:Lazy<ILScopeRef>
16721672
abstract SystemCollectionsScopeRef:Lazy<ILScopeRef>
16731673
abstract SystemReflectionScopeRef:Lazy<ILScopeRef>

‎src/fsharp/FSComp.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1328,4 +1328,5 @@ descriptionUnavailable,"(description unavailable...)"
13281328
3176,tcFieldNameIsUsedModeThanOnce,"Named field '%s' is used more than once."
13291329
3176,tcFieldNameConflictsWithGeneratedNameForAnonymousField,"Named field '%s' conflicts with autogenerated name for anonymous field."
13301330
3177,tastConstantExpressionOverflow,"This literal expression or attribute argument results in an arithmetic overflow."
1331-
3178,tcIllegalStructTypeForConstantExpression,"This is not valid literal expression. The [<Literal>] attribute will be ignored."
1331+
3178,tcIllegalStructTypeForConstantExpression,"This is not valid literal expression. The [<Literal>] attribute will be ignored."
1332+
3179,fscSystemRuntimeInteropServicesIsRequired,"System.Runtime.InteropServices assembly is required to use UnknownWrapper\DispatchWrapper classes."

‎src/fsharp/NicePrint.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,11 +658,11 @@ module private PrintTypes =
658658

659659
if denv.showAttributesthen
660660
// Don't display DllImport attributes in generated signatures
661-
letattrs= attrs|> List.filter(IsMatchingFSharpAttribute denv.g denv.g.attrib_DllImportAttribute>>not)
661+
letattrs= attrs|> List.filter(IsMatchingFSharpAttributeOpt denv.g denv.g.attrib_DllImportAttribute>>not)
662662
letattrs= attrs|> List.filter(IsMatchingFSharpAttributeOpt denv.g denv.g.attrib_ContextStaticAttribute>>not)
663663
letattrs= attrs|> List.filter(IsMatchingFSharpAttributeOpt denv.g denv.g.attrib_ThreadStaticAttribute>>not)
664664
letattrs= attrs|> List.filter(IsMatchingFSharpAttribute denv.g denv.g.attrib_EntryPointAttribute>>not)
665-
letattrs= attrs|> List.filter(IsMatchingFSharpAttribute denv.g denv.g.attrib_MarshalAsAttribute>>not)
665+
letattrs= attrs|> List.filter(IsMatchingFSharpAttributeOpt denv.g denv.g.attrib_MarshalAsAttribute>>not)
666666
letattrs= attrs|> List.filter(IsMatchingFSharpAttribute denv.g denv.g.attrib_ReflectedDefinitionAttribute>>not)
667667
letattrs= attrs|> List.filter(IsMatchingFSharpAttribute denv.g denv.g.attrib_StructLayoutAttribute>>not)
668668
letattrs= attrs|> List.filter(IsMatchingFSharpAttribute denv.g denv.g.attrib_AutoSerializableAttribute>>not)

0 commit comments

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