Skip to content

Commit 226fd83

Browse files
flcdrgflcdrg
authored
Merge pull request #100 from flcdrg/vs2017
Vs2017
2 parents d498e4f + ac84349 commit 226fd83

File tree

7 files changed

+45
-66
lines changed

7 files changed

+45
-66
lines changed

‎src/Gardiner.XsltTools.Tests/Gardiner.XsltTools.Tests.csproj

+7-37
Original file line numberDiff line numberDiff line change
@@ -36,51 +36,23 @@
3636
</PropertyGroup>
3737
<ItemGroup>
3838
<Reference Include="ApprovalTests, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
39-
<HintPath>..\..\packages\ApprovalTests.3.0.11\lib\net40\ApprovalTests.dll</HintPath>
39+
<HintPath>..\..\packages\ApprovalTests.3.0.13\lib\net40\ApprovalTests.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="ApprovalUtilities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
43-
<HintPath>..\..\packages\ApprovalUtilities.3.0.11\lib\net45\ApprovalUtilities.dll</HintPath>
43+
<HintPath>..\..\packages\ApprovalUtilities.3.0.13\lib\net45\ApprovalUtilities.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="ApprovalUtilities.Net45, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\ApprovalUtilities.3.0.11\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
47+
<HintPath>..\..\packages\ApprovalUtilities.3.0.13\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
5050
<Reference Include="Microsoft.Language.Xml, Version=0.0.0.0, Culture=neutral, PublicKeyToken=d8943316a876e00f, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\Microsoft.Language.Xml.1.0.13\lib\net45\Microsoft.Language.Xml.dll</HintPath>
51+
<HintPath>..\..\packages\Microsoft.Language.Xml.1.0.15\lib\net45\Microsoft.Language.Xml.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
54-
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.dll</HintPath>
56-
<Private>True</Private>
57-
</Reference>
58-
<Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Mdb.dll</HintPath>
60-
<Private>True</Private>
61-
</Reference>
62-
<Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
63-
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Pdb.dll</HintPath>
64-
<Private>True</Private>
65-
</Reference>
66-
<Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
67-
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Rocks.dll</HintPath>
68-
<Private>True</Private>
69-
</Reference>
70-
<Reference Include="nunit.engine, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
71-
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\nunit.engine.dll</HintPath>
72-
<Private>True</Private>
73-
</Reference>
74-
<Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
75-
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\nunit.engine.api.dll</HintPath>
76-
<Private>True</Private>
77-
</Reference>
78-
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
79-
<HintPath>..\..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
80-
<Private>True</Private>
81-
</Reference>
82-
<Reference Include="NUnit3.TestAdapter, Version=3.4.1.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
83-
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\NUnit3.TestAdapter.dll</HintPath>
54+
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
55+
<HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
8456
<Private>True</Private>
8557
</Reference>
8658
<Reference Include="System" />
@@ -108,16 +80,14 @@
10880
<Compile Include="XPathTreeBuilderTests.cs" />
10981
<Compile Include="Properties\AssemblyInfo.cs" />
11082
</ItemGroup>
111-
<ItemGroup>
112-
<None Include="packages.config" />
113-
</ItemGroup>
11483
<ItemGroup>
11584
<ProjectReference Include="..\Gardiner.XsltTools\Gardiner.XsltTools.csproj">
11685
<Project>{0602540b-2ee9-4a21-8450-2901822c7b00}</Project>
11786
<Name>Gardiner.XsltTools</Name>
11887
</ProjectReference>
11988
</ItemGroup>
12089
<ItemGroup>
90+
<None Include="packages.config" />
12191
<None Include="XPathTreeBuilderTests.AllFredElements.approved.xml" />
12292
</ItemGroup>
12393
<Choose>

