Граф коммитов

8431 Коммитов

Автор SHA1 Сообщение Дата
Jason Imison bd679b037c
Merge pull request #43 from xamarin/dev/nosami/fix-1088740
Remove automatic project reordering
2022-06-21 12:56:30 +01:00
nosami 3815881cff Remove automatic project reordering
It caused more problems than it solves.

Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1088740
2022-06-21 11:42:29 +01:00
iain f1c88c3ef4
Merge pull request #42 from xamarin/dev/iain/remove-gtk-icon-size
[Gtk] Update to match new ImageService API without Gtk.IconSize
2022-05-17 11:18:37 +01:00
iain holmes a30af9c022 [Gtk] Update to match new ImageService API without Gtk.IconSize 2022-05-11 12:00:09 +01:00
Jason Imison 09f59ddc29
Merge pull request #41 from xamarin/dev/marshall/gettextcatalog
Use gettextcatalog with hardcoded strings
2022-05-02 15:03:15 +01:00
David Wengier 15815321bc
Merge pull request #37 from xamarin/dev/dawengie/Options
Respond to options changes in Roslyn
2022-05-02 07:28:32 +10:00
marshall-lerner 1580a8380a
Update InteractivePad.fs
Switch to use Gettextcatalog with the string contained so that it gets picked up by "make update-po"
2022-04-28 12:18:52 -04:00
David Wengier 16f201cfea Respond to options changes in Roslyn 2022-03-29 17:12:15 +11:00
Jason Imison 55df533a82
Merge pull request #40 from xamarin/fsi-remove-mono-dependency
Don't depend on targets installed by Mono
2022-03-24 09:45:42 +00:00
nosami b29a9f68f4 Don't depend on targets installed by Mono 2022-03-24 09:44:03 +00:00
Jason Imison 4b50f51366
Merge pull request #38 from xamarin/dev/therzok/fsharp-editor-references-unify
Remove .netframework references in F# editor and use dotnet version ones
2022-03-15 15:34:50 +00:00
Jason Imison f032847b0c
Merge pull request #39 from xamarin/dev/nosami/fix-1469789
Remove FSharp.addin.xml as EmbeddedResource
2022-03-10 11:48:54 +00:00
nosami c343bc9b8a Remove FSharp.addin.xml as EmbeddedResource
as it is being added twice

Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1469789/
2022-03-10 11:47:30 +00:00
Marius Ungureanu 5cf5de24ba Make it actually reference the dlls for System nugets 2022-03-09 16:43:38 +02:00
Marius Ungureanu e234559885 Reference Mono.ADdins from nuget 2022-03-09 16:43:38 +02:00
Marius Ungureanu 548b7206df This kept getting out of sync with vsmac, so remove it as it's inherited as submodule 2022-03-09 16:43:38 +02:00
Marius Ungureanu c607405d2d Remove .netframework references in F# editor and use dotnet version ones 2022-03-09 16:43:38 +02:00
Jason Imison 627941f537
Merge pull request #36 from xamarin/dev/sandy/mono-addins-refs
Remove references to old mono-addins submodule
2022-02-24 18:23:48 +00:00
Sandy Armstrong 43c7c707c4 Remove references to old mono-addins submodule 2022-02-24 10:18:12 -08:00
Jason Imison 7199a4516a
Merge pull request #35 from xamarin/dev/nosami/fix-1473378
Dev/nosami/fix 1473378
2022-02-24 14:32:26 +00:00
nosami c94e35bb7a Rearrange to remove exceptions and remove dead code 2022-02-22 10:03:59 +00:00
nosami 4a1b95b6f7 Session is optional 2022-02-20 02:04:21 +00:00
nosami eb6a020182 Create empty text view immediately 2022-02-20 01:55:34 +00:00
nosami 03c5768b21 Delay fsi session until PadContentShown 2022-02-20 01:33:39 +00:00
Jason Imison a3172fabe2
Merge pull request #34 from xamarin/dev/nosami/fix-fcs-M1
Use modified FCS to use byte arrays instead of memory mapped files
2022-02-16 15:10:32 +00:00
nosami d59febdb89 Use modified FCS to use byte arrays instead of memory mapped files 2022-02-14 16:01:30 +00:00
Jason Imison 4c833f8aac
Merge pull request #33 from xamarin/dev/nosami/fix-1468334
Fixes System.ArgumentOutOfRangeException_Microsoft.VisualStudio.Text.…
2022-02-04 12:19:17 +00:00
nosami a31413fc2d Fixes System.ArgumentOutOfRangeException_Microsoft.VisualStudio.Text.Data.dll_.ctor
Fixes https://dev.azure.com/devdiv/DevDiv/_workitems/edit/1468334
2022-02-04 12:17:33 +00:00
Jason Imison 724664513a
Merge pull request #32 from xamarin/dev/nosami/fix-1471445
Dev/nosami/fix 1471445
2022-02-03 13:51:40 +00:00
nosami d55d0cb0a7 Use FSharpCompletionServiceWithProviders instead of CompletionServiceWithProviders
CompletionServiceWithProviders is now internal in Roslyn

Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1471445/
2022-02-03 13:47:19 +00:00
nosami 435d5f19d8 Revert "Use FSharpCompletionServiceWithProvider"
This reverts commit 71adf97c2d.
2022-02-03 13:37:06 +00:00
Jason Imison 31191ca8ba
Merge pull request #31 from xamarin/dev/nosami/fix-1469801
Dev/nosami/fix 1469801
2022-02-02 19:05:38 +00:00
Jason Imison a687bf52da
Merge pull request #18 from xamarin/pr-dawengie-roslyn-4.1.0-1.21526.33
Use FSharpCompletionServiceWithProvider
2022-02-01 15:56:51 +00:00
nosami f32cfca81a Add resource logical name 2022-02-01 15:42:32 +00:00
nosami 5223c747a2 Add resource logical name 2022-02-01 15:37:35 +00:00
Jason Imison 56c0fa9314
Merge pull request #30 from xamarin/dev/sandy/PackageDownload
Build: Use PackageDownload instead of DownloadNupkg
2022-01-17 09:48:40 +00:00
Sandy Armstrong ba984235d0 Build: Use PackageDownload instead of DownloadNupkg
See https://github.com/xamarin/vsmac/pull/5642

