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

Don't bundle binaries in VisualStudioSetup.Next #11337

Merged
merged 1 commit into from
May 16, 2016
Merged

Don't bundle binaries in VisualStudioSetup.Next #11337

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
7 changes: 3 additions & 4 deletions src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<ImportVSSDKTargets>true</ImportVSSDKTargets>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<CopyNuGetImplementations>true</CopyNuGetImplementations>
<DeployExtension Condition="'$(VisualStudioVersion)' == '14.0'">false</DeployExtension>
Copy link
Member

Choose a reason for hiding this comment

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

Nit: more resilient to use this version:

<DeployExtension Condition="'$(VisualStudioVersion)' == '15.0'">true</DeployExtension>

Accounts for the case where VisualStudioVersion is undefined.

Copy link
Member Author

Choose a reason for hiding this comment

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

We rely on VisualStudioVersion everywhere.

Copy link
Member

Choose a reason for hiding this comment

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

Okay. I've gotten bitten by that in the past. Maybe it's an issue that's since been fixed.

Copy link
Member

Choose a reason for hiding this comment

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

We define it in our core targets if it's unset, because we do rely on it everywhere.

Copy link
Member

Choose a reason for hiding this comment

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

So it is a real problem, we just work around it? Great, not crazy (abotu that)

</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Dependencies\VisualStudio\VisualStudio.csproj">
Expand All @@ -31,12 +32,13 @@
<ProjectReference Include="..\..\EditorFeatures\Next\EditorFeatures.Next.csproj">
<Project>{366BBCDC-B05F-4677-9B5B-78BA816A1484}</Project>
<Name>EditorFeatures.Next</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
</ProjectReference>
<ProjectReference Include="..\Setup\VisualStudioSetup.csproj">
<Name>VisualStudioSetup</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
Expand All @@ -56,9 +58,6 @@
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Setup\ProvideRoslynBindingRedirection.cs">
<Link>ProvideRoslynBindingRedirection.cs</Link>
Expand Down