Update ReSharper SDK.

olsh · Dec 17, 2016 · 123965c · 123965c
1 parent 6048239
commit 123965c
Show file tree

Hide file tree

Showing 10 changed files with 325 additions and 103 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 #Configuration Sense for ReSharper
 
+[![Build status](https://ci.appveyor.com/api/projects/status/d2u5scm7t3d373qj?svg=true)](https://ci.appveyor.com/project/olsh/resharper-configuration-sense)
+
 This extension provides autocomplete and validation for `App settings` and `Connection strings`.  
 
 ![Demo](https://github.com/olsh/resharper-configuration-sense/raw/master/images/demo.gif)

diff --git a/build.cmd b/build.cmd
@@ -4,7 +4,7 @@ if "%config%" == "" (
    set config=Release
 )
 
-set version=2016.2.3
+set version=2016.3.0
 if not "%PackageVersion%" == "" (
    set version=%PackageVersion%
 )
@@ -13,4 +13,4 @@ nuget restore src\Resharper.ConfigurationSense.sln
 
 "%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild" src\Resharper.ConfigurationSense.sln /t:Rebuild /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false
 
-nuget pack resharper.nuspec -NoPackageAnalysis -Version %version% -Properties "Configuration=%config%;ReSharperDep=Wave;ReSharperVer=[6.0]"
+nuget pack resharper.nuspec -NoPackageAnalysis -Version %version% -Properties "Configuration=%config%;ReSharperDep=Wave;ReSharperVer=[7.0]"
diff --git a/src/Resharper.ConfigurationSense/Analyzers/AccessorSettingsAnalyzer.cs b/src/Resharper.ConfigurationSense/Analyzers/AccessorSettingsAnalyzer.cs
@@ -43,7 +43,10 @@ protected override void Run(
             }
 
             var accessorPath = element.GetAccessorPath();
-            if (string.IsNullOrEmpty(accessorPath))
+            var accessorSuperTypes = element.GetAccessorSuperTypes();
+
+            // ReSharper disable once PossibleMultipleEnumeration
+            if (string.IsNullOrEmpty(accessorPath) && !accessorSuperTypes.Any())
             {
                 return;
             }
@@ -73,10 +76,10 @@ protected override void Run(
                 type = "Connection string";
             }
 
-            var accessorSuperTypes = element.GetAccessorSuperTypes();
+            // ReSharper disable once PossibleMultipleEnumeration
             if (accessorSuperTypes.Any(t => t.ToString().Equals(ClrTypeConstants.NetCoreConfiguration, StringComparison.OrdinalIgnoreCase)))
             {
-                keyValueSettings = project.GetJsonProjectSettings(FileNames.NetCoreAppSettingsJson);
+                keyValueSettings = project.GetJsonProjectSettings();
                 type = "Setting";
             }
 

diff --git a/src/Resharper.ConfigurationSense/Analyzers/InvocationExpressionSettingsAnalyzer.cs b/src/Resharper.ConfigurationSense/Analyzers/InvocationExpressionSettingsAnalyzer.cs
@@ -55,9 +55,7 @@ protected override void Run(
             IEnumerable<KeyValueSetting> keyValueSettings;
             if (methodPath == ClrTypeConstants.NetCoreGetConnectionString)
             {
-                keyValueSettings = project.GetJsonProjectSettings(
-                    FileNames.NetCoreAppSettingsJson,
-                    SettingsConstants.NetCoreConnectionStringsJsonPath);
+                keyValueSettings = project.GetJsonProjectSettings(SettingsConstants.NetCoreConnectionStringsJsonPath);
             }
             else
             {

diff --git a/src/Resharper.ConfigurationSense/Components/GenericSettingsSuggestionProvider.cs b/src/Resharper.ConfigurationSense/Components/GenericSettingsSuggestionProvider.cs
@@ -36,7 +36,7 @@ public LinkedList<KeyValueSettingLookupItem> GetJsonSettingsLookupItems(
             }
 
             var rangeMarker = CreateRangeMarker(context);
-            var settings = project.GetJsonProjectSettings(fileName, jsonPath);
+            var settings = project.GetJsonProjectSettings(jsonPath);
 
             return CreateLookupItems(context, settings, project, rangeMarker, lookupItems);
         }

diff --git a/src/Resharper.ConfigurationSense/Extensions/ProjectExtensions.cs b/src/Resharper.ConfigurationSense/Extensions/ProjectExtensions.cs
@@ -22,7 +22,6 @@ public static class ProjectExtensions
     {
         public static IEnumerable<KeyValueSetting> GetJsonProjectSettings(
             this IProject project,
-            string fileName,
             string searchPath = null)
         {
             var configFiles = GetNetCoreJsonConfigFiles(project);

diff --git a/src/Resharper.ConfigurationSense/Highlights/SettingsNotFoundHighlighting.cs b/src/Resharper.ConfigurationSense/Highlights/SettingsNotFoundHighlighting.cs
@@ -8,7 +8,7 @@
 [assembly:
     RegisterConfigurableSeverity(SettingsNotFoundHighlighting.SeverityId, null, HighlightingGroupIds.CompilerWarnings,
         "The setting wasn't found in configuration files", "The setting wasn't found in configuration files",
-        Severity.WARNING, false)]
+        Severity.WARNING)]
 
 namespace Resharper.ConfigurationSense.Highlights
 {

diff --git a/src/Resharper.ConfigurationSense/Resharper.ConfigurationSense.csproj b/src/Resharper.ConfigurationSense/Resharper.ConfigurationSense.csproj
diff --git a/src/Resharper.ConfigurationSense/app.config b/src/Resharper.ConfigurationSense/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/src/Resharper.ConfigurationSense/packages.config b/src/Resharper.ConfigurationSense/packages.config
@@ -1,49 +1,61 @@
 <?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="AsyncBridge.JetBrains" version="0.1.1.0" targetFramework="net40" />
-  <package id="AsyncIO" version="0.1.18.0" targetFramework="net40" />
-  <package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net40" />
-  <package id="JetBrains.Annotations" version="10.1.5" targetFramework="net40" />
-  <package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20151217.1" targetFramework="net40" developmentDependency="true" />
-  <package id="JetBrains.ExternalAnnotations" version="10.2.0" targetFramework="net40" />
-  <package id="JetBrains.Mono.Posix" version="0.1" targetFramework="net40" />
-  <package id="JetBrains.Platform.Core.Ide" version="106.0.20160818.163532" targetFramework="net40" />
-  <package id="JetBrains.Platform.Core.Shell" version="106.0.20160818.163301" targetFramework="net40" />
-  <package id="JetBrains.Platform.Core.Text" version="106.0.20160818.163532" targetFramework="net40" />
-  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Framework" version="106.0.20160818.163532" targetFramework="net40" />
-  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="106.0.20160818.163532" 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.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.RdProtocol" version="106.0.20160818.163532" targetFramework="net40" />
-  <package id="JetBrains.Platform.Symbols" version="106.0.20160818.163532" targetFramework="net40" />
-  <package id="JetBrains.Platform.Tests.Framework" version="106.0.20160818.163532" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.Core" version="106.0.20160818.164034" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.src" version="106.0.20160818.164034" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.Tasks" version="106.0.20160818.164034" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.test.Framework" version="106.0.20160818.164034" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.UnitTesting" version="106.0.20160818.164034" targetFramework="net40" />
-  <package id="JetBrains.ReSharper.SDK" version="2016.2.20160818.171542" targetFramework="net40" developmentDependency="true" />
-  <package id="JetBrains.ReSharper.SDK.Internal" version="106.0.20160818.171542" targetFramework="net40" />
-  <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
-  <package id="NetMQ" version="3.3.3.1" targetFramework="net40" />
-  <package id="Newtonsoft35.Json" version="7.0.1" targetFramework="net40" />
-  <package id="NuGet.Core" version="2.12.0" targetFramework="net40" />
-  <package id="NuGet.Core.Ultimate" version="3.3.2" targetFramework="net40" />
-  <package id="NUnit" version="2.6.4" targetFramework="net40" />
-  <package id="NUnit.ReSharperRunner2" version="2.6.408" targetFramework="net40" />
-  <package id="NUnit.ReSharperRunner3" version="3.0.12" targetFramework="net40" />
-  <package id="NVelocity" version="1.0.3" 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="6.0.0.0" targetFramework="net40" />
-  <package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net40" />
-  <package id="xmlrpcnet" version="2.5.0" targetFramework="net40" />
-  <package id="xunit.abstractions.JetBrains" version="2.0.0" targetFramework="net40" />
-  <package id="xunit.JetBrains" version="1.9.2" targetFramework="net40" />
-  <package id="xunit.runner.utility.JetBrains" version="2.2.0" targetFramework="net40" />
+  <package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net45" />
+  <package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net45" />
+  <package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net45" />
+  <package id="ICSharpCode.NRefactory" version="5.5.1" targetFramework="net45" />
+  <package id="JetBrains.Annotations" version="10.2.1" targetFramework="net45" />
+  <package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20151217.1" targetFramework="net45" developmentDependency="true" />
+  <package id="JetBrains.ExternalAnnotations" version="10.2.5" targetFramework="net45" />
+  <package id="JetBrains.MSBuild.Xplat.Engine" version="20161013.1.0" targetFramework="net45" />
+  <package id="JetBrains.NuGet.Core" version="2.13.0" targetFramework="net45" />
+  <package id="JetBrains.NuGet.Ultimate" version="3.5.0.1" targetFramework="net45" />
+  <package id="JetBrains.Platform.Core.Ide" version="107.0.20161214.153643" targetFramework="net45" />
+  <package id="JetBrains.Platform.Core.Shell" version="107.0.20161214.153252" targetFramework="net45" />
+  <package id="JetBrains.Platform.Core.Text" version="107.0.20161214.153643" targetFramework="net45" />
+  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Framework" version="107.0.20161214.153643" targetFramework="net45" />
+  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="107.0.20161214.153643" targetFramework="net45" />
+  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop.Ide" version="107.0.20161214.153643" targetFramework="net45" />
+  <package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20150224.0" targetFramework="net45" />
+  <package id="JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab" version="2.0.20140304.0" targetFramework="net45" />
+  <package id="JetBrains.Platform.Lib.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net45" />
+  <package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net45" />
+  <package id="JetBrains.Platform.RdProtocol" version="107.0.20161214.153643" targetFramework="net45" />
+  <package id="JetBrains.Platform.Symbols" version="107.0.20161214.153643" targetFramework="net45" />
+  <package id="JetBrains.Platform.Tests.Framework" version="107.0.20161214.153643" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.Core" version="107.0.20161215.131222" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.src" version="107.0.20161215.131222" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.Tasks" version="107.0.20161215.131222" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.test.Framework" version="107.0.20161215.131222" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.UnitTesting" version="107.0.20161215.131222" targetFramework="net45" />
+  <package id="JetBrains.ReSharper.SDK" version="2016.3.20161215.134837" targetFramework="net45" developmentDependency="true" />
+  <package id="JetBrains.ReSharper.SDK.Internal" version="107.0.20161215.134837" targetFramework="net45" />
+  <package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
+  <package id="Microsoft.Owin.FileSystems" version="3.0.1" targetFramework="net45" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
+  <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
+  <package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net45" />
+  <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
+  <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
+  <package id="Mono.Debugger.Soft" version="1.0.20161020.46" targetFramework="net45" />
+  <package id="Mono.Debugging" version="1.0.20161020.46" targetFramework="net45" />
+  <package id="Mono.Debugging.Soft" version="1.0.20161020.46" targetFramework="net45" />
+  <package id="Mono.Debugging.Win32" version="1.0.20161020.46" targetFramework="net45" />
+  <package id="Mono.VSCodeDebugging" version="1.0.20161019.44" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="NUnit.ReSharperRunner2" version="2.6.408" targetFramework="net45" />
+  <package id="NUnit.ReSharperRunner3" version="3.0.12" targetFramework="net45" />
+  <package id="NVelocity" version="1.0.3" targetFramework="net45" />
+  <package id="Owin" version="1.0" targetFramework="net45" />
+  <package id="sharpcompress" version="0.11.6" targetFramework="net45" />
+  <package id="SharpZipLib.JetBrains.Stripped" version="0.87.20160802.0" targetFramework="net45" />
+  <package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net45" />
+  <package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net45" />
+  <package id="Wave" version="7.0.0.0" targetFramework="net45" />
+  <package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net45" />
+  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
+  <package id="xunit.abstractions.JetBrains" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.JetBrains" version="1.9.2" targetFramework="net45" />
+  <package id="xunit.runner.utility.JetBrains" version="2.2.0" targetFramework="net45" />
 </packages>