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

Commit7118378

Browse files
author
dotnet-automerge-bot
authored
Merge pull requestdotnet#5906 from Microsoft/merges/master-to-dev16.0
Merge master to dev16.0
2 parents0a6a8c6 +17ab8f9 commit7118378

30 files changed

+651
-808
lines changed

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.403
1+
2.1.403

‎init-tools.cmd‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ if exist "%BUILD_TOOLS_SEMAPHORE%" (
3838
goto :DONE
3939
)
4040

41-
ifexist"%TOOLRUNTIME_DIR%"rmdir /S /Q"%TOOLRUNTIME_DIR%"
42-
4341
:: Download Nuget.exe
4442
ifNOTexist"%PACKAGES_DIR%NuGet.exe" (
4543
ifNOTexist"%PACKAGES_DIR%"mkdir"%PACKAGES_DIR%"
@@ -63,6 +61,7 @@ if errorlevel 1 (
6361
setTOOLS_INIT_RETURN_CODE=1
6462
goto :DONE
6563
)
64+
echo"%DOTNET_TOOLS_VERSION% >>"%DOTNET_TOOLS_PATH%\sdk\%DOTNET_TOOLS_VERSION%"
6665
:afterdotnettoolsrestore
6766

6867
set /pDOTNET_VERSION=<"%~dp0DotnetCLIVersion.txt"

‎scripts/dotnet-install.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ function GetHTTPResponse([Uri] $Uri)
188188
}
189189
# Default timeout for HttpClient is 100s. For a 50 MB download this assumes 500 KB/s average, any less will time out
190190
# 10 minutes allows it to work over much slower connections.
191-
$HttpClient.Timeout=New-TimeSpan-Minutes10
191+
$HttpClient.Timeout=New-TimeSpan-Minutes20
192192
$Response=$HttpClient.GetAsync($Uri).Result
193193
if (($Response-eq$null)-or (-not ($Response.IsSuccessStatusCode)))
194194
{

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

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3197,10 +3197,10 @@ type internal SR private() =
31973197
/// (Originally from ..\FSComp.txt:1044)
31983198
static membertastInvalidAddressOfMutableAcrossAssemblyBoundary()=(1188, GetStringFunc("tastInvalidAddressOfMutableAcrossAssemblyBoundary",",,,"))
31993199
/// Remove spaces between the type name and type parameter, e.g. \"type C<'T>\", not type \"C <'T>\". Type parameters must be placed directly adjacent to the type name.
3200-
/// (Originally from ..\FSComp.txt:1043)
3200+
/// (Originally from ..\FSComp.txt:1045)
32013201
static memberparsNonAdjacentTypars()=(1189, GetStringFunc("parsNonAdjacentTypars",",,,"))
32023202
/// Remove spaces between the type name and type parameter, e.g. \"C<'T>\", not \"C <'T>\". Type parameters must be placed directly adjacent to the type name.
3203-
/// (Originally from ..\FSComp.txt:1044)
3203+
/// (Originally from ..\FSComp.txt:1046)
32043204
static memberparsNonAdjacentTyargs()=(1190, GetStringFunc("parsNonAdjacentTyargs",",,,"))
32053205
/// The use of the type syntax 'int C' and 'C <int>' is not permitted here. Consider adjusting this type to be written in the form 'C<int>'
32063206
/// (Originally from ..\FSComp.txt:1047)
@@ -4348,62 +4348,56 @@ type internal SR private() =
43484348
/// The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
43494349
/// (Originally from ..\FSComp.txt:1440)
43504350
static memberchkNoByrefAddressOfValueFromExpression()=(3228, GetStringFunc("chkNoByrefAddressOfValueFromExpression",",,,"))
4351-
/// The Span or IsByRefLike expression cannot be returned from this function or method, because it is composed using elements that may escape their scope.
4352-
/// (Originally from ..\FSComp.txt:1441)
4353-
static memberchkNoReturnOfLimitedSpan()=(3229, GetStringFunc("chkNoReturnOfLimitedSpan",",,,"))
43544351
/// This value can't be assigned because the target '%s' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope.
4355-
/// (Originally from ..\FSComp.txt:1442)
4356-
static memberchkNoWriteToLimitedSpan(a0:System.String)=(3230, GetStringFunc("chkNoWriteToLimitedSpan",",,,%s,,,") a0)
4352+
/// (Originally from ..\FSComp.txt:1441)
4353+
static memberchkNoWriteToLimitedSpan(a0:System.String)=(3229, GetStringFunc("chkNoWriteToLimitedSpan",",,,%s,,,") a0)
43574354
/// A value defined in a module must be mutable in order to take its address, e.g. 'let mutable x = ...'
4358-
/// (Originally from ..\FSComp.txt:1443)
4359-
static membertastValueMustBeLocal()=(3231, GetStringFunc("tastValueMustBeLocal",",,,"))
4355+
/// (Originally from ..\FSComp.txt:1442)
4356+
static membertastValueMustBeLocal()=(3230, GetStringFunc("tastValueMustBeLocal",",,,"))
43604357
/// A type annotated with IsReadOnly must also be a struct. Consider adding the [<Struct>] attribute to the type.
4361-
/// (Originally from ..\FSComp.txt:1444)
4362-
static membertcIsReadOnlyNotStruct()=(3232, GetStringFunc("tcIsReadOnlyNotStruct",",,,"))
4358+
/// (Originally from ..\FSComp.txt:1443)
4359+
static membertcIsReadOnlyNotStruct()=(3231, GetStringFunc("tcIsReadOnlyNotStruct",",,,"))
43634360
/// Struct members cannot return the address of fields of the struct by reference
4364-
/// (Originally from ..\FSComp.txt:1445)
4365-
static memberchkStructsMayNotReturnAddressesOfContents()=(3233, GetStringFunc("chkStructsMayNotReturnAddressesOfContents",",,,"))
4361+
/// (Originally from ..\FSComp.txt:1444)
4362+
static memberchkStructsMayNotReturnAddressesOfContents()=(3232, GetStringFunc("chkStructsMayNotReturnAddressesOfContents",",,,"))
43664363
/// The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope.
4367-
/// (Originally from ..\FSComp.txt:1446)
4368-
static memberchkNoByrefLikeFunctionCall()=(3234, GetStringFunc("chkNoByrefLikeFunctionCall",",,,"))
4364+
/// (Originally from ..\FSComp.txt:1445)
4365+
static memberchkNoByrefLikeFunctionCall()=(3233, GetStringFunc("chkNoByrefLikeFunctionCall",",,,"))
43694366
/// The Span or IsByRefLike variable '%s' cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
4370-
/// (Originally from ..\FSComp.txt:1447)
4371-
static memberchkNoSpanLikeVariable(a0:System.String)=(3235, GetStringFunc("chkNoSpanLikeVariable",",,,%s,,,") a0)
4367+
/// (Originally from ..\FSComp.txt:1446)
4368+
static memberchkNoSpanLikeVariable(a0:System.String)=(3234, GetStringFunc("chkNoSpanLikeVariable",",,,%s,,,") a0)
43724369
/// A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope.
4373-
/// (Originally from ..\FSComp.txt:1448)
4374-
static memberchkNoSpanLikeValueFromExpression()=(3236, GetStringFunc("chkNoSpanLikeValueFromExpression",",,,"))
4370+
/// (Originally from ..\FSComp.txt:1447)
4371+
static memberchkNoSpanLikeValueFromExpression()=(3235, GetStringFunc("chkNoSpanLikeValueFromExpression",",,,"))
43754372
/// Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.
4373+
/// (Originally from ..\FSComp.txt:1448)
4374+
static membertastCantTakeAddressOfExpression()=(3236, GetStringFunc("tastCantTakeAddressOfExpression",",,,"))
4375+
/// Cannot call the byref extension method '%s. The first parameter requires the value to be mutable or a non-readonly byref type.
43764376
/// (Originally from ..\FSComp.txt:1449)
4377-
static membertastCantTakeAddressOfExpression()=(3237, GetStringFunc("tastCantTakeAddressOfExpression",",,,"))
4378-
/// 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.
4379-
/// (Originally from ..\FSComp.txt:1450)
4380-
static membertcCannotCallExtensionMemberInrefToByref()=(3238, GetStringFunc("tcCannotCallExtensionMemberInrefToByref",",,,"))
4377+
static membertcCannotCallExtensionMethodInrefToByref(a0:System.String)=(3237, GetStringFunc("tcCannotCallExtensionMethodInrefToByref",",,,%s,,,") a0)
43814378
/// Byref types are not allowed to have optional type extensions.
4382-
/// (Originally from ..\FSComp.txt:1451)
4383-
static membertcByrefsMayNotHaveTypeExtensions()=(3239, GetStringFunc("tcByrefsMayNotHaveTypeExtensions",",,,"))
4384-
/// Cannot call the byref extension method '%s. The first parameter requires the value to be mutable or a non-readonly byref type.
4385-
/// (Originally from ..\FSComp.txt:1452)
4386-
static membertcCannotCallExtensionMethodInrefToByref(a0:System.String)=(3240, GetStringFunc("tcCannotCallExtensionMethodInrefToByref",",,,%s,,,") a0)
4379+
/// (Originally from ..\FSComp.txt:1450)
4380+
static membertcByrefsMayNotHaveTypeExtensions()=(3238, GetStringFunc("tcByrefsMayNotHaveTypeExtensions",",,,"))
43874381
/// Cannot partially apply the extension method '%s' because the first parameter is a byref type.
4388-
/// (Originally from ..\FSComp.txt:1453)
4389-
static membertcCannotPartiallyApplyExtensionMethodForByref(a0:System.String)=(3241, GetStringFunc("tcCannotPartiallyApplyExtensionMethodForByref",",,,%s,,,") a0)
4382+
/// (Originally from ..\FSComp.txt:1451)
4383+
static membertcCannotPartiallyApplyExtensionMethodForByref(a0:System.String)=(3239, GetStringFunc("tcCannotPartiallyApplyExtensionMethodForByref",",,,%s,,,") a0)
43904384
/// This type does not inherit Attribute, it will not work correctly with other .NET languages.
4391-
/// (Originally from ..\FSComp.txt:1454)
4385+
/// (Originally from ..\FSComp.txt:1452)
43924386
static membertcTypeDoesNotInheritAttribute()=(3242, GetStringFunc("tcTypeDoesNotInheritAttribute",",,,"))
43934387
/// Invalid anonymous record expression
4394-
/// (Originally from ..\FSComp.txt:1455)
4388+
/// (Originally from ..\FSComp.txt:1453)
43954389
static memberparsInvalidAnonRecdExpr()=(3243, GetStringFunc("parsInvalidAnonRecdExpr",",,,"))
43964390
/// Invalid anonymous record type
4397-
/// (Originally from ..\FSComp.txt:1456)
4391+
/// (Originally from ..\FSComp.txt:1454)
43984392
static memberparsInvalidAnonRecdType()=(3244, GetStringFunc("parsInvalidAnonRecdType",",,,"))
43994393
/// The input to a copy-and-update expression that creates an anonymous record must be either an anonymous record or a record
4400-
/// (Originally from ..\FSComp.txt:1457)
4394+
/// (Originally from ..\FSComp.txt:1455)
44014395
static membertcCopyAndUpdateNeedsRecordType()=(3245, GetStringFunc("tcCopyAndUpdateNeedsRecordType",",,,"))
44024396
/// The parameter '%s' has an invalid type '%s'. This is not permitted by the rules of Common IL.
4403-
/// (Originally from ..\FSComp.txt:1458)
4397+
/// (Originally from ..\FSComp.txt:1456)
44044398
static memberchkInvalidFunctionParameterType(a0:System.String,a1:System.String)=(3300, GetStringFunc("chkInvalidFunctionParameterType",",,,%s,,,%s,,,") a0 a1)
44054399
/// The function or method has an invalid return type '%s'. This is not permitted by the rules of Common IL.
4406-
/// (Originally from ..\FSComp.txt:1459)
4400+
/// (Originally from ..\FSComp.txt:1457)
44074401
static memberchkInvalidFunctionReturnType(a0:System.String)=(3301, GetStringFunc("chkInvalidFunctionReturnType",",,,%s,,,") a0)
44084402

44094403
/// Call this method once to validate that all known resources are valid; throws if not
@@ -5819,7 +5813,6 @@ type internal SR private() =
58195813
ignore(GetString("tcByrefReturnImplicitlyDereferenced"))
58205814
ignore(GetString("tcByRefLikeNotStruct"))
58215815
ignore(GetString("chkNoByrefAddressOfValueFromExpression"))
5822-
ignore(GetString("chkNoReturnOfLimitedSpan"))
58235816
ignore(GetString("chkNoWriteToLimitedSpan"))
58245817
ignore(GetString("tastValueMustBeLocal"))
58255818
ignore(GetString("tcIsReadOnlyNotStruct"))
@@ -5828,9 +5821,8 @@ type internal SR private() =
58285821
ignore(GetString("chkNoSpanLikeVariable"))
58295822
ignore(GetString("chkNoSpanLikeValueFromExpression"))
58305823
ignore(GetString("tastCantTakeAddressOfExpression"))
5831-
ignore(GetString("tcCannotCallExtensionMemberInrefToByref"))
5832-
ignore(GetString("tcByrefsMayNotHaveTypeExtensions"))
58335824
ignore(GetString("tcCannotCallExtensionMethodInrefToByref"))
5825+
ignore(GetString("tcByrefsMayNotHaveTypeExtensions"))
58345826
ignore(GetString("tcCannotPartiallyApplyExtensionMethodForByref"))
58355827
ignore(GetString("tcTypeDoesNotInheritAttribute"))
58365828
ignore(GetString("parsInvalidAnonRecdExpr"))

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4351,9 +4351,6 @@
43514351
<dataname="chkNoByrefAddressOfValueFromExpression"xml:space="preserve">
43524352
<value>The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope.</value>
43534353
</data>
4354-
<dataname="chkNoReturnOfLimitedSpan"xml:space="preserve">
4355-
<value>The Span or IsByRefLike expression cannot be returned from this function or method, because it is composed using elements that may escape their scope.</value>
4356-
</data>
43574354
<dataname="chkNoWriteToLimitedSpan"xml:space="preserve">
43584355
<value>This value can't be assigned because the target '{0}' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope.</value>
43594356
</data>
@@ -4378,15 +4375,12 @@
43784375
<dataname="tastCantTakeAddressOfExpression"xml:space="preserve">
43794376
<value>Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.</value>
43804377
</data>
4381-
<dataname="tcCannotCallExtensionMemberInrefToByref"xml:space="preserve">
4382-
<value>Cannot call the extensionmember as itrequires the value to be mutable or a byref type due to the extending type being used as a byref.</value>
4378+
<dataname="tcCannotCallExtensionMethodInrefToByref"xml:space="preserve">
4379+
<value>Cannot call thebyrefextensionmethod '{0}. The first parameterrequires the value to be mutable or anon-readonlybyref type.</value>
43834380
</data>
43844381
<dataname="tcByrefsMayNotHaveTypeExtensions"xml:space="preserve">
43854382
<value>Byref types are not allowed to have optional type extensions.</value>
43864383
</data>
4387-
<dataname="tcCannotCallExtensionMethodInrefToByref"xml:space="preserve">
4388-
<value>Cannot call the byref extension method '{0}. The first parameter requires the value to be mutable or a non-readonly byref type.</value>
4389-
</data>
43904384
<dataname="tcCannotPartiallyApplyExtensionMethodForByref"xml:space="preserve">
43914385
<value>Cannot partially apply the extension method '{0}' because the first parameter is a byref type.</value>
43924386
</data>

‎src/fsharp/FSComp.txt‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1438,19 +1438,17 @@ notAFunctionButMaybeDeclaration,"This value is not a function and cannot be appl
14381438
3226,tcByrefReturnImplicitlyDereferenced,"A byref pointer returned by a function or method is implicitly dereferenced as of F# 4.5. To acquire the return value as a pointer, use the address-of operator, e.g. '&f(x)' or '&obj.Method(arg1, arg2)'."
14391439
3227,tcByRefLikeNotStruct,"A type annotated with IsByRefLike must also be a struct. Consider adding the [<Struct>] attribute to the type."
14401440
3228,chkNoByrefAddressOfValueFromExpression,"The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope."
1441-
3229,chkNoReturnOfLimitedSpan,"The Span or IsByRefLike expression cannot be returned from this function or method, because it is composed using elements that may escape their scope."
1442-
3230,chkNoWriteToLimitedSpan,"This value can't be assigned because the target '%s' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope."
1443-
3231,tastValueMustBeLocal,"A value defined in a module must be mutable in order to take its address, e.g. 'let mutable x = ...'"
1444-
3232,tcIsReadOnlyNotStruct,"A type annotated with IsReadOnly must also be a struct. Consider adding the [<Struct>] attribute to the type."
1445-
3233,chkStructsMayNotReturnAddressesOfContents,"Struct members cannot return the address of fields of the struct by reference"
1446-
3234,chkNoByrefLikeFunctionCall,"The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope."
1447-
3235,chkNoSpanLikeVariable,"The Span or IsByRefLike variable '%s' cannot be used at this point. This is to ensure the address of the local value does not escape its scope."
1448-
3236,chkNoSpanLikeValueFromExpression,"A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope."
1449-
3237,tastCantTakeAddressOfExpression,"Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address."
1450-
3238,tcCannotCallExtensionMemberInrefToByref,"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."
1451-
3239,tcByrefsMayNotHaveTypeExtensions,"Byref types are not allowed to have optional type extensions."
1452-
3240,tcCannotCallExtensionMethodInrefToByref,"Cannot call the byref extension method '%s. The first parameter requires the value to be mutable or a non-readonly byref type."
1453-
3241,tcCannotPartiallyApplyExtensionMethodForByref,"Cannot partially apply the extension method '%s' because the first parameter is a byref type."
1441+
3229,chkNoWriteToLimitedSpan,"This value can't be assigned because the target '%s' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope."
1442+
3230,tastValueMustBeLocal,"A value defined in a module must be mutable in order to take its address, e.g. 'let mutable x = ...'"
1443+
3231,tcIsReadOnlyNotStruct,"A type annotated with IsReadOnly must also be a struct. Consider adding the [<Struct>] attribute to the type."
1444+
3232,chkStructsMayNotReturnAddressesOfContents,"Struct members cannot return the address of fields of the struct by reference"
1445+
3233,chkNoByrefLikeFunctionCall,"The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope."
1446+
3234,chkNoSpanLikeVariable,"The Span or IsByRefLike variable '%s' cannot be used at this point. This is to ensure the address of the local value does not escape its scope."
1447+
3235,chkNoSpanLikeValueFromExpression,"A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope."
1448+
3236,tastCantTakeAddressOfExpression,"Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address."
1449+
3237,tcCannotCallExtensionMethodInrefToByref,"Cannot call the byref extension method '%s. The first parameter requires the value to be mutable or a non-readonly byref type."
1450+
3238,tcByrefsMayNotHaveTypeExtensions,"Byref types are not allowed to have optional type extensions."
1451+
3239,tcCannotPartiallyApplyExtensionMethodForByref,"Cannot partially apply the extension method '%s' because the first parameter is a byref type."
14541452
3242,tcTypeDoesNotInheritAttribute,"This type does not inherit Attribute, it will not work correctly with other .NET languages."
14551453
3243,parsInvalidAnonRecdExpr,"Invalid anonymous record expression"
14561454
3244,parsInvalidAnonRecdType,"Invalid anonymous record type"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
5858
<PropertyGroupCondition="'$(DOTNET_HOST_PATH)' != ''">
5959
<FscToolPathCondition="'$(FscToolPath)' == ''">$([System.IO.Path]::GetDirectoryName($(DOTNET_HOST_PATH)))</FscToolPath>
6060
<FscToolExeCondition="'$(FscToolExe)' == ''">$([System.IO.Path]::GetFileName($(DOTNET_HOST_PATH)))</FscToolExe>
61-
<DotnetFscCompilerPath>"$(MSBuildThisFileDirectory)fsc.exe"</DotnetFscCompilerPath>
61+
<DotnetFscCompilerPathCondition="'$(DotnetFscCompilerPath)' == ''">"$(MSBuildThisFileDirectory)fsc.exe"</DotnetFscCompilerPath>
6262
</PropertyGroup>
6363

6464
<ItemGroupCondition="'$(DisableImplicitSystemValueTupleReference)' != 'true'

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp