Skip to content

Merge master to release/dev16.8 #9817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cartermp merged 2 commits into from
Jul 29, 2020
Merged

Merge master to release/dev16.8 #9817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25d7304
Remove duplicate typeprovider target (#9815)
baronfel Jul 28, 2020
8267c59
Fix for FS0874 error text (#9813)
Lanayx Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/fsharp/FSComp.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ tcUnnamedArgumentsDoNotFormPrefix,"The unnamed arguments do not form a prefix of
871,tcConstructorsIllegalForThisType,"Constructors cannot be defined for this type"
872,tcRecursiveBindingsWithMembersMustBeDirectAugmentation,"Recursive bindings that include member specifications can only occur as a direct augmentation of a type"
873,tcOnlySimplePatternsInLetRec,"Only simple variable patterns can be bound in 'let rec' constructs"
874,tcOnlyRecordFieldsAndSimpleLetCanBeMutable,"Only record fields and simple, non-recursive 'let' bindings may be marked mutable"
874,tcOnlyRecordFieldsAndSimpleLetCanBeMutable,"Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces"
875,tcMemberIsNotSufficientlyGeneric,"This member is not sufficiently generic"
876,tcLiteralAttributeRequiresConstantValue,"A declaration may only be the [<Literal>] attribute if a constant value is also given, e.g. 'val x : int = 1'"
877,tcValueInSignatureRequiresLiteralAttribute,"A declaration may only be given a value in a signature if the declaration has the [<Literal>] attribute"
Expand Down
9 changes: 0 additions & 9 deletions src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,4 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and

</ItemGroup>
</Target>

<Target Name="CollectFSharpDesignTimeTools" BeforeTargets="BeforeCompile" DependsOnTargets="_GetFrameworkAssemblyReferences">
<ItemGroup>
<PropertyNames Include = "Pkg$([System.String]::Copy('%(PackageReference.FileName)').Replace('.','_'))" Condition = " '%(PackageReference.IsFSharpDesignTimeProvider)' == 'true' and '%(PackageReference.Extension)' == '' "/>
<PropertyNames Include = "Pkg$([System.String]::Copy('%(PackageReference.FileName)%(PackageReference.Extension)').Replace('.','_'))" Condition = " '%(PackageReference.IsFSharpDesignTimeProvider)' == 'true' and '%(PackageReference.Extension)' != '' "/>
<FscCompilerTools Include = "$(%(PropertyNames.Identity))" />
</ItemGroup>
</Target>

</Project>
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">Označení mutable můžou mít jenom pole záznamu a jednoduché, nerekurzivní vazby let.</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">Nur Datensatzfelder und einfache, nicht rekursive let-Bindungen dürfen als "mutable" markiert werden.</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">Solo los campos de registro y los enlaces 'let' sencillos no recursivos se pueden marcar como mutables</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">Seuls les champs d'enregistrement et les liaisons 'let' simples non récursives peuvent être marqués comme mutables</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">Solo i campi di record e i binding 'let' semplici non ricorsivi possono essere contrassegnati come mutable</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">'mutable' とマークできるのはレコード フィールドと単純で非再帰的な 'let' バインディングのみです</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">레코드 필드 및 단순, 비재귀적 'let' 바인딩만 mutable로 표시할 수 있습니다.</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">Tylko pola rekordów i proste, niecykliczne powiązania „let” mogą być oznaczone jako modyfikowalne</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">Apenas campos de registro e associações 'let' simples e não recursivas podem ser marcados como mutáveis</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">Только поля записей и простые нерекурсивные привязки "let" могут быть помечены как изменяемые</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">Yalnızca kayıt alanları ve basit, özyinelemeli olmayan 'let' bağlamaları değişebilir olarak işaretlenebilir</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">只有记录字段和简单的非递归 "let" 绑定可能会被标记为“可变”</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,8 +3738,8 @@
<note />
</trans-unit>
<trans-unit id="tcOnlyRecordFieldsAndSimpleLetCanBeMutable">
<source>Only record fields and simple, non-recursive 'let' bindings may be marked mutable</source>
<target state="translated">只有記錄欄位及簡單的非遞迴 'let' 繫結可以標記為可變動</target>
<source>Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</source>
<target state="new">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</target>
<note />
</trans-unit>
<trans-unit id="tcMemberIsNotSufficientlyGeneric">
Expand Down
2 changes: 1 addition & 1 deletion ...rmance/ObjectOrientedTypeDefinitions/ClassTypes/StaticLetDoDeclarations/E_RecMutable01.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// rec (mutable)
// See FSHARP1.0:2329
//<Expects id="FS0874" span="(7,37-7,38)" status="error">Only record fields and simple, non-recursive 'let' bindings may be marked mutable</Expects>
//<Expects id="FS0874" span="(7,37-7,38)" status="error">Mutable 'let' bindings can't be recursive or defined in recursive modules or namespaces</Expects>
type C() = class
static let rec mutable m = 0 // only record fields and simple 'let' bindings may be marked mutable.
end
Expand Down