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

Jump to bottom

Update vsix generation to use latest tools. #1903

Merged
merged 1 commit into from
Dec 7, 2016
Merged

Update vsix generation to use latest tools. #1903

merged 1 commit into from
Dec 7, 2016

Conversation

brettfo
Copy link
Member

@brettfo brettfo commented Nov 30, 2016

No description provided.

@heejaechang
Copy link

@brettfo is it your issue or infrastructure issue?

KevinRansom
KevinRansom approved these changes Nov 30, 2016
View reviewed changes
Copy link
Member

@KevinRansom KevinRansom left a comment

Choose a reason for hiding this comment

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

Looks good

@brettfo
Copy link
Member Author

brettfo commented Nov 30, 2016

@heejaechang Mine to update the tooling in this repo and ideally infrastructure's issue to do the insertion, but since there are other moving parts I'll handle this one end-to-end.

OmarTawfik
OmarTawfik approved these changes Nov 30, 2016
View reviewed changes
build.cmd
@@ -389,7 +389,8 @@ if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\common7\ide\devenv.ex
if exist "%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" set VisualStudioVersion=12.0

:vsversionset
if '%VisualStudioVersion%' == '' echo Error: Could not find an installation of Visual Studio && goto :failure
if "%VisualStudioVersion%" == "" echo Error: Could not find an installation of Visual Studio && goto :failure
if "%VSSDK150INSTALL%" == "" (if "%BUILD_VS%" == "1" echo Error: Could not find an installation of Visual Studio 2015 VSSDK which is required for building VS components && goto :failure)
Copy link
Contributor

Choose a reason for hiding this comment

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

I thought with the move to VSSDK nuget, we shouldnet need this whole version check? we would never use the local VSSDK?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good point. I'll remove this check.

vsintegration/packages.config
<package id="Microsoft.VisualStudio.Language.StandardClassification" version="14.3.25407" targetFramework="net46" />
<package id="Microsoft.VisualStudio.Language.Intellisense" version="14.3.25407" targetFramework="net46" />
<package id="Microsoft.VisualStudio.Language.Intellisense" version="14.3.25407" targetFramework="net46" />
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to update these references in any other packages.config in the rep?

Copy link
Member Author

Choose a reason for hiding this comment

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

VS binding redirects will continue to take care of those until we have RTM packages that we can reference.

@OmarTawfik
Copy link
Contributor

Do we need to update the .vsmanproj to reference the json file produced out of the .vsixproj instead of the .swixproj?

@brettfo
Copy link
Member Author

brettfo commented Nov 30, 2016

The generated .json files have the same name as the old ones so no update to the .vsmanproj is needed.

tinaschrepfer
tinaschrepfer reviewed Nov 30, 2016
View reviewed changes
vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
<ShortcutPath>..\CommonExtensions\Microsoft\FSharp</ShortcutPath>
<PackageId>Microsoft.FSharp.VSIX.Full.Core</PackageId>
<ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
<ExtensionInstallationFolder>Microsoft\FSharp</ExtensionInstallationFolder>
Copy link

Choose a reason for hiding this comment

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

These VSIXes both go to Microsoft\FSharp, which is not allowed. They need to go to different installation folders.

Copy link
Member Author

Choose a reason for hiding this comment

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

These extensions will never be installed at the same time.

tinaschrepfer
tinaschrepfer reviewed Nov 30, 2016
View reviewed changes
vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
<ShortcutPath>..\CommonExtensions\Microsoft\FSharp</ShortcutPath>
<PackageId>Microsoft.FSharp.VSIX.OpenSource.Core</PackageId>
<ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
<ExtensionInstallationFolder>Microsoft\FSharp</ExtensionInstallationFolder>
Copy link

Choose a reason for hiding this comment

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

See comment above.

tinaschrepfer
tinaschrepfer reviewed Nov 30, 2016
View reviewed changes
vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
@@ -5,7 +5,9 @@
<Identity Id="VisualFSharp" Version="15.4.1.0" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
<DisplayName>Visual F# Tools</DisplayName>
<Description xml:space="preserve">Deploy Visual F# Tools templates to Visual Studio</Description>
<ShortcutPath>..\CommonExtensions\Microsoft\FSharp</ShortcutPath>
<PackageId>Microsoft.FSharp.VSIX.Full.Core</PackageId>
<ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
Copy link

Choose a reason for hiding this comment

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

These (ExtensionInstallationFolder and ExtensionInstallationRoot) should be added to the csproj as build properties, not the VSIX manifest.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks, done.

tinaschrepfer
tinaschrepfer reviewed Nov 30, 2016
View reviewed changes
vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
<ShortcutPath>..\CommonExtensions\Microsoft\FSharp</ShortcutPath>
<PackageId>Microsoft.FSharp.VSIX.Web.Core</PackageId>
<ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
<ExtensionInstallationFolder>Microsoft\FSharp</ExtensionInstallationFolder>
Copy link

Choose a reason for hiding this comment

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

See comments above.

@brettfo brettfo changed the title [WIP] Update vsix generation to use latest tools. Update vsix generation to use latest tools. Dec 7, 2016
@brettfo brettfo merged commit 2caa428 into dotnet:master Dec 7, 2016
@brettfo brettfo mentioned this pull request Dec 8, 2016
Merged
@brettfo brettfo deleted the update-vsix-generation branch January 9, 2017 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tinaschrepfer tinaschrepfer tinaschrepfer left review comments

@KevinRansom KevinRansom KevinRansom approved these changes

@OmarTawfik OmarTawfik OmarTawfik approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@brettfo @heejaechang @OmarTawfik @KevinRansom @tinaschrepfer @msftclas