diff options
| author | Matt Ward <matt.ward@microsoft.com> | 2021-09-27 17:22:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 17:22:27 +0300 |
| commit | 66e81934b75c8c131f62ca08caaf0f77f8561cf7 (patch) | |
| tree | 65b8b4cd6e857644b76ab7a048853d0a0c86510f | |
| parent | 0c979e6d769bda97bfba41c29324f727e72e27d8 (diff) | |
[MacSDK] Add F# targets to VisualStudio/v17.0 directory (#21218)
.NET 6 RC 2 adds an MSBuild check to see that the VisualStudioVersion
property is below 17.0 and reports a not supported warning if this is
the case. Updating the VisualStudioVersion to 17.0 used in Visual
Studio for Mac 17.0 to fix this warning breaks F# SDK projects and
classic F# projects since Mono's MSBuild tries to load F# targets
files from a directory which does not exist:
xbuild/Microsoft/VisualStudio/v17.0/FSharp
Adding a v17.0 directory to Mono allows Visual Studio for Mac 17.0
to define VisualStudioVersion to be 17.0 and restore and build F#
projects.
| -rw-r--r-- | packaging/MacSDK/fsharp.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packaging/MacSDK/fsharp.py b/packaging/MacSDK/fsharp.py index 06e947543dc..17addcf3935 100644 --- a/packaging/MacSDK/fsharp.py +++ b/packaging/MacSDK/fsharp.py @@ -98,6 +98,7 @@ class FsharpPackage(GitHubTarballPackage): self.copy_netsdk_files("artifacts/bin/fsc/Release/net472", os.path.join(self.staged_prefix, "lib/mono/xbuild/Microsoft/VisualStudio/v14.0/FSharp")) self.copy_netsdk_files("artifacts/bin/fsc/Release/net472", os.path.join(self.staged_prefix, "lib/mono/xbuild/Microsoft/VisualStudio/v15.0/FSharp")) self.copy_netsdk_files("artifacts/bin/fsc/Release/net472", os.path.join(self.staged_prefix, "lib/mono/xbuild/Microsoft/VisualStudio/v16.0/FSharp")) + self.copy_netsdk_files("artifacts/bin/fsc/Release/net472", os.path.join(self.staged_prefix, "lib/mono/xbuild/Microsoft/VisualStudio/v17.0/FSharp")) self.write_targets_files(os.path.join(self.staged_prefix, "lib/mono/Microsoft F#/v4.0")) self.write_targets_files(os.path.join(self.staged_prefix, "lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0")) @@ -110,6 +111,7 @@ class FsharpPackage(GitHubTarballPackage): self.write_targets_files(os.path.join(self.staged_prefix, "lib/mono/xbuild/Microsoft/VisualStudio/v14.0/FSharp")) self.write_targets_files(os.path.join(self.staged_prefix, "lib/mono/xbuild/Microsoft/VisualStudio/v15.0/FSharp")) self.write_targets_files(os.path.join(self.staged_prefix, "lib/mono/xbuild/Microsoft/VisualStudio/v16.0/FSharp")) + self.write_targets_files(os.path.join(self.staged_prefix, "lib/mono/xbuild/Microsoft/VisualStudio/v17.0/FSharp")) self.write_script(os.path.join(self.staged_prefix, "bin"), "fsharpc", "fsc.exe") self.write_script(os.path.join(self.staged_prefix, "bin"), "fsharpi", "fsi.exe") |