Skip to content

Commit 8459291

Browse files
dotnet-botdotnet-bot
authored
Merge pull request #13675 from dotnet/merges/release/dev17.3-to-main
Merge release/dev17.3 to main
2 parents a3741b1 + 1fb9c87 commit 8459291

File tree

86 files changed

+598
-605
lines changed

Some content is hidden

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

86 files changed

+598
-605
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
}
1111
}
1212
}
13+

‎azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,8 +595,8 @@ stages:
595595
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
596596
- template: eng/release/insert-into-vs.yml
597597
parameters:
598-
componentBranchName: refs/heads/release/dev17.2
599-
insertTargetBranch: rel/d17.2
598+
componentBranchName: refs/heads/release/dev17.3
599+
insertTargetBranch: rel/d17.3
600600
insertTeamEmail: fsharpteam@microsoft.com
601601
insertTeamName: 'F#'
602602
completeInsertion: 'auto'

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- F# Version components -->
1616
<FSMajorVersion>6</FSMajorVersion>
1717
<FSMinorVersion>0</FSMinorVersion>
18-
<FSBuildVersion>5</FSBuildVersion>
18+
<FSBuildVersion>6</FSBuildVersion>
1919
<FSRevisionVersion>0</FSRevisionVersion>
2020
<!-- -->
2121
<!-- F# Language version -->
@@ -32,7 +32,7 @@
3232
<!-- FSharp.Compiler.Service version -->
3333
<FCSMajorVersion>41</FCSMajorVersion>
3434
<FCSMinorVersion>0</FCSMinorVersion>
35-
<FCSBuildVersion>5</FCSBuildVersion>
35+
<FCSBuildVersion>6</FCSBuildVersion>
3636
<FCSRevisionVersion>$(FSRevisionVersion)</FCSRevisionVersion>
3737
<FSharpCompilerServicePackageVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion)</FSharpCompilerServicePackageVersion>
3838
<FSharpCompilerServiceVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion).$(FCSRevisionVersion)</FSharpCompilerServiceVersion>
@@ -55,7 +55,7 @@
5555
</PropertyGroup>
5656
<PropertyGroup>
5757
<VSMajorVersion>17</VSMajorVersion>
58-
<VSMinorVersion>1</VSMinorVersion>
58+
<VSMinorVersion>3</VSMinorVersion>
5959
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
6060
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
6161
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>

‎src/Compiler/Checking/NameResolution.fsi‎

100644100755
File mode changed.

‎src/Compiler/Interactive/xlf/FSIstrings.txt.cs.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fsiEntryPointWontBeInvoked">
66
<source>Functions with [&lt;EntryPoint&gt;] are not invoked in FSI. '{0}' was not invoked. Execute '{1} &lt;args&gt;' in order to invoke '{2}' with the appropriate string array of command line arguments.</source>
7-
<target state="new">Functions with [&lt;EntryPoint&gt;] are not invoked in FSI. '{0}' was not invoked. Execute '{1} &lt;args&gt;' in order to invoke '{2}' with the appropriate string array of command line arguments.</target>
7+
<target state="translated">Funkce s [&lt;EntryPoint&gt;] nejsou vyvolány v FSI. {0} nebylo vyvoláno. Pokud chcete vyvolat {2} s příslušným polem řetězců argumentů příkazového řádku, spusťte příkaz{1} &lt;args&gt;.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="fsiInternalAccess">
@@ -19,7 +19,7 @@
1919
</trans-unit>
2020
<trans-unit id="fsiIntroTextHashclearInfo">
2121
<source>Clear screen</source>
22-
<target state="new">Clear screen</target>
22+
<target state="translated">Vymazat obrazovku</target>
2323
<note />
2424
</trans-unit>
2525
<trans-unit id="fsiMultiAssemblyEmitOptionOffByDefault">

‎src/Compiler/Interactive/xlf/FSIstrings.txt.de.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fsiEntryPointWontBeInvoked">
66
<source>Functions with [&lt;EntryPoint&gt;] are not invoked in FSI. '{0}' was not invoked. Execute '{1} &lt;args&gt;' in order to invoke '{2}' with the appropriate string array of command line arguments.</source>
7-
<target state="new">Functions with [&lt;EntryPoint&gt;] are not invoked in FSI. '{0}' was not invoked. Execute '{1} &lt;args&gt;' in order to invoke '{2}' with the appropriate string array of command line arguments.</target>
7+
<target state="translated">Funktionen mit [&lt;EntryPoint&gt;] werden in FSI nicht aufgerufen. '{0}' wurde nicht aufgerufen. Führen Sie '{1} &lt;args&gt;' aus, um '{2}' mit dem entsprechenden String-Array von Befehlszeilenargumenten aufzurufen.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="fsiInternalAccess">
@@ -19,7 +19,7 @@
1919
</trans-unit>
2020
<trans-unit id="fsiIntroTextHashclearInfo">
2121
<source>Clear screen</source>
22-
<target state="new">Clear screen</target>
22+
<target state="translated">Bildschirm löschen</target>
2323
<note />
2424
</trans-unit>
2525
<trans-unit id="fsiMultiAssemblyEmitOptionOffByDefault">

