Merge branch 'develop'

alphacloud · Dec 4, 2016 · 9b04b86 · 9b04b86
2 parents 94ee9d8 + 07ff21d
commit 9b04b86
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 48 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,6 +1,5 @@
 assembly-versioning-scheme: MajorMinorPatch
-mode: ContinuousDelivery
-next-version: 0.3.0
+mode: Mainline
 branches: {}
 ignore:
   sha: []
diff --git a/README.md b/README.md
@@ -1,10 +1,11 @@
 # MSBuild.Xslt
 XSLT 3 transformation task for MSBuild
 
-This package provides SAXON-based XSLT 3 transformation tasks for MSBuild.
+This package provides SAXON-based XSLT 2 and XSLT 3 transformation tasks for MSBuild.
 This is **tools** package, i.e. no assembly references are added to .NET projects.
 
-Project is based on [Saxon-HE](http://nuget.org/List/Packages/Saxon-HE).
+Project uses [Saxon-HE](http://nuget.org/List/Packages/Saxon-HE) to perform XSLT transformation. 
+Please see http://www.saxonica.com/products/products.xml for details on Home Edition.
 
 [![Master branch build](https://ci.appveyor.com/api/projects/status/github/alphacloud/MSBuild.Xslt?branch=master&svg=true)](https://ci.appveyor.com/project/shatl/msbuild-xslt)
 
@@ -17,7 +18,7 @@ Install nuget package as usual.
 
 1. Import targets file 
 ```
-<Import Project="$(MSBuildProjectDirectory)\Packages\Alphacloud.MSBuild.Xslt.0.1.0.0\tools\Alphacloud.MSBuild.Xslt.targets" />
+<Import Project="$(MSBuildProjectDirectory)\Packages\Alphacloud.MSBuild.Xslt.0.3.1\tools\Alphacloud.MSBuild.Xslt.targets" />
 ```
 2. Execute task
 ```
@@ -35,7 +36,7 @@ Install nuget package as usual.
 Task parameters:
 * Input - Source XML file;
 * Xslt - XSL template;
-* OmitXmlDeclatation - omits `<?xml ?>` declaration from output file. Not required if output is configured with `<xsl:output />` instruction.
+* OmitXmlDeclatation - omits `<?xml ... ?>` declaration from output file. Not required if output is configured with `<xsl:output />` instruction.
 * Output - Generated file name.
 
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -22,7 +22,8 @@
     - choco install gitversion.portable -pre -y
 
   before_build:
-    - ps: gitversion /l console /output buildserver /updateAssemblyInfo
+    - ps: C:\ProgramData\chocolatey\bin\gfv.exe /l console /output buildserver /updateAssemblyInfo
+    - ps: appveyor-retry nuget restore src\Alphacloud.MSBuild.Xslt.sln 
 
   build_script:
   - cmd: '"%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" build.proj /t:BuildAll;Pack /p:PackageVersion="%GitVersion_NuGetVersion%'

diff --git a/src/Alphacloud.MSBuild.Xslt.sln b/src/Alphacloud.MSBuild.Xslt.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alphacloud.MSBuild.Xslt", "solution\Alphacloud.MSBuild.Xslt.csproj", "{02353814-7194-4688-B7E2-B8442DFF88A5}"
 EndProject
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\appveyor.yml = ..\appveyor.yml
 		..\build.proj = ..\build.proj
 		..\GitVersion.yml = ..\GitVersion.yml
+		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
 Global

diff --git a/src/solution/Alphacloud.MSBuild.Xslt.csproj b/src/solution/Alphacloud.MSBuild.Xslt.csproj
@@ -39,16 +39,14 @@
     </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="JetBrains.Annotations, Version=10.1.5.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\JetBrains.Annotations.10.1.5\lib\net\JetBrains.Annotations.dll</HintPath>
+    <Reference Include="JetBrains.Annotations, Version=10.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\JetBrains.Annotations.10.2.1\lib\net\JetBrains.Annotations.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="saxon9he-api, Version=9.7.0.7, Culture=neutral, PublicKeyToken=e1fdd002d5083fe6, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Saxon-HE.9.7.0.7\lib\net40\saxon9he-api.dll</HintPath>
+    <Reference Include="saxon9he-api, Version=9.7.0.13, Culture=neutral, PublicKeyToken=e1fdd002d5083fe6, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Saxon-HE.9.7.0.13\lib\net40\saxon9he-api.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/src/solution/Xslt.nuspec b/src/solution/Xslt.nuspec
@@ -3,18 +3,18 @@
   <metadata minClientVersion="2.8">
     <id>Alphacloud.MSBuild.Xslt</id>
     <version>0.2.3.0</version>
-    <title>XSLT 3 transformation for MSBuild.</title>
+    <title>XSLT 2 and 3 transformation for MSBuild.</title>
     <authors>Alphacloud.net</authors>
     <owners>Alphacloud.net</owners>
     <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
     <projectUrl>https://github.com/alphacloud/MSBuild.Xslt</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>XSTL 3 transformation for MSBuild.</description>
+    <description>XSTL 2 and 3 transformation for MSBuild.</description>
     <releaseNotes>
-Upgraded Saxon to 9.7.0.7.
+Upgraded Saxon to 9.7.0.13.
     </releaseNotes>
     <copyright>Copyright (c) 2016-2016 Alphacloud.net</copyright>
-    <tags>alphacloud msbuild xslt xslt-3 xml</tags>
+    <tags>alphacloud msbuild xslt xslt-2 xslt-3 xml</tags>
     <frameworkAssemblies></frameworkAssemblies>
     <dependencies></dependencies>
   </metadata>

diff --git a/src/solution/packages.config b/src/solution/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="JetBrains.Annotations" version="10.1.5" targetFramework="net40" />
-  <package id="Saxon-HE" version="9.7.0.7" targetFramework="net40" />
+  <package id="JetBrains.Annotations" version="10.2.1" targetFramework="net40" />
+  <package id="Saxon-HE" version="9.7.0.13" targetFramework="net40" />
 </packages>
diff --git a/src/tests/Alphacloud.MSBuild.Xslt.Tests.csproj b/src/tests/Alphacloud.MSBuild.Xslt.Tests.csproj
@@ -30,45 +30,39 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FluentAssertions, Version=4.12.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\FluentAssertions.4.12.0\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.17.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\FluentAssertions.4.17.0\lib\net45\FluentAssertions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.12.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\FluentAssertions.4.12.0\lib\net45\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.17.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\FluentAssertions.4.17.0\lib\net45\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="JetBrains.Annotations, Version=10.1.5.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\JetBrains.Annotations.10.1.5\lib\net\JetBrains.Annotations.dll</HintPath>
+    <Reference Include="JetBrains.Annotations, Version=10.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\JetBrains.Annotations.10.2.1\lib\net\JetBrains.Annotations.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="saxon9he-api, Version=9.7.0.7, Culture=neutral, PublicKeyToken=e1fdd002d5083fe6, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Saxon-HE.9.7.0.7\lib\net40\saxon9he-api.dll</HintPath>
+    <Reference Include="saxon9he-api, Version=9.7.0.13, Culture=neutral, PublicKeyToken=e1fdd002d5083fe6, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Saxon-HE.9.7.0.13\lib\net40\saxon9he-api.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="xmlunit-core, Version=2.2.0.90, Culture=neutral, PublicKeyToken=e7d7e3088fd452f6, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\XMLUnit.Core.2.2.0\lib\net35\xmlunit-core.dll</HintPath>
+    <Reference Include="xmlunit-core, Version=2.3.0.96, Culture=neutral, PublicKeyToken=e7d7e3088fd452f6, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XMLUnit.Core.2.3.0\lib\net35\xmlunit-core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xmlunit-nunit3-constraints, Version=2.2.0.90, Culture=neutral, PublicKeyToken=e7d7e3088fd452f6, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\XMLUnit.NUnit3.Constraints.2.2.0\lib\net35\xmlunit-nunit3-constraints.dll</HintPath>
+    <Reference Include="xmlunit-nunit3-constraints, Version=2.3.0.96, Culture=neutral, PublicKeyToken=e7d7e3088fd452f6, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XMLUnit.NUnit3.Constraints.2.3.0\lib\net35\xmlunit-nunit3-constraints.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -88,6 +82,7 @@
     <None Include="packages.config" />
     <None Include="TestTransform.proj">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </None>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/tests/app.config b/src/tests/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.4.1.0" newVersion="3.4.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/src/tests/packages.config b/src/tests/packages.config
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="4.12.0" targetFramework="net45" />
-  <package id="JetBrains.Annotations" version="10.1.5" targetFramework="net45" />
-  <package id="NUnit" version="3.4.1" targetFramework="net45" />
-  <package id="Saxon-HE" version="9.7.0.7" targetFramework="net45" />
-  <package id="XMLUnit.Core" version="2.2.0" targetFramework="net45" />
-  <package id="XMLUnit.NUnit3.Constraints" version="2.2.0" targetFramework="net45" />
+  <package id="FluentAssertions" version="4.17.0" targetFramework="net45" />
+  <package id="JetBrains.Annotations" version="10.2.1" targetFramework="net45" />
+  <package id="NUnit" version="3.5.0" targetFramework="net45" />
+  <package id="Saxon-HE" version="9.7.0.13" targetFramework="net45" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net45" />
+  <package id="XMLUnit.Core" version="2.3.0" targetFramework="net45" />
+  <package id="XMLUnit.NUnit3.Constraints" version="2.3.0" targetFramework="net45" />
 </packages>