Skip to content

Commit aaa3827

Browse files
codecadwalladercodecadwallader
committed
Merge branch 'master' into stable
2 parents 3ff9df5 + c040e13 commit aaa3827

117 files changed

Lines changed: 1782 additions & 2444 deletions

File tree

Some content is hidden

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

‎CHANGELOG.md‎

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

3-
## vNext (10.6)
3+
## vNext (11.1)
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,17 @@ 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+
## 11.0
16+
17+
**2019-03-28**
18+
19+
- [x] Features
20+
- [x] [#625](https://github.com/codecadwallader/codemaid/pull/625) - Use new AsyncPackage base class
21+
22+
- [x] Fixes
23+
- [x] [#613](https://github.com/codecadwallader/codemaid/pull/613) - Formatting: Avoid trailing comment line on self closing XML tag - thanks [bonimy](https://github.com/bonimy)!
24+
- [x] [#632](https://github.com/codecadwallader/codemaid/issues/632) - Options: Fix XML encoding issue from resource translations
25+
1526
## 10.6
1627

1728
**2018-12-09**

‎CodeMaid.IntegrationTests/CodeMaid.IntegrationTests.csproj‎

Lines changed: 105 additions & 54 deletions
Large diffs are not rendered by default.

‎CodeMaid.IntegrationTests/Helpers/TestEnvironment.cs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using EnvDTE;
2+
using Microsoft.VisualStudio.Shell;
23
using Microsoft.VisualStudio.Shell.Interop;
34
using Microsoft.VisualStudio.TestTools.UnitTesting;
45
using Microsoft.VSSDK.Tools.VsIdeTesting;
@@ -81,7 +82,16 @@ public static void CommonTestInitialize()
8182
/// <returns>The package command.</returns>
8283
public static MenuCommand GetPackageCommand(CommandID commandID)
8384
{
84-
var command = Package.MenuCommandService.FindCommand(commandID);
85+
MenuCommand command = null;
86+
87+
Package.JoinableTaskFactory.Run(async () =>
88+
{
89+
if (await Package.GetServiceAsync(typeof(IMenuCommandService)) is OleMenuCommandService menuCommandService)
90+
{
91+
command = menuCommandService.FindCommand(commandID);
92+
}
93+
});
94+
8595
Assert.IsNotNull(command);
8696

8797
return command;

‎CodeMaid.IntegrationTests/app.config‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,23 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="Microsoft.VisualStudio.ComponentModelHost" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0" />
88
</dependentAssembly>
99
<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" />
10+
<assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
1220
</dependentAssembly>
1321
</assemblyBinding>
1422
</runtime>
1523
<startup>
16-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
24+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
1725
</startup>
1826
</configuration>

‎CodeMaid.IntegrationTests/packages.config‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,33 @@
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" />
5-
<package id="stdole" version="7.0.3301" targetFramework="net461" />
3+
<package id="Microsoft.VisualStudio.CoreUtility" version="15.8.525" targetFramework="net472" />
4+
<package id="Microsoft.VisualStudio.ImageCatalog" version="15.9.28307" targetFramework="net472" />
5+
<package id="Microsoft.VisualStudio.Imaging" version="15.9.28307" targetFramework="net472" />
6+
<package id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="14.3.26930" targetFramework="net472" />
7+
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net472" />
8+
<package id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" version="15.0.27" targetFramework="net472" />
9+
<package id="Microsoft.VisualStudio.Shell.15.0" version="15.9.28307" targetFramework="net472" />
10+
<package id="Microsoft.VisualStudio.Shell.Framework" version="15.9.28307" targetFramework="net472" />
11+
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net472" />
12+
<package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6072" targetFramework="net472" />
13+
<package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30320" targetFramework="net472" />
14+
<package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61031" targetFramework="net472" />
15+
<package id="Microsoft.VisualStudio.Shell.Interop.12.0" version="12.0.30111" targetFramework="net472" />
16+
<package id="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" version="14.3.26929" targetFramework="net472" />
17+
<package id="Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime" version="15.0.26929" targetFramework="net472" />
18+
<package id="Microsoft.VisualStudio.Shell.Interop.15.6.DesignTime" version="15.6.27413" targetFramework="net472" />
19+
<package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50728" targetFramework="net472" />
20+
<package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30730" targetFramework="net472" />
21+
<package id="Microsoft.VisualStudio.Text.Data" version="15.8.525" targetFramework="net472" />
22+
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6071" targetFramework="net472" />
23+
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50728" targetFramework="net472" />
24+
<package id="Microsoft.VisualStudio.Threading" version="15.8.209" targetFramework="net472" />
25+
<package id="Microsoft.VisualStudio.Threading.Analyzers" version="15.8.209" targetFramework="net472" />
26+
<package id="Microsoft.VisualStudio.Utilities" version="15.9.28307" targetFramework="net472" />
27+
<package id="Microsoft.VisualStudio.Validation" version="15.3.58" targetFramework="net472" />
28+
<package id="Microsoft.VSSDK.UnitTestLibrary" version="14.3.25407" targetFramework="net472" />
29+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
30+
<package id="StreamJsonRpc" version="1.3.23" targetFramework="net472" />
31+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
32+
<package id="VS.QualityTools.UnitTestFramework" version="15.0.27323.2" targetFramework="net472" />
633
</packages>

‎CodeMaid.UnitTests/CodeMaid.UnitTests.csproj‎

Lines changed: 32 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="15.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>
6+
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
7+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
68
<ProjectGuid>{27C78B2A-18BC-4CE0-BCB1-DB4C30D805BE}</ProjectGuid>
79
<OutputType>Library</OutputType>
810
<AppDesignerFolder>Properties</AppDesignerFolder>
911
<RootNamespace>SteveCadwallader.CodeMaid.UnitTests</RootNamespace>
1012
<AssemblyName>SteveCadwallader.CodeMaid.UnitTests</AssemblyName>
11-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<SignAssembly>True</SignAssembly>
14+
<AssemblyOriginatorKeyFile>..\CodeMaid.snk</AssemblyOriginatorKeyFile>
15+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1216
<FileAlignment>512</FileAlignment>
1317
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
15-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
1618
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
1719
<IsCodedUITest>False</IsCodedUITest>
1820
<TestProjectType>UnitTest</TestProjectType>
1921
<LangVersion>latest</LangVersion>
22+
<NuGetPackageImportStamp>
23+
</NuGetPackageImportStamp>
2024
</PropertyGroup>
2125
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2226
<DebugSymbols>true</DebugSymbols>
@@ -37,72 +41,37 @@
3741
<WarningLevel>4</WarningLevel>
3842
<Prefer32Bit>false</Prefer32Bit>
3943
</PropertyGroup>
40-
<PropertyGroup>
41-
<SignAssembly>true</SignAssembly>
42-
<AssemblyOriginatorKeyFile>..\CodeMaid.snk</AssemblyOriginatorKeyFile>
43-
</PropertyGroup>
4444
<ItemGroup>
4545
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
4646
<EmbedInteropTypes>False</EmbedInteropTypes>
47-
<HintPath>..\packages\EnvDTE.8.0.1\lib\net10\EnvDTE.dll</HintPath>
48-
<Private>True</Private>
47+
</Reference>
48+
<Reference Include="EnvDTE100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
49+
<EmbedInteropTypes>False</EmbedInteropTypes>
4950
</Reference>
5051
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
5152
<EmbedInteropTypes>False</EmbedInteropTypes>
52-
<HintPath>..\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE80.dll</HintPath>
53-
<Private>True</Private>
5453
</Reference>
55-
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
56-
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
54+
<Reference Include="EnvDTE90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
55+
<EmbedInteropTypes>False</EmbedInteropTypes>
5856
</Reference>
57+
<Reference Include="Microsoft.CSharp" />
5958
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
60-
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\lib\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
59+
<HintPath>..\packages\VS.QualityTools.UnitTestFramework.15.0.27323.2\lib\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
6260
</Reference>
63-
<Reference Include="Microsoft.VisualStudio.Shell.11.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
64-
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\lib\Microsoft.VisualStudio.Shell.11.0.dll</HintPath>
61+
<Reference Include="Microsoft.VisualStudio.Threading, Version=15.8.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
62+
<HintPath>..\packages\Microsoft.VisualStudio.Threading.15.8.209\lib\net46\Microsoft.VisualStudio.Threading.dll</HintPath>
6663
</Reference>
67-
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
68-
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
70-
</Reference>
71-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
72-
<SpecificVersion>False</SpecificVersion>
73-
<EmbedInteropTypes>True</EmbedInteropTypes>
74-
<HintPath>..\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
75-
</Reference>
76-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
77-
<SpecificVersion>False</SpecificVersion>
78-
<EmbedInteropTypes>True</EmbedInteropTypes>
79-
<HintPath>..\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
80-
</Reference>
81-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
82-
<SpecificVersion>False</SpecificVersion>
83-
<HintPath>..\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
84-
</Reference>
85-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
86-
<SpecificVersion>False</SpecificVersion>
87-
<HintPath>..\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
88-
</Reference>
89-
<Reference Include="Microsoft.VSSDK.UnitTestLibrary, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
90-
<SpecificVersion>False</SpecificVersion>
91-
<HintPath>..\lib\Microsoft.VSSDK.UnitTestLibrary.dll</HintPath>
64+
<Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
65+
<HintPath>..\packages\Microsoft.VisualStudio.Validation.15.3.58\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
9266
</Reference>
9367
<Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
9468
<HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
9569
<Private>True</Private>
9670
</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>
10271
<Reference Include="System" />
10372
<Reference Include="System.Design" />
104-
<Reference Include="System.XML" />
10573
<Reference Include="System.Xml.Linq" />
74+
<Reference Include="WindowsBase" />
10675
</ItemGroup>
10776
<ItemGroup>
10877
<Compile Include="..\GlobalAssemblyInfo.cs">
@@ -118,14 +87,9 @@
11887
<Compile Include="Formatting\XmlFormattingTests.cs" />
11988
<Compile Include="Formatting\ListFormattingTests.cs" />
12089
<Compile Include="Helpers\CodeItemTypeComparerTests.cs" />
121-
<Compile Include="Helpers\CodeMaidPackageHelper.cs" />
12290
<Compile Include="Helpers\SettingsMonitorTests.cs" />
123-
<Compile Include="Helpers\UIShellServiceMock.cs" />
124-
<Compile Include="Helpers\WindowFrameMock.cs" />
125-
<Compile Include="CodeMaidPackageTest.cs" />
12691
<Compile Include="MemberTypeSettingTests.cs" />
12792
<Compile Include="Properties\AssemblyInfo.cs" />
128-
<Compile Include="SpadeTest.cs" />
12993
</ItemGroup>
13094
<ItemGroup>
13195
<ProjectReference Include="..\CodeMaid\CodeMaid.csproj">
@@ -140,6 +104,10 @@
140104
<None Include="app.config" />
141105
<None Include="packages.config" />
142106
</ItemGroup>
107+
<ItemGroup>
108+
<Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.209\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
109+
<Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.209\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
110+
</ItemGroup>
143111
<Choose>
144112
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
145113
<ItemGroup>
@@ -160,7 +128,14 @@
160128
</Choose>
161129
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
162130
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
163-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
131+
<Import Project="..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.209\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.209\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
132+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
133+
<PropertyGroup>
134+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
135+
</PropertyGroup>
136+
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.209\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.209\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
137+
</Target>
138+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
164139
Other similar extension points exist, see Microsoft.Common.targets.
165140
<Target Name="BeforeBuild">
166141
</Target>

‎CodeMaid.UnitTests/CodeMaidPackageTest.cs‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎CodeMaid.UnitTests/Helpers/CodeMaidPackageHelper.cs‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)