Skip to content

Commit 85bc35c

Browse files
codecadwalladercodecadwallader
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into stable
2 parents 1d7113e + c1038df commit 85bc35c

28 files changed

+267
-184
lines changed

‎CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## vNext (10.2)
3+
## vNext (10.4)
44

55
These changes have not been released to the Visual Studio marketplace, but (if checked) are available in preview within the [CI build](http://vsixgallery.com/extension/4c82e17d-927e-42d2-8460-b473ac7df316/).
66

@@ -12,6 +12,18 @@ These changes have not been released to the Visual Studio marketplace, but (if c
1212

1313
These are the changes to each version that has been released to the Visual Studio marketplace.
1414

15+
## 10.3
16+
17+
**2017-03-26**
18+
19+
- [x] Features
20+
- [x] [#359](https://github.com/codecadwallader/codemaid/pull/359) - Reorganizing: Add option to sort private->public vs. public->private - thanks [ahalassy](https://github.com/ahalassy)!
21+
- [x] [#394](https://github.com/codecadwallader/codemaid/pull/394) - Finding: Add ability to clear solution explorer search before finding - thanks [joeburdick](https://github.com/joeburdick)!
22+
- [x] [#420](https://github.com/codecadwallader/codemaid/issues/420) - Upgraded projects to .NET 4.6.1 and misc. fixes for VS2017 build support
23+
24+
- [x] Fixes
25+
- [x] [#419](https://github.com/codecadwallader/codemaid/issues/419) - Cleaning: Switched using statement cleanup command to workaround VS2017+ReSharper issue that prevented using statement cleanup from activating - thanks [jlbeard84](https://github.com/jlbeard84)!
26+
1527
## 10.2
1628

1729
**2017-01-01**

‎CodeMaid.IntegrationTests/CodeMaid.IntegrationTests.csproj

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +8,7 @@
88
<AppDesignerFolder>Properties</AppDesignerFolder>
99
<RootNamespace>SteveCadwallader.CodeMaid.IntegrationTests</RootNamespace>
1010
<AssemblyName>SteveCadwallader.CodeMaid.IntegrationTests</AssemblyName>
11-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -42,6 +42,16 @@
4242
<AssemblyOriginatorKeyFile>..\CodeMaid.snk</AssemblyOriginatorKeyFile>
4343
</PropertyGroup>
4444
<ItemGroup>
45+
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
46+
<EmbedInteropTypes>False</EmbedInteropTypes>
47+
<HintPath>..\packages\EnvDTE.8.0.1\lib\net10\EnvDTE.dll</HintPath>
48+
<Private>True</Private>
49+
</Reference>
50+
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
51+
<EmbedInteropTypes>False</EmbedInteropTypes>
52+
<HintPath>..\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE80.dll</HintPath>
53+
<Private>True</Private>
54+
</Reference>
4555
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
4656
<SpecificVersion>False</SpecificVersion>
4757
<HintPath>..\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
@@ -81,30 +91,15 @@
8191
<HintPath>..\lib\Microsoft.VSSDK.TestHostFramework.dll</HintPath>
8292
</Reference>
8393
<Reference Include="PresentationCore" />
94+
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
95+
<EmbedInteropTypes>True</EmbedInteropTypes>
96+
<HintPath>..\packages\stdole.7.0.3301\lib\net10\stdole.dll</HintPath>
97+
<Private>True</Private>
98+
</Reference>
8499
<Reference Include="System" />
85100
<Reference Include="System.Design" />
86101
<Reference Include="WindowsBase" />
87102
</ItemGroup>
88-
<ItemGroup>
89-
<COMReference Include="EnvDTE">
90-
<Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
91-
<VersionMajor>8</VersionMajor>
92-
<VersionMinor>0</VersionMinor>
93-
<Lcid>0</Lcid>
94-
<WrapperTool>primary</WrapperTool>
95-
<Isolated>False</Isolated>
96-
<EmbedInteropTypes>False</EmbedInteropTypes>
97-
</COMReference>
98-
<COMReference Include="EnvDTE80">
99-
<Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
100-
<VersionMajor>8</VersionMajor>
101-
<VersionMinor>0</VersionMinor>
102-
<Lcid>0</Lcid>
103-
<WrapperTool>primary</WrapperTool>
104-
<Isolated>False</Isolated>
105-
<EmbedInteropTypes>False</EmbedInteropTypes>
106-
</COMReference>
107-
</ItemGroup>
108103
<ItemGroup>
109104
<Compile Include="..\GlobalAssemblyInfo.cs">
110105
<Link>Properties\GlobalAssemblyInfo.cs</Link>
@@ -879,6 +874,7 @@
879874
<Content Include="Cleaning\Update\Data\FileHeaderR.R">
880875
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
881876
</Content>
877+
<None Include="packages.config" />
882878
</ItemGroup>
883879
<ItemGroup>
884880
<Content Include="Cleaning\FileTypes\Data\XAML.xaml">

‎CodeMaid.IntegrationTests/app.config

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
<assemblyIdentity name="Microsoft.VisualStudio.ComponentModelHost" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
77
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
88
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.11.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
12+
</dependentAssembly>
913
</assemblyBinding>
1014
</runtime>
15+
<startup>
16+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
17+
</startup>
1118
</configuration>

‎CodeMaid.IntegrationTests/packages.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="EnvDTE" version="8.0.1" targetFramework="net461" />
4+
<package id="EnvDTE80" version="8.0.1" targetFramework="net461" />
5+
<package id="stdole" version="7.0.3301" targetFramework="net461" />
6+
</packages>

‎CodeMaid.UnitTests/CodeMaid.UnitTests.csproj

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +8,7 @@
88
<AppDesignerFolder>Properties</AppDesignerFolder>
99
<RootNamespace>SteveCadwallader.CodeMaid.UnitTests</RootNamespace>
1010
<AssemblyName>SteveCadwallader.CodeMaid.UnitTests</AssemblyName>
11-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -42,6 +42,16 @@
4242
<AssemblyOriginatorKeyFile>..\CodeMaid.snk</AssemblyOriginatorKeyFile>
4343
</PropertyGroup>
4444
<ItemGroup>
45+
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
46+
<EmbedInteropTypes>False</EmbedInteropTypes>
47+
<HintPath>..\packages\EnvDTE.8.0.1\lib\net10\EnvDTE.dll</HintPath>
48+
<Private>True</Private>
49+
</Reference>
50+
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
51+
<EmbedInteropTypes>False</EmbedInteropTypes>
52+
<HintPath>..\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE80.dll</HintPath>
53+
<Private>True</Private>
54+
</Reference>
4555
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
4656
<SpecificVersion>False</SpecificVersion>
4757
<HintPath>..\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
@@ -84,31 +94,16 @@
8494
<HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
8595
<Private>True</Private>
8696
</Reference>
97+
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
98+
<EmbedInteropTypes>True</EmbedInteropTypes>
99+
<HintPath>..\packages\stdole.7.0.3301\lib\net10\stdole.dll</HintPath>
100+
<Private>True</Private>
101+
</Reference>
87102
<Reference Include="System" />
88103
<Reference Include="System.Design" />
89104
<Reference Include="System.XML" />
90105
<Reference Include="System.Xml.Linq" />
91106
</ItemGroup>
92-
<ItemGroup>
93-
<COMReference Include="EnvDTE">
94-
<Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
95-
<VersionMajor>8</VersionMajor>
96-
<VersionMinor>0</VersionMinor>
97-
<Lcid>0</Lcid>
98-
<WrapperTool>primary</WrapperTool>
99-
<Isolated>False</Isolated>
100-
<EmbedInteropTypes>False</EmbedInteropTypes>
101-
</COMReference>
102-
<COMReference Include="EnvDTE80">
103-
<Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
104-
<VersionMajor>8</VersionMajor>
105-
<VersionMinor>0</VersionMinor>
106-
<Lcid>0</Lcid>
107-
<WrapperTool>primary</WrapperTool>
108-
<Isolated>False</Isolated>
109-
<EmbedInteropTypes>False</EmbedInteropTypes>
110-
</COMReference>
111-
</ItemGroup>
112107
<ItemGroup>
113108
<Compile Include="..\GlobalAssemblyInfo.cs">
114109
<Link>Properties\GlobalAssemblyInfo.cs</Link>

‎CodeMaid.UnitTests/CodeMaidPackageTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
namespace SteveCadwallader.CodeMaid.UnitTests
55
{
66
[TestClass]
7+
[Ignore]
8+
//TODO: Disabled while experimenting with VS2017 RC.
79
public class CodeMaidPackageTest
810
{
911
[TestMethod]

‎CodeMaid.UnitTests/app.config

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
<assemblyIdentity name="Microsoft.VisualStudio.ComponentModelHost" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
77
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
88
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.11.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
12+
</dependentAssembly>
913
</assemblyBinding>
1014
</runtime>
15+
<startup>
16+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
17+
</startup>
1118
</configuration>

‎CodeMaid.UnitTests/packages.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="EnvDTE" version="8.0.1" targetFramework="net461" />
4+
<package id="EnvDTE80" version="8.0.1" targetFramework="net461" />
35
<package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
6+
<package id="stdole" version="7.0.3301" targetFramework="net461" />
47
</packages>

‎CodeMaid/CodeMaid.csproj

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AssemblyName>SteveCadwallader.CodeMaid</AssemblyName>
1414
<SignAssembly>True</SignAssembly>
1515
<AssemblyOriginatorKeyFile>..\CodeMaid.snk</AssemblyOriginatorKeyFile>
16-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1717
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
1818
<OldToolsVersion>12.0</OldToolsVersion>
1919
<FileUpgradeFlags>
@@ -35,6 +35,7 @@
3535
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
3636
<UseApplicationTrust>false</UseApplicationTrust>
3737
<BootstrapperEnabled>true</BootstrapperEnabled>
38+
<TargetFrameworkProfile />
3839
</PropertyGroup>
3940
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4041
<DebugSymbols>true</DebugSymbols>
@@ -59,6 +60,16 @@
5960
<DeployExtension>False</DeployExtension>
6061
</PropertyGroup>
6162
<ItemGroup>
63+
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
64+
<EmbedInteropTypes>False</EmbedInteropTypes>
65+
<HintPath>..\packages\EnvDTE.8.0.1\lib\net10\EnvDTE.dll</HintPath>
66+
<Private>True</Private>
67+
</Reference>
68+
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
69+
<EmbedInteropTypes>False</EmbedInteropTypes>
70+
<HintPath>..\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE80.dll</HintPath>
71+
<Private>True</Private>
72+
</Reference>
6273
<Reference Include="Microsoft.CSharp" />
6374
<Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6475
<SpecificVersion>False</SpecificVersion>
@@ -132,6 +143,11 @@
132143
</Reference>
133144
<Reference Include="PresentationCore" />
134145
<Reference Include="PresentationFramework" />
146+
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
147+
<EmbedInteropTypes>True</EmbedInteropTypes>
148+
<HintPath>..\packages\stdole.7.0.3301\lib\net10\stdole.dll</HintPath>
149+
<Private>True</Private>
150+
</Reference>
135151
<Reference Include="System" />
136152
<Reference Include="System.Configuration" />
137153
<Reference Include="System.Design" />
@@ -149,26 +165,6 @@
149165
<RequiredTargetFramework>3.0</RequiredTargetFramework>
150166
</Reference>
151167
</ItemGroup>
152-
<ItemGroup>
153-
<COMReference Include="EnvDTE">
154-
<Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
155-
<VersionMajor>8</VersionMajor>
156-
<VersionMinor>0</VersionMinor>
157-
<Lcid>0</Lcid>
158-
<WrapperTool>primary</WrapperTool>
159-
<Isolated>False</Isolated>
160-
<EmbedInteropTypes>False</EmbedInteropTypes>
161-
</COMReference>
162-
<COMReference Include="EnvDTE80">
163-
<Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
164-
<VersionMajor>8</VersionMajor>
165-
<VersionMinor>0</VersionMinor>
166-
<Lcid>0</Lcid>
167-
<WrapperTool>primary</WrapperTool>
168-
<Isolated>False</Isolated>
169-
<EmbedInteropTypes>False</EmbedInteropTypes>
170-
</COMReference>
171-
</ItemGroup>
172168
<ItemGroup>
173169
<Compile Include="..\GlobalAssemblyInfo.cs">
174170
<Link>Properties\GlobalAssemblyInfo.cs</Link>

‎CodeMaid/CodeMaidPackage.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ public sealed class CodeMaidPackage : Package, IVsInstalledProduct, IVsPackageDy
6868
/// </summary>
6969
private DTE2 _ide;
7070

71+
/// <summary>
72+
/// The service provider.
73+
/// </summary>
74+
private IServiceProvider _serviceProvider;
75+
7176
/// <summary>
7277
/// The Spade tool window.
7378
/// </summary>
@@ -160,6 +165,11 @@ public Document ActiveDocument
160165
/// </summary>
161166
public OleMenuCommandService MenuCommandService => GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
162167

168+
/// <summary>
169+
/// Gets the service provider.
170+
/// </summary>
171+
public IServiceProvider ServiceProvider => _serviceProvider ?? (_serviceProvider = new ServiceProvider((Microsoft.VisualStudio.OLE.Interop.IServiceProvider)IDE));
172+
163173
/// <summary>
164174
/// Gets the Spade tool window, iff it already exists.
165175
/// </summary>

0 commit comments

Comments
 (0)