Skip to content

Commit c4d3a44

Browse files
brettfobrettfo
authored
Merge pull request #7925 from dotnet/merges/release/dev16.4-to-master
Merge release/dev16.4 to master
2 parents 4978145 + 48b60c2 commit c4d3a44

File tree

57 files changed

+213
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+213
-231
lines changed

‎FSharp.Profiles.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,12 @@
55
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
66
<DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
77
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
8-
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
98
</PropertyGroup>
109

1110
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
1211
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
1312
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
1413
<DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
15-
<DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
16-
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
17-
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
1814
<DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
1915
<DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
2016
<DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>

‎azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,6 @@ stages:
340340
- template: eng/release/insert-into-vs.yml
341341
parameters:
342342
componentBranchName: refs/heads/release/dev16.4
343-
insertTargetBranch: master
343+
insertTargetBranch: rel/d16.4
344344
insertTeamEmail: [email protected]
345345
insertTeamName: 'F#'

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
<FSharpCorePreviewPackageVersion>$(FSCorePackageVersion)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
26-
<FSPackageMajorVersion>10.6</FSPackageMajorVersion>
26+
<FSPackageMajorVersion>10.7</FSPackageMajorVersion>
2727
<FSPackageVersion>$(FSPackageMajorVersion).0</FSPackageVersion>
2828
<FSProductVersionPrefix>$(FSPackageVersion)</FSProductVersionPrefix>
2929
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
3030
</PropertyGroup>
3131
<PropertyGroup>
3232
<VSMajorVersion>16</VSMajorVersion>
33-
<VSMinorVersion>3</VSMinorVersion>
33+
<VSMinorVersion>4</VSMinorVersion>
3434
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3535
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
3636
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -155,7 +155,7 @@
155155
<MicrosoftVisualStudioUtilitiesVersion>16.1.28917.181</MicrosoftVisualStudioUtilitiesVersion>
156156
<MicrosoftVisualStudioValidationVersion>15.3.58</MicrosoftVisualStudioValidationVersion>
157157
<MicrosoftVisualStudioWCFReferenceInteropVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropVersion>
158-
<MicrosoftVSSDKBuildToolsVersion>16.0.2264</MicrosoftVSSDKBuildToolsVersion>
158+
<MicrosoftVSSDKBuildToolsVersion>16.3.2099</MicrosoftVSSDKBuildToolsVersion>
159159
<VSSDKDebuggerVisualizersVersion>12.0.4</VSSDKDebuggerVisualizersVersion>
160160
<VSSDKVSLangProjVersion>7.0.4</VSSDKVSLangProjVersion>
161161
<VSSDKVSLangProj8Version>8.0.4</VSSDKVSLangProj8Version>

‎src/fsharp/FSharp.Core/async.fs

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,31 +1250,28 @@ namespace Microsoft.FSharp.Control
12501250
|> unfake)
12511251
| Some maxDegreeOfParallelism ->
12521252
let mutable i = -1
1253-
let worker = MakeAsync (fun _ ->
1254-
while i < tasks.Length do
1253+
let rec worker (trampolineHolder : TrampolineHolder) =
1254+
if i < tasks.Length then
12551255
let j = Interlocked.Increment &i
12561256
if j < tasks.Length then
1257-
let trampolineHolder = new TrampolineHolder()
1258-
trampolineHolder.ExecuteWithTrampoline (fun () ->
1259-
let ctxt =
1257+
if innerCTS.Token.IsCancellationRequested then
1258+
let cexn = new OperationCanceledException (innerCTS.Token)
1259+
recordFailure (Choice2Of2 cexn) |> unfake
1260+
worker trampolineHolder |> unfake
1261+
else
1262+
let taskCtxt =
12601263
AsyncActivation.Create
12611264
innerCTS.Token
12621265
trampolineHolder
1263-
(fun res -> recordSuccess j res)
1264-
(fun edi -> recordFailure (Choice1Of2 edi))
1265-
(fun cexn -> recordFailure (Choice2Of2 cexn))
1266-
tasks.[j].Invoke ctxt
1267-
)
1268-
|> unfake
1266+
(fun res -> recordSuccess j res |> unfake; worker trampolineHolder)
1267+
(fun edi -> recordFailure (Choice1Of2 edi) |> unfake; worker trampolineHolder)
1268+
(fun cexn -> recordFailure (Choice2Of2 cexn) |> unfake; worker trampolineHolder)
1269+
tasks.[j].Invoke taskCtxt |> unfake
12691270
fake()
1270-
)
12711271
for x = 1 to maxDegreeOfParallelism do
1272-
QueueAsync
1273-
innerCTS.Token
1274-
(fun _ -> fake())
1275-
(fun edi -> recordFailure (Choice1Of2 edi))
1276-
(fun cexn -> recordFailure (Choice2Of2 cexn))
1277-
worker
1272+
let trampolineHolder = new TrampolineHolder()
1273+
trampolineHolder.QueueWorkItemWithTrampoline (fun () ->
1274+
worker trampolineHolder)
12781275
|> unfake
12791276

