Skip to content
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.

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

Merge release/dev17.10 to release/dev17.11 #17033

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5bdd8bb
reset realsig
KevinRansom Apr 10, 2024
90a81d7
Merge pull request #17022 from KevinRansom/mefexports
vzarytovskii Apr 11, 2024
0d60517
Fix MEF issues with options
vzarytovskii Apr 10, 2024
f68c1ea
Update azure-pipelines.yml
vzarytovskii Apr 11, 2024
3f571c2
Merge pull request #17026 from dotnet/backport/pr-17015-to-release/de…
vzarytovskii Apr 11, 2024
e3c0f43
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Apr 11, 2024
6e39c07
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Apr 11, 2024
5fd33f3
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Apr 11, 2024
ad6b9de
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Apr 11, 2024
097bfbc
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Apr 11, 2024
f9a4967
Stop publishing of additional packages (#17016)
NikolaMilosavljevic Apr 11, 2024
0a9eade
Merge branch 'release/dev17.10' into locfiles/3110e97f-0951-49a2-b264…
vzarytovskii Apr 11, 2024
ac0bb27
Merge branch 'release/dev17.10' into locfiles/5b1c53cd-8fe9-43e5-9674…
vzarytovskii Apr 11, 2024
f688a4c
Merge pull request #17029 from dotnet/locfiles/3110e97f-0951-49a2-b26…
vzarytovskii Apr 11, 2024
21d8d0a
Merge branch 'release/dev17.10' into locfiles/5b1c53cd-8fe9-43e5-9674…
vzarytovskii Apr 11, 2024
dd74905
Merge pull request #17028 from dotnet/locfiles/5b1c53cd-8fe9-43e5-967…
vzarytovskii Apr 11, 2024
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
3 changes: 2 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
Don't use it explicitly when building with plain .NET (without Proto or Arcade).
-->
<OtherFlags Condition="'$(Configuration)' != 'Proto' and '$(TestingLegacyInternalSignature)' != 'true'">$(OtherFlags) --realsig-</OtherFlags>
<OtherFlags Condition="'$(Configuration)' != 'Proto' and '$(TestingLegacyInternalSignature)' == 'true'">$(OtherFlags) --realsig+</OtherFlags>
<!-- TBD: Fix MEF Export visibility issues in VS -->
<OtherFlags Condition="'$(Configuration)' != 'Proto' and '$(TestingLegacyInternalSignature)' == 'true'">$(OtherFlags) --realsig-</OtherFlags>

</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 0 additions & 13 deletions eng/Publishing.props

This file was deleted.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.cs.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.de.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.es.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.fr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.it.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.ja.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.ko.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.pl.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.pt-BR.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.ru.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.tr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.zh-Hans.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.zh-Hant.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/Options/EditorOptions.fs
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ type EditorOptions() =
member _.Formatting: FormattingOptions = store.Get()

[<Export(typeof<SettingsStore.ISettingsStore>)>]
member private _.SettingsStore = store
member _.SettingsStore = store

member _.With value = store.Register value

Expand Down
Loading