‎src/Gardiner.XsltTools.Tests/packages.config

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ApprovalTests" version="3.0.11" targetFramework="net461" />
4-
<package id="ApprovalUtilities" version="3.0.11" targetFramework="net461" />
5-
<package id="Microsoft.Language.Xml" version="1.0.13" targetFramework="net461" />
6-
<package id="NUnit" version="3.4.1" targetFramework="net461" />
7-
<package id="NUnit.Console" version="3.4.1" targetFramework="net461" />
8-
<package id="NUnit.ConsoleRunner" version="3.4.1" targetFramework="net461" />
9-
<package id="NUnit.Extension.NUnitProjectLoader" version="3.4.1" targetFramework="net461" />
10-
<package id="NUnit.Extension.NUnitV2Driver" version="3.4.1" targetFramework="net461" />
11-
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.4.1" targetFramework="net461" />
12-
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.1" targetFramework="net461" />
13-
<package id="NUnit.Extension.VSProjectLoader" version="3.4.1" targetFramework="net461" />
14-
<package id="NUnit3TestAdapter" version="3.4.1" targetFramework="net461" />
3+
<package id="ApprovalTests" version="3.0.13" targetFramework="net461" />
4+
<package id="ApprovalUtilities" version="3.0.13" targetFramework="net461" />
5+
<package id="Microsoft.Language.Xml" version="1.0.15" targetFramework="net461" />
6+
<package id="NUnit" version="3.6.1" targetFramework="net461" />
7+
<package id="NUnit.Console" version="3.6.1" targetFramework="net461" />
8+
<package id="NUnit.ConsoleRunner" version="3.6.1" targetFramework="net461" />
9+
<package id="NUnit.Extension.NUnitProjectLoader" version="3.5.0" targetFramework="net461" />
10+
<package id="NUnit.Extension.NUnitV2Driver" version="3.6.0" targetFramework="net461" />
11+
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.5.0" targetFramework="net461" />
12+
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
13+
<package id="NUnit.Extension.VSProjectLoader" version="3.5.0" targetFramework="net461" />
14+
<package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net461" />
1515
</packages>

‎src/Gardiner.XsltTools/FodyWeavers.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Weavers>
33
<PropertyChanged />
44
</Weavers>

‎src/Gardiner.XsltTools/Gardiner.XsltTools.csproj

+14-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" />
34
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props')" />
45
<Import Project="..\..\packages\Text.Analyzers.1.2.0-beta2\build\Text.Analyzers.props" Condition="Exists('..\..\packages\Text.Analyzers.1.2.0-beta2\build\Text.Analyzers.props')" />
56
<Import Project="..\..\packages\System.Threading.Tasks.Analyzers.1.2.0-beta2\build\System.Threading.Tasks.Analyzers.props" Condition="Exists('..\..\packages\System.Threading.Tasks.Analyzers.1.2.0-beta2\build\System.Threading.Tasks.Analyzers.props')" />
@@ -18,6 +19,7 @@
1819
</NuGetPackageImportStamp>
1920
<UseCodebase>true</UseCodebase>
2021
<Features>IOperation</Features>
22+
<VsixType>v3</VsixType>
2123
</PropertyGroup>
2224
<PropertyGroup>
2325
<SignAssembly>true</SignAssembly>
@@ -165,22 +167,22 @@
165167
<EmbedInteropTypes>False</EmbedInteropTypes>
166168
<Private>False</Private>
167169
</Reference>
168-
<Reference Include="JetBrains.Annotations, Version=10.1.5.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
169-
<HintPath>..\..\packages\JetBrains.Annotations.10.1.5\lib\net\JetBrains.Annotations.dll</HintPath>
170+
<Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
171+
<HintPath>..\..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
170172
<Private>True</Private>
171173
</Reference>
172174
<Reference Include="Microsoft.Build.Framework" />
173175
<Reference Include="Microsoft.CSharp" />
174-
<Reference Include="Microsoft.HockeyApp.Core45, Version=4.1.4.28552, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
175-
<HintPath>..\..\packages\HockeySDK.WPF.4.1.4\lib\net45\Microsoft.HockeyApp.Core45.dll</HintPath>
176+
<Reference Include="Microsoft.HockeyApp.Core45, Version=4.1.6.1005, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
177+
<HintPath>..\..\packages\HockeySDK.WPF.4.1.6\lib\net45\Microsoft.HockeyApp.Core45.dll</HintPath>
176178
<Private>True</Private>
177179
</Reference>
178-
<Reference Include="Microsoft.HockeyApp.Kit, Version=4.1.4.28552, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
179-
<HintPath>..\..\packages\HockeySDK.WPF.4.1.4\lib\net45\Microsoft.HockeyApp.Kit.dll</HintPath>
180+
<Reference Include="Microsoft.HockeyApp.Kit, Version=4.1.6.1005, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
181+
<HintPath>..\..\packages\HockeySDK.WPF.4.1.6\lib\net45\Microsoft.HockeyApp.Kit.dll</HintPath>
180182
<Private>True</Private>
181183
</Reference>
182184
<Reference Include="Microsoft.Language.Xml, Version=0.0.0.0, Culture=neutral, PublicKeyToken=d8943316a876e00f, processorArchitecture=MSIL">
183-
<HintPath>..\..\packages\Microsoft.Language.Xml.1.0.13\lib\net45\Microsoft.Language.Xml.dll</HintPath>
185+
<HintPath>..\..\packages\Microsoft.Language.Xml.1.0.15\lib\net45\Microsoft.Language.Xml.dll</HintPath>
184186
<Private>True</Private>
185187
</Reference>
186188
<Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -308,8 +310,8 @@
308310
</Reference>
309311
<Reference Include="PresentationCore" />
310312
<Reference Include="PresentationFramework" />
311-
<Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
312-
<HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\lib\dotnet\PropertyChanged.dll</HintPath>
313+
<Reference Include="PropertyChanged, Version=1.52.1.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
314+
<HintPath>..\..\packages\PropertyChanged.Fody.1.52.1\lib\netstandard10\PropertyChanged.dll</HintPath>
313315
<Private>False</Private>
314316
</Reference>
315317
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -395,9 +397,12 @@
395397
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props'))" />
396398
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets'))" />
397399
<Error Condition="!Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
400+
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props'))" />
401+
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets'))" />
398402
</Target>
399403
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets')" />
400404
<Import Project="..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
405+
<Import Project="..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" />
401406
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
402407
Other similar extension points exist, see Microsoft.Common.targets.
403408
<Target Name="BeforeBuild">

‎src/Gardiner.XsltTools/packages.config

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<packages>
33
<package id="Desktop.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
44
<package id="Fody" version="1.29.4" targetFramework="net461" developmentDependency="true" />
5-
<package id="HockeySDK.Core" version="4.1.4" targetFramework="net461" />
6-
<package id="HockeySDK.WPF" version="4.1.4" targetFramework="net461" />
7-
<package id="JetBrains.Annotations" version="10.1.5" targetFramework="net461" />
5+
<package id="HockeySDK.Core" version="4.1.6" targetFramework="net461" />
6+
<package id="HockeySDK.WPF" version="4.1.6" targetFramework="net461" />
7+
<package id="JetBrains.Annotations" version="10.4.0" targetFramework="net461" />
88
<package id="Microsoft.ApiDesignGuidelines.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
99
<package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="1.2.0-beta2" targetFramework="net461" />
10-
<package id="Microsoft.Language.Xml" version="1.0.13" targetFramework="net461" />
10+
<package id="Microsoft.Language.Xml" version="1.0.15" targetFramework="net461" />
1111
<package id="Microsoft.Maintainability.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
1212
<package id="Microsoft.QualityGuidelines.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
1313
<package id="Microsoft.VisualStudio.CoreUtility" version="14.3.25407" targetFramework="net461" />
@@ -17,6 +17,7 @@
1717
<package id="Microsoft.VisualStudio.Language.StandardClassification" version="14.3.25407" targetFramework="net461" />
1818
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net461" />
1919
<package id="Microsoft.VisualStudio.Package.LanguageService.14.0" version="14.3.25407" targetFramework="net461" />
20+
<package id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" version="14.0.23-pre" targetFramework="net461" developmentDependency="true" />
2021
<package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net461" />
2122
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net461" />
2223
<package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net461" />
@@ -39,7 +40,7 @@
3940
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net461" />
4041
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net461" />
4142
<package id="Microsoft.VSSDK.BuildTools" version="14.3.25420" targetFramework="net461" developmentDependency="true" />
42-
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net461" developmentDependency="true" />
43+
<package id="PropertyChanged.Fody" version="1.52.1" targetFramework="net461" developmentDependency="true" />
4344
<package id="System.Collections.Immutable.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
4445
<package id="System.Resources.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
4546
<package id="System.Runtime.Analyzers" version="1.2.0-beta2" targetFramework="net461" />

‎src/Gardiner.XsltTools/source.extension.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// ------------------------------------------------------------------------------
22
// <auto-generated>
3-
// This file was generated by Extensibility Tools v1.10.182
3+
// This file was generated by Extensibility Tools v1.10.188
44
// </auto-generated>
55
// ------------------------------------------------------------------------------
66
namespace Gardiner.XsltTools

‎src/Gardiner.XsltTools/source.extension.vsixmanifest

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Static analysis runs on Build, and lists any rule violations in the Error List w
1616
<Tags>xslt, static analysis, fxcop</Tags>
1717
</Metadata>
1818
<Installation>
19-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
19+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,16.0)" />
2020
</Installation>
2121
<Dependencies>
2222
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
@@ -26,4 +26,7 @@ Static analysis runs on Build, and lists any rule violations in the Error List w
2626
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
2727
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
2828
</Assets>
29+
<Prerequisites>
30+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
31+
</Prerequisites>
2932
</PackageManifest>

0 commit comments

Comments
 (0)