From 5bdd8bb948d7b30884f031cafe05ee182524bc76 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Wed, 10 Apr 2024 11:12:41 -0700 Subject: [PATCH 1/9] reset realsig --- Directory.Build.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 8525bdb4d0f..314e3f3b64f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -35,7 +35,8 @@ Don't use it explicitly when building with plain .NET (without Proto or Arcade). --> $(OtherFlags) --realsig- - $(OtherFlags) --realsig+ + + $(OtherFlags) --realsig- From 0d60517289a61a4afdadf9cff087a59599888ca0 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 10 Apr 2024 15:20:14 +0200 Subject: [PATCH 2/9] Fix MEF issues with options It seems something changed about MEF import w.r.t. private members. --- vsintegration/src/FSharp.Editor/Options/EditorOptions.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsintegration/src/FSharp.Editor/Options/EditorOptions.fs b/vsintegration/src/FSharp.Editor/Options/EditorOptions.fs index e9b7f60252a..d260a602a7c 100644 --- a/vsintegration/src/FSharp.Editor/Options/EditorOptions.fs +++ b/vsintegration/src/FSharp.Editor/Options/EditorOptions.fs @@ -168,7 +168,7 @@ type EditorOptions() = member _.Formatting: FormattingOptions = store.Get() [)>] - member private _.SettingsStore = store + member _.SettingsStore = store member _.With value = store.Register value From f68c1ea3cdab7f61c010b8d4821722f037d8ee7b Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Thu, 11 Apr 2024 12:59:43 +0200 Subject: [PATCH 3/9] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eceff869ba2..a4811d238a7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -35,7 +35,7 @@ variables: # (since for all *new* release branches we insert into VS main and for all *previous* releases we insert into corresponding VS release), # i.e. 'rel/d17.9' in dotnet/fsharp/refs/heads/main and 'main' in F# dotnet/fsharp/refs/heads/release/dev17.10 - name: VSInsertionTargetBranchName - value: main + value: rel/d17.10 - name: _TeamName value: FSharp - name: TeamName From e3c0f43fc3e0502600be97d908bc59f13b435ecd Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 11 Apr 2024 04:07:58 -0700 Subject: [PATCH 4/9] Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2428168 (#17024) Co-authored-by: Vlad Zarytovskii --- src/Compiler/xlf/FSComp.txt.cs.xlf | 2 +- src/Compiler/xlf/FSComp.txt.fr.xlf | 2 +- src/Compiler/xlf/FSComp.txt.ja.xlf | 2 +- src/Compiler/xlf/FSComp.txt.pt-BR.xlf | 2 +- src/Compiler/xlf/FSComp.txt.ru.xlf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Compiler/xlf/FSComp.txt.cs.xlf b/src/Compiler/xlf/FSComp.txt.cs.xlf index c302b314542..4a57c5a229d 100644 --- a/src/Compiler/xlf/FSComp.txt.cs.xlf +++ b/src/Compiler/xlf/FSComp.txt.cs.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Sníží [for x in xs -> f x] a [|for x in xs -> f x|] na volání List.map a Array.map, když xs je seznam, respektive pole. diff --git a/src/Compiler/xlf/FSComp.txt.fr.xlf b/src/Compiler/xlf/FSComp.txt.fr.xlf index 3cb65e67abd..5ace1c2dc39 100644 --- a/src/Compiler/xlf/FSComp.txt.fr.xlf +++ b/src/Compiler/xlf/FSComp.txt.fr.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Diminue [for x in xs -> f x] et [|for x in xs -> f x|] aux appels à List.map et Array.map, respectivement lorsque xs est une liste ou un tableau. diff --git a/src/Compiler/xlf/FSComp.txt.ja.xlf b/src/Compiler/xlf/FSComp.txt.ja.xlf index 3c6f07de9d4..04b73c10939 100644 --- a/src/Compiler/xlf/FSComp.txt.ja.xlf +++ b/src/Compiler/xlf/FSComp.txt.ja.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + xs が list または array の場合、[for x in xs -> f x] および [|for x in xs -> f x|] を下げて List.map および Array.map を呼び出します。 diff --git a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf index a2f86aed03f..9356372d275 100644 --- a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf +++ b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Reduz [para x em xs -> f x] e [|para x em xs -> f x|] para chamadas em List.map e Array.map quando xs for uma lista ou uma matriz, respectivamente. diff --git a/src/Compiler/xlf/FSComp.txt.ru.xlf b/src/Compiler/xlf/FSComp.txt.ru.xlf index d362d1424f9..6a08c7ada1a 100644 --- a/src/Compiler/xlf/FSComp.txt.ru.xlf +++ b/src/Compiler/xlf/FSComp.txt.ru.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Понижает [для x в xs -> f x] и [|для x в xs -> f x|] для вызовов List.map и Array.map, если xs является списком или массивом соответственно. From 6e39c0705128f47c461fdb27500bb71c0d19673f Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 11 Apr 2024 04:16:32 -0700 Subject: [PATCH 5/9] Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2428253 --- src/Compiler/xlf/FSComp.txt.de.xlf | 2 +- src/Compiler/xlf/FSComp.txt.es.xlf | 2 +- src/Compiler/xlf/FSComp.txt.it.xlf | 2 +- src/Compiler/xlf/FSComp.txt.ko.xlf | 2 +- src/Compiler/xlf/FSComp.txt.pl.xlf | 2 +- src/Compiler/xlf/FSComp.txt.tr.xlf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Compiler/xlf/FSComp.txt.de.xlf b/src/Compiler/xlf/FSComp.txt.de.xlf index 518b689184a..3875895aed7 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Verringert [für x in xs -> f x] und [|für x in xs -> f x|] für Aufrufe von „List.map“ und „Array.map“, wenn xs eine Liste bzw. ein Array ist. diff --git a/src/Compiler/xlf/FSComp.txt.es.xlf b/src/Compiler/xlf/FSComp.txt.es.xlf index ecb20c16a14..229f3781a88 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Reduce [for x in xs -> f x] y [|for x in xs -> f x|] a las llamadas a List.map y Array.map cuando xs es una lista o una matriz, respectivamente. diff --git a/src/Compiler/xlf/FSComp.txt.it.xlf b/src/Compiler/xlf/FSComp.txt.it.xlf index ae2efc918d9..c5cb0876c15 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Riduce [per x in xs -> f x] e [|per x in xs -> f x|] alle chiamate rispettivamente a List.map e Array.map quando xs è un elenco o una matrice. diff --git a/src/Compiler/xlf/FSComp.txt.ko.xlf b/src/Compiler/xlf/FSComp.txt.ko.xlf index bb947ca39ae..afd1f78ca86 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + xs가 각각 목록 또는 배열인 경우 [for x in xs -> f x] 및 [|for x in xs -> f x|]를 List.map 및 Array.map에 대한 호출로 낮춥니다. diff --git a/src/Compiler/xlf/FSComp.txt.pl.xlf b/src/Compiler/xlf/FSComp.txt.pl.xlf index 12c3b313911..98611ebcc88 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Obniża wartości [dla x w xs -> f x] i [|dla x w xs -> f x|] do wywołań w List.map i Array.map, gdy xs jest odpowiednio listą lub tablicą. diff --git a/src/Compiler/xlf/FSComp.txt.tr.xlf b/src/Compiler/xlf/FSComp.txt.tr.xlf index 5001ea8e2ea..7aab43de9c4 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Xs bir liste veya dizi olduğunda [for x in xs -> f x] ve [|for x in xs -> f x|] çağrılarını sırasıyla List.map ve Array.map olarak indirger. From 5fd33f3173840037a70542f92d45c7d60b6ffeab Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 11 Apr 2024 04:17:37 -0700 Subject: [PATCH 6/9] Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2428253 --- src/Compiler/xlf/FSComp.txt.zh-Hans.xlf | 2 +- src/Compiler/xlf/FSComp.txt.zh-Hant.xlf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf index 69bc4127d49..95715bd1b8a 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + 当 xs 是列表或数组时，将 [for x in xs -> f x] 和 [|for x in xs -> f x|] 分别降级为对 List.map 和 Array.map 的调用。 diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf index 487d6aa4ed7..5b95c7fe99e 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + 當 xs 是清單或陣列時，分別將 [for x in xs -> f x] 和 [|for x in xs -> f x|] 降低至 List.map 和 Array.map 的呼叫。 From ad6b9de8377e8d5c6d77089bdc7898c466334ea7 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 11 Apr 2024 04:24:41 -0700 Subject: [PATCH 7/9] Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2428259 --- src/Compiler/xlf/FSComp.txt.de.xlf | 2 +- src/Compiler/xlf/FSComp.txt.es.xlf | 2 +- src/Compiler/xlf/FSComp.txt.it.xlf | 2 +- src/Compiler/xlf/FSComp.txt.ko.xlf | 2 +- src/Compiler/xlf/FSComp.txt.pl.xlf | 2 +- src/Compiler/xlf/FSComp.txt.tr.xlf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Compiler/xlf/FSComp.txt.de.xlf b/src/Compiler/xlf/FSComp.txt.de.xlf index 518b689184a..3875895aed7 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Verringert [für x in xs -> f x] und [|für x in xs -> f x|] für Aufrufe von „List.map“ und „Array.map“, wenn xs eine Liste bzw. ein Array ist. diff --git a/src/Compiler/xlf/FSComp.txt.es.xlf b/src/Compiler/xlf/FSComp.txt.es.xlf index ecb20c16a14..229f3781a88 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Reduce [for x in xs -> f x] y [|for x in xs -> f x|] a las llamadas a List.map y Array.map cuando xs es una lista o una matriz, respectivamente. diff --git a/src/Compiler/xlf/FSComp.txt.it.xlf b/src/Compiler/xlf/FSComp.txt.it.xlf index ae2efc918d9..c5cb0876c15 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Riduce [per x in xs -> f x] e [|per x in xs -> f x|] alle chiamate rispettivamente a List.map e Array.map quando xs è un elenco o una matrice. diff --git a/src/Compiler/xlf/FSComp.txt.ko.xlf b/src/Compiler/xlf/FSComp.txt.ko.xlf index bb947ca39ae..afd1f78ca86 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + xs가 각각 목록 또는 배열인 경우 [for x in xs -> f x] 및 [|for x in xs -> f x|]를 List.map 및 Array.map에 대한 호출로 낮춥니다. diff --git a/src/Compiler/xlf/FSComp.txt.pl.xlf b/src/Compiler/xlf/FSComp.txt.pl.xlf index 12c3b313911..98611ebcc88 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Obniża wartości [dla x w xs -> f x] i [|dla x w xs -> f x|] do wywołań w List.map i Array.map, gdy xs jest odpowiednio listą lub tablicą. diff --git a/src/Compiler/xlf/FSComp.txt.tr.xlf b/src/Compiler/xlf/FSComp.txt.tr.xlf index 5001ea8e2ea..7aab43de9c4 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + Xs bir liste veya dizi olduğunda [for x in xs -> f x] ve [|for x in xs -> f x|] çağrılarını sırasıyla List.map ve Array.map olarak indirger. From 097bfbca06ef2ce8a4b88ba4e2bd8fc9ce91281e Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 11 Apr 2024 04:25:46 -0700 Subject: [PATCH 8/9] Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2428259 --- src/Compiler/xlf/FSComp.txt.zh-Hans.xlf | 2 +- src/Compiler/xlf/FSComp.txt.zh-Hant.xlf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf index 69bc4127d49..95715bd1b8a 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + 当 xs 是列表或数组时，将 [for x in xs -> f x] 和 [|for x in xs -> f x|] 分别降级为对 List.map 和 Array.map 的调用。 diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf index 487d6aa4ed7..5b95c7fe99e 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -389,7 +389,7 @@ Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. - Lowers [for x in xs -> f x] and [|for x in xs -> f x|] to calls to List.map and Array.map when xs is a list or an array, respectively. + 當 xs 是清單或陣列時，分別將 [for x in xs -> f x] 和 [|for x in xs -> f x|] 降低至 List.map 和 Array.map 的呼叫。 From f9a49675df18d83628c99700bc03b63d5702559b Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 11 Apr 2024 04:47:31 -0700 Subject: [PATCH 9/9] Stop publishing of additional packages (#17016) Co-authored-by: Petr --- eng/Publishing.props | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 eng/Publishing.props diff --git a/eng/Publishing.props b/eng/Publishing.props deleted file mode 100644 index 6a0673b5a51..00000000000 --- a/eng/Publishing.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - -