Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix vsix redirects #6416

Merged
merged 1 commit into from
Apr 2, 2019
Merged

Fix vsix redirects #6416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions vsintegration/Vsix/RegisterFsharpPackage.pkgdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,42 +62,42 @@
[$RootKey$\CLSID\{e1194663-db3c-49eb-8b45-276fcdc440ea}]
"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL"
"Class"="Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpBuildPropertyPage"
"Assembly"="FSharp.ProjectSystem.FSharp, Version=15.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"Assembly"="FSharp.ProjectSystem.FSharp, Version=15.9.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ThreadingModel"="Both"
@="Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpBuildPropertyPage"

[$RootKey$\CLSID\{6d2d9b56-2691-4624-a1bf-d07a14594748}]
"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL"
"Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpApplicationPropPageComClass"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.9.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ThreadingModel"="Both"
@="Microsoft.VisualStudio.Editors.PropertyPages.FSharpApplicationPropPageComClass"

[$RootKey$\CLSID\{dd84aa8f-71bb-462a-8ef8-c9992cb325b7}]
"InprocServer32"="$System$mscoree.dll"
"Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpBuildEventsPropPageComClass"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.9.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ThreadingModel"="Both"
@="Microsoft.VisualStudio.Editors.PropertyPages.FSharpBuildEventsPropPageComClass"

[$RootKey$\CLSID\{fac0a17e-2e70-4211-916a-0d34fb708bff}]
"InprocServer32"="$System$mscoree.dll"
"Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpBuildPropPageComClass"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.9.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ThreadingModel"="Both"
@="Microsoft.VisualStudio.Editors.PropertyPages.FSharpBuildPropPageComClass"

[$RootKey$\CLSID\{9cfbeb2a-6824-43e2-bd3b-b112febc3772}]
"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL"
"Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpDebugPropPageComClass"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.9.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ThreadingModel"="Both"
@="Microsoft.VisualStudio.Editors.PropertyPages.FSharpDebugPropPageComClass"

[$RootKey$\CLSID\{df16b1a2-0e91-4499-ae60-c7144e614bf1}]
"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL"
"Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpReferencePathsPropPageComClass"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.9.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ThreadingModel"="Both"
@="Microsoft.VisualStudio.Editors.PropertyPages.FSharpReferencePathsPropPageComClass"

Expand Down
5 changes: 0 additions & 5 deletions vsintegration/src/FSharp.Editor/Common/AssemblyInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ namespace Microsoft.VisualStudio.FSharp.Editor

open Microsoft.VisualStudio.Shell

[<assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\FSharp.Editor.dll")>]
[<assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\FSharp.UIResources.dll")>]

do()

// This is needed to load XAML resource dictionaries from FSharp.UIResources assembly because ProvideCodeBase attribute does not work for that purpose.
// This adds $PackageFolder$ to the directories probed for assemblies to load.
// The attribute is inexplicably class-targeted, hence the dummy class.
Expand Down
13 changes: 13 additions & 0 deletions vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,17 @@
<PackageReference Include="VSSDK.VSLangProj" Version="$(VSSDKVSLangProjPackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
</ItemGroup>

<ItemGroup>
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideCodeBaseAttribute">
<AssemblyName>FSharp.Editor</AssemblyName>
<Version>$(VSAssemblyVersion)</Version>
<CodeBase>$PackageFolder$\FSharp.Editor.dll</CodeBase>
</AssemblyAttribute>
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideCodeBaseAttribute">
<AssemblyName>FSharp.UIResources</AssemblyName>
<Version>$(VSAssemblyVersion)</Version>
<CodeBase>$PackageFolder$\FSharp.UIResources.dll</CodeBase>
</AssemblyAttribute>
</ItemGroup>

</Project>
8 changes: 8 additions & 0 deletions vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,12 @@
<PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
</ItemGroup>

<ItemGroup>
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideCodeBaseAttribute">
<AssemblyName>FSharp.LanguageService.Base</AssemblyName>
<Version>$(VSAssemblyVersion)</Version>
<CodeBase>$PackageFolder$\FSharp.LanguageService.Base.dll</CodeBase>
</AssemblyAttribute>
</ItemGroup>

</Project>
2 changes: 0 additions & 2 deletions vsintegration/src/FSharp.LanguageService.Base/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,3 @@
[assembly: Guid("1EB3E293-6A40-4480-8FE6-7436C4879CA4")]

[assembly: CLSCompliant(true)]

[assembly: Microsoft.VisualStudio.Shell.ProvideCodeBase (CodeBase = @"$PackageFolder$\FSharp.LanguageService.Base.dll")]
11 changes: 0 additions & 11 deletions vsintegration/src/FSharp.LanguageService/AssemblyInfo.fs
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<GenerateSource>true</GenerateSource>
<GeneratedModuleName>Microsoft.VisualStudio.FSharp.LanguageService.Strings</GeneratedModuleName>
</EmbeddedResource>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="LanguageServiceConstants.fs" />
<Compile Include="Error.fs" />
<Compile Include="Vs.fs" />
Expand Down Expand Up @@ -85,4 +84,12 @@
<PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
</ItemGroup>

<ItemGroup>
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideCodeBaseAttribute">
<AssemblyName>FSharp.LanguageService</AssemblyName>
<Version>$(VSAssemblyVersion)</Version>
<CodeBase>$PackageFolder$\FSharp.LanguageService.dll</CodeBase>
</AssemblyAttribute>
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion vsintegration/src/FSharp.ProjectSystem.Base/Project/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
using System.Runtime.InteropServices;

[assembly:ComVisible(false)]
[assembly: Microsoft.VisualStudio.Shell.ProvideCodeBase(CodeBase = @"$PackageFolder$\FSharp.ProjectSystem.Base.dll")]
8 changes: 8 additions & 0 deletions vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@
<PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
</ItemGroup>

<ItemGroup>
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideCodeBaseAttribute">
<AssemblyName>FSharp.ProjectSystem.Base</AssemblyName>
<Version>$(VSAssemblyVersion)</Version>
<CodeBase>$PackageFolder$\FSharp.ProjectSystem.Base.dll</CodeBase>
</AssemblyAttribute>
</ItemGroup>

<Target Name="HACK_AddAliasToMicrosoftVisualStudioShell140" BeforeTargets="CoreCompile">
<ItemGroup>
<!--
Expand Down
11 changes: 0 additions & 11 deletions vsintegration/src/FSharp.ProjectSystem.FSharp/AssemblyInfo.fs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem

open EnvDTE

[<assembly:ProvideCodeBase(AssemblyName = "FSharp.Compiler.Private", CodeBase = @"$PackageFolder$\FSharp.Compiler.Private.dll")>]
[<assembly:ProvideCodeBase(AssemblyName = "FSharp.Compiler.Server.Shared", CodeBase = @"$PackageFolder$\FSharp.Compiler.Server.Shared.dll")>]
[<assembly:ProvideCodeBase(AssemblyName = "FSharp.UIResources", CodeBase = @"$PackageFolder$\FSharp.UIResources.dll")>]
do ()

module internal VSHiveUtilities =
/// For a given sub-hive, check to see if a 3rd party has specified any
/// custom/extended property pages.
Expand Down
40 changes: 32 additions & 8 deletions vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<ManifestResourceName>VSPackage</ManifestResourceName>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="ProjectPrelude.fs" />
<Compile Include="WaitDialog.fs" />
<Compile Include="MSBuildUtilities.fs" />
Expand All @@ -42,25 +41,50 @@
</ItemGroup>

<ItemGroup>
<AssemblyLevelAttribute Include="Microsoft.VisualStudio.Shell.ProvideBindingRedirectionAttribute">
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideBindingRedirectionAttribute">
<AssemblyName>FSharp.Core</AssemblyName>
<OldVersionLowerBound>2.0.0.0</OldVersionLowerBound>
<OldVersionUpperBound>$(FSCoreVersion)</OldVersionUpperBound>
<NewVersion>$(FSCoreVersion)</NewVersion>
<CodeBase>$PackageFolder$\FSharp.Core.dll</CodeBase>
</AssemblyLevelAttribute>
<AssemblyLevelAttribute Include="Microsoft.VisualStudio.Shell.ProvideBindingRedirectionAttribute">
</AssemblyAttribute>
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideBindingRedirectionAttribute">
<AssemblyName>FSharp.ProjectSystem.FSharp</AssemblyName>
<OldVersionLowerBound>15.0.0.0</OldVersionLowerBound>
<OldVersionUpperBound>$(VSAssemblyVersion)</OldVersionUpperBound>
<NewVersion>$(VSAssemblyVersion)</NewVersion>
</AssemblyLevelAttribute>
<AssemblyLevelAttribute Include="Microsoft.VisualStudio.Shell.ProvideBindingRedirectionAttribute">
</AssemblyAttribute>
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideBindingRedirectionAttribute">
<AssemblyName>FSharp.ProjectSystem.PropertyPages</AssemblyName>
<OldVersionLowerBound>15.0.0.0</OldVersionLowerBound>
<OldVersionUpperBound>$(VSAssemblyVersion)</OldVersionUpperBound>
<NewVersion>$(VSAssemblyVersion)</NewVersion>
</AssemblyLevelAttribute>
</AssemblyAttribute>

<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideCodeBaseAttribute">
<AssemblyName>FSharp.Core</AssemblyName>
<Version>$(FSCoreVersion)</Version>
<CodeBase>$PackageFolder$\FSharp.Core.dll</CodeBase>
</AssemblyAttribute>
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideCodeBaseAttribute">
<AssemblyName>FSharp.ProjectSystem.FSharp</AssemblyName>
<Version>$(VSAssemblyVersion)</Version>
<CodeBase>$PackageFolder$\FSharp.ProjectSystem.FSharp.dll</CodeBase>
</AssemblyAttribute>
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideCodeBaseAttribute">
<AssemblyName>FSharp.Compiler.Private</AssemblyName>
<Version>$(FSProductVersion)$(_BuildNumberSuffix)</Version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the difference in assembly suffix? $(VSAssemblyVersion) vs $(FSProductVersion)$(_BuildNumberSuffix).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VSAssemblyVersion is 15.9.0.0
$(FSProductVersion)$(_BuildNumberSuffix) 10.2.3.0

<CodeBase>$PackageFolder$\FSharp.Compiler.Private.dll</CodeBase>
</AssemblyAttribute>
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideCodeBaseAttribute">
<AssemblyName>FSharp.Compiler.Server.Shared</AssemblyName>
<CodeBase>$PackageFolder$\FSharp.Compiler.Server.Shared.dll</CodeBase>
<Version>$(FSProductVersion)$(_BuildNumberSuffix)</Version>
</AssemblyAttribute>
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideCodeBaseAttribute">
<AssemblyName>FSharp.UIResources</AssemblyName>
<Version>$(VSAssemblyVersion)</Version>
<CodeBase>$PackageFolder$\FSharp.UIResources.dll</CodeBase>
</AssemblyAttribute>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions vsintegration/src/FSharp.VS.FSI/AssemblyInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,5 @@ open System.Runtime.InteropServices
open Microsoft.VisualStudio.Shell

[<assembly: AssemblyCulture("")>]
[<assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\FSharp.VS.FSI.dll")>]

do()

8 changes: 8 additions & 0 deletions vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,12 @@
<PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
</ItemGroup>

<ItemGroup>
<AssemblyAttribute Include="Microsoft.VisualStudio.Shell.ProvideCodeBaseAttribute">
<AssemblyName>FSharp.VS.FSI.Base</AssemblyName>
<Version>$(VSAssemblyVersion)</Version>
<CodeBase>$PackageFolder$\FSharp.VS.FSI.dll</CodeBase>
</AssemblyAttribute>
</ItemGroup>

</Project>