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

Commitcae1da3

Browse files
KevinRansomdsyme
authored andcommitted
Improve package definition specs fro F# VS Package (#3461)
1 parent22d3b16 commitcae1da3

File tree

7 files changed

+9
-36
lines changed

7 files changed

+9
-36
lines changed

‎src/FSharpSource.Settings.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
<UseMicroBuild>true</UseMicroBuild>
5555
<UseSourceLink Condition =" '$(UseSourceLink)' == '' AND '$(Configuration)'=='Release'">false</UseSourceLink>
5656
<UseGatherBinaries>true</UseGatherBinaries>
57-
<AddVsSdkAttributesToSomeCoreComponents>true</AddVsSdkAttributesToSomeCoreComponents>
5857
<VsSDKInstallCondition=" '$(VsSDKInstall)' == ''">$(MSBuildThisFileDirectory)..\packages\$(VSSDK_BUILDTOOLS_VERSION)\tools\vssdk</VsSDKInstall>
5958
<VsSDKToolPathCondition=" '$(VsSDKToolPath)' == ''">$(MSBuildThisFileDirectory)..\packages\$(VSSDK_BUILDTOOLS_VERSION)\tools\vssdk\bin</VsSDKToolPath>
6059
<VsSDKTargetsCondition=" '$(VsSDKTargets)' == ''">$(MSBuildThisFileDirectory)..\packages\$(VSSDK_BUILDTOOLS_VERSION)\tools\vssdk\Microsoft.VsSDK.targets</VsSDKTargets>

‎src/fsharp/FSharp.Compiler.Server.Shared/AssemblyInfo.fs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,3 @@ do()
2121
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
2222
[<assembly:ComVisible(false)>]
2323
do()
24-
25-
#if HAVE_VS_SDK
26-
// This Visual Studio-specific attribute is needed on this DLL because for historical reasons it shipped as part of the Visual F# IDE Tools rather than this F# SDK
27-
[<assembly: Microsoft.VisualStudio.Shell.ProvideCodeBase(CodeBase=@"$PackageFolder$\FSharp.Compiler.Server.Shared.dll")>]
28-
do()
29-
#endif
30-

‎src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,7 @@
1212
<ProjectGuid>{d5870cf0-ed51-4cbc-b3d7-6f56da84ac06}</ProjectGuid>
1313
<OutputType>Library</OutputType>
1414
<AssemblyName>FSharp.Compiler.Server.Shared</AssemblyName>
15-
<ImportVSSDKTargets>true</ImportVSSDKTargets>
16-
<CreateVsixContainer>false</CreateVsixContainer>
17-
<DeployExtension>false</DeployExtension>
18-
<UseCodebase>true</UseCodebase>
19-
<GeneratePkgDefFile>true</GeneratePkgDefFile>
20-
<IncludePkgdefInVSIXContainer>true</IncludePkgdefInVSIXContainer>
2115
<TargetFrameworkVersionCondition="'$(TargetDotnetProfile)' != 'coreclr'">v4.6</TargetFrameworkVersion>
22-
<DefineConstantsCondition="'$(AddVsSdkAttributesToSomeCoreComponents)' == 'true'">$(DefineConstants);HAVE_VS_SDK</DefineConstants>
2316
</PropertyGroup>
2417
<ItemGroup>
2518
<CompileInclude="AssemblyInfo.fs" />
@@ -32,15 +25,6 @@
3225
<ReferenceInclude="mscorlib" />
3326
<ReferenceInclude="System" />
3427
<ReferenceInclude="System.Runtime.Remoting" />
35-
<ReferenceInclude="Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion), Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"Condition="'$(AddVsSdkAttributesToSomeCoreComponents)' == 'true'">
36-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).dll</HintPath>
37-
</Reference>
38-
<ReferenceInclude="Microsoft.VisualStudio.Shell.Framework"Condition="'$(AddVsSdkAttributesToSomeCoreComponents)' == 'true'">
39-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Framework.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
40-
</Reference>
41-
<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"Condition="'$(AddVsSdkAttributesToSomeCoreComponents)' == 'true'">
42-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
43-
</Reference>
4428
</ItemGroup>
4529
<ItemGroup>
4630
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
@@ -49,7 +33,6 @@
4933
</ProjectReference>
5034
</ItemGroup>
5135
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
52-
<ImportProject="$(VsSDKInstall)\Microsoft.VsSDK.targets"Condition="'$(AddVsSdkAttributesToSomeCoreComponents)' == 'true'"/>
5336

5437
<TargetName="GatherBinariesToBeSigned"AfterTargets="Localize"Condition="'$(UseGatherBinaries)' == 'true'">
5538
<ItemGroup>

‎vsintegration/Vsix/RegisterFsharpPackage.pkgdef‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77
"Name"="F#"
88
@="{871d2a70-12a2-4e42-9440-425dd92a4116}"
99

10-
[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{e847195f-56ff-fbc3-d0f2-f7254fb9439c}]
11-
"Name"="FSharp.Core"
12-
"PublicKeyToken"="b03f5f7f11d50a3a"
13-
"OldVersion"="2.0.0.0-4.4.0.0"
14-
"NewVersion"="4.4.1.0"
15-
"Culture"="neutral"
16-
"codeBase"="$PackageFolder$\FSharp.Core.dll"
17-
1810
[$RootKey$\Editors\{8a5aa6cf-46e3-4520-a70a-7393d15233e9}\LogicalViews]
1911
"{7651a700-06e5-11d1-8ebd-00a0c90f26ea}"=""
2012
"{7651a701-06e5-11d1-8ebd-00a0c90f26ea}"=""

‎vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj">
120120
<Project>{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}</Project>
121121
<Name>FSharp.Compiler.Server.Shared</Name>
122-
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
122+
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
123123
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
124124
<Private>True</Private>
125125
</ProjectReference>

‎vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj">
119119
<Project>{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}</Project>
120120
<Name>FSharp.Compiler.Server.Shared</Name>
121-
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
121+
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
122122
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
123123
<Private>True</Private>
124124
</ProjectReference>

‎vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,15 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
3939
openMicrosoft.VisualStudio.Editors
4040
openMicrosoft.VisualStudio.Editors.PropertyPages
4141
openMicrosoft.VisualStudio.PlatformUI
42-
42+
4343
openEnvDTE
4444

45+
[<assembly:ProvideCodeBase(AssemblyName="FSharp.Compiler.Private", CodeBase=@"$PackageFolder$\FSharp.Compiler.Private.dll")>]
46+
[<assembly:ProvideCodeBase(AssemblyName="FSharp.Compiler.Server.Shared", CodeBase=@"$PackageFolder$\FSharp.Compiler.Server.Shared.dll")>]
47+
[<assembly:ProvideCodeBase(AssemblyName="FSharp.UIResources", CodeBase=@"$PackageFolder$\FSharp.UIResources.dll")>]
48+
[<assembly:ProvideBindingRedirection(AssemblyName="FSharp.Core", OldVersionLowerBound="2.0.0.0", OldVersionUpperBound="4.4.0.0", NewVersion="4.4.1.0", CodeBase=@"$PackageFolder$\FSharp.Core.dll")>]
49+
do()
50+
4551
moduleinternalVSHiveUtilities=
4652
/// For a given sub-hive, check to see if a 3rd party has specified any
4753
/// custom/extended property pages.

0 commit comments

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