Skip to content

Commit 5b17929

Browse files
mhoumannmhoumann
committed
Using Shared project
1 parent c4a559c commit 5b17929

11 files changed

+71
-43
lines changed

‎CommentsPlus.sln

+8-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.31205.134
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommentsPlus", "CommentsPlus.csproj", "{32E82793-0D5E-4EF7-8344-FF9FD80F678F}"
7-
EndProject
86
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{61E5FC7C-6EF0-4B4C-9569-6332FB02336D}"
97
ProjectSection(SolutionItems) = preProject
108
.editorconfig = .editorconfig
119
EndProjectSection
1210
EndProject
11+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommentsPlus", "CommentsPlus16\CommentsPlus.csproj", "{32E82793-0D5E-4EF7-8344-FF9FD80F678F}"
12+
EndProject
13+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CommentsPlusShared", "CommentsPlusShared.shproj", "{3E4BAC08-24C7-4C05-8683-E8109183D72B}"
14+
EndProject
1315
Global
16+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
17+
CommentsPlusShared.projitems*{32e82793-0d5e-4ef7-8344-ff9fd80f678f}*SharedItemsImports = 4
18+
CommentsPlusShared.projitems*{3e4bac08-24c7-4c05-8683-e8109183d72b}*SharedItemsImports = 13
19+
EndGlobalSection
1420
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1521
Debug|Any CPU = Debug|Any CPU
1622
Release|Any CPU = Release|Any CPU

‎CommentsPlus.csproj ‎CommentsPlus16/CommentsPlus.csproj

+25-41
Original file line numberDiff line numberDiff line change
@@ -49,41 +49,18 @@
4949
<DeployExtension>True</DeployExtension>
5050
</PropertyGroup>
5151
<ItemGroup>
52-
<Compile Include="CommentClassifier\Classifications.cs" />
53-
<Compile Include="CommentClassifier\CommentTagger.cs" />
54-
<Compile Include="ExtensionMethods\ExtensionMethods.cs" />
55-
<Compile Include="ItalicComments\FormatMapWatcher.cs" />
56-
<Compile Include="ItalicComments\ViewCreationListener.cs" />
57-
<Compile Include="Properties\AssemblyInfo.cs" />
58-
</ItemGroup>
59-
<ItemGroup>
60-
<Content Include="comments-plus-t-icon.png">
61-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
62-
<IncludeInVSIX>true</IncludeInVSIX>
63-
</Content>
64-
<Content Include="readme.rtf">
52+
<None Include="..\README.md">
53+
<Link>README.md</Link>
54+
</None>
55+
<Content Include="..\Shared\readme.rtf">
56+
<Link>readme.rtf</Link>
6557
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6658
<IncludeInVSIX>true</IncludeInVSIX>
6759
</Content>
68-
<None Include="README.md" />
6960
<None Include="source.extension.vsixmanifest">
7061
<SubType>Designer</SubType>
7162
</None>
7263
</ItemGroup>
73-
<ItemGroup>
74-
<Content Include="comments-plus-icon.png">
75-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
76-
<IncludeInVSIX>true</IncludeInVSIX>
77-
</Content>
78-
<Content Include="comments-plus-screenshot.png">
79-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
80-
<IncludeInVSIX>true</IncludeInVSIX>
81-
</Content>
82-
<Content Include="ms-pl.txt">
83-
<IncludeInVSIX>true</IncludeInVSIX>
84-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
85-
</Content>
86-
</ItemGroup>
8764
<ItemGroup>
8865
<Reference Include="PresentationCore" />
8966
<Reference Include="PresentationFramework" />
@@ -94,24 +71,31 @@
9471
<Reference Include="WindowsBase" />
9572
</ItemGroup>
9673
<ItemGroup>
97-
<None Include="Samples\Sample2.ts" />
98-
<None Include="Samples\Class1.vb" />
99-
<None Include="Samples\HTMLPage1.html" />
100-
<None Include="Samples\python_class1.py" />
101-
<None Include="Samples\samplescript.ps1" />
102-
<None Include="Samples\Script2.js" />
103-
<None Include="Samples\XMLFile1.xml" />
74+
<PackageReference Include="Microsoft.VisualStudio.SDK">
75+
<Version>15.0.1</Version>
76+
</PackageReference>
10477
</ItemGroup>
10578
<ItemGroup>
106-
<None Include="Samples\samplepage.xaml">
107-
<SubType>Designer</SubType>
108-
</None>
79+
<Content Include="..\Shared\comments-plus-screenshot.png">
80+
<Link>comments-plus-screenshot.png</Link>
81+
<IncludeInVSIX>true</IncludeInVSIX>
82+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
83+
</Content>
84+
<Content Include="..\Shared\comments-plus-t-icon.png">
85+
<Link>comments-plus-t-icon.png</Link>
86+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
87+
<IncludeInVSIX>true</IncludeInVSIX>
88+
</Content>
89+
<Content Include="..\Shared\ms-pl.txt">
90+
<Link>ms-pl.txt</Link>
91+
<IncludeInVSIX>true</IncludeInVSIX>
92+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
93+
</Content>
10994
</ItemGroup>
11095
<ItemGroup>
111-
<PackageReference Include="Microsoft.VisualStudio.SDK">
112-
<Version>15.0.1</Version>
113-
</PackageReference>
96+
<Folder Include="Properties\" />
11497
</ItemGroup>
98+
<Import Project="..\CommentsPlusShared.projitems" Label="Shared" />
11599
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
116100
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
117101
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎source.extension.vsixmanifest ‎CommentsPlus16/source.extension.vsixmanifest