‎src/Compiler/Interactive/xlf/FSIstrings.txt.es.xlf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fsiEntryPointWontBeInvoked">
66
<source>Functions with [&lt;EntryPoint&gt;] are not invoked in FSI. '{0}' was not invoked. Execute '{1} &lt;args&gt;' in order to invoke '{2}' with the appropriate string array of command line arguments.</source>
7-
<target state="new">Functions with [&lt;EntryPoint&gt;] are not invoked in FSI. '{0}' was not invoked. Execute '{1} &lt;args&gt;' in order to invoke '{2}' with the appropriate string array of command line arguments.</target>
7+
<target state="translated">Las funciones con [&lt;EntryPoint&gt;] no se invocan en FSI. “{0}” no se invocó. Ejecute “{1} &lt;args&gt;” para invocar “{2}” con la matriz adecuada de cadenas de argumentos de línea de comandos.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="fsiInternalAccess">
@@ -19,7 +19,7 @@
1919
</trans-unit>
2020
<trans-unit id="fsiIntroTextHashclearInfo">
2121
<source>Clear screen</source>
22-
<target state="new">Clear screen</target>
22+
<target state="translated">Borrar pantalla</target>
2323
<note />
2424
</trans-unit>
2525
<trans-unit id="fsiMultiAssemblyEmitOptionOffByDefault">
@@ -49,7 +49,7 @@
4949
</trans-unit>
5050
<trans-unit id="fsiUsage">
5151
<source>Usage: {0} &lt;options&gt; [script.fsx [&lt;arguments&gt;]]</source>
52-
<target state="translated">Uso: {0} &lt;opciones&gt; [script.fsx [&lt;argumentos&gt;]]</target>
52+
<target state="translated">Uso: {0} &lt;options&gt; [script.fsx [&lt;arguments&gt;]]</target>
5353
<note />
5454
</trans-unit>
5555
<trans-unit id="fsiInputFiles">

‎src/Compiler/Interactive/xlf/FSIstrings.txt.fr.xlf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fsiEntryPointWontBeInvoked">
66
<source>Functions with [&lt;EntryPoint&gt;] are not invoked in FSI. '{0}' was not invoked. Execute '{1} &lt;args&gt;' in order to invoke '{2}' with the appropriate string array of command line arguments.</source>
7-
<target state="new">Functions with [&lt;EntryPoint&gt;] are not invoked in FSI. '{0}' was not invoked. Execute '{1} &lt;args&gt;' in order to invoke '{2}' with the appropriate string array of command line arguments.</target>
7+
<target state="translated">Les fonctions avec [&lt;EntryPoint&gt;] ne sont pas appelées dans FSI. '{0}' n’a pas été appelée. Exécutez '{1} &lt;args&gt;' pour appeler '{2}' avec le tableau de chaînes approprié d’arguments de ligne de commande.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="fsiInternalAccess">
@@ -19,7 +19,7 @@
1919
</trans-unit>
2020
<trans-unit id="fsiIntroTextHashclearInfo">
2121
<source>Clear screen</source>
22-
<target state="new">Clear screen</target>
22+
<target state="translated">Effacer l'écran</target>
2323
<note />
2424
</trans-unit>
2525
<trans-unit id="fsiMultiAssemblyEmitOptionOffByDefault">
@@ -49,7 +49,7 @@
4949
</trans-unit>
5050
<trans-unit id="fsiUsage">
5151
<source>Usage: {0} &lt;options&gt; [script.fsx [&lt;arguments&gt;]]</source>
52-
<target state="translated">Utilisation : {0} &lt;options&gt; [script.fsx [&lt;arguments&gt;]]</target>
52+
<target state="translated">Utilisation{0}: &lt;options&gt; [script.fsx [&lt;arguments&gt;]]</target>
5353
<note />
5454
</trans-unit>
5555
<trans-unit id="fsiInputFiles">

