Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd928459

Browse files
committed
build SDK proejcts with the shipped IDE compiler
1 parentf987726 commitd928459

File tree

4 files changed

+35
-1
lines changed

4 files changed

+35
-1
lines changed

‎build/targets/PackageVersions.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<MicrosoftVisualStudioManagedInterfacesPackageVersion>8.0.50727</MicrosoftVisualStudioManagedInterfacesPackageVersion>
3636
<MicrosoftVisualStudioPackageLanguageService150PackageVersion>15.0.26201</MicrosoftVisualStudioPackageLanguageService150PackageVersion>
3737
<MicrosoftVisualStudioProjectAggregatorPackageVersion>8.0.50727</MicrosoftVisualStudioProjectAggregatorPackageVersion>
38+
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
3839
<MicrosoftVisualStudioShell140PackageVersion>14.3.25407</MicrosoftVisualStudioShell140PackageVersion>
3940
<MicrosoftVisualStudioShell150PackageVersion>15.0.26201</MicrosoftVisualStudioShell150PackageVersion>
4041
<MicrosoftVisualStudioShellDesignPackageVersion>15.0.26201</MicrosoftVisualStudioShellDesignPackageVersion>

‎vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<AssetType="Microsoft.VisualStudio.VsPackage"d:Source="File"Path="FSharp.ProjectSystem.PropertyPages.pkgdef" />
4545
<AssetType="Microsoft.VisualStudio.VsPackage"d:Source="File"Path="FSharp.Compiler.Server.Shared.pkgdef" />
4646

47-
<AssetType="Microsoft.VisualStudio.MefComponent"d:Source="Project"d:ProjectName="FSharp.Editor"Path="|FSharp.Editor|"AssemblyName="|FSharp.Editor;AssemblyName|"/>
47+
<AssetType="Microsoft.VisualStudio.MefComponent"d:Source="Project"d:ProjectName="FSharp.Editor"Path="|FSharp.Editor|" />
4848
<AssetType="Microsoft.VisualStudio.Analyzer"d:Source="Project"d:ProjectName="FSharp.Editor"Path="|FSharp.Editor|" />
4949
<AssetType="Microsoft.VisualStudio.MefComponent"d:Source="Project"d:ProjectName="ProjectSystem.Base"Path="|ProjectSystem.Base|" />
5050

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
2+
3+
namespaceMicrosoft.VisualStudio.FSharp.Editor
4+
5+
openSystem.Collections.Immutable
6+
openSystem.ComponentModel.Composition
7+
openSystem.IO
8+
openSystem.Reflection
9+
openSystem.Threading
10+
openSystem.Threading.Tasks
11+
openMicrosoft.VisualStudio.ProjectSystem
12+
openMicrosoft.VisualStudio.ProjectSystem.Build
13+
14+
// We can't use well-known constants here because `string + string` isn't a valid constant expression in F#.
15+
[<AppliesTo("FSharp&LanguageService")>]
16+
[<ExportBuildGlobalPropertiesProvider>]
17+
typeinternalSetGlobalPropertiesForSdkProjects
18+
[<ImportingConstructor>]
19+
(
20+
projectService: IProjectService
21+
)=
22+
inherit StaticGlobalPropertiesProviderBase(projectService.Services)
23+
24+
override__.GetGlobalPropertiesAsync(_cancellationToken:CancellationToken):Task<IImmutableDictionary<string, string>>=
25+
leteditorDirectory= Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
26+
["FSharpPropsShim","Microsoft.FSharp.NetSdk.props"
27+
"FSharpTargetsShim","Microsoft.FSharp.NetSdk.targets"
28+
"FSharpOverridesTargetsShim","Microsoft.FSharp.Overrides.NetSdk.targets"]
29+
|> List.map(fun(key,value)->(key, Path.Combine(editorDirectory, value)))
30+
|> List.fold(fun(map:ImmutableDictionary<string, string>)(key,value)-> map.Add(key, value))(Empty.PropertiesMap)
31+
|> Task.FromResult<IImmutableDictionary<string, string>>

‎vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<CompileInclude="CodeFix\MissingReferenceCodeFixProvider.fs" />
9898
<CompileInclude="CodeFix\FixIndexerAccess.fs" />
9999
<CompileInclude="CodeFix\RenameParamToMatchSignature.fs" />
100+
<CompileInclude="Build\SetGlobalPropertiesForSdkProjects.fs" />
100101
</ItemGroup>
101102

102103
<ItemGroup>
@@ -139,6 +140,7 @@
139140
<PackageReferenceInclude="Microsoft.VisualStudio.LanguageServices"Version="$(MicrosoftVisualStudioLanguageServicesPackageVersion)" />
140141
<PackageReferenceInclude="Microsoft.VisualStudio.Package.LanguageService.15.0"Version="$(MicrosoftVisualStudioPackageLanguageService150PackageVersion)" />
141142
<PackageReferenceInclude="Microsoft.VisualStudio.ProjectAggregator"Version="$(MicrosoftVisualStudioProjectAggregatorPackageVersion)" />
143+
<PackageReferenceInclude="Microsoft.VisualStudio.ProjectSystem.Managed"Version="$(MicrosoftVisualStudioProjectSystemManagedVersion)" />
142144
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Design"Version="$(MicrosoftVisualStudioShellDesignPackageVersion)" />
143145
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.10.0"Version="$(MicrosoftVisualStudioShellImmutable100PackageVersion)" />
144146
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.11.0"Version="$(MicrosoftVisualStudioShellImmutable110PackageVersion)" />

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp