Skip to content

Commit 41547be

Browse files
ebertholdeberthold
committed
fixed breaking nugets which killed whole functionality
1 parent 9a2e061 commit 41547be

File tree

11 files changed

+33
-26
lines changed

11 files changed

+33
-26
lines changed

‎Source/BusinessLogic/CodeAnalysis/Steroids.Roslyn.Tests/Steroids.Roslyn.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@
8484
<Version>6.0.0</Version>
8585
</PackageReference>
8686
<PackageReference Include="Microsoft.CodeAnalysis.Common">
87-
<Version>3.4.0</Version>
87+
<Version>3.0.0</Version>
8888
</PackageReference>
8989
<PackageReference Include="Microsoft.CodeAnalysis.CSharp">
90-
<Version>3.4.0</Version>
90+
<Version>3.0.0</Version>
9191
</PackageReference>
9292
<PackageReference Include="MSTest.TestAdapter">
9393
<Version>2.1.0</Version>

‎Source/BusinessLogic/CodeAnalysis/Steroids.Roslyn/Steroids.Roslyn.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,24 +112,27 @@
112112
</ItemGroup>
113113
<ItemGroup>
114114
<PackageReference Include="Microsoft.CodeAnalysis.Common">
115-
<Version>3.4.0</Version>
115+
<Version>3.0.0</Version>
116116
</PackageReference>
117117
<PackageReference Include="Microsoft.CodeAnalysis.CSharp">
118-
<Version>3.4.0</Version>
118+
<Version>3.0.0</Version>
119119
</PackageReference>
120120
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
121121
<Version>2.9.8</Version>
122122
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
123123
<PrivateAssets>all</PrivateAssets>
124124
</PackageReference>
125125
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic">
126-
<Version>3.4.0</Version>
126+
<Version>3.0.0</Version>
127127
</PackageReference>
128128
<PackageReference Include="StyleCop.Analyzers">
129129
<Version>1.1.118</Version>
130130
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
131131
<PrivateAssets>all</PrivateAssets>
132132
</PackageReference>
133+
<PackageReference Include="System.Collections.Immutable">
134+
<Version>1.7.0</Version>
135+
</PackageReference>
133136
</ItemGroup>
134137
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
135138
</Project>

‎Source/BusinessLogic/CodeQuality/Steroids.CodeQuality.Tests/Steroids.CodeQuality.Tests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@
7777
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
7878
<HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
7979
</Reference>
80-
<Reference Include="Microsoft.CodeAnalysis, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81-
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
80+
<Reference Include="Microsoft.CodeAnalysis, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.3.0.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
8282
</Reference>
83-
<Reference Include="Microsoft.CodeAnalysis.EditorFeatures.Text, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84-
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.EditorFeatures.Text.3.4.0\lib\net472\Microsoft.CodeAnalysis.EditorFeatures.Text.dll</HintPath>
83+
<Reference Include="Microsoft.CodeAnalysis.EditorFeatures.Text, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84+
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.EditorFeatures.Text.3.0.0\lib\net472\Microsoft.CodeAnalysis.EditorFeatures.Text.dll</HintPath>
8585
</Reference>
86-
<Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87-
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.3.4.0\lib\netstandard2.0\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
86+
<Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87+
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.3.0.0\lib\netstandard2.0\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
8888
</Reference>
8989
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
9090
<HintPath>..\..\..\packages\Microsoft.VisualStudio.CoreUtility.16.4.280\lib\net472\Microsoft.VisualStudio.CoreUtility.dll</HintPath>

‎Source/BusinessLogic/CodeQuality/Steroids.CodeQuality.Tests/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net48" />
99
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.9.8" targetFramework="net48" developmentDependency="true" />
1010
<package id="Microsoft.CodeAnalysis.BannedApiAnalyzers" version="2.9.8" targetFramework="net48" developmentDependency="true" />
11-
<package id="Microsoft.CodeAnalysis.Common" version="3.4.0" targetFramework="net48" />
12-
<package id="Microsoft.CodeAnalysis.EditorFeatures.Text" version="3.4.0" targetFramework="net48" />
13-
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="3.4.0" targetFramework="net48" />
11+
<package id="Microsoft.CodeAnalysis.Common" version="3.0.0" targetFramework="net48" />
12+
<package id="Microsoft.CodeAnalysis.EditorFeatures.Text" version="3.0.0" targetFramework="net48" />
13+
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="3.0.0" targetFramework="net48" />
1414
<package id="Microsoft.VisualStudio.CoreUtility" version="16.4.280" targetFramework="net48" />
1515
<package id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="14.3.26930" targetFramework="net48" />
1616
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net48" />

