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

Commit369c538

Browse files
authored
Merge pull request #4922 from brettfo/editor-compiler
Add the compiler to the regular IDE package.
2 parentsa1f2f80 +d928459 commit369c538

File tree

7 files changed

+65
-3
lines changed

7 files changed

+65
-3
lines changed

‎build/targets/PackageVersions.props‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<MicrosoftBuildOverallPackagesVersion>15.6.85</MicrosoftBuildOverallPackagesVersion>
2020
<MicrosoftBuildPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildPackageVersion>
2121
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildFrameworkPackageVersion>
22-
<MicrosoftBuildTasksPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildTasksPackageVersion>
22+
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildTasksCorePackageVersion>
2323
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
2424
<MicrosoftVisualFSharpMSBuild150PackageVersion>1.0.1</MicrosoftVisualFSharpMSBuild150PackageVersion>
2525

@@ -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>
@@ -61,9 +62,11 @@
6162
<MicrosoftCompositionPackageVersion>1.0.30</MicrosoftCompositionPackageVersion>
6263
<MicrosoftDiaSymReaderPdb2PdbPackageVersion>1.1.0-roslyn-62714-01</MicrosoftDiaSymReaderPdb2PdbPackageVersion>
6364
<MicrosoftMSXMLPackageVersion>8.0.0-alpha</MicrosoftMSXMLPackageVersion>
65+
<MicrosoftVisualFSharpTypeProvidersRedistPackageVersion>1.0.0</MicrosoftVisualFSharpTypeProvidersRedistPackageVersion>
6466
<NewtonsoftJsonPackageVersion>9.0.1</NewtonsoftJsonPackageVersion>
6567
<NUnitPackageVersion>3.5.0</NUnitPackageVersion>
6668
<XliffTasksPackageVersion>0.2.0-beta-000081</XliffTasksPackageVersion>
69+
6770
</PropertyGroup>
6871

6972
<!-- dependency uptake version overrides-->

‎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

‎vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,21 @@
3333
<Link>packages\System.ValueTuple.4.4.0.nupkg</Link>
3434
<IncludeInVSIX>true</IncludeInVSIX>
3535
</Content>
36+
<ContentInclude="$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Type.Providers.Redist\$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion)\content\4.3.0.0\FSharp.Data.TypeProviders.dll">
37+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
38+
<Link>FSharp.Data.TypeProviders.dll</Link>
39+
<IncludeInVSIX>true</IncludeInVSIX>
40+
</Content>
3641
</ItemGroup>
3742

3843
<ItemGroup>
44+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\FSharp.Build.fsproj">
45+
<Project>{702A7979-BCF9-4C41-853E-3ADFC9897890}</Project>
46+
<Name>FSharp.Build</Name>
47+
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
48+
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
49+
<Private>True</Private>
50+
</ProjectReference>
3951
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
4052
<Project>{649FA588-F02E-457C-9FCF-87E46407481E}</Project>
4153
<Name>FSharp.Compiler.Interactive.Settings</Name>
@@ -78,6 +90,13 @@
7890
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
7991
<Private>True</Private>
8092
</ProjectReference>
93+
<ProjectReferenceInclude="..\..\..\src\fsharp\Fsc\Fsc.fsproj">
94+
<Project>{C94C257C-3C0A-4858-B5D8-D746498D1F08}</Project>
95+
<Name>fsc</Name>
96+
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
97+
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
98+
<Private>True</Private>
99+
</ProjectReference>
81100
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Editor\FSharp.Editor.fsproj">
82101
<Project>{65e0e82a-eace-4787-8994-888674c2fe87}</Project>
83102
<Name>FSharp.Editor</Name>
@@ -193,6 +212,11 @@
193212
</ItemGroup>
194213

195214
<ItemGroup>
215+
<PackageReferenceInclude="Microsoft.Build"Version="$(MicrosoftBuildPackageVersion)"ExcludeAssets="all" />
216+
<PackageReferenceInclude="Microsoft.Build.Framework"Version="$(MicrosoftBuildFrameworkPackageVersion)"ExcludeAssets="all" />
217+
<PackageReferenceInclude="Microsoft.Build.Tasks.Core"Version="$(MicrosoftBuildTasksCorePackageVersion)"ExcludeAssets="all" />
218+
<PackageReferenceInclude="Microsoft.Build.Utilities.Core"Version="$(MicrosoftBuildUtilitiesCorePackageVersion)"ExcludeAssets="all" />
219+
<PackageReferenceInclude="Microsoft.VisualFSharp.Type.Providers.Redist"Version="$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion)" />
196220
<PackageReferenceInclude="Newtonsoft.Json"Version="$(NewtonsoftJsonPackageVersion)" />
197221
</ItemGroup>
198222

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)" />

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/Utilities.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,8 @@ public static Microsoft.Build.Evaluation.Project InitializeMsBuildProject(Micros
742742
buildProject.IsBuildEnabled=true;
743743
}
744744

745+
buildProject.SetProperty("FSharpTargetsPath",Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),"Microsoft.FSharp.targets"));
746+
745747
returnbuildProject;
746748
}
747749

‎vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
<PackageReferenceInclude="EnvDTE80"Version="$(EnvDTE80PackageVersion)" />
179179
<PackageReferenceInclude="Microsoft.Build"Version="$(MicrosoftBuildPackageVersion)"ExcludeAssets="all" />
180180
<PackageReferenceInclude="Microsoft.Build.Framework"Version="$(MicrosoftBuildFrameworkPackageVersion)"ExcludeAssets="all" />
181-
<PackageReferenceInclude="Microsoft.Build.Tasks.Core"Version="$(MicrosoftBuildTasksPackageVersion)"ExcludeAssets="all" />
181+
<PackageReferenceInclude="Microsoft.Build.Tasks.Core"Version="$(MicrosoftBuildTasksCorePackageVersion)"ExcludeAssets="all" />
182182
<PackageReferenceInclude="Microsoft.Build.Utilities.Core"Version="$(MicrosoftBuildUtilitiesCorePackageVersion)"ExcludeAssets="all" />
183183
<PackageReferenceInclude="Microsoft.CodeAnalysis.EditorFeatures"Version="$(MicrosoftCodeAnalysisEditorFeaturesPackageVersion)" />
184184
<PackageReferenceInclude="Microsoft.CodeAnalysis.EditorFeatures.Text"Version="$(MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)" />

0 commit comments

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