From 2d47342dedf31e578d0fd4e2b46defa5414fe289 Mon Sep 17 00:00:00 2001
From: Sergey Teplyakov <Sergey.Teplyakov@gmail.com>
Date: Mon, 12 Oct 2015 23:54:27 -0700
Subject: [PATCH] Minor fixes.

---
 ContractExtensions.nuspec                     |   8 +-
 .../ReSharper.ContractExtensions.csproj       |   1 +
 ContractExtensions/ZooMarker.cs               |  10 ++
 ContractExtensions/packages.config            |   2 -
 .../ReSharper.ContractExtensions.Tests.csproj |   5 +-
 .../packages.config                           | 147 ++++++------------
 6 files changed, 66 insertions(+), 107 deletions(-)
 create mode 100644 ContractExtensions/ZooMarker.cs

diff --git a/ContractExtensions.nuspec b/ContractExtensions.nuspec
index 6bc82f4..ddc4de4 100644
--- a/ContractExtensions.nuspec
+++ b/ContractExtensions.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>ReSharper.ContractExtensions</id>
-    <version>0.9.2.0</version>
+    <version>0.9.2.5</version>
     <!-- update plugin ver in AssemblyInfo.cs plz -->
     <title>Code Contract editing extensions</title>
     <authors>Sergey Teplyakov, https://github.com/Diagonactic</authors>
@@ -15,11 +15,11 @@
       Detects Code Contract error/warnings in the IDE.
     </description>
 	<dependencies>
-		<dependency id="Wave" version="[3.0]" />
+		<dependency id="Wave" version="[3.0, 4.0)" />
 	</dependencies>
     <releaseNotes>
 
-*What's new in 0.9.2.0*
+*What's new in 0.9.2.4*
 Updated to API for ReSharper 9.2
 Minor bug fixes.
 Support for nameof(s) in requires
@@ -99,6 +99,6 @@ Bug fixes
     <tags>code contracts design by contract</tags>
   </metadata>
   <files>
-    <file src="ContractExtensions\bin\Release\" target="DotFiles" />
+    <file src="ContractExtensions\bin\Release\ReSharper.ContractExtensions*.dll" target="DotFiles" />
   </files>
 </package>
diff --git a/ContractExtensions/ReSharper.ContractExtensions.csproj b/ContractExtensions/ReSharper.ContractExtensions.csproj
index 67fc179..fc0e01f 100644
--- a/ContractExtensions/ReSharper.ContractExtensions.csproj
+++ b/ContractExtensions/ReSharper.ContractExtensions.csproj
@@ -379,6 +379,7 @@
     <Compile Include="Utilities\TreeNodeExtensions.cs" />
     <Compile Include="Utilities\JetTypeEx.cs" />
     <Compile Include="Utilities\TypeExtensions.cs" />
+    <Compile Include="ZooMarker.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="ProblemAnalyzers\PreconditionAnalyzers\PurityAnalyzers\" />
diff --git a/ContractExtensions/ZooMarker.cs b/ContractExtensions/ZooMarker.cs
new file mode 100644
index 0000000..2209d41
--- /dev/null
+++ b/ContractExtensions/ZooMarker.cs
@@ -0,0 +1,10 @@
+using JetBrains.Application.BuildScript.Application.Zones;
+using JetBrains.ReSharper.Feature.Services;
+using JetBrains.ReSharper.Psi.CSharp;
+
+namespace ReSharper.ContractExtensions
+{
+    [ZoneMarker]
+    public class ZoneMarker : IRequire<ICodeEditingZone>, IRequire<ILanguageCSharpZone> { }
+
+}
\ No newline at end of file
diff --git a/ContractExtensions/packages.config b/ContractExtensions/packages.config
index e8d219b..63a310e 100644
--- a/ContractExtensions/packages.config
+++ b/ContractExtensions/packages.config
@@ -30,7 +30,6 @@
   <package id="JetBrains.Psi.Features.VisualStudio" version="103.0.20150819.145114" targetFramework="net4" />
   <package id="JetBrains.ReSharper.SDK" version="9.2.20150819.163916" targetFramework="net4" developmentDependency="true" />
   <package id="JetBrains.Unix.Utils" version="20150702.4" targetFramework="net4" />
-  <package id="jQuery" version="2.1.4" targetFramework="net4" />
   <package id="Microsoft.VC100.CRT.JetBrains" version="10.00.40219.2" targetFramework="net4" />
   <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net4" />
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net4" />
@@ -39,7 +38,6 @@
   <package id="NUnit" version="2.6.4" targetFramework="net4" />
   <package id="NUnit.Core" version="2.6.4" targetFramework="net4" />
   <package id="NVelocity" version="1.0.3" targetFramework="net4" />
-  <package id="SampleDependency" version="1.0.0" targetFramework="net4" />
   <package id="SharpZipLib.JetBrains.Stripped" version="0.86.20150204.1" targetFramework="net4" />
   <package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net4" />
   <package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net4" />
diff --git a/ReSharper.ContractExtensions.Tests/ReSharper.ContractExtensions.Tests.csproj b/ReSharper.ContractExtensions.Tests/ReSharper.ContractExtensions.Tests.csproj
index 402e858..df3a32f 100644
--- a/ReSharper.ContractExtensions.Tests/ReSharper.ContractExtensions.Tests.csproj
+++ b/ReSharper.ContractExtensions.Tests/ReSharper.ContractExtensions.Tests.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<Import Project="..\..\packages\JetBrains.ReSharper.SDK.Tests.9.2.20150819.163916\build\JetBrains.ReSharper.SDK.Tests.props" Condition="Exists('..\..\packages\JetBrains.ReSharper.SDK.Tests.9.2.20150819.163916\build\JetBrains.ReSharper.SDK.Tests.props')" />  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="..\..\packages\JetBrains.ReSharper.SDK.Tests.9.2.20150819.163916\build\JetBrains.ReSharper.SDK.Tests.props" Condition="Exists('..\..\packages\JetBrains.ReSharper.SDK.Tests.9.2.20150819.163916\build\JetBrains.ReSharper.SDK.Tests.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -234,7 +235,7 @@
     <None Include="Scripts\jquery-2.1.4.min.map" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Scripts\jquery-2.1.4-vsdoc.js" />
+    <Content Include="Scripts\jquery-2.1.4.intellisense.js" />
     <Content Include="Scripts\jquery-2.1.4.js" />
     <Content Include="Scripts\jquery-2.1.4.min.js" />
     <Content Include="Scripts\nugetexample.js" />