This simplifies the restore process and the build.
2022-01-16 06:57:01 -08:00
Jason Imison c6e2fc6c2b
Merge pull request #29 from xamarin/dev/nosami/fsi-dotnet-launch
Use dotnet to launch F# Interactive
2022-01-11 23:14:10 +00:00
nosami b26d7ddc69 Use dotnet to launch F# Interactive 2022-01-11 23:07:37 +00:00
David Wengier 3580e6265e Remove old project reference 2022-01-11 14:40:06 +11:00
David Wengier f1e300ad3c Merge remote-tracking branch 'origin/net6' into pr-dawengie-roslyn-4.1.0-1.21526.33 2022-01-11 14:34:45 +11:00
Jason Imison 04cd354904
Merge pull request #27 from xamarin/dev/sandy/novsplatref
FSharp.Editor.fsproj: Remove VS-Platform proj ref
2022-01-03 15:54:25 +00:00
Sandy Armstrong 2cf333ab89
FSharp.Editor.fsproj: Remove VS-Platform proj ref
This causes build issues if somebody still has a VS-Platform submodule in their checkout.
2022-01-03 06:58:24 -08:00
Jason Imison 30e38b5bca
Merge pull request #26 from xamarin/dev/therzok/fsharp-xammac-net6
Remove explicit Xamarin.Mac.dll reference from the F# extension
2021-12-17 15:18:23 +00:00
Marius Ungureanu 9094da9fd8 Some more minor cleanups 2021-12-17 14:02:03 +02:00
Marius Ungureanu eefb708f04 Small cleanup in the project file 2021-12-17 13:55:43 +02:00
Marius Ungureanu 0cd03c24f2 Allow VSMac to set implicit target framework here 2021-12-17 13:52:51 +02:00
Jason Imison 2bf2db7e31
Merge pull request #25 from xamarin/dev/therzok/fsharp-warnings
Fix warning spam when building
2021-12-13 14:18:39 +00:00
Marius Ungureanu 5178ee2fb8
Fix warning spam when building
```
/Users/builder/azdo/_work/1/s/main/external/fsharp-editor/vsintegration/src/FSharp.Editor/unknown(1,1): warning FS3384: The .NET SDK for this script could not be determined. If the script is in a directory using a 'global.json' then ensure the relevant .NET SDK is installed. The output from '/usr/local/share/dotnet/dotnet --version' in the directory '/Users/builder/azdo/_work/1/s/main/external/fsharp-editor/vsintegration/src/FSharp.Editor' was: 'Could not execute because the application was not found or a compatible .NET SDK is not installed.Possible reasons for this include:  * You intended to execute a .NET program:      The application '--version' does not exist.  * You intended to execute a .NET SDK command:      A compatible installed .NET SDK for global.json version [5.0.100] from [/Users/builder/azdo/_work/1/s/main/external/fsharp-editor/global.json] was not found.      Install the [5.0.100] .NET SDK or update [/Users/builder/azdo/_work/1/s/main/external/fsharp-editor/global.json] with an installed .NET SDK:' and the exit code was '145'. [/Users/builder/azdo/_work/1/s/main/external/fsharp-editor/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj]
```

Bump the SDK version to avoid this.
2021-12-13 02:00:28 +02:00
Jason Imison 9594339d85
Merge pull request #23 from xamarin/dev/kirillo/fixFSharpMEF
Remove two types from MEF that were causing MEF errors
2021-12-10 09:32:52 +00:00