Skip to content

Commit fde8342

Browse files
tonyhalletttonyhallett
authored
Vs2022 (#196)
1 parent 98daf26 commit fde8342

File tree

166 files changed

+532
-282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+532
-282
lines changed

‎.github/workflows/push_pull.yaml‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
run: |
2121
echo "SOLN=${{env.VSIX_PROJECT}}.sln" >> $GITHUB_ENV
2222
echo "VSIX=${{github.workspace}}\${{env.VSIX_PROJECT}}\bin\${{env.CONFIGURATION}}\${{env.VSIX_PROJECT}}.vsix" >> $GITHUB_ENV # full path required for vsix publish
23+
echo "VSIX2022=${{github.workspace}}\${{env.VSIX_PROJECT}}2022\bin\${{env.CONFIGURATION}}\${{env.VSIX_PROJECT}}2022.vsix" >> $GITHUB_ENV # full path required for vsix publish
2324
- name: checkout
2425
uses: actions/checkout@v2
2526
with:
@@ -43,8 +44,19 @@ jobs:
4344
- name: Set version for Visual Studio Extension
4445
uses: cezarypiatek/[email protected]
4546
with:
46-
version: ${{steps.next-version.outputs.major}}.${{steps.next-version.outputs.minor}}.${{github.run_number}}.${{steps.next-version.outputs.patch}}
47+
version: ${{steps.next-version.outputs.major}}.${{steps.next-version.outputs.minor}}.${{steps.next-version.outputs.patch}}
4748
vsix-manifest-file: ${{env.VSIX_PROJECT}}\source.extension.vsixmanifest
49+
# want this ${{steps.next-version.outputs.major}}.${{steps.next-version.outputs.minor}}.${{github.run_number}}.${{steps.next-version.outputs.patch}}
50+
# but https://github.com/FortuneN/FineCodeCoverage/issues/178
51+
52+
- name: Set version for Visual Studio Extension 2022
53+
uses: cezarypiatek/[email protected]
54+
with:
55+
version: ${{steps.next-version.outputs.major}}.${{steps.next-version.outputs.minor}}.${{steps.next-version.outputs.patch}}
56+
vsix-manifest-file: ${{env.VSIX_PROJECT}}2022\source.extension.vsixmanifest
57+
# want this ${{steps.next-version.outputs.major}}.${{steps.next-version.outputs.minor}}.${{github.run_number}}.${{steps.next-version.outputs.patch}}
58+
# but https://github.com/FortuneN/FineCodeCoverage/issues/178
59+
4860

4961
- name: build vsix
5062
run: |
@@ -63,6 +75,13 @@ jobs:
6375
name: FineCodeCoverage ( zipped vsix)
6476
path: ${{env.VSIX}}
6577

78+
- name: upload vsix 2022
79+
if: github.event_name == 'pull_request' && !github.event.pull_request.draft
80+
uses: actions/upload-artifact@v2
81+
with:
82+
name: FineCodeCoverage2022 ( zipped vsix)
83+
path: ${{env.VSIX2022}}
84+
6685
# push only
6786
- name: create release
6887
if: github.event_name == 'push'
@@ -86,13 +105,35 @@ jobs:
86105
asset_path: ${{env.VSIX}}
87106
asset_name: ${{env.VSIX_PROJECT}}.vsix
88107
asset_content_type: application/zip
108+
109+
- name: Update release asset 2022
110+
if: github.event_name == 'push'
111+
id: upload-release-asset-2022
112+
uses: actions/upload-release-asset@v1
113+
env:
114+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
115+
with:
116+
upload_url: ${{steps.create_release.outputs.upload_url}}
117+
asset_path: ${{env.VSIX2022}}
118+
asset_name: ${{env.VSIX_PROJECT}}2022.vsix
119+
asset_content_type: application/zip
120+
89121
- name: add to marketplace
90122
if: github.event_name == 'push'
91123
uses: mrluje/vs-marketplace-publisher@v2
92124
with:
93125
pat: ${{ secrets.FCC_VS_MARKET_PLACE_PUBLISH_TOKEN }}
94126
manifestPath: ${{github.workspace}}\vs-market-place-manifest.json
95127
vsixPath: ${{env.VSIX}}
128+
129+
- name: add to marketplace 2022
130+
if: github.event_name == 'push'
131+
uses: mrluje/vs-marketplace-publisher@v2
132+
with:
133+
pat: ${{ secrets.FCC_VS_MARKET_PLACE_PUBLISH_TOKEN }}
134+
manifestPath: ${{github.workspace}}\vs-market-place-manifest.json
135+
vsixPath: ${{env.VSIX2022}}
136+
96137
- name: comment - released and added to marketplace
97138
if: github.event_name == 'push'
98139
uses: tonyhallett/[email protected]

‎FineCodeCoverage.sln‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportGeneratorPlugins", "R
2323
EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineCodeCoverageTests", "FineCodeCoverageTests\FineCodeCoverageTests.csproj", "{01F70D01-062D-4391-AF82-8325B22B87AB}"
2525
EndProject
26+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedProject", "SharedProject\SharedProject.shproj", "{9353044C-5D39-4E70-8E78-28213E05217A}"
27+
EndProject
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineCodeCoverage2022", "FineCodeCoverage2022\FineCodeCoverage2022.csproj", "{59A22196-A750-4BA4-B30E-BE1422E68B8E}"
29+
EndProject
2630
Global
31+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
32+
SharedProject\SharedProject.projitems*{31c104bb-d294-4942-b206-896aa7a5fcb9}*SharedItemsImports = 4
33+
SharedProject\SharedProject.projitems*{59a22196-a750-4ba4-b30e-be1422e68b8e}*SharedItemsImports = 4
34+
SharedProject\SharedProject.projitems*{9353044c-5d39-4e70-8e78-28213e05217a}*SharedItemsImports = 13
35+
EndGlobalSection
2736
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2837
Debug|Any CPU = Debug|Any CPU
2938
Release|Any CPU = Release|Any CPU
@@ -41,6 +50,10 @@ Global
4150
{01F70D01-062D-4391-AF82-8325B22B87AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
4251
{01F70D01-062D-4391-AF82-8325B22B87AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
4352
{01F70D01-062D-4391-AF82-8325B22B87AB}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{59A22196-A750-4BA4-B30E-BE1422E68B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{59A22196-A750-4BA4-B30E-BE1422E68B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{59A22196-A750-4BA4-B30E-BE1422E68B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{59A22196-A750-4BA4-B30E-BE1422E68B8E}.Release|Any CPU.Build.0 = Release|Any CPU
4457
EndGlobalSection
4558
GlobalSection(SolutionProperties) = preSolution
4659
HideSolutionNode = FALSE

‎FineCodeCoverage/FineCodeCoverage.csproj‎

Lines changed: 12 additions & 200 deletions
Original file line numberDiff line numberDiff line change
@@ -53,157 +53,6 @@
5353
<WarningLevel>4</WarningLevel>
5454
</PropertyGroup>
5555
<ItemGroup>
56-
<Compile Include="Core\AppDataFolder.cs" />
57-
<Compile Include="Core\Cobertura\Class.cs" />
58-
<Compile Include="Core\Cobertura\Classes.cs" />
59-
<Compile Include="Core\Cobertura\Condition.cs" />
60-
<Compile Include="Core\Cobertura\Conditions.cs" />
61-
<Compile Include="Core\Cobertura\CoverageReport.cs" />
62-
<Compile Include="Core\Cobertura\CoberturaUtil.cs" />
63-
<Compile Include="Core\Cobertura\ICoberturaUtil.cs" />
64-
<Compile Include="Core\Cobertura\Line.cs" />
65-
<Compile Include="Core\Cobertura\Lines.cs" />
66-
<Compile Include="Core\Cobertura\Method.cs" />
67-
<Compile Include="Core\Cobertura\Methods.cs" />
68-
<Compile Include="Core\Cobertura\Package.cs" />
69-
<Compile Include="Core\Cobertura\Packages.cs" />
70-
<Compile Include="Core\Cobertura\Sources.cs" />
71-
<Compile Include="Impl\CoverageColorProvider.cs" />
72-
<Compile Include="Core\CoverageToolOutput\AppOptionsCoverageToolOutputFolderSolutionProvider.cs" />
73-
<Compile Include="Core\CoverageToolOutput\CoverageToolOutputFolderFromSolutionProvider.cs" />
74-
<Compile Include="Core\CoverageToolOutput\FccOutputExistenceCoverageToolOutputFolderSolutionProvider.cs" />
75-
<Compile Include="Core\CoverageToolOutput\ICoverageToolOutputFolderProvider.cs" />
76-
<Compile Include="Core\CoverageToolOutput\ICoverageToolOutputFolderSolutionProvider.cs" />
77-
<Compile Include="Core\CoverageToolOutput\ISolutionFolderProvider.cs" />
78-
<Compile Include="Core\CoverageToolOutput\SolutionFolderProvider.cs" />
79-
<Compile Include="Core\CoverageUIEvents.cs" />
80-
<Compile Include="Core\CoverageUtilManager.cs" />
81-
<Compile Include="Core\Coverlet\Console\CoverletConsoleDotnetToolsGlobalExecutor.cs" />
82-
<Compile Include="Core\Coverlet\Console\CoverletConsoleCustomPathExecutor.cs" />
83-
<Compile Include="Core\Coverlet\Console\CoverletConsoleDotnetToolsLocalExecutor.cs" />
84-
<Compile Include="Core\CoverageToolOutput\ICoverageToolOutputManager.cs" />
85-
<Compile Include="Impl\ICoverageColours.cs" />
86-
<Compile Include="Impl\ICoverageColoursProvider.cs" />
87-
<Compile Include="Core\ICoverageUtilManager.cs" />
88-
<Compile Include="Core\MsTestPlatform\IMsTestPlatformUtil.cs" />
89-
<Compile Include="Core\Utilities\LinqExtensions.cs" />
90-
<Compile Include="Core\Utilities\MEF.cs" />
91-
<Compile Include="Core\Utilities\ReflectionExtensions.cs" />
92-
<Compile Include="Core\Utilities\ToolZip\IToolFolder.cs" />
93-
<Compile Include="Core\Utilities\ToolZip\IToolZipProvider.cs" />
94-
<Compile Include="Core\Utilities\ToolZip\ToolFolder.cs" />
95-
<Compile Include="Core\Utilities\ToolZip\ToolZipProvider.cs" />
96-
<Compile Include="Core\Utilities\DotNet\DotNetConfigFinder.cs" />
97-
<Compile Include="Core\Coverlet\Console\DotNetToolListCoverlet.cs" />
98-
<Compile Include="Core\Utilities\DotNet\DotNetToolListExecutor.cs" />
99-
<Compile Include="Core\Utilities\DotNet\DotNetToolListParser.cs" />
100-
<Compile Include="Core\Coverlet\Console\FCCCoverletConsoleExecutor.cs" />
101-
<Compile Include="Core\Coverlet\Console\ICoverletConsoleExecutor.cs" />
102-
<Compile Include="Core\Utilities\DotNet\IDotNetConfigFinder.cs" />
103-
<Compile Include="Core\Coverlet\Console\IDotNetToolListCoverlet.cs" />
104-
<Compile Include="Core\Utilities\DotNet\IDotNetToolListExecutor.cs" />
105-
<Compile Include="Core\Utilities\DotNet\IDotNetToolListParser.cs" />
106-
<Compile Include="Core\Coverlet\Console\IFCCCoverletConsoleExecutor.cs" />
107-
<Compile Include="Core\Coverlet\DataCollector\CoverletDataCollectorGeneratedCobertura.cs" />
108-
<Compile Include="Core\Coverlet\DataCollector\CoverletDataCollectorUtil.cs" />
109-
<Compile Include="Core\Coverlet\Console\CoverletConsoleUtil.cs" />
110-
<Compile Include="Core\Coverlet\CoverletUtil.cs" />
111-
<Compile Include="Core\Coverlet\DataCollector\DataCollectorSettingsBuilder.cs" />
112-
<Compile Include="Core\Coverlet\DataCollector\DataCollectorSettingsBuilderFactory.cs" />
113-
<Compile Include="Core\Utilities\FileUtil.cs" />
114-
<Compile Include="Core\Coverlet\DataCollector\interfaces\ICoverletDataCollectorGeneratedCobertura.cs" />
115-
<Compile Include="Core\Coverlet\DataCollector\interfaces\ICoverletDataCollectorUtil.cs" />
116-
<Compile Include="Core\Coverlet\Console\ICoverletConsoleUtil.cs" />
117-
<Compile Include="Core\Coverlet\ICoverletUtil.cs" />
118-
<Compile Include="Core\Coverlet\DataCollector\interfaces\IDataCollectorSettingsBuilder.cs" />
119-
<Compile Include="Core\Coverlet\DataCollector\interfaces\IDataCollectorSettingsBuilderFactory.cs" />
120-
<Compile Include="Core\Utilities\IFileUtil.cs" />
121-
<Compile Include="Core\Utilities\IZipFile.cs" />
122-
<Compile Include="Core\Utilities\ZipFileWrapper.cs" />
123-
<Compile Include="Core\Coverlet\DataCollector\interfaces\IRunSettingsCoverletConfiguration.cs" />
124-
<Compile Include="Core\Utilities\IAssemblyUtil.cs" />
125-
<Compile Include="Core\Utilities\IProcessUtil.cs" />
126-
<Compile Include="Core\Utilities\ProcessResponseProcessor.cs" />
127-
<Compile Include="Core\Utilities\IProcessResponseProcessor.cs" />
128-
<Compile Include="Core\Coverlet\DataCollector\interfaces\IRunSettingsCoverletConfigurationFactory.cs" />
129-
<Compile Include="Core\Coverlet\DataCollector\RunSettingsCoverletConfiguration.cs" />
130-
<Compile Include="Core\Coverlet\DataCollector\RunSettingsCoverletConfigurationFactory.cs" />
131-
<Compile Include="Core\EnvironmentVariable.cs" />
132-
<Compile Include="Core\FileSynchronization\FileSynchronization.cs" />
133-
<Compile Include="Core\IAppDataFolder.cs" />
134-
<Compile Include="Core\IEnvironmentVariable.cs" />
135-
<Compile Include="Core\IFCCEngine.cs" />
136-
<Compile Include="Core\IMessageBox.cs" />
137-
<Compile Include="Core\ISourceFileOpener.cs" />
138-
<Compile Include="Core\MessageBoxWrapper.cs" />
139-
<Compile Include="Core\Model\CoverageProjectFactory.cs" />
140-
<Compile Include="Core\Model\ICoverageProject.cs" />
141-
<Compile Include="Core\Model\ICoverageProjectFactory.cs" />
142-
<Compile Include="Core\Model\ReferencedProject.cs" />
143-
<Compile Include="Core\MsTestPlatform\MsTestPlatformUtil.cs" />
144-
<Compile Include="Core\OpenCover\IOpenCoverUtil.cs" />
145-
<Compile Include="Core\ReportGenerator\ReportGeneratorUtil.cs" />
146-
<Compile Include="Core\SourceFileOpener.cs" />
147-
<Compile Include="Core\SVsColorThemeService.cs" />
148-
<Compile Include="Core\Utilities\AssemblyUtil.cs" />
149-
<Compile Include="Core\Model\CoverageLine.cs" />
150-
<Compile Include="Core\Model\CoverageProject.cs" />
151-
<Compile Include="Core\FCCEngine.cs" />
152-
<Compile Include="Core\Utilities\ComparableFile.cs" />
153-
<Compile Include="Core\Utilities\FileComparer.cs" />
154-
<Compile Include="Core\Utilities\FileSystemInfoDeleteExtensions.cs" />
155-
<Compile Include="Core\Utilities\XElementUtil.cs" />
156-
<Compile Include="Core\CoverageToolOutput\CoverageToolOutputManager.cs" />
157-
<Compile Include="Impl\ILogger.cs" />
158-
<Compile Include="Impl\RunSettingsRetriever.cs" />
159-
<Compile Include="Impl\CoverageLineGlyphFactory.cs" />
160-
<Compile Include="Impl\CoverageLineGlyphFactoryProvider.cs" />
161-
<Compile Include="Impl\CoverageLineGlyphTag.cs" />
162-
<Compile Include="Impl\Logger.cs" />
163-
<Compile Include="Impl\TestContainerDiscovery\Container.cs" />
164-
<Compile Include="Impl\TestContainerDiscovery\ContainerData.cs" />
165-
<Compile Include="Impl\TestContainerDiscovery\IInitializer.cs" />
166-
<Compile Include="Impl\TestContainerDiscovery\IInitializeStatusProvider.cs" />
167-
<Compile Include="Impl\TestContainerDiscovery\Initializer.cs" />
168-
<Compile Include="Impl\TestContainerDiscovery\InitializeStatus.cs" />
169-
<Compile Include="Impl\TestContainerDiscovery\IPackageInitializer.cs" />
170-
<Compile Include="Impl\TestContainerDiscovery\ITestOperation.cs" />
171-
<Compile Include="Impl\TestContainerDiscovery\ITestOperationFactory.cs" />
172-
<Compile Include="Impl\TestContainerDiscovery\Operation.cs" />
173-
<Compile Include="Impl\TestContainerDiscovery\PackageInitializer.cs" />
174-
<Compile Include="Impl\TestContainerDiscovery\TestConfiguration.cs" />
175-
<Compile Include="Impl\TestContainerDiscovery\TestOperation.cs" />
176-
<Compile Include="Impl\TestContainerDiscovery\TestOperationFactory.cs" />
177-
<Compile Include="Impl\TestContainerDiscovery\TestRunResponse.cs" />
178-
<Compile Include="Impl\Vsix.cs" />
179-
<Compile Include="Impl\CoverageLineGlyphTagger.cs" />
180-
<Compile Include="Impl\CoverageLineGlyphTaggerProvider.cs" />
181-
<Compile Include="Impl\TestContainerDiscovery\TestContainerDiscoverer.cs" />
182-
<Compile Include="Core\OpenCover\OpenCoverUtil.cs" />
183-
<Compile Include="Options\AppOptions.cs">
184-
<SubType>Component</SubType>
185-
</Compile>
186-
<Compile Include="Options\AppOptionsProvider.cs" />
187-
<Compile Include="Options\IAppOptions.cs" />
188-
<Compile Include="Options\IAppOptionsProvider.cs" />
189-
<Compile Include="Options\IAppOptionsStorageProvider.cs" />
190-
<Compile Include="Output\ClearUICommand.cs" />
191-
<Compile Include="Output\IProcess.cs" />
192-
<Compile Include="Output\OutputToolWindow.cs" />
193-
<Compile Include="Output\OutputToolWindowCommand.cs" />
194-
<Compile Include="Output\OutputToolWindowContext.cs" />
195-
<Compile Include="Output\OutputToolWindowControl.xaml.cs">
196-
<DependentUpon>OutputToolWindowControl.xaml</DependentUpon>
197-
</Compile>
198-
<Compile Include="Output\OutputToolWindowPackage.cs" />
199-
<Compile Include="Output\OutputToolWindowPackage1.cs">
200-
<AutoGen>True</AutoGen>
201-
<DesignTime>True</DesignTime>
202-
<DependentUpon>OutputToolWindowPackage.vsct</DependentUpon>
203-
</Compile>
204-
<Compile Include="Core\Utilities\ProcessUtil.cs" />
205-
<Compile Include="Output\ProcessWrapper.cs" />
206-
<Compile Include="Output\ScriptManager.cs" />
20756
<Compile Include="Properties\AssemblyInfo.cs" />
20857
<Compile Include="source.extension.cs">
20958
<AutoGen>True</AutoGen>
@@ -216,38 +65,17 @@
21665
<Link>Resources\logo.png</Link>
21766
<IncludeInVSIX>true</IncludeInVSIX>
21867
</Content>
219-
<Content Include="..\Art\Options-Global.png">
220-
<Link>Resources\Options-Global.png</Link>
221-
</Content>
222-
<Content Include="..\Art\Options-Project.png">
223-
<Link>Resources\Options-Project.png</Link>
224-
</Content>
225-
<Content Include="..\Art\Output-Coverage.png">
226-
<Link>Resources\Output-Coverage.png</Link>
227-
<IncludeInVSIX>true</IncludeInVSIX>
228-
</Content>
229-
<Content Include="..\Art\Output-RiskHotspots.png">
230-
<Link>Resources\Output-RiskHotspots.png</Link>
231-
<IncludeInVSIX>true</IncludeInVSIX>
232-
</Content>
233-
<Content Include="..\Art\Output-Summary.png">
234-
<Link>Resources\Output-Summary.png</Link>
235-
<IncludeInVSIX>true</IncludeInVSIX>
236-
</Content>
23768
<Content Include="..\Art\preview-subject.png">
23869
<Link>Resources\preview-subject.png</Link>
23970
<IncludeInVSIX>true</IncludeInVSIX>
24071
</Content>
241-
<Content Include="..\Art\preview-test.png">
242-
<Link>Resources\preview-test.png</Link>
243-
<IncludeInVSIX>true</IncludeInVSIX>
244-
</Content>
24572
<Content Include="..\LICENSE">
24673
<Link>Resources\LICENSE</Link>
24774
<IncludeInVSIX>true</IncludeInVSIX>
24875
</Content>
249-
<Content Include="Output\Resources\ClearUICommand.png" />
250-
<Content Include="Output\Resources\OutputToolWindowCommand.png" />
76+
<Content Include="ZippedTools\coverlet.collector.3.0.3.zip">
77+
<IncludeInVSIX>true</IncludeInVSIX>
78+
</Content>
25179
<Content Include="ZippedTools\coverlet.console.3.0.3.zip">
25280
<IncludeInVSIX>true</IncludeInVSIX>
25381
</Content>
@@ -260,19 +88,18 @@
26088
<Content Include="ZippedTools\reportGenerator.4.7.1.zip">
26189
<IncludeInVSIX>true</IncludeInVSIX>
26290
</Content>
263-
<VSCTCompile Include="Output\OutputToolWindowPackage.vsct">
264-
<Generator>VsctGenerator</Generator>
91+
<VSCTCompile Include="..\Shared Files\OutputToolWindowPackage.vsct">
92+
<Link>OutputToolWindowPackage.vsct</Link>
26593
<ResourceName>Menus.ctmenu</ResourceName>
266-
<LastGenOutput>OutputToolWindowPackage1.cs</LastGenOutput>
26794
</VSCTCompile>
268-
<Content Include="ZippedTools\coverlet.collector.3.0.3.zip">
95+
<Content Include="..\Shared Files\Resources\ClearUICommand.png">
96+
<Link>Resources\ClearUICommand.png</Link>
97+
<IncludeInVSIX>true</IncludeInVSIX>
98+
</Content>
99+
<Content Include="..\Shared Files\Resources\OutputToolWindowCommand.png">
100+
<Link>Resources\OutputToolWindowCommand.png</Link>
269101
<IncludeInVSIX>true</IncludeInVSIX>
270102
</Content>
271-
<None Include="Output\Resources\OutputToolWindowCommand.png.x" />
272-
<Content Include="Output\Resources\OutputToolWindowPackage.ico" />
273-
<None Include="..\.editorconfig">
274-
<Link>.editorconfig</Link>
275-
</None>
276103
<!--
277104
<None Include="Key.snk" />
278105
-->
@@ -292,9 +119,6 @@
292119
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild">
293120
<Version>3.8.0</Version>
294121
</PackageReference>
295-
<PackageReference Include="Microsoft.TestPlatform.TestHost">
296-
<Version>16.8.3</Version>
297-
</PackageReference>
298122
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.206" ExcludeAssets="runtime">
299123
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
300124
</PackageReference>
@@ -334,26 +158,14 @@
334158
<Reference Include="System.Xml.Linq" />
335159
<Reference Include="WindowsBase" />
336160
</ItemGroup>
337-
<ItemGroup>
338-
<Page Include="Output\OutputToolWindowControl.xaml">
339-
<SubType>Designer</SubType>
340-
<Generator>MSBuild:Compile</Generator>
341-
</Page>
342-
</ItemGroup>
343-
<ItemGroup>
344-
<EmbeddedResource Include="Output\VSPackage.resx">
345-
<MergeWithCTO>true</MergeWithCTO>
346-
<ManifestResourceName>VSPackage</ManifestResourceName>
347-
<SubType>Designer</SubType>
348-
</EmbeddedResource>
349-
</ItemGroup>
350161
<ItemGroup>
351162
<ProjectReference Include="..\ReportGeneratorPlugins\ReportGeneratorPlugins.csproj">
352163
<Project>{14fb668b-4b70-41e4-964b-405e5c9a6a58}</Project>
353164
<Name>ReportGeneratorPlugins</Name>
354165
</ProjectReference>
355166
</ItemGroup>
356167
<ItemGroup />
168+
<Import Project="..\SharedProject\SharedProject.projitems" Label="Shared" />
357169
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
358170
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
359171
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

0 commit comments

Comments
 (0)