Skip to content

Commit ad793dd

Browse files
awulkiewawulkiew
committed
Add support for VS2013, package-wise for now.
1 parent eb19784 commit ad793dd

File tree

92 files changed

+75699
-28379
lines changed

Some content is hidden

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

92 files changed

+75699
-28379
lines changed

‎Visual_Studio_2015/GraphicalDebugging/ExpressionLoader.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@ public enum Kind
3838

3939
private static ExpressionLoader Instance { get; set; }
4040

41-
public static async Task InitializeAsync(AsyncPackage package, CancellationToken cancellationToken)
41+
public static void Initialize(GraphicalWatchPackage package)
4242
{
43-
DTE2 dte = await package.GetServiceAsync(typeof(DTE)) as DTE2;
44-
45-
await package.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
46-
43+
DTE2 dte = package.GetService(typeof(DTE)) as DTE2;
44+
4745
Instance = new ExpressionLoader(dte);
4846
}
4947

‎Visual_Studio_2015/GraphicalDebugging/GeometryWatchCommand.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,10 @@ private IServiceProvider ServiceProvider
8181
/// Initializes the singleton instance of the command.
8282
/// </summary>
8383
/// <param name="package">Owner package, not null.</param>
84-
public static async Task InitializeAsync(AsyncPackage package, CancellationToken cancellationToken)
84+
public static void Initialize(GraphicalWatchPackage package)
8585
{
86-
OleMenuCommandService commandService = await package.GetServiceAsync(typeof(IMenuCommandService)) as OleMenuCommandService;
87-
88-
await package.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
89-
86+
OleMenuCommandService commandService = package.GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
87+
9088
Instance = new GeometryWatchCommand(package, commandService);
9189
}
9290

‎Visual_Studio_2015/GraphicalDebugging/GraphicalDebugging.csproj‎

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,10 @@
168168
</Page>
169169
</ItemGroup>
170170
<ItemGroup>
171-
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
171+
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
172172
<EmbedInteropTypes>False</EmbedInteropTypes>
173+
<HintPath>..\packages\VSSDK.DTE.7.0.4\lib\net20\envdte.dll</HintPath>
174+
<Private>True</Private>
173175
</Reference>
174176
<Reference Include="EnvDTE100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
175177
<EmbedInteropTypes>False</EmbedInteropTypes>
@@ -189,37 +191,46 @@
189191
<HintPath>..\packages\Microsoft.VisualStudio.Debugger.Engine.14.0.23205\lib\net45\Microsoft.VisualStudio.Debugger.Engine.dll</HintPath>
190192
<Private>True</Private>
191193
</Reference>
194+
<Reference Include="Microsoft.VisualStudio.GraphModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
195+
<HintPath>..\packages\VSSDK.GraphModel.11.0.4\lib\net45\Microsoft.VisualStudio.GraphModel.dll</HintPath>
196+
<Private>False</Private>
197+
</Reference>
192198
<Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
193199
<HintPath>..\packages\Microsoft.VisualStudio.Imaging.14.0.23107\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
194200
<Private>True</Private>
195201
</Reference>
196202
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
197-
<HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
203+
<HintPath>..\packages\VSSDK.OLE.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
198204
<Private>True</Private>
205+
<Private>False</Private>
199206
</Reference>
200-
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
201-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.14.0.14.0.23107\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
202-
<Private>True</Private>
207+
<Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
208+
<HintPath>..\packages\VSSDK.Shell.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll</HintPath>
209+
<Private>False</Private>
203210
</Reference>
204211
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
205-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
212+
<HintPath>..\packages\VSSDK.Shell.Immutable.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
206213
<Private>True</Private>
214+
<Private>False</Private>
207215
</Reference>
208216
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
209-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
217+
<HintPath>..\packages\VSSDK.Shell.Immutable.11.11.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
210218
<Private>True</Private>
219+
<Private>False</Private>
211220
</Reference>
212221
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
213-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
222+
<HintPath>..\packages\VSSDK.Shell.Immutable.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
214223
<Private>True</Private>
224+
<Private>False</Private>
215225
</Reference>
216226
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
217227
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.0.23107\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
218228
<Private>True</Private>
219229
</Reference>
220230
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
221-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
231+
<HintPath>..\packages\VSSDK.Shell.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
222232
<Private>True</Private>
233+
<Private>False</Private>
223234
</Reference>
224235
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
225236
<EmbedInteropTypes>True</EmbedInteropTypes>
@@ -237,24 +248,28 @@
237248
<Private>True</Private>
238249
</Reference>
239250
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
240-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
251+
<HintPath>..\packages\VSSDK.Shell.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
241252
<Private>True</Private>
253+
<Private>False</Private>
242254
</Reference>
243255
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
244-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
256+
<HintPath>..\packages\VSSDK.Shell.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
245257
<Private>True</Private>
258+
<Private>False</Private>
246259
</Reference>
247260
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
248-
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
261+
<HintPath>..\packages\VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
249262
<Private>True</Private>
263+
<Private>False</Private>
250264
</Reference>
251265
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
252-
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
266+
<HintPath>..\packages\VSSDK.TextManager.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
253267
<Private>True</Private>
268+
<Private>False</Private>
254269
</Reference>
255-
<Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
256-
<HintPath>..\packages\Microsoft.VisualStudio.Threading.14.0.50702\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
257-
<Private>True</Private>
270+
<Reference Include="Microsoft.VisualStudio.Threading, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
271+
<HintPath>..\packages\VSSDK.Threading.12.0.4\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
272+
<Private>False</Private>
258273
</Reference>
259274
<Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
260275
<HintPath>..\packages\Microsoft.VisualStudio.Utilities.14.0.23107\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
@@ -268,14 +283,19 @@
268283
<Reference Include="PresentationFramework" />
269284
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
270285
<EmbedInteropTypes>False</EmbedInteropTypes>
286+
<HintPath>..\packages\VSSDK.DTE.7.0.4\lib\net20\stdole.dll</HintPath>
287+
<Private>True</Private>
271288
</Reference>
272289
<Reference Include="System" />
273290
<Reference Include="System.Data" />
274291
<Reference Include="System.Design" />
275292
<Reference Include="System.Drawing" />
293+
<Reference Include="System.Transactions" />
276294
<Reference Include="System.Windows.Forms" />
277295
<Reference Include="System.Xaml" />
278296
<Reference Include="System.Xml" />
297+
<Reference Include="System.Xml.Linq" />
298+
<Reference Include="UIAutomationTypes" />
279299
<Reference Include="WindowsBase" />
280300
</ItemGroup>
281301
<ItemGroup>

‎Visual_Studio_2015/GraphicalDebugging/GraphicalWatchCommand.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,10 @@ private IServiceProvider ServiceProvider
8181
/// Initializes the singleton instance of the command.
8282
/// </summary>
8383
/// <param name="package">Owner package, not null.</param>
84-
public static async Task InitializeAsync(AsyncPackage package, CancellationToken cancellationToken)
84+
public static void Initialize(GraphicalWatchPackage package)
8585
{
86-
OleMenuCommandService commandService = await package.GetServiceAsync(typeof(IMenuCommandService)) as OleMenuCommandService;
87-
88-
await package.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
89-
86+
OleMenuCommandService commandService = package.GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
87+
9088
Instance = new GraphicalWatchCommand(package, commandService);
9189
}
9290

‎Visual_Studio_2015/GraphicalDebugging/GraphicalWatchPackage.cs‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace GraphicalDebugging
3030
/// To get loaded into VS, the package must be referred by &lt;Asset Type="Microsoft.VisualStudio.VsPackage" ...&gt; in .vsixmanifest file.
3131
/// </para>
3232
/// </remarks>
33-
[PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
33+
[PackageRegistration(UseManagedResourcesOnly = true)]
3434
[InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)] // Info on this package for Help/About
3535
[ProvideMenuResource("Menus.ctmenu", 1)]
3636
[Guid(GraphicalWatchPackage.PackageGuidString)]
@@ -42,7 +42,7 @@ namespace GraphicalDebugging
4242
[ProvideOptionPage(typeof(GeometryWatchOptionPage), "Graphical Debugging", "Geometry Watch", 0, 0, true)]
4343
[ProvideOptionPage(typeof(GraphicalWatchOptionPage), "Graphical Debugging", "Graphical Watch", 0, 0, true)]
4444
[ProvideOptionPage(typeof(PlotWatchOptionPage), "Graphical Debugging", "Plot Watch", 0, 0, true)]
45-
public sealed class GraphicalWatchPackage : AsyncPackage
45+
public sealed class GraphicalWatchPackage : Package
4646
{
4747
/// <summary>
4848
/// GraphicalWatchPackage GUID string.
@@ -71,17 +71,27 @@ public GraphicalWatchPackage()
7171
/// Initialization of the package; this method is called right after the package is sited, so this is the place
7272
/// where you can put all the initialization code that rely on services provided by VisualStudio.
7373
/// </summary>
74-
protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
74+
protected override void Initialize()
7575
{
7676
Instance = this;
7777

78-
await base.InitializeAsync(cancellationToken, progress);
78+
base.Initialize();
7979

80-
await ExpressionLoader.InitializeAsync(this, cancellationToken);
80+
ExpressionLoader.Initialize(this);
8181

82-
await GeometryWatchCommand.InitializeAsync(this, cancellationToken);
83-
await GraphicalWatchCommand.InitializeAsync(this, cancellationToken);
84-
await PlotWatchCommand.InitializeAsync(this, cancellationToken);
82+
GeometryWatchCommand.Initialize(this);
83+
GraphicalWatchCommand.Initialize(this);
84+
PlotWatchCommand.Initialize(this);
85+
}
86+
87+
public new object GetService(Type serviceType)
88+
{
89+
return base.GetService(serviceType);
90+
}
91+
92+
public new DialogPage GetDialogPage(Type dialogPageType)
93+
{
94+
return base.GetDialogPage(dialogPageType);
8595
}
8696

8797
#endregion

‎Visual_Studio_2015/GraphicalDebugging/PlotWatchCommand.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,10 @@ private IServiceProvider ServiceProvider
8181
/// Initializes the singleton instance of the command.
8282
/// </summary>
8383
/// <param name="package">Owner package, not null.</param>
84-
public static async Task InitializeAsync(AsyncPackage package, CancellationToken cancellationToken)
84+
public static void Initialize(GraphicalWatchPackage package)
8585
{
86-
OleMenuCommandService commandService = await package.GetServiceAsync(typeof(IMenuCommandService)) as OleMenuCommandService;
87-
88-
await package.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
89-
86+
OleMenuCommandService commandService = package.GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
87+
9088
Instance = new PlotWatchCommand(package, commandService);
9189
}
9290

‎Visual_Studio_2015/GraphicalDebugging/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("Graphical Debugging")]
9-
[assembly: AssemblyDescription("Visual Studio 2015, 2017 Graphical Debugging Tools")]
9+
[assembly: AssemblyDescription("Visual Studio 2013, 2015, 2017 Graphical Debugging Tools")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("Graphical Debugging")]
@@ -29,5 +29,5 @@
2929
// You can specify all the values or you can default the Build and Revision Numbers
3030
// by using the '*' as shown below:
3131
// [assembly: AssemblyVersion("1.0.*")]
32-
[assembly: AssemblyVersion("0.19.0.0")]
33-
[assembly: AssemblyFileVersion("0.19.0.0")]
32+
[assembly: AssemblyVersion("0.20.0.0")]
33+
[assembly: AssemblyFileVersion("0.20.0.0")]

‎Visual_Studio_2015/GraphicalDebugging/Util.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public static List<string> Tparams(string type)
155155
public static T GetDialogPage<T>()
156156
where T : DialogPage
157157
{
158-
Package package = GraphicalWatchPackage.Instance;
158+
GraphicalWatchPackage package = GraphicalWatchPackage.Instance;
159159
if (package == null)
160160
return default(T);
161161

‎Visual_Studio_2015/GraphicalDebugging/packages.config‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<package id="Microsoft.VisualStudio.Imaging" version="14.0.23107" targetFramework="net452" />
55
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net452" />
66
<package id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" version="14.5.100" targetFramework="net452" developmentDependency="true" />
7-
<package id="Microsoft.VisualStudio.Shell.14.0" version="14.0.23107" targetFramework="net452" />
87
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net452" />
98
<package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net452" />
109
<package id="Microsoft.VisualStudio.Shell.Immutable.12.0" version="12.0.21003" targetFramework="net452" />
@@ -21,4 +20,24 @@
2120
<package id="Microsoft.VisualStudio.Utilities" version="14.0.23107" targetFramework="net452" />
2221
<package id="Microsoft.VisualStudio.Validation" version="14.0.50702" targetFramework="net452" />
2322
<package id="Microsoft.VSSDK.BuildTools" version="14.0.23107" targetFramework="net452" developmentDependency="true" />
23+
<package id="VSSDK.DTE" version="7.0.4" targetFramework="net452" />
24+
<package id="VSSDK.GraphModel" version="11.0.4" targetFramework="net452" />
25+
<package id="VSSDK.IDE" version="7.0.4" targetFramework="net452" />
26+
<package id="VSSDK.IDE.10" version="10.0.4" targetFramework="net452" />
27+
<package id="VSSDK.IDE.11" version="11.0.4" targetFramework="net452" />
28+
<package id="VSSDK.IDE.12" version="12.0.4" targetFramework="net452" />
29+
<package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net452" />
30+
<package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net452" />
31+
<package id="VSSDK.OLE.Interop" version="7.0.4" targetFramework="net452" />
32+
<package id="VSSDK.Shell.12" version="12.0.4" targetFramework="net452" />
33+
<package id="VSSDK.Shell.Immutable.10" version="10.0.4" targetFramework="net452" />
34+
<package id="VSSDK.Shell.Immutable.11" version="11.0.4" targetFramework="net452" />
35+
<package id="VSSDK.Shell.Immutable.12" version="12.0.4" targetFramework="net452" />
36+
<package id="VSSDK.Shell.Interop" version="7.0.4" targetFramework="net452" />
37+
<package id="VSSDK.Shell.Interop.8" version="8.0.4" targetFramework="net452" />
38+
<package id="VSSDK.Shell.Interop.9" version="9.0.4" targetFramework="net452" />
39+
<package id="VSSDK.TextManager.Interop" version="7.0.4" targetFramework="net452" />
40+
<package id="VSSDK.TextManager.Interop.8" version="8.0.4" targetFramework="net452" />
41+
<package id="VSSDK.Threading" version="12.0.4" targetFramework="net452" />
42+
<package id="VSSDK.Threading.12" version="12.0.4" targetFramework="net452" />
2443
</packages>

0 commit comments

Comments
 (0)