12801277
fake()))

‎src/fsharp/fsi/xlf/FSIstrings.txt.cs.xlf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<body>
55
<trans-unit id="fsiOperationCouldNotBeCompleted">
66
<source>Operation could not be completed due to earlier error</source>
7-
<target state="new">Operation could not be completed due to earlier error</target>
7+
<target state="translated">Operaci nešlo dokončit z důvodu dřívější chyby.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="fsiOperationFailed">
1111
<source>Operation failed. The error text has been printed in the error stream. To return the corresponding FSharpErrorInfo use the EvalInteractionNonThrowing, EvalScriptNonThrowing or EvalExpressionNonThrowing</source>
12-
<target state="new">Operation failed. The error text has been printed in the error stream. To return the corresponding FSharpErrorInfo use the EvalInteractionNonThrowing, EvalScriptNonThrowing or EvalExpressionNonThrowing</target>
12+
<target state="translated">Operace nebyla úspěšná. Text chyby se vytiskl do streamu chyb. Pokud chcete vrátit odpovídající FSharpErrorInfo, použijte EvalInteractionNonThrowing, EvalScriptNonThrowing nebo EvalExpressionNonThrowing.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="stoppedDueToError">
@@ -19,7 +19,7 @@
1919
</trans-unit>
2020
<trans-unit id="fsiUsage">
2121
<source>Usage: {0} &lt;options&gt; [script.fsx [&lt;arguments&gt;]]</source>
22-
<target state="translated">Použití: {0} &lt;parametry&gt; [skript.fsx [&lt;argumenty&gt;]]</target>
22+
<target state="translated">Použití: {0} &lt;možnosti&gt; [script.fsx [&lt;argumenty&gt;]]</target>
2323
<note />
2424
</trans-unit>
2525
<trans-unit id="fsiInputFiles">
@@ -109,7 +109,7 @@
109109
</trans-unit>
110110
<trans-unit id="fsiConsoleProblem">
111111
<source>A problem occurred starting the F# Interactive process. This may be due to a known problem with background process console support for Unicode-enabled applications on some Windows systems. Try selecting Tools-&gt;Options-&gt;F# Interactive for Visual Studio and enter '--fsi-server-no-unicode'.</source>
112-
<target state="translated">Při spuštění procesu F# Interactive se vyskytl problém. Ten mohly způsobit známé potíže s podporou konzoly procesu na pozadí pro aplikace umožňující kódování Unicode v některých systémech Windows. V případě sady Visual Studio zkuste vybrat Nástroje-&gt;Možnosti-&gt;F# Interactive a zadat: --fsi-server-no-unicode.</target>
112+
<target state="translated">Při spouštění procesu F# Interactive došlo k potížím. Může to být způsobené známým problémem s podporou procesů na pozadí v konzole pro aplikace podporující Unicode v některých systémech Windows. Zkuste vybrat Nástroje -&gt; Možnosti -&gt; F# Interactive pro Visual Studio a zadat --fsi-server-no-unicode.</target>
113113
<note />
114114
</trans-unit>
115115
<trans-unit id="fsiInvalidAssembly">
@@ -219,22 +219,22 @@
219219
</trans-unit>
220220
<trans-unit id="fsiDidAHashr">
221221
<source>--&gt; Referenced '{0}'</source>
222-
<target state="translated">--&gt; Odkazovaný soubor {0}</target>
222+
<target state="translated">--&gt; Odkazovalo se na: {0}</target>
223223
<note />
224224
</trans-unit>
225225
<trans-unit id="fsiDidAHashrWithLockWarning">
226226
<source>--&gt; Referenced '{0}' (file may be locked by F# Interactive process)</source>
227-
<target state="translated">--&gt; Odkazovaný soubor {0} (Soubor musí být procesem F# Interactive uzamčený.)</target>
227+
<target state="translated">--&gt; Odkazovalo se na: {0} (soubor může být zamknutý procesem F# Interactive)</target>
228228
<note />
229229
</trans-unit>
230230
<trans-unit id="fsiDidAHashrWithStaleWarning">
231231
<source>--&gt; Referenced '{0}' (an assembly with a different timestamp has already been referenced from this location, reset fsi to load the updated assembly)</source>
232-
<target state="translated">--&gt; Odkazováno {0} (na sestavení s odlišným časovým razítkem se už z tohoto umístění odkazovalo, pro načtení aktualizovaného sestavení obnovte soubor fsi)</target>
232+
<target state="translated">--&gt; Odkazovalo se na: {0} (Z tohoto umístění se už odkazovalo na sestavení s jiným časovým razítkem. Je třeba resetovat fsi, aby se načetlo aktualizované sestavení.)</target>
233233
<note />
234234
</trans-unit>
235235
<trans-unit id="fsiDidAHashI">
236236
<source>--&gt; Added '{0}' to library include path</source>
237-
<target state="translated">--&gt; Soubory přidané do knihovny ({0}) zahrnují cestu.</target>
237+
<target state="translated">--&gt; Přidali jsme {0} do cesty pro zahrnutí do knihovny</target>
238238
<note />
239239
</trans-unit>
240240
<trans-unit id="fsiTurnedTimingOn">

‎src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<body>
55
<trans-unit id="fsiOperationCouldNotBeCompleted">
66
<source>Operation could not be completed due to earlier error</source>
7-
<target state="new">Operation could not be completed due to earlier error</target>
7+
<target state="translated">Der Vorgang konnte aufgrund eines vorherigen Fehlers nicht abgeschlossen werden.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="fsiOperationFailed">
1111
<source>Operation failed. The error text has been printed in the error stream. To return the corresponding FSharpErrorInfo use the EvalInteractionNonThrowing, EvalScriptNonThrowing or EvalExpressionNonThrowing</source>
12-
<target state="new">Operation failed. The error text has been printed in the error stream. To return the corresponding FSharpErrorInfo use the EvalInteractionNonThrowing, EvalScriptNonThrowing or EvalExpressionNonThrowing</target>
12+
<target state="translated">Der Vorgang ist fehlgeschlagen. Der Fehlertext wurde im Fehlerstream ausgegeben. Verwenden Sie EvalInteractionNonThrowing, EvalScriptNonThrowing oder EvalExpressionNonThrowing, um die entsprechende FSharpErrorInfo zurückzugeben.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="stoppedDueToError">
@@ -19,7 +19,7 @@
1919
</trans-unit>
2020
<trans-unit id="fsiUsage">
2121
<source>Usage: {0} &lt;options&gt; [script.fsx [&lt;arguments&gt;]]</source>
22-
<target state="translated">Verwendung: {0} &lt;Optionen&gt; [script.fsx [&lt;Argumente&gt;]]</target>
22+
<target state="translated">Verwendung: {0} &lt;Optionen&gt; [script.fsx [&lt;arguments&gt;]]</target>
2323
<note />
2424
</trans-unit>
2525
<trans-unit id="fsiInputFiles">
@@ -109,7 +109,7 @@
109109
</trans-unit>
110110
<trans-unit id="fsiConsoleProblem">
111111
<source>A problem occurred starting the F# Interactive process. This may be due to a known problem with background process console support for Unicode-enabled applications on some Windows systems. Try selecting Tools-&gt;Options-&gt;F# Interactive for Visual Studio and enter '--fsi-server-no-unicode'.</source>
112-
<target state="translated">Beim Starten des F# Interactive-Prozesses ist ein Fehler aufgetreten. Ursache hierfür kann ein bekanntes Problem mit der Hintergrundprozess-Konsolenunterstützung für Unicode-aktivierte Anwendungen unter manchen Windows-Systemen sein. Wählen Sie "Tools" -&gt; "Optionen" -&gt; "F# Interactive für Visual Studio" aus, und geben Sie "--fsi-server-no-unicode" ein.</target>
112+
<target state="translated">Beim Starten des F# Interactive-Prozesses ist ein Fehler aufgetreten. Ursache hierfür kann ein bekanntes Problem mit der Hintergrundprozess-Konsolenunterstützung für Unicode-aktivierte Anwendungen unter manchen Windows-Systemen sein. Navigieren Sie zu "Tools &gt; Optionen &gt; F# Interactive für Visual Studio", und geben Sie --fsi-server-no-unicode ein.</target>
113113
<note />
114114
</trans-unit>
115115
<trans-unit id="fsiInvalidAssembly">
@@ -219,22 +219,22 @@
219219
</trans-unit>
220220
<trans-unit id="fsiDidAHashr">
221221
<source>--&gt; Referenced '{0}'</source>
222-
<target state="translated">--&gt; Auf "{0}" wurde verwiesen</target>
222+
<target state="translated">--&gt; Auf {0} wurde verwiesen</target>
223223
<note />
224224
</trans-unit>
225225
<trans-unit id="fsiDidAHashrWithLockWarning">
226226
<source>--&gt; Referenced '{0}' (file may be locked by F# Interactive process)</source>
227-
<target state="translated">--&gt; Auf "{0}" wurde verwiesen (die Datei wird möglicherweise vom F# Interactive-Prozess gesperrt)</target>
227+
<target state="translated">--&gt; Auf {0} wurde verwiesen (die Datei wird möglicherweise vom F# Interactive-Prozess gesperrt).</target>
228228
<note />
229229
</trans-unit>
230230
<trans-unit id="fsiDidAHashrWithStaleWarning">
231231
<source>--&gt; Referenced '{0}' (an assembly with a different timestamp has already been referenced from this location, reset fsi to load the updated assembly)</source>
232-
<target state="translated">--&gt; Auf "{0}" wurde verwiesen (eine Assembly mit einem anderen Zeitstempel wurde bereits von diesem Ort verwiesen; stellen Sie fsi wieder her, um die aktualisierte Assembly zu laden)</target>
232+
<target state="translated">--&gt; Auf {0} wurde verwiesen (eine Assembly mit einem anderen Zeitstempel wurde bereits von diesem Ort verwiesen; setzen Sie fsi zurück, um die aktualisierte Assembly zu laden).</target>
233233
<note />
234234
</trans-unit>
235235
<trans-unit id="fsiDidAHashI">
236236
<source>--&gt; Added '{0}' to library include path</source>
237-
<target state="translated">--&gt; "{0}" wurde zum Bibliotheksincludepfad hinzugefügt</target>
237+
<target state="translated">--&gt; {0} wurde zum Bibliotheksincludepfad hinzugefügt.</target>
238238
<note />
239239
</trans-unit>
240240
<trans-unit id="fsiTurnedTimingOn">

0 commit comments

Comments
 (0)