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

Commit7d50759

Browse files
committed
Merge remote-tracking branch 'upstream/master' into merges/master-to-dev16.0
2 parentsa80e401 +8189443 commit7d50759

File tree

34 files changed

+150
-11
lines changed

34 files changed

+150
-11
lines changed

‎.vsts-pr.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ phases:
88
release_default:
99
_command:./mono/cibuild.sh
1010
_args:release
11-
release_fcs:
12-
_command:./fcs/build.sh
13-
_args:Build
11+
# disabled until it can be properly fixed
12+
#release_fcs:
13+
# _command: ./fcs/build.sh
14+
# _args: Build
1415
steps:
1516
-script:$(_command) $(_args)
1617
-task:PublishBuildArtifacts@1

‎src/buildfromsource/FSharp.Compiler.Private/FSComp.fs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4366,11 +4366,14 @@ type internal SR private() =
43664366
/// Cannot partially apply the extension method '%s' because the first parameter is a byref type.
43674367
/// (Originally from ..\FSComp.txt:1446)
43684368
static membertcCannotPartiallyApplyExtensionMethodForByref(a0:System.String)=(3241, GetStringFunc("tcCannotPartiallyApplyExtensionMethodForByref",",,,%s,,,") a0)
4369-
///The parameter '%s' has an invalid type '%s'. This isnotpermitted by the rules of Common IL.
4369+
///This type does not inherit Attribute, it willnotwork correctly with other .NET languages.
43704370
/// (Originally from ..\FSComp.txt:1447)
4371+
static membertcTypeDoesNotInheritAttribute()=(3242, GetStringFunc("tcTypeDoesNotInheritAttribute",",,,"))
4372+
/// The parameter '%s' has an invalid type '%s'. This is not permitted by the rules of Common IL.
4373+
/// (Originally from ..\FSComp.txt:1448)
43714374
static memberchkInvalidFunctionParameterType(a0:System.String,a1:System.String)=(3300, GetStringFunc("chkInvalidFunctionParameterType",",,,%s,,,%s,,,") a0 a1)
43724375
/// The function or method has an invalid return type '%s'. This is not permitted by the rules of Common IL.
4373-
/// (Originally from ..\FSComp.txt:1448)
4376+
/// (Originally from ..\FSComp.txt:1449)
43744377
static memberchkInvalidFunctionReturnType(a0:System.String)=(3301, GetStringFunc("chkInvalidFunctionReturnType",",,,%s,,,") a0)
43754378

43764379
/// Call this method once to validate that all known resources are valid; throws if not
@@ -5792,6 +5795,7 @@ type internal SR private() =
57925795
ignore(GetString("tcByrefsMayNotHaveTypeExtensions"))
57935796
ignore(GetString("tcCannotCallExtensionMethodInrefToByref"))
57945797
ignore(GetString("tcCannotPartiallyApplyExtensionMethodForByref"))
5798+
ignore(GetString("tcTypeDoesNotInheritAttribute"))
57955799
ignore(GetString("chkInvalidFunctionParameterType"))
57965800
ignore(GetString("chkInvalidFunctionReturnType"))
57975801
()

‎src/buildfromsource/FSharp.Compiler.Private/FSComp.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4369,6 +4369,9 @@
43694369
<dataname="tcCannotPartiallyApplyExtensionMethodForByref"xml:space="preserve">
43704370
<value>Cannot partially apply the extension method '{0}' because the first parameter is a byref type.</value>
43714371
</data>
4372+
<dataname="tcTypeDoesNotInheritAttribute"xml:space="preserve">
4373+
<value>This type does not inherit Attribute, it will not work correctly with other .NET languages.</value>
4374+
</data>
43724375
<dataname="chkInvalidFunctionParameterType"xml:space="preserve">
43734376
<value>The parameter '{0}' has an invalid type '{1}'. This is not permitted by the rules of Common IL.</value>
43744377
</data>

‎src/fsharp/FSComp.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,5 +1444,6 @@ notAFunctionButMaybeDeclaration,"This value is not a function and cannot be appl
14441444
3239,tcByrefsMayNotHaveTypeExtensions,"Byref types are not allowed to have optional type extensions."
14451445
3240,tcCannotCallExtensionMethodInrefToByref,"Cannot call the byref extension method '%s. The first parameter requires the value to be mutable or a non-readonly byref type."
14461446
3241,tcCannotPartiallyApplyExtensionMethodForByref,"Cannot partially apply the extension method '%s' because the first parameter is a byref type."
1447+
3242,tcTypeDoesNotInheritAttribute,"This type does not inherit Attribute, it will not work correctly with other .NET languages."
14471448
3300,chkInvalidFunctionParameterType,"The parameter '%s' has an invalid type '%s'. This is not permitted by the rules of Common IL."
14481449
3301,chkInvalidFunctionReturnType,"The function or method has an invalid return type '%s'. This is not permitted by the rules of Common IL."

‎src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
3939
<Prefer32BitCondition="'$(Prefer32Bit)' == ''">false</Prefer32Bit>
4040
<TreatWarningsAsErrorsCondition="'$(TreatWarningsAsErrors)' == ''">false</TreatWarningsAsErrors>
4141
<WarningLevelCondition=" '$(WarningLevel)' == ''">3</WarningLevel>
42-
<WarningsAsErrorsCondition="'$(WarningsAsErrors)' == ''" />
42+
<WarningsAsErrors>3239;$(WarningsAsErrors)</WarningsAsErrors>
4343
<UseStandardResourceNamesCondition=" '$(UseStandardResourceNames)' == ''">true</UseStandardResourceNames>
4444
</PropertyGroup>
4545

‎src/fsharp/TypeChecker.fs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10748,6 +10748,7 @@ and TcAttribute canFail cenv (env: TcEnv) attrTgt (synAttr: SynAttribute) =
1074810748
| Exception _ when canFail -> [ ], true
1074910749
| res ->
1075010750
let item = ForceRaise res
10751+
if not (ExistsHeadTypeInEntireHierarchy cenv.g cenv.amap mAttr ty cenv.g.tcref_System_Attribute) then warning(Error(FSComp.SR.tcTypeDoesNotInheritAttribute(), mAttr))
1075110752
let attrib =
1075210753
match item with
1075310754
| Item.CtorGroup(methodName, minfos) ->

‎src/fsharp/xlf/FSComp.txt.cs.xlf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7092,6 +7092,11 @@
70927092
<targetstate="new">Cannot call the extension member as it requires the value to be mutable or a byref type due to the extending type being used as a byref.</target>
70937093
<note />
70947094
</trans-unit>
7095+
<trans-unitid="tcTypeDoesNotInheritAttribute">
7096+
<source>This type does not inherit Attribute, it will not work correctly with other .NET languages.</source>
7097+
<targetstate="new">This type does not inherit Attribute, it will not work correctly with other .NET languages.</target>
7098+
<note />
7099+
</trans-unit>
70957100
</body>
70967101
</file>
70977102
</xliff>

‎src/fsharp/xlf/FSComp.txt.de.xlf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7092,6 +7092,11 @@
70927092
<target state="new">Cannot call the extension member as it requires the value to be mutable or a byref type due to the extending type being used as a byref.</target>
70937093
<note />
70947094
</trans-unit>
7095+
<trans-unit id="tcTypeDoesNotInheritAttribute">
7096+
<source>This type does not inherit Attribute, it will not work correctly with other .NET languages.</source>
7097+
<target state="new">This type does not inherit Attribute, it will not work correctly with other .NET languages.</target>
7098+
<note />
7099+
</trans-unit>
70957100
</body>
70967101
</file>
70977102
</xliff>

‎src/fsharp/xlf/FSComp.txt.en.xlf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7092,6 +7092,11 @@
70927092
<targetstate="new">Cannot call the extension member as it requires the value to be mutable or a byref type due to the extending type being used as a byref.</target>
70937093
<note />
70947094
</trans-unit>
7095+
<trans-unitid="tcTypeDoesNotInheritAttribute">
7096+
<source>This type does not inherit Attribute, it will not work correctly with other .NET languages.</source>
7097+
<targetstate="new">This type does not inherit Attribute, it will not work correctly with other .NET languages.</target>
7098+
<note />
7099+
</trans-unit>
70957100
</body>
70967101
</file>
70977102
</xliff>

‎src/fsharp/xlf/FSComp.txt.es.xlf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7092,6 +7092,11 @@
70927092
<target state="new">Cannot call the extension member as it requires the value to be mutable or a byref type due to the extending type being used as a byref.</target>
70937093
<note />
70947094
</trans-unit>
7095+
<trans-unit id="tcTypeDoesNotInheritAttribute">
7096+
<source>This type does not inherit Attribute, it will not work correctly with other .NET languages.</source>
7097+
<target state="new">This type does not inherit Attribute, it will not work correctly with other .NET languages.</target>
7098+
<note />
7099+
</trans-unit>
70957100
</body>
70967101
</file>
70977102
</xliff>

0 commit comments

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