File renamed without changes.

‎CommentsPlusShared.projitems

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5+
<HasSharedItems>true</HasSharedItems>
6+
<SharedGUID>3e4bac08-24c7-4c05-8683-e8109183d72b</SharedGUID>
7+
</PropertyGroup>
8+
<PropertyGroup Label="Configuration">
9+
<Import_RootNamespace>CommentsPlus</Import_RootNamespace>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<Compile Include="$(MSBuildThisFileDirectory)Properties\AssemblyInfo.cs" />
13+
<Compile Include="$(MSBuildThisFileDirectory)CommentClassifier\Classifications.cs" />
14+
<Compile Include="$(MSBuildThisFileDirectory)CommentClassifier\CommentTagger.cs" />
15+
<Compile Include="$(MSBuildThisFileDirectory)ExtensionMethods\ExtensionMethods.cs" />
16+
<Compile Include="$(MSBuildThisFileDirectory)ItalicComments\FormatMapWatcher.cs" />
17+
<Compile Include="$(MSBuildThisFileDirectory)ItalicComments\ViewCreationListener.cs" />
18+
</ItemGroup>
19+
<ItemGroup>
20+
<Folder Include="$(MSBuildThisFileDirectory)Properties\" />
21+
<Folder Include="$(MSBuildThisFileDirectory)CommentClassifier\" />
22+
<Folder Include="$(MSBuildThisFileDirectory)ExtensionMethods\" />
23+
<Folder Include="$(MSBuildThisFileDirectory)ItalicComments\" />
24+
</ItemGroup>
25+
</Project>

‎CommentsPlusShared.shproj

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Label="Globals">
4+
<ProjectGuid>3e4bac08-24c7-4c05-8683-e8109183d72b</ProjectGuid>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
6+
</PropertyGroup>
7+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
8+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
9+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
10+
<PropertyGroup />
11+
<Import Project="CommentsPlusShared.projitems" Label="Shared" />
12+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
13+
</Project>

‎comments-plus-icon.png ‎Shared/comments-plus-icon.png

File renamed without changes.

‎comments-plus-screenshot.png ‎Shared/comments-plus-screenshot.png

File renamed without changes.

‎comments-plus-t-icon.png ‎Shared/comments-plus-t-icon.png

File renamed without changes.

‎cp-screenshot-white.png ‎Shared/cp-screenshot-white.png

File renamed without changes.

‎ms-pl.txt ‎Shared/ms-pl.txt

File renamed without changes.

‎readme.rtf ‎Shared/readme.rtf

File renamed without changes.

0 commit comments

Comments
 (0)