‎src/Compiler/Interactive/xlf/FSIstrings.txt.it.xlf‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fsiEntryPointWontBeInvoked">
66
<source>Functions with [&lt;EntryPoint&gt;] are not invoked in FSI. '{0}' was not invoked. Execute '{1} &lt;args&gt;' in order to invoke '{2}' with the appropriate string array of command line arguments.</source>
7-
<target state="new">Functions with [&lt;EntryPoint&gt;] are not invoked in FSI. '{0}' was not invoked. Execute '{1} &lt;args&gt;' in order to invoke '{2}' with the appropriate string array of command line arguments.</target>
7+
<target state="translated">Le funzioni con [&lt;EntryPoint&gt;] non vengono richiamate in FSI. '{0}' non è stato richiamato. Eseguire '{1} &lt;args&gt;' per richiamare '{2}' con la matrice di stringhe appropriata degli argomenti della riga di comando.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="fsiInternalAccess">
@@ -17,6 +17,11 @@
1717
<target state="translated">Includi l'URI di origine pacchetti durante la ricerca di pacchetti</target>
1818
<note />
1919
</trans-unit>
20+
<trans-unit id="fsiIntroTextHashclearInfo">
21+
<source>Clear screen</source>
22+
<target state="translated">Cancella schermata</target>
23+
<note />
24+
</trans-unit>
2025
<trans-unit id="fsiMultiAssemblyEmitOptionOffByDefault">
2126
<source>Emit multiple assemblies (off by default for .NET Framework)</source>
2227
<target state="translated">Creare più assembly (disattivato per impostazione predefinita per .NET Framework)</target>
@@ -44,7 +49,7 @@
4449
</trans-unit>
4550
<trans-unit id="fsiUsage">
4651
<source>Usage: {0} &lt;options&gt; [script.fsx [&lt;arguments&gt;]]</source>
47-
<target state="translated">Utilizzo: {0} &lt;opzioni&gt; [script.fsx [&lt;argomenti&gt;]]</target>
52+
<target state="translated">Utilizzo: {0} &lt;options&gt; [script.fsx [&lt;arguments&gt;]]</target>
4853
<note />
4954
</trans-unit>
5055
<trans-unit id="fsiInputFiles">
@@ -202,11 +207,6 @@
202207
<target state="translated">Esci</target>
203208
<note />
204209
</trans-unit>
205-
<trans-unit id="fsiIntroTextHashclearInfo">
206-
<source>Clear screen</source>
207-
<target state="needs-review-translation">Pulisci terminale</target>
208-
<note />
209-
</trans-unit>
210210
<trans-unit id="fsiIntroTextHeader2commandLine">
211211
<source> F# Interactive command line options:</source>
212212
<target state="translated"> Opzioni della riga di comando F# Interactive:</target>

‎src/Compiler/Interactive/xlf/FSIstrings.txt.ja.xlf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fsiEntryPointWontBeInvoked">
66
<source>Functions with [&lt;EntryPoint&gt;] are not invoked in FSI. '{0}' was not invoked. Execute '{1} &lt;args&gt;' in order to invoke '{2}' with the appropriate string array of command line arguments.</source>
7-
<target state="new">Functions with [&lt;EntryPoint&gt;] are not invoked in FSI. '{0}' was not invoked. Execute '{1} &lt;args&gt;' in order to invoke '{2}' with the appropriate string array of command line arguments.</target>
7+
<target state="translated">[&lt;EntryPoint&gt;] を含む関数は FSI では呼び出されません。'{0}' は呼び出されませんでした。コマンド ライン引数の適切な文字列配列を使用して '{2}' を呼び出すには、'{1} &lt;args&gt;' を実行してください。</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="fsiInternalAccess">
@@ -19,7 +19,7 @@
1919
</trans-unit>
2020
<trans-unit id="fsiIntroTextHashclearInfo">
2121
<source>Clear screen</source>
22-
<target state="new">Clear screen</target>
22+
<target state="translated">画面をクリアする</target>
2323
<note />
2424
</trans-unit>
2525
<trans-unit id="fsiMultiAssemblyEmitOptionOffByDefault">
@@ -49,7 +49,7 @@
4949
</trans-unit>
5050
<trans-unit id="fsiUsage">
5151
<source>Usage: {0} &lt;options&gt; [script.fsx [&lt;arguments&gt;]]</source>
52-
<target state="translated">使用状況: {0} &lt;オプション&gt; [script.fsx [&lt;引数&gt;]]</target>
52+
<target state="translated">使用状況: {0} &lt;options&gt; [script.fsx [&lt;arguments&gt;]]</target>
5353
<note />
5454
</trans-unit>
5555
<trans-unit id="fsiInputFiles">

0 commit comments

Comments
 (0)