Skip to content

Commit

Permalink
Merge pull request #100 from flcdrg/vs2017
Browse files Browse the repository at this point in the history 
Vs2017
  • Loading branch information
@flcdrg
flcdrg authored Mar 12, 2017
2 parents d498e4f + ac84349 commit 226fd83
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 66 deletions.
44 changes: 7 additions & 37 deletions src/Gardiner.XsltTools.Tests/Gardiner.XsltTools.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,51 +36,23 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ApprovalTests, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
<HintPath>..\..\packages\ApprovalTests.3.0.11\lib\net40\ApprovalTests.dll</HintPath>
<HintPath>..\..\packages\ApprovalTests.3.0.13\lib\net40\ApprovalTests.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ApprovalUtilities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
<HintPath>..\..\packages\ApprovalUtilities.3.0.11\lib\net45\ApprovalUtilities.dll</HintPath>
<HintPath>..\..\packages\ApprovalUtilities.3.0.13\lib\net45\ApprovalUtilities.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ApprovalUtilities.Net45, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ApprovalUtilities.3.0.11\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
<HintPath>..\..\packages\ApprovalUtilities.3.0.13\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Language.Xml, Version=0.0.0.0, Culture=neutral, PublicKeyToken=d8943316a876e00f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Language.Xml.1.0.13\lib\net45\Microsoft.Language.Xml.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Language.Xml.1.0.15\lib\net45\Microsoft.Language.Xml.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Mdb.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Pdb.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Rocks.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.engine, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\nunit.engine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\nunit.engine.api.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NUnit3.TestAdapter, Version=3.4.1.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit3TestAdapter.3.4.1\lib\NUnit3.TestAdapter.dll</HintPath>
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -108,16 +80,14 @@
<Compile Include="XPathTreeBuilderTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Gardiner.XsltTools\Gardiner.XsltTools.csproj">
<Project>{0602540b-2ee9-4a21-8450-2901822c7b00}</Project>
<Name>Gardiner.XsltTools</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="XPathTreeBuilderTests.AllFredElements.approved.xml" />
</ItemGroup>
<Choose>
Expand Down
24 changes: 12 additions & 12 deletions src/Gardiner.XsltTools.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ApprovalTests" version="3.0.11" targetFramework="net461" />
<package id="ApprovalUtilities" version="3.0.11" targetFramework="net461" />
<package id="Microsoft.Language.Xml" version="1.0.13" targetFramework="net461" />
<package id="NUnit" version="3.4.1" targetFramework="net461" />
<package id="NUnit.Console" version="3.4.1" targetFramework="net461" />
<package id="NUnit.ConsoleRunner" version="3.4.1" targetFramework="net461" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.4.1" targetFramework="net461" />
<package id="NUnit.Extension.NUnitV2Driver" version="3.4.1" targetFramework="net461" />
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.4.1" targetFramework="net461" />
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.1" targetFramework="net461" />
<package id="NUnit.Extension.VSProjectLoader" version="3.4.1" targetFramework="net461" />
<package id="NUnit3TestAdapter" version="3.4.1" targetFramework="net461" />
<package id="ApprovalTests" version="3.0.13" targetFramework="net461" />
<package id="ApprovalUtilities" version="3.0.13" targetFramework="net461" />
<package id="Microsoft.Language.Xml" version="1.0.15" targetFramework="net461" />
<package id="NUnit" version="3.6.1" targetFramework="net461" />
<package id="NUnit.Console" version="3.6.1" targetFramework="net461" />
<package id="NUnit.ConsoleRunner" version="3.6.1" targetFramework="net461" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.5.0" targetFramework="net461" />
<package id="NUnit.Extension.NUnitV2Driver" version="3.6.0" targetFramework="net461" />
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.5.0" targetFramework="net461" />
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
<package id="NUnit.Extension.VSProjectLoader" version="3.5.0" targetFramework="net461" />
<package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net461" />
</packages>
2 changes: 1 addition & 1 deletion src/Gardiner.XsltTools/FodyWeavers.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<PropertyChanged />
</Weavers>
23 changes: 14 additions & 9 deletions src/Gardiner.XsltTools/Gardiner.XsltTools.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<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')" />
<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')" />
<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')" />
<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')" />
Expand All @@ -18,6 +19,7 @@
</NuGetPackageImportStamp>
<UseCodebase>true</UseCodebase>
<Features>IOperation</Features>
<VsixType>v3</VsixType>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
Expand Down Expand Up @@ -165,22 +167,22 @@
<EmbedInteropTypes>False</EmbedInteropTypes>
<Private>False</Private>
</Reference>
<Reference Include="JetBrains.Annotations, Version=10.1.5.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
<HintPath>..\..\packages\JetBrains.Annotations.10.1.5\lib\net\JetBrains.Annotations.dll</HintPath>
<Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
<HintPath>..\..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.HockeyApp.Core45, Version=4.1.4.28552, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\HockeySDK.WPF.4.1.4\lib\net45\Microsoft.HockeyApp.Core45.dll</HintPath>
<Reference Include="Microsoft.HockeyApp.Core45, Version=4.1.6.1005, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\HockeySDK.WPF.4.1.6\lib\net45\Microsoft.HockeyApp.Core45.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.HockeyApp.Kit, Version=4.1.4.28552, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\HockeySDK.WPF.4.1.4\lib\net45\Microsoft.HockeyApp.Kit.dll</HintPath>
<Reference Include="Microsoft.HockeyApp.Kit, Version=4.1.6.1005, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\HockeySDK.WPF.4.1.6\lib\net45\Microsoft.HockeyApp.Kit.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Language.Xml, Version=0.0.0.0, Culture=neutral, PublicKeyToken=d8943316a876e00f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Language.Xml.1.0.13\lib\net45\Microsoft.Language.Xml.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Language.Xml.1.0.15\lib\net45\Microsoft.Language.Xml.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
Expand Down Expand Up @@ -308,8 +310,8 @@
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
<HintPath>..\..\packages\PropertyChanged.Fody.1.51.3\lib\dotnet\PropertyChanged.dll</HintPath>
<Reference Include="PropertyChanged, Version=1.52.1.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
<HintPath>..\..\packages\PropertyChanged.Fody.1.52.1\lib\netstandard10\PropertyChanged.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
Expand Down Expand Up @@ -395,9 +397,12 @@
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
</Target>
<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')" />
<Import Project="..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
<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')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
11 changes: 6 additions & 5 deletions src/Gardiner.XsltTools/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<packages>
<package id="Desktop.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
<package id="Fody" version="1.29.4" targetFramework="net461" developmentDependency="true" />
<package id="HockeySDK.Core" version="4.1.4" targetFramework="net461" />
<package id="HockeySDK.WPF" version="4.1.4" targetFramework="net461" />
<package id="JetBrains.Annotations" version="10.1.5" targetFramework="net461" />
<package id="HockeySDK.Core" version="4.1.6" targetFramework="net461" />
<package id="HockeySDK.WPF" version="4.1.6" targetFramework="net461" />
<package id="JetBrains.Annotations" version="10.4.0" targetFramework="net461" />
<package id="Microsoft.ApiDesignGuidelines.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
<package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="1.2.0-beta2" targetFramework="net461" />
<package id="Microsoft.Language.Xml" version="1.0.13" targetFramework="net461" />
<package id="Microsoft.Language.Xml" version="1.0.15" targetFramework="net461" />
<package id="Microsoft.Maintainability.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
<package id="Microsoft.QualityGuidelines.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
<package id="Microsoft.VisualStudio.CoreUtility" version="14.3.25407" targetFramework="net461" />
Expand All @@ -17,6 +17,7 @@
<package id="Microsoft.VisualStudio.Language.StandardClassification" version="14.3.25407" targetFramework="net461" />
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Package.LanguageService.14.0" version="14.3.25407" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" version="14.0.23-pre" targetFramework="net461" developmentDependency="true" />
<package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net461" />
Expand All @@ -39,7 +40,7 @@
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net461" />
<package id="Microsoft.VSSDK.BuildTools" version="14.3.25420" targetFramework="net461" developmentDependency="true" />
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net461" developmentDependency="true" />
<package id="PropertyChanged.Fody" version="1.52.1" targetFramework="net461" developmentDependency="true" />
<package id="System.Collections.Immutable.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
<package id="System.Resources.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
<package id="System.Runtime.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
Expand Down
2 changes: 1 addition & 1 deletion src/Gardiner.XsltTools/source.extension.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ------------------------------------------------------------------------------
// <auto-generated>
// This file was generated by Extensibility Tools v1.10.182
// This file was generated by Extensibility Tools v1.10.188
// </auto-generated>
// ------------------------------------------------------------------------------
namespace Gardiner.XsltTools
Expand Down
5 changes: 4 additions & 1 deletion src/Gardiner.XsltTools/source.extension.vsixmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Static analysis runs on Build, and lists any rule violations in the Error List w
<Tags>xslt, static analysis, fxcop</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,16.0)" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
Expand All @@ -26,4 +26,7 @@ Static analysis runs on Build, and lists any rule violations in the Error List w
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>

0 comments on commit 226fd83

Please sign in to comment.