‎Source/BusinessLogic/CodeStructure/Steroids.CodeStructure.Tests/Steroids.CodeStructure.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<Version>6.0.0</Version>
5959
</PackageReference>
6060
<PackageReference Include="Microsoft.CodeAnalysis.CSharp">
61-
<Version>3.4.0</Version>
61+
<Version>3.0.0</Version>
6262
</PackageReference>
6363
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf">
6464
<Version>16.4.280</Version>

‎Source/BusinessLogic/CodeStructure/Steroids.CodeStructure/Steroids.CodeStructure.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
</ItemGroup>
101101
<ItemGroup>
102102
<PackageReference Include="Microsoft.CodeAnalysis.Common">
103-
<Version>3.4.0</Version>
103+
<Version>3.0.0</Version>
104104
</PackageReference>
105105
<PackageReference Include="StyleCop.Analyzers">
106106
<Version>1.1.118</Version>

‎Source/VisualStudio/SteroidsVS.CodeStructure/SteroidsVS.CodeStructure.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<Version>3.4.0</Version>
141141
</PackageReference>
142142
<PackageReference Include="Microsoft.CodeAnalysis.Common">
143-
<Version>3.4.0</Version>
143+
<Version>3.0.0</Version>
144144
</PackageReference>
145145
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common">
146146
<Version>3.4.0</Version>

‎Source/VisualStudio/SteroidsVS.SharedUI/SteroidsVS.SharedUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<Version>3.4.0</Version>
8282
</PackageReference>
8383
<PackageReference Include="Microsoft.CodeAnalysis.Common">
84-
<Version>3.4.0</Version>
84+
<Version>3.0.0</Version>
8585
</PackageReference>
8686
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text">
8787
<Version>3.4.0</Version>

‎Source/VisualStudio/SteroidsVS/CodeAdornments/CodeAdornmentsBootstrapper.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ private void Initialize()
6969
var outliningManagerService = RootContainer.Resolve<IOutliningManagerService>();
7070
Container.RegisterInstance(outliningManagerService);
7171

72-
Container.RegisterType<IAdornmentSpaceReservation, CodeStructureSpaceReservation>(new ContainerControlledLifetimeManager());
73-
Container.RegisterType<IDocumentAnalyzerService, DocumentAnalyzerService>(new ContainerControlledLifetimeManager());
74-
Container.RegisterType<CodeStructureAdorner>(new ContainerControlledLifetimeManager());
75-
Container.RegisterType<CodeStructureViewModel>(new ContainerControlledLifetimeManager());
76-
Container.RegisterType<DiagnosticInfosViewModel>(new ContainerControlledLifetimeManager());
77-
Container.RegisterType<IEditor, WpfTextViewAdapter>(new ContainerControlledLifetimeManager());
72+
Container.RegisterSingleton<IAdornmentSpaceReservation, CodeStructureSpaceReservation>();
73+
Container.RegisterSingleton<IDocumentAnalyzerService, DocumentAnalyzerService>();
74+
Container.RegisterSingleton<CodeStructureAdorner>();
75+
Container.RegisterSingleton<CodeStructureViewModel>();
76+
Container.RegisterSingleton<DiagnosticInfosViewModel>();
77+
Container.RegisterSingleton<IEditor, WpfTextViewAdapter>();
7878

7979
Container.RegisterType<DiagnosticInfoAdorner>(new ContainerControlledLifetimeManager());
8080
}

‎Source/VisualStudio/SteroidsVS/SteroidsVS.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,12 @@
201201
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
202202
<PrivateAssets>all</PrivateAssets>
203203
</PackageReference>
204+
<PackageReference Include="System.Collections.Immutable">
205+
<Version>1.7.0</Version>
206+
<IncludeInVSIX>true</IncludeInVSIX>
207+
</PackageReference>
204208
<PackageReference Include="Unity">
205-
<Version>5.11.3</Version>
209+
<Version>5.6.0</Version>
206210
</PackageReference>
207211
</ItemGroup>
208212
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Source/VisualStudio/SteroidsVS/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="97188178-f68c-49a6-9e5e-5fb99661bf09" Version="0.2.44.0" Language="en-US" Publisher="Erik Berthold" />
4+
<Identity Id="97188178-f68c-49a6-9e5e-5fb99661bf09" Version="0.2.44.1" Language="en-US" Publisher="Erik Berthold" />
55
<DisplayName>SteroidsVS</DisplayName>
66
<Description xml:space="preserve">Improves visibility of roslyn analyzer warnings and errors in documents.
77
Includes an overall file quality indicator (bottom right corner, glows in specific color).

0 commit comments

Comments
 (0)