diff --git a/ReSharper.ContractExtensions.Tests/packages.config b/ReSharper.ContractExtensions.Tests/packages.config
index 6078008..e8d219b 100644
--- a/ReSharper.ContractExtensions.Tests/packages.config
+++ b/ReSharper.ContractExtensions.Tests/packages.config
@@ -1,101 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net40" />
-  <package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net40" />
-  <package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net40" />
-  <package id="JetBrains.Annotations" version="9.2.0" targetFramework="net40" />
-  <package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20150812.0" targetFramework="net40" developmentDependency="true" />
-  <package id="JetBrains.ExternalAnnotations" version="9.2.1" targetFramework="net40" />
-  <package id="JetBrains.Platform.Core.Ide" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Platform.Core.Shell" version="103.0.20150818.190334" targetFramework="net40" />
-  <package id="JetBrains.Platform.Core.Text" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Platform.Installer" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20150224.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab" version="2.0.20140304.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.Microsoft.Deployment.WindowsInstaller" version="2.0.20140821.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild" version="2.0.20140304.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Symbols" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Platform.Tests.Framework" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Platform.VisualStudio" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.Core" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.Cpp.src" version="103.0.20150819.153342" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.SolutionBuilder" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.src" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.Tasks" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.test.Framework" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.UnitTesting" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.VisualStudio" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.ReSharper.SDK" version="9.2.20150819.163916" targetFramework="net40" developmentDependency="true" />
-  <package id="JetBrains.Unix.Utils" version="20150702.4" targetFramework="net40" />
-  <package id="jQuery" version="2.1.4" targetFramework="net40" />
-  <package id="Microsoft.VC100.CRT.JetBrains" version="10.00.40219.2" targetFramework="net40" />
-  <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net40" />
-  <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
-  <package id="Newtonsoft35.Json" version="7.0.1" targetFramework="net40" />
-  <package id="NuGet.Core" version="2.8.6" targetFramework="net40" />
-  <package id="NUnit" version="2.6.4" targetFramework="net40" />
-  <package id="NUnit.Core" version="2.6.4" targetFramework="net40" />
-  <package id="NVelocity" version="1.0.3" targetFramework="net40" />
-  <package id="SampleDependency" version="1.0.0" targetFramework="net40" />
-  <package id="SharpZipLib.JetBrains.Stripped" version="0.86.20150204.1" targetFramework="net40" />
-  <package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net40" />
-  <package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net40" />
-  <package id="Wave" version="3.0.0.0" targetFramework="net40" />
-  <package id="WinDbg.SymStore" version="8.1.20130822.1833" targetFramework="net40" developmentDependency="true" />
-  <package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net40" />
-  <package id="xmlrpcnet" version="2.5.0" targetFramework="net40" />
-</packages>
-
-<!--<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net40" />
-  <package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net40" />
-  <package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net40" />
-  <package id="JetBrains.Annotations" version="9.2.0" targetFramework="net40" />
-  <package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20150812.0" targetFramework="net40" developmentDependency="true" />
-  <package id="JetBrains.ExternalAnnotations" version="9.2.1" targetFramework="net40" />
-  <package id="JetBrains.Platform.Core.Ide" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Platform.Core.Shell" version="103.0.20150818.190334" targetFramework="net40" />
-  <package id="JetBrains.Platform.Core.Text" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Platform.Installer" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20150224.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab" version="2.0.20140304.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.Microsoft.Deployment.WindowsInstaller" version="2.0.20140821.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild" version="2.0.20140304.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Symbols" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Platform.Tests.Framework" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Platform.VisualStudio" version="103.0.20150818.200225" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.Core" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.Cpp.src" version="103.0.20150819.153342" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.SolutionBuilder" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.src" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.Tasks" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.test.Framework" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.UnitTesting" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.VisualStudio" version="103.0.20150819.145114" targetFramework="net40" />
-  <package id="JetBrains.ReSharper.SDK" version="9.2.20150819.163916" targetFramework="net40" developmentDependency="true" />
-  <package id="JetBrains.Unix.Utils" version="20150702.4" targetFramework="net40" />
-  <package id="jQuery" version="2.1.4" targetFramework="net40" />
-  <package id="Microsoft.VC100.CRT.JetBrains" version="10.00.40219.2" targetFramework="net40" />
-  <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net40" />
-  <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
-  <package id="Newtonsoft35.Json" version="7.0.1" targetFramework="net40" />
-  <package id="NuGet.Core" version="2.8.6" targetFramework="net40" />
-  <package id="NUnit" version="2.6.4" targetFramework="net40" />
-  <package id="NUnit.Core" version="2.6.4" targetFramework="net40" />
-  <package id="NVelocity" version="1.0.3" targetFramework="net40" />
-  <package id="SampleDependency" version="1.0.0" targetFramework="net40" />
-  <package id="SharpZipLib.JetBrains.Stripped" version="0.86.20150204.1" targetFramework="net40" />
-  <package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net40" />
-  <package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net40" />
-  <package id="Wave" version="3.0.0.0" targetFramework="net40" />
-  <package id="WinDbg.SymStore" version="8.1.20130822.1833" targetFramework="net40" developmentDependency="true" />
-  <package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net40" />
-  <package id="xmlrpcnet" version="2.5.0" targetFramework="net40" />
-</packages>-->
\ No newline at end of file
+  <package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net4" />
+  <package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net4" />
+  <package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net4" />
+  <package id="JetBrains.Annotations" version="9.2.0" targetFramework="net4" />
+  <package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20150812.0" targetFramework="net4" developmentDependency="true" />
+  <package id="JetBrains.ExternalAnnotations" version="9.2.1" targetFramework="net4" />
+  <package id="JetBrains.Platform.Core.Ide" version="103.0.20150818.200225" targetFramework="net4" />
+  <package id="JetBrains.Platform.Core.Shell" version="103.0.20150818.190334" targetFramework="net4" />
+  <package id="JetBrains.Platform.Core.Text" version="103.0.20150818.200225" targetFramework="net4" />
+  <package id="JetBrains.Platform.Installer" version="103.0.20150818.200225" targetFramework="net4" />
+  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="103.0.20150818.200225" targetFramework="net4" />
+  <package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20150224.0" targetFramework="net4" />
+  <package id="JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab" version="2.0.20140304.0" targetFramework="net4" />
+  <package id="JetBrains.Platform.Lib.Microsoft.Deployment.WindowsInstaller" version="2.0.20140821.0" targetFramework="net4" />
+  <package id="JetBrains.Platform.Lib.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net4" />
+  <package id="JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild" version="2.0.20140304.0" targetFramework="net4" />
+  <package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net4" />
+  <package id="JetBrains.Platform.Symbols" version="103.0.20150818.200225" targetFramework="net4" />
+  <package id="JetBrains.Platform.Tests.Framework" version="103.0.20150818.200225" targetFramework="net4" />
+  <package id="JetBrains.Platform.VisualStudio" version="103.0.20150818.200225" targetFramework="net4" />
+  <package id="JetBrains.Psi.Features.Core" version="103.0.20150819.145114" targetFramework="net4" />
+  <package id="JetBrains.Psi.Features.Cpp.src" version="103.0.20150819.153342" targetFramework="net4" />
+  <package id="JetBrains.Psi.Features.SolutionBuilder" version="103.0.20150819.145114" targetFramework="net4" />
+  <package id="JetBrains.Psi.Features.src" version="103.0.20150819.145114" targetFramework="net4" />
+  <package id="JetBrains.Psi.Features.Tasks" version="103.0.20150819.145114" targetFramework="net4" />
+  <package id="JetBrains.Psi.Features.test.Framework" version="103.0.20150819.145114" targetFramework="net4" />
+  <package id="JetBrains.Psi.Features.UnitTesting" version="103.0.20150819.145114" targetFramework="net4" />
+  <package id="JetBrains.Psi.Features.VisualStudio" version="103.0.20150819.145114" targetFramework="net4" />
+  <package id="JetBrains.ReSharper.SDK" version="9.2.20150819.163916" targetFramework="net4" developmentDependency="true" />
+  <package id="JetBrains.Unix.Utils" version="20150702.4" targetFramework="net4" />
+  <package id="jQuery" version="2.1.4" targetFramework="net4" />
+  <package id="Microsoft.VC100.CRT.JetBrains" version="10.00.40219.2" targetFramework="net4" />
+  <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net4" />
+  <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net4" />
+  <package id="Newtonsoft35.Json" version="7.0.1" targetFramework="net4" />
+  <package id="NuGet.Core" version="2.8.6" targetFramework="net4" />
+  <package id="NUnit" version="2.6.4" targetFramework="net4" />
+  <package id="NUnit.Core" version="2.6.4" targetFramework="net4" />
+  <package id="NVelocity" version="1.0.3" targetFramework="net4" />
+  <package id="SampleDependency" version="1.0.0" targetFramework="net4" />
+  <package id="SharpZipLib.JetBrains.Stripped" version="0.86.20150204.1" targetFramework="net4" />
+  <package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net4" />
+  <package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net4" />
+  <package id="Wave" version="3.0.0.0" targetFramework="net4" />
+  <package id="WinDbg.SymStore" version="8.1.20130822.1833" targetFramework="net4" developmentDependency="true" />
+  <package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net4" />
+  <package id="xmlrpcnet" version="2.5.0" targetFramework="net4" />
+</packages>
\ No newline at end of file