Version bump (+ minor script update).

jwaliszko · Feb 9, 2016 · d4aed1f · d4aed1f
1 parent 1b5eb0d
commit d4aed1f
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 38 deletions.
diff --git a/build/2.6.7/ExpressiveAnnotations/api.chm b/build/2.6.7/ExpressiveAnnotations/api.chm
diff --git a/build/test.ps1 b/build/test.ps1
@@ -7,9 +7,6 @@ if($env:APPVEYOR -eq $true) {
     $buildcfg = $env:CONFIGURATION
 }
 
-# for sake of peace kill zombies, if any
-Get-Process -Name 'phantomjs','iisexpress' -ErrorAction Ignore | Stop-Process -Force
-
 # collect tools
 $xunitdir = Get-ChildItem $rootdir xunit.console.exe -Recurse | Select-Object -First 1 | Select -Expand Directory
 $opencoverdir = Get-ChildItem $rootdir OpenCover.Console.exe -Recurse | Select-Object -First 1 | Select -Expand Directory
@@ -31,7 +28,7 @@ $formtest = "$rootdir\src\tests.html"
 
 # run tests and analyze code coverage
 $opencovercmd = "$opencover -register:user -hideskipped:All -mergebyhash '-target:$xunit' '-targetargs:$eatestdll $vatestdll $uitestdll -noshadow -appveyor' -returntargetcode '-targetdir:$webmvcbin' '-filter:+[ExpressiveAnnotations(.MvcUnobtrusive)?]*' '-output:.\csharp-coverage.xml'"
-$chutzpahcmd = "$chutzpah /path $maintest /path $formtest /coverage /coverageExcludes '*jquery*' /junit .\chutzpah-results.xml /lcov .\chutzpah-results.lcov"
+$chutzpahcmd = "$chutzpah /path $maintest /path $formtest /coverage /coverageIgnores '*test*, *jquery*' /junit .\chutzpah-results.xml /lcov .\chutzpah-results.lcov"
 
 Invoke-Expression $opencovercmd
 Invoke-Expression $chutzpahcmd

diff --git a/doc/api/api.chm b/doc/api/api.chm
diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Chutzpah" version="4.1.0" />
-  <package id="OpenCover" version="4.6.166" />
+  <package id="Chutzpah" version="4.2.0" />
+  <package id="OpenCover" version="4.6.519" />
   <package id="xunit.runner.console" version="2.1.0" />
 </packages>
diff --git a/...ressiveAnnotations.MvcUnobtrusive.Tests/ExpressiveAnnotations.MvcUnobtrusive.Tests.csproj b/...ressiveAnnotations.MvcUnobtrusive.Tests/ExpressiveAnnotations.MvcUnobtrusive.Tests.csproj
@@ -127,9 +127,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources.pl.resx" />

diff --git a/src/ExpressiveAnnotations.MvcUnobtrusive/ExpressiveAnnotations.MvcUnobtrusive.csproj b/src/ExpressiveAnnotations.MvcUnobtrusive/ExpressiveAnnotations.MvcUnobtrusive.csproj
@@ -104,9 +104,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ExpressiveAnnotations\ExpressiveAnnotations.csproj">

diff --git a/...ressiveAnnotations.MvcWebSample.UITests/ExpressiveAnnotations.MvcWebSample.UITests.csproj b/...ressiveAnnotations.MvcWebSample.UITests/ExpressiveAnnotations.MvcWebSample.UITests.csproj
@@ -44,12 +44,12 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WebDriver, Version=2.48.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.WebDriver.2.48.2\lib\net40\WebDriver.dll</HintPath>
+    <Reference Include="WebDriver, Version=2.51.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.WebDriver.2.51.0\lib\net40\WebDriver.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="WebDriver.Support, Version=2.48.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.Support.2.48.2\lib\net40\WebDriver.Support.dll</HintPath>
+    <Reference Include="WebDriver.Support, Version=2.51.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.Support.2.51.0\lib\net40\WebDriver.Support.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
@@ -84,9 +84,7 @@
     <Compile Include="ServerFixture.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -99,7 +97,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\packages\PhantomJS.2.0.0\tools\phantomjs\phantomjs.exe">
+    <Content Include="..\packages\PhantomJS.2.1.1\tools\phantomjs\phantomjs.exe">
       <Link>phantomjs.exe</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/src/ExpressiveAnnotations.MvcWebSample.UITests/packages.config b/src/ExpressiveAnnotations.MvcWebSample.UITests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="PhantomJS" version="2.0.0" targetFramework="net451" />
-  <package id="Selenium.Support" version="2.48.2" targetFramework="net451" />
-  <package id="Selenium.WebDriver" version="2.48.2" targetFramework="net451" />
+  <package id="PhantomJS" version="2.1.1" targetFramework="net451" />
+  <package id="Selenium.Support" version="2.51.0" targetFramework="net451" />
+  <package id="Selenium.WebDriver" version="2.51.0" targetFramework="net451" />
   <package id="xunit" version="2.1.0" targetFramework="net451" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
   <package id="xunit.assemblyfixture" version="2.0.2" targetFramework="net451" />

diff --git a/src/ExpressiveAnnotations.MvcWebSample/ExpressiveAnnotations.MvcWebSample.csproj b/src/ExpressiveAnnotations.MvcWebSample/ExpressiveAnnotations.MvcWebSample.csproj
@@ -228,9 +228,7 @@
     <Content Include="Scripts\jquery.validate.unobtrusive.js" />
     <Content Include="Content\site.css" />
     <Content Include="Global.asax" />
-    <Content Include="Web.config">
-      <SubType>Designer</SubType>
-    </Content>
+    <Content Include="Web.config" />
     <Content Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </Content>
@@ -281,9 +279,7 @@
     <Content Include="Views\Home\EditorTemplates\Address.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="packages.config">
-      <SubType>Designer</SubType>
-    </Content>
+    <Content Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ExpressiveAnnotations.MvcUnobtrusive\ExpressiveAnnotations.MvcUnobtrusive.csproj">

diff --git a/src/ExpressiveAnnotations.MvvmDesktopSample/ExpressiveAnnotations.MvvmDesktopSample.csproj b/src/ExpressiveAnnotations.MvvmDesktopSample/ExpressiveAnnotations.MvvmDesktopSample.csproj
@@ -80,9 +80,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\ContactView.xaml">
-      <SubType>Designer</SubType>
+    <Page Include="Views\ContactView.xaml">      
       <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
     <Page Include="Views\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -96,9 +96,9 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="Views\QueryView.xaml">
-      <SubType>Designer</SubType>
+    <Page Include="Views\QueryView.xaml">      
       <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
   <ItemGroup>
@@ -127,9 +127,7 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ExpressiveAnnotations\ExpressiveAnnotations.csproj">

diff --git a/src/ExpressiveAnnotations/Properties/AssemblyInfo.cs b/src/ExpressiveAnnotations/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.6.0")]
-[assembly: AssemblyFileVersion("2.3.6.0")]
+[assembly: AssemblyVersion("2.3.7.0")]
+[assembly: AssemblyFileVersion("2.3.7.0")]