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

Show files in Solution Explorer #20842

Merged
merged 3 commits into from
Jul 13, 2017
Merged

Show files in Solution Explorer #20842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e66f9ea
Remove unnecessary Folder items from project files
sharwell Jul 12, 2017
678f8a7
Show XAML-related files in Solution Explorer
sharwell Jul 11, 2017
9fa3722
Show VSCT files in Solution Explorer
sharwell Jul 12, 2017
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
9 changes: 9 additions & 0 deletions build/Targets/Imports.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,4 +498,13 @@
<AdditionalFiles Include="@(PublicAPI)" />
</ItemGroup>

<!-- CPS doesn't show these items by default, but we want to show them. -->
Copy link
Member

Choose a reason for hiding this comment

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

Aren't these bugs that should be fixed elsewhere?

Copy link
Member Author

Choose a reason for hiding this comment

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

Well technically CPS does add these files as <None> items, but we explicitly disabled that feature. I imagine that this will be addressed by dotnet/project-system#113.

Copy link
Member

Choose a reason for hiding this comment

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

Which one of the chanes disabled displaying that?

Copy link
Member Author

Choose a reason for hiding this comment

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

@jaredpar <EnableDefaultNoneItems>False</EnableDefaultNoneItems>

Copy link
Member

Choose a reason for hiding this comment

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

Looks like @srivatsn added that line here

245012e

Probably need an item to track undoing that + this once we have the right project system fix.

Copy link
Member Author

Choose a reason for hiding this comment

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

➡️ Filed #20863

Copy link
Contributor

Choose a reason for hiding this comment

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

EnableDefaultNoneItems=false is a good thing and shouldn't be disabled. Basically the SDK picks up any file in a given directory and adds it as a None item. This causes some weird issues in the IDE like dotnet/sdk#1157. Basically we shouldn't have done that in the SDK and we should set EnableNoneItems=false by default in the SDK if it wasn't a breaking change.

This change here of adding None globs for the files that we want to show explicitly is preferable.

Note though that once we have WPF support, we would Page items so that line may become unnecessary.

<ItemGroup>
<!-- XAML pages and resources -->
<None Include="@(Page)" />
<None Include="@(Resource)" />

<!-- Special items in VSSDK projects -->
<None Include="@(VSCTCompile)" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
<PackageReference Include="xunit" Version="$(xunitVersion)" />
<PackageReference Include="xunit.runner.console" Version="$(xunitrunnerconsoleVersion)" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions src/EditorFeatures/Core/EditorFeatures.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,5 @@
<PublicAPI Include="PublicAPI.Shipped.txt" />
<PublicAPI Include="PublicAPI.Unshipped.txt" />
</ItemGroup>
<ItemGroup>
<Folder Include="Extensibility\Navigation\" />
</ItemGroup>
<Import Project="..\..\..\build\Targets\Imports.targets" />
</Project>
3 changes: 0 additions & 3 deletions src/Test/Perf/Runner/Perf.Runner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,5 @@
<ProjectReference Include="..\..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj" />
<ProjectReference Include="..\Utilities\Perf.Utilities.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="CPC-Consumption\" />
</ItemGroup>
<Import Project="..\..\..\..\build\Targets\Imports.targets" />
</Project>
3 changes: 0 additions & 3 deletions src/Test/Perf/Utilities/Perf.Utilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,5 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="..\..\..\..\build\Targets\Imports.targets" />
</Project>
3 changes: 0 additions & 3 deletions src/Tools/RepoUtil/RepoUtil.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.6">
<Visible>False</Visible>
Expand Down
3 changes: 0 additions & 3 deletions src/VisualStudio/Core/SolutionExplorerShim/SolutionExplorerShim.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@
<InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities2" />
<InternalsVisibleToTest Include="RoslynETAHost" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="SolutionExplorerShim.resx">
<Generator>ResXFileCodeGenerator</Generator>
Expand Down
3 changes: 0 additions & 3 deletions src/VisualStudio/RemoteHostClientMock/RemoteHostClientMock.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,5 @@
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="..\..\..\build\Targets\Imports.targets" />
</Project>
3 changes: 0 additions & 3 deletions src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,6 @@
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Page Include="VenusMargin\ProjectionBufferMargin.xaml">
<Generator>MSBuild:Compile</Generator>
Expand Down
3 changes: 0 additions & 3 deletions src/Workspaces/CSharp/Portable/CSharpWorkspace.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@
<DependentUpon>CSharpWorkspaceResources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="CodeCleanup\Providers\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="CSharpWorkspaceResources.resx">
<Generator>ResXFileCodeGenerator</Generator>
Expand Down
3 changes: 0 additions & 3 deletions src/Workspaces/CoreTest/ServicesTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Folder Include="Host\Utilities\" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\Compilers\Core\MSBuildTask\Microsoft.CSharp.Core.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down