Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit aeb733c

Browse files
grokysgrokys
committed
Use Madskristensen.VisualStudio.SDK.
Use metapackage instead of referencing individual VSSDK packages.
1 parent e71077a commit aeb733c

File tree

13 files changed

+16
-78
lines changed

13 files changed

+16
-78
lines changed

‎src/GitHub.App/GitHub.App.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,10 @@
4040
</ItemGroup>
4141

4242
<ItemGroup>
43-
<PackageReference Include="EnvDTE" Version="8.0.1" />
4443
<PackageReference Include="LibGit2Sharp" Version="0.23.1" />
4544
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="1.0.164" />
45+
<PackageReference Include="Madskristensen.VisualStudio.SDK" Version="14.3.75-pre" />
4646
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
47-
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="14.0.25424" />
48-
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="14.3.25407" />
49-
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" />
50-
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
5147
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
5248
<PackageReference Include="Octokit.GraphQL" Version="0.1.1-beta" />
5349
<PackageReference Include="Rothko" Version="0.0.3-ghfvs" />

‎src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,5 @@
2727

2828
<ItemGroup>
2929
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
30-
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="14.3.25407" />
3130
</ItemGroup>
3231
</Project>

‎src/GitHub.Exports/GitHub.Exports.csproj‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,11 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="EnvDTE" Version="8.0.1" />
27-
<PackageReference Include="EnvDTE80" Version="8.0.1" />
2826
<PackageReference Include="LibGit2Sharp" Version="0.23.1" />
2927
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="1.0.164" />
28+
<PackageReference Include="Madskristensen.VisualStudio.SDK" Version="14.3.75-pre" />
3029
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
31-
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="14.0.25424" />
32-
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="14.3.25407" />
33-
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" />
3430
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.15.103" />
35-
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
36-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="11.0.61030" />
37-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.12.0" Version="12.0.30110" />
3831
<PackageReference Include="Rothko" Version="0.0.3-ghfvs" />
3932
<PackageReference Include="Serilog" Version="2.5.0" />
4033
<PackageReference Include="SerilogAnalyzer" Version="0.12.0.0" />

‎src/GitHub.Extensions/GitHub.Extensions.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,5 @@
2626

2727
<ItemGroup>
2828
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
29-
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" />
30-
<PackageReference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" Version="10.0.30319" />
3129
</ItemGroup>
3230
</Project>

‎src/GitHub.InlineReviews/GitHub.InlineReviews.csproj‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -199,18 +199,6 @@
199199
</ProjectReference>
200200
</ItemGroup>
201201
<ItemGroup>
202-
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
203-
<EmbedInteropTypes>False</EmbedInteropTypes>
204-
</Reference>
205-
<Reference Include="EnvDTE100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
206-
<EmbedInteropTypes>False</EmbedInteropTypes>
207-
</Reference>
208-
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
209-
<EmbedInteropTypes>False</EmbedInteropTypes>
210-
</Reference>
211-
<Reference Include="EnvDTE90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
212-
<EmbedInteropTypes>False</EmbedInteropTypes>
213-
</Reference>
214202
<Reference Include="Microsoft.Build.Framework" />
215203
<Reference Include="Microsoft.CSharp" />
216204
<Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -297,24 +285,9 @@
297285
<PackageReference Include="Markdig.Wpf.Signed">
298286
<Version>0.2.1</Version>
299287
</PackageReference>
300-
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost">
301-
<Version>14.0.25424</Version>
302-
</PackageReference>
303-
<PackageReference Include="Microsoft.VisualStudio.Editor">
304-
<Version>14.3.25407</Version>
305-
</PackageReference>
306-
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense">
307-
<Version>14.3.25407</Version>
308-
</PackageReference>
309288
<PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers">
310289
<Version>15.8.33</Version>
311290
</PackageReference>
312-
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0">
313-
<Version>14.3.25407</Version>
314-
</PackageReference>
315-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime">
316-
<Version>14.3.25407</Version>
317-
</PackageReference>
318291
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
319292
<Version>15.8.122</Version>
320293
</PackageReference>

‎src/GitHub.StartPage/GitHub.StartPage.csproj‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@
110110
<PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers">
111111
<Version>15.8.33</Version>
112112
</PackageReference>
113-
<PackageReference Include="Microsoft.VisualStudio.Shell.Framework">
114-
<Version>15.8.28010</Version>
115-
</PackageReference>
116113
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
117114
<Version>15.8.122</Version>
118115
</PackageReference>
@@ -130,15 +127,9 @@
130127
<PackageReference Include="System.Reactive">
131128
<Version>4.0.0</Version>
132129
</PackageReference>
133-
<PackageReference Include="System.Reactive.PlatformServices">
134-
<Version>3.1.1</Version>
135-
</PackageReference>
136-
<PackageReference Include="System.Reactive.Windows.Threading">
137-
<Version>3.1.1</Version>
138-
</PackageReference>
139130
</ItemGroup>
140131
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
141-
<!--<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != '' And '$(NCrunch)' != '1'" />-->
132+
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != '' And '$(NCrunch)' != '1'" />
142133
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
143134
Other similar extension points exist, see Microsoft.Common.targets.
144135
<Target Name="BeforeBuild">

‎src/GitHub.TeamFoundation.16/GitHub.TeamFoundation.16.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,6 @@
223223
<PackageReference Include="LibGit2Sharp.NativeBinaries">
224224
<Version>1.0.164</Version>
225225
</PackageReference>
226-
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost">
227-
<Version>14.0.25424</Version>
228-
</PackageReference>
229-
<PackageReference Include="Microsoft.VisualStudio.Threading">
230-
<Version>14.1.131</Version>
231-
</PackageReference>
232226
<PackageReference Include="Serilog">
233227
<Version>2.5.0</Version>
234228
</PackageReference>

‎src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="EnvDTE" Version="8.0.1" />
2625
<PackageReference Include="Markdig.Signed" version="0.13.0" />
2726
<PackageReference Include="Markdig.Wpf.Signed" version="0.2.1" />
28-
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" />
29-
<PackageReference Include="Microsoft.VisualStudio.ImageCatalog" version="14.3.25407" />
30-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" version="14.3.25407" />
3127
</ItemGroup>
3228
</Project>

‎src/GitHub.VisualStudio/GitHub.VisualStudio.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
<Reference Include="Microsoft.TeamFoundation.Controls">
9999
<HintPath>..\..\lib\14.0\Microsoft.TeamFoundation.Controls.dll</HintPath>
100100
</Reference>
101-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />
102101
<Reference Include="System" />
103102
<Reference Include="System.ComponentModel.Composition" />
104103
<Reference Include="System.Core" />
@@ -113,11 +112,6 @@
113112
<Reference Include="WindowsBase" />
114113
<Reference Include="System.Xaml" />
115114
</ItemGroup>
116-
<ItemGroup>
117-
<Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
118-
<EmbedInteropTypes>False</EmbedInteropTypes>
119-
</Reference>
120-
</ItemGroup>
121115
<ItemGroup>
122116
<Compile Include="..\common\SolutionInfo.cs">
123117
<Link>Properties\SolutionInfo.cs</Link>

‎src/GitHub.VisualStudio/GitHubPackage.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,14 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
265265
// HACK: We need to make sure this is run on the main thread. We really
266266
// shouldn't be injecting a view model concern into LoginManager - this
267267
// needs to be refactored. See #1398.
268+
#pragma warning disable VSTHRD011 // Use AsyncLazy<T>
268269
var lazy2Fa = new Lazy<ITwoFactorChallengeHandler>(() =>
269270
ThreadHelper.JoinableTaskFactory.Run(async () =>
270271
{
271272
await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
272273
return serviceProvider.GetService<ITwoFactorChallengeHandler>();
273274
}));
275+
#pragma warning restore VSTHRD011 // Use AsyncLazy<T>
274276

275277
return new LoginManager(
276278
keychain,

0 commit comments

Comments
 (0)