added support for VS2022 while keeping VS2019 intact

eberthold · Aug 4, 2021 · 4eed9bc · 4eed9bc · eberthold · Aug 4, 2021
1 parent 07a5374
commit 4eed9bc
Show file tree

Hide file tree

Showing 110 changed files with 2,070 additions and 248 deletions.
diff --git a/Source/Steroids.sln b/Source/Steroids.sln
diff --git a/....CodeStructure/Properties/AssemblyInfo.cs → ....CodeStructure/Properties/AssemblyInfo.cs b/....CodeStructure/Properties/AssemblyInfo.cs → ....CodeStructure/Properties/AssemblyInfo.cs
diff --git a/...tructure/Properties/Resources.Designer.cs → ...tructure/Properties/Resources.Designer.cs b/...tructure/Properties/Resources.Designer.cs → ...tructure/Properties/Resources.Designer.cs
diff --git a/...S.CodeStructure/Properties/Resources.resx → ...S.CodeStructure/Properties/Resources.resx b/...S.CodeStructure/Properties/Resources.resx → ...S.CodeStructure/Properties/Resources.resx
diff --git a/...Structure/Properties/Settings.Designer.cs → ...Structure/Properties/Settings.Designer.cs b/...Structure/Properties/Settings.Designer.cs → ...Structure/Properties/Settings.Designer.cs
diff --git a/...odeStructure/Properties/Settings.settings → ...odeStructure/Properties/Settings.settings b/...odeStructure/Properties/Settings.settings → ...odeStructure/Properties/Settings.settings
diff --git a/...Structure/SteroidsVS.CodeStructure.csproj → ...Structure/SteroidsVS.CodeStructure.csproj b/...Structure/SteroidsVS.CodeStructure.csproj → ...Structure/SteroidsVS.CodeStructure.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E6451202-C6F6-4E47-86F1-2745FB353758}</ProjectGuid>
+    <ProjectGuid>{9AD45BA0-FA8F-42C5-A7FA-17D410F69995}</ProjectGuid>
     <OutputType>library</OutputType>
     <RootNamespace>SteroidsVS.CodeStructure</RootNamespace>
     <AssemblyName>SteroidsVS.CodeStructure</AssemblyName>
@@ -38,7 +38,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\..\SteroidsVs.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\SteroidsVs.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -59,33 +59,6 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Controls\SelectionHintControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Resources\ModuleResourceDictionary.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="UI\CodeStructureView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Adorners\CodeStructureAdorner.cs" />
-    <Compile Include="Adorners\ICodeStructureAdorner.cs" />
-    <Compile Include="Controls\IndicatorButton.cs" />
-    <Compile Include="Controls\SelectionHintControl.xaml.cs">
-      <DependentUpon>SelectionHintControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Monikers\TypeDescriptorMonikerConverter.cs" />
-    <Compile Include="Monikers\TypeDescriptorMonikerNameResolver.cs" />
-    <Compile Include="Monikers\TypeDescriptorMonikerResolver.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -99,38 +72,28 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="Resources\ModuleResourceDictionary.xaml.cs">
-      <DependentUpon>ModuleResourceDictionary.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Text\TextSpanExtensions.cs" />
-    <Compile Include="UI\CodeStructureSpaceReservation.cs" />
-    <Compile Include="UI\CodeStructureView.xaml.cs">
-      <DependentUpon>CodeStructureView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="UI\LevelToThicknessConverter.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="..\..\SteroidsVs.snk">
+    <None Include="..\..\..\SteroidsVs.snk">
       <Link>SteroidsVs.snk</Link>
     </None>
-    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\BusinessLogic\CodeAnalysis\Steroids.Roslyn\Steroids.Roslyn.csproj">
+    <ProjectReference Include="..\..\..\BusinessLogic\CodeAnalysis\Steroids.Roslyn\Steroids.Roslyn.csproj">
       <Project>{c02f84ae-8614-443d-b38c-cbae226bac77}</Project>
       <Name>Steroids.Roslyn</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\BusinessLogic\CodeStructure\Steroids.CodeStructure\Steroids.CodeStructure.csproj">
+    <ProjectReference Include="..\..\..\BusinessLogic\CodeStructure\Steroids.CodeStructure\Steroids.CodeStructure.csproj">
       <Project>{1406F7C6-80FE-4EE2-A651-7432C0EF9CD2}</Project>
       <Name>Steroids.CodeStructure</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\BusinessLogic\Core\Steroids.Core\Steroids.Core.csproj">
+    <ProjectReference Include="..\..\..\BusinessLogic\Core\Steroids.Core\Steroids.Core.csproj">
       <Project>{D43C1A42-A6B0-4F1B-8637-79DAACAAE487}</Project>
       <Name>Steroids.Core</Name>
     </ProjectReference>
@@ -166,5 +129,6 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+  <Import Project="..\..\Shared\SteroidsVs.CodeStructure\SteroidsVs.CodeStructure.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/...idsVS.SharedUI/Properties/AssemblyInfo.cs → ...idsVS.SharedUI/Properties/AssemblyInfo.cs b/...idsVS.SharedUI/Properties/AssemblyInfo.cs → ...idsVS.SharedUI/Properties/AssemblyInfo.cs
diff --git a/...idsVS.SharedUI/SteroidsVS.SharedUI.csproj → ...idsVS.SharedUI/SteroidsVS.SharedUI.csproj b/...idsVS.SharedUI/SteroidsVS.SharedUI.csproj → ...idsVS.SharedUI/SteroidsVS.SharedUI.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{58AC3D8F-294E-4389-8A93-570AE6C45808}</ProjectGuid>
+    <ProjectGuid>{7B19258E-102F-4AB5-B955-977E529A9A00}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Steroids.SharedUI</RootNamespace>
@@ -34,7 +34,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\..\SteroidsVs.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\SteroidsVs.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
@@ -55,26 +55,12 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Behaviors\MouseOverPopupBehavior.cs" />
-    <Compile Include="Converters\DiagnosticLevelToBrushConverter.cs" />
-    <Compile Include="Editor\IWpfTextViewExtensions.cs" />
-    <Compile Include="Resources\ModuleResourceDictionary.xaml.cs">
-      <DependentUpon>ModuleResourceDictionary.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Resources\ModuleResourceDictionary.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\SteroidsVs.snk">
+    <None Include="..\..\..\SteroidsVs.snk">
       <Link>SteroidsVs.snk</Link>
     </None>
-    <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis">
@@ -106,5 +92,6 @@
       <Version>1.7.0</Version>
     </PackageReference>
   </ItemGroup>
+  <Import Project="..\..\Shared\SteroidsVs.SharedUI\SteroidsVs.SharedUI.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/...dio/SteroidsVS/Assets/SteroidsVS.afdesign → ...teroidsVS.Vsix/Assets/SteroidsVS.afdesign b/...dio/SteroidsVS/Assets/SteroidsVS.afdesign → ...teroidsVS.Vsix/Assets/SteroidsVS.afdesign
diff --git a/...dio/SteroidsVS/Assets/SteroidsVS_icon.png → ...teroidsVS.Vsix/Assets/SteroidsVS_icon.png b/...dio/SteroidsVS/Assets/SteroidsVS_icon.png → ...teroidsVS.Vsix/Assets/SteroidsVS_icon.png
diff --git a/.../SteroidsVS/Assets/SteroidsVS_preview.png → ...oidsVS.Vsix/Assets/SteroidsVS_preview.png b/.../SteroidsVS/Assets/SteroidsVS_preview.png → ...oidsVS.Vsix/Assets/SteroidsVS_preview.png
diff --git a/...dio/SteroidsVS/Properties/AssemblyInfo.cs → ...teroidsVS.Vsix/Properties/AssemblyInfo.cs b/...dio/SteroidsVS/Properties/AssemblyInfo.cs → ...teroidsVS.Vsix/Properties/AssemblyInfo.cs
diff --git a/...teroidsVS/Resources/SteroidsVsPackage.ico → ...dsVS.Vsix/Resources/SteroidsVsPackage.ico b/...teroidsVS/Resources/SteroidsVsPackage.ico → ...dsVS.Vsix/Resources/SteroidsVsPackage.ico
diff --git a/...VisualStudio/SteroidsVS/SteroidsVS.csproj → ...19/SteroidsVS.Vsix/SteroidsVS.Vsix.csproj b/...VisualStudio/SteroidsVS/SteroidsVS.csproj → ...19/SteroidsVS.Vsix/SteroidsVS.Vsix.csproj
@@ -13,7 +13,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\..\SteroidsVs.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\SteroidsVs.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -56,23 +56,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="CodeAdornments\CodeAdornmentsTextViewCreationListener.cs" />
-    <Compile Include="CodeAdornments\CodeAdornmentsBootstrapper.cs" />
-    <Compile Include="Bootstrapper.cs" />
-    <Compile Include="CodeAdornments\CodeStructureOpenCommand.cs" />
-    <Compile Include="Editor\FoldingManagerAdapter.cs" />
-    <Compile Include="Editor\WpfTextViewAdapter.cs" />
-    <Compile Include="Services\ActiveTextViewProvider.cs" />
-    <Compile Include="Contracts\IVsServiceProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\DispatcherService.cs" />
-    <Compile Include="Services\DispatcherServiceFactory.cs" />
-    <Compile Include="Services\IActiveTextViewProvider.cs" />
-    <Compile Include="Services\VsServiceProvider.cs" />
-    <Compile Include="SteroidsVsPackage.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\SteroidsVs.snk">
+    <None Include="..\..\..\SteroidsVs.snk">
       <Link>SteroidsVs.snk</Link>
     </None>
     <None Include="app.config" />
@@ -111,34 +98,34 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\BusinessLogic\CodeAnalysis\Steroids.Roslyn\Steroids.Roslyn.csproj">
+    <ProjectReference Include="..\..\..\BusinessLogic\CodeAnalysis\Steroids.Roslyn\Steroids.Roslyn.csproj">
       <Project>{C02F84AE-8614-443D-B38C-CBAE226BAC77}</Project>
       <Name>Steroids.Roslyn</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\BusinessLogic\CodeQuality\Steroids.CodeQuality\Steroids.CodeQuality.csproj">
+    <ProjectReference Include="..\..\..\BusinessLogic\CodeQuality\Steroids.CodeQuality\Steroids.CodeQuality.csproj">
       <Project>{8e125506-818b-40e4-adfb-6238c2a49ac7}</Project>
       <Name>Steroids.CodeQuality</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\BusinessLogic\CodeStructure\Steroids.CodeStructure\Steroids.CodeStructure.csproj">
+    <ProjectReference Include="..\..\..\BusinessLogic\CodeStructure\Steroids.CodeStructure\Steroids.CodeStructure.csproj">
       <Project>{1406f7c6-80fe-4ee2-a651-7432c0ef9cd2}</Project>
       <Name>Steroids.CodeStructure</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\BusinessLogic\Core\Steroids.Core\Steroids.Core.csproj">
+    <ProjectReference Include="..\..\..\BusinessLogic\Core\Steroids.Core\Steroids.Core.csproj">
       <Project>{d43c1a42-a6b0-4f1b-8637-79daacaae487}</Project>
       <Name>Steroids.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SteroidsVS.SharedUI\SteroidsVS.SharedUI.csproj">
-      <Project>{58ac3d8f-294e-4389-8a93-570ae6c45808}</Project>
-      <Name>Steroids.SharedUI</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\SteroidsVS.CodeQuality\SteroidsVS.CodeQuality.csproj">
-      <Project>{E4C0B3CB-96AD-405D-87FB-8E6318827E5B}</Project>
+    <ProjectReference Include="..\SteroidsVs.CodeQuality\SteroidsVS.CodeQuality.csproj">
+      <Project>{6d8d8ae9-a333-480b-820c-f8e6bce3e734}</Project>
       <Name>SteroidsVS.CodeQuality</Name>
     </ProjectReference>
     <ProjectReference Include="..\SteroidsVS.CodeStructure\SteroidsVS.CodeStructure.csproj">
-      <Project>{E6451202-C6F6-4E47-86F1-2745FB353758}</Project>
+      <Project>{9ad45ba0-fa8f-42c5-a7fa-17d410f69995}</Project>
       <Name>SteroidsVS.CodeStructure</Name>
     </ProjectReference>
+    <ProjectReference Include="..\SteroidsVS.SharedUI\SteroidsVS.SharedUI.csproj">
+      <Project>{7b19258e-102f-4ab5-b955-977e529a9a00}</Project>
+      <Name>SteroidsVS.SharedUI</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\SteroidsVS_preview.png">
@@ -163,6 +150,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Community.VisualStudio.Toolkit">
+      <Version>16.0.75.103</Version>
+    </PackageReference>
     <PackageReference Include="EnvDTE">
       <Version>8.0.2</Version>
     </PackageReference>
@@ -181,6 +171,9 @@
     <PackageReference Include="Microsoft.VisualStudio.LanguageServices">
       <Version>3.4.0</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.SDK">
+      <Version>16.0.206</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Shell.15.0">
       <Version>16.4.29519.181</Version>
     </PackageReference>
@@ -210,6 +203,7 @@
       <Version>5.6.0</Version>
     </PackageReference>
   </ItemGroup>
+  <Import Project="..\..\Shared\SteroidsVS.Vsix\SteroidsVS.Vsix.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/...lStudio/SteroidsVS/SteroidsVsPackage.vsct → ...19/SteroidsVS.Vsix/SteroidsVsPackage.vsct b/...lStudio/SteroidsVS/SteroidsVsPackage.vsct → ...19/SteroidsVS.Vsix/SteroidsVsPackage.vsct
diff --git a/...ce/VisualStudio/SteroidsVS/VSPackage.resx → ...tudio/2019/SteroidsVS.Vsix/VSPackage.resx b/...ce/VisualStudio/SteroidsVS/VSPackage.resx → ...tudio/2019/SteroidsVS.Vsix/VSPackage.resx
diff --git a/Source/VisualStudio/SteroidsVS/app.config → ...ualStudio/2019/SteroidsVS.Vsix/app.config b/Source/VisualStudio/SteroidsVS/app.config → ...ualStudio/2019/SteroidsVS.Vsix/app.config
diff --git a/Source/VisualStudio/2019/SteroidsVS.Vsix/source.extension.vsixmanifest b/Source/VisualStudio/2019/SteroidsVS.Vsix/source.extension.vsixmanifest
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+    <Metadata>
+        <Identity Id="97188178-f68c-49a6-9e5e-5fb99661bf09" Version="2021.08.04.01" Language="en-US" Publisher="Erik Berthold" />
+        <DisplayName>SteroidsVS 2019</DisplayName>
+        <Description xml:space="preserve">Improves visibility of roslyn analyzer warnings and errors in documents.
+Includes an overall file quality indicator (bottom right corner, glows in specific color).
+Adds code structure view as code adornment.</Description>
+        <MoreInfo>https://github.com/eberthold/SteroidsVS</MoreInfo>
+        <Icon>Assets\SteroidsVS_icon.png</Icon>
+        <PreviewImage>Assets\SteroidsVS_preview.png</PreviewImage>
+        <Tags>roslyn code quality warning error structure map</Tags>
+    </Metadata>
+    <Installation>
+        <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Community" />
+        <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
+        <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
+    </Installation>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+        <!--<Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0]" />-->
+    </Dependencies>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
+    </Prerequisites>
+    <Assets>
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+    </Assets>
+</PackageManifest>
diff --git a/...Vs.CodeQuality/Properties/AssemblyInfo.cs → ...Vs.CodeQuality/Properties/AssemblyInfo.cs b/...Vs.CodeQuality/Properties/AssemblyInfo.cs → ...Vs.CodeQuality/Properties/AssemblyInfo.cs
diff --git a/...eQuality/Properties/Resources.Designer.cs → ...eQuality/Properties/Resources.Designer.cs b/...eQuality/Properties/Resources.Designer.cs → ...eQuality/Properties/Resources.Designer.cs
diff --git a/...sVs.CodeQuality/Properties/Resources.resx → ...sVs.CodeQuality/Properties/Resources.resx b/...sVs.CodeQuality/Properties/Resources.resx → ...sVs.CodeQuality/Properties/Resources.resx
diff --git a/...deQuality/Properties/Settings.Designer.cs → ...deQuality/Properties/Settings.Designer.cs b/...deQuality/Properties/Settings.Designer.cs → ...deQuality/Properties/Settings.Designer.cs
diff --git a/....CodeQuality/Properties/Settings.settings → ....CodeQuality/Properties/Settings.settings b/....CodeQuality/Properties/Settings.settings → ....CodeQuality/Properties/Settings.settings
diff --git a/...CodeQuality/SteroidsVS.CodeQuality.csproj → ...CodeQuality/SteroidsVS.CodeQuality.csproj b/...CodeQuality/SteroidsVS.CodeQuality.csproj → ...CodeQuality/SteroidsVS.CodeQuality.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E4C0B3CB-96AD-405D-87FB-8E6318827E5B}</ProjectGuid>
+    <ProjectGuid>{6D8D8AE9-A333-480B-820C-F8E6BCE3E734}</ProjectGuid>
     <OutputType>library</OutputType>
     <RootNamespace>SteroidsVS.CodeQuality</RootNamespace>
     <AssemblyName>SteroidsVS.CodeQuality</AssemblyName>
@@ -38,7 +38,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\..\SteroidsVs.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\SteroidsVs.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -58,13 +58,6 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Diagnostic\ErrorListDiagnosticProvider.cs" />
-    <Compile Include="Diagnostic\ITableEntryExtensions.cs" />
-    <Compile Include="Diagnostic\TableManagerDiagnosticsProvider.cs" />
-    <Compile Include="UI\DiagnosticInfoAdorner.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -78,58 +71,30 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="Resources\ModuleResourceDictionary.xaml.cs">
-      <DependentUpon>ModuleResourceDictionary.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="UI\DiagnosticInfoControl.cs" />
-    <Compile Include="UI\DiagnosticInfoLinePanel.cs" />
-    <Compile Include="UI\DiagnosticInfoPlacementCalculator.cs" />
-    <Compile Include="UI\DiagnosticInfosView.xaml.cs">
-      <DependentUpon>DiagnosticInfosView.xaml</DependentUpon>
-    </Compile>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="..\..\SteroidsVs.snk">
+    <None Include="..\..\..\SteroidsVs.snk">
       <Link>SteroidsVs.snk</Link>
     </None>
-    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Resources\ModuleResourceDictionary.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="UI\DiagnosticInfosView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\BusinessLogic\CodeQuality\Steroids.CodeQuality\Steroids.CodeQuality.csproj">
+    <ProjectReference Include="..\..\..\BusinessLogic\CodeQuality\Steroids.CodeQuality\Steroids.CodeQuality.csproj">
       <Project>{8e125506-818b-40e4-adfb-6238c2a49ac7}</Project>
       <Name>Steroids.CodeQuality</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\BusinessLogic\Core\Steroids.Core\Steroids.Core.csproj">
+    <ProjectReference Include="..\..\..\BusinessLogic\Core\Steroids.Core\Steroids.Core.csproj">
       <Project>{D43C1A42-A6B0-4F1B-8637-79DAACAAE487}</Project>
       <Name>Steroids.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\SteroidsVS.SharedUI\SteroidsVS.SharedUI.csproj">
       <Project>{58ac3d8f-294e-4389-8a93-570ae6c45808}</Project>
-      <Name>Steroids.SharedUI</Name>
+      <Name>SteroidsVS.SharedUI</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -154,5 +119,6 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+  <Import Project="..\..\Shared\SteroidsVs.CodeQuality\SteroidsVs.CodeQuality.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>