Update to SDK 2016.2.

matkoch · Aug 19, 2016 · 870be74 · 870be74
1 parent bff7dfc
commit 870be74
Show file tree

Hide file tree

Showing 7 changed files with 212 additions and 101 deletions.
diff --git a/build.cmd b/build.cmd
@@ -4,7 +4,7 @@ if "%config%" == "" (
    set config=Release
 )
 
-set version=2016.1.0
+set version=2016.2.0
 if not "%PackageVersion%" == "" (
    set version=%PackageVersion%
 )
@@ -19,4 +19,4 @@ if "%nuget%" == "" (
 
 set package_id="ReSharper.InternalsVisibleTo"
 
-%nuget% pack "src\ReSharper.InternalsVisibleTo.nuspec" -NoPackageAnalysis -Version %version% -Properties "Configuration=%config%;ReSharperDep=Wave;ReSharperVer=[5.0];PackageId=%package_id%"
+%nuget% pack "src\ReSharper.InternalsVisibleTo.nuspec" -NoPackageAnalysis -Version %version% -Properties "Configuration=%config%;ReSharperDep=Wave;ReSharperVer=[6.0];PackageId=%package_id%"
diff --git a/src/ReSharper.InternalsVisibleTo.sln.DotSettings b/src/ReSharper.InternalsVisibleTo.sln.DotSettings
@@ -96,6 +96,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String></wpf:ResourceDictionary>
diff --git a/src/ReSharper.InternalsVisibleTo/ProjectReferenceLookupItem.cs b/src/ReSharper.InternalsVisibleTo/ProjectReferenceLookupItem.cs
@@ -2,6 +2,7 @@
 using System.Drawing;
 using System.Text;
 using JetBrains.DocumentModel;
+using JetBrains.Metadata.Reader.API;
 using JetBrains.ProjectModel;
 using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure.LookupItems.Impl;
 using JetBrains.ReSharper.Feature.Services.Lookup;
@@ -62,15 +63,15 @@ private static string GetCompleteText(IProject project)
 
         private static string GetProjectDisplayName(IProject project)
         {
-            return project.GetOutputAssemblyName();
+            return project.GetOutputAssemblyName(TargetFrameworkId.Default);
         }
 
         private static string GetPublicKeyString(IProject project)
         {
             var solution = project.GetSolution();
             var snkProvider = solution.GetComponent<SnkDataProvider>();
 
-            byte[] data = snkProvider.ProjectDataCache.GetData<byte[]>(snkProvider, project.ProjectFileLocation, null);
+            byte[] data = snkProvider.ProjectDataCache.GetData(snkProvider, project.ProjectFileLocation, null);
             return data?.Length > 0
                 ? (SnkDataProvider.IsPublicKeyBlob(data) ? StringUtil.ToHexString(data) : null)
                 : null;

diff --git a/src/ReSharper.InternalsVisibleTo/ReSharper.InternalsVisibleTo.csproj b/src/ReSharper.InternalsVisibleTo/ReSharper.InternalsVisibleTo.csproj
diff --git a/src/ReSharper.InternalsVisibleTo/SnkDataProvider.cs b/src/ReSharper.InternalsVisibleTo/SnkDataProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Xml;
@@ -12,42 +13,44 @@
 namespace ReSharper.InternalsVisibleTo
 {
     [SolutionInstanceComponent]
-    internal class SnkDataProvider : IProjectFileDataCache
+    internal class SnkDataProvider : IProjectFileDataProvider<byte[]>
     {
         [NotNull]
-        public ProjectFileDataCache ProjectDataCache { get; }
+        public ProjectFileDataCacheImpl ProjectDataCache { get; }
 
-        public SnkDataProvider([NotNull] Lifetime lifetime, [NotNull] ProjectFileDataCache projectDataCache)
+        public SnkDataProvider([NotNull] Lifetime lifetime, [NotNull] ProjectFileDataCacheImpl projectDataCache)
         {
             ProjectDataCache = projectDataCache;
 
             projectDataCache.RegisterCache(lifetime, this);
         }
 
-        public object Read(BinaryReader reader)
+        private FileSystemPath currentProjectPath;
+
+        public bool CanHandle(FileSystemPath projectFileLocation)
+        {
+            currentProjectPath = projectFileLocation;
+            return true;
+        }
+
+        public int Version { get; }
+
+        public byte[] Read(FileSystemPath projectFileLocation, BinaryReader reader)
         {
             int length = reader.ReadInt32();
             if (length == 0)
                 return EmptyArray<byte>.Instance;
             return reader.ReadBytes(length);
         }
 
-        public void Write(BinaryWriter writer, object data)
+        public void Write(FileSystemPath projectFileLocation, BinaryWriter writer, byte[] data)
         {
-            var bytes = (byte[])data;
+            var bytes = data;
             writer.Write(bytes.Length);
             writer.Write(bytes);
         }
 
-        private FileSystemPath currentProjectPath;
-
-        public bool CanHandle(FileSystemPath projectFileLocation)
-        {
-            currentProjectPath = projectFileLocation;
-            return true;
-        }
-
-        public object BuildData(XmlDocument document)
+        public byte[] BuildData(FileSystemPath projectFileLocation, XmlDocument document)
         {
             string keyContainer = ExtractPublicKeyFile(document);
             if (!string.IsNullOrWhiteSpace(keyContainer))
@@ -59,6 +62,11 @@ public object BuildData(XmlDocument document)
             return EmptyArray<byte>.Instance;
         }
 
+        public Action OnDataChanged(FileSystemPath projectFileLocation, byte[] oldData, byte[] newData)
+        {
+            return null;
+        }
+
         private static string ExtractPublicKeyFile(XmlDocument document)
         {
             XmlElement documentElement = document.DocumentElement;
@@ -155,12 +163,5 @@ private IClrStrongName GetStrongNameInterface()
         {
             return ClrStrongName.GetInstance();
         }
-
-        public Action OnDataChanged(FileSystemPath projectFileLocation, object oldData, object newData)
-        {
-            return null;
-        }
-
-        public int Version => 0;
     }
-}
+}
diff --git a/src/ReSharper.InternalsVisibleTo/app.config b/src/ReSharper.InternalsVisibleTo/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="NuGet.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.12.0.817" newVersion="2.12.0.817" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/src/ReSharper.InternalsVisibleTo/packages.config b/src/ReSharper.InternalsVisibleTo/packages.config
@@ -3,50 +3,45 @@
   <package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net46" />
   <package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net46" />
   <package id="AsyncBridge.JetBrains" version="0.1.1.0" targetFramework="net46" />
+  <package id="AsyncIO" version="0.1.18.0" targetFramework="net46" />
   <package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net46" />
-  <package id="JetBrains.Annotations" version="10.1.4" targetFramework="net46" />
+  <package id="JetBrains.Annotations" version="10.1.5" targetFramework="net46" />
   <package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20151217.1" targetFramework="net46" developmentDependency="true" />
-  <package id="JetBrains.ExternalAnnotations" version="10.1.8" targetFramework="net46" />
+  <package id="JetBrains.ExternalAnnotations" version="10.2.0" targetFramework="net46" />
   <package id="JetBrains.Mono.Posix" version="0.1" targetFramework="net46" />
-  <package id="JetBrains.Platform.Core.Ide" version="105.0.20160414.153405" targetFramework="net46" />
-  <package id="JetBrains.Platform.Core.Shell" version="105.0.20160414.95726" targetFramework="net46" />
-  <package id="JetBrains.Platform.Core.Text" version="105.0.20160414.153405" targetFramework="net46" />
-  <package id="JetBrains.Platform.Installer" version="105.0.20160414.153405" targetFramework="net46" />
-  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="105.0.20160414.153405" targetFramework="net46" />
+  <package id="JetBrains.Platform.Core.Ide" version="106.0.20160818.163532" targetFramework="net46" />
+  <package id="JetBrains.Platform.Core.Shell" version="106.0.20160818.163301" targetFramework="net46" />
+  <package id="JetBrains.Platform.Core.Text" version="106.0.20160818.163532" targetFramework="net46" />
+  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Framework" version="106.0.20160818.163532" targetFramework="net46" />
+  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="106.0.20160818.163532" targetFramework="net46" />
   <package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20150224.0" targetFramework="net46" />
   <package id="JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab" version="2.0.20140304.0" targetFramework="net46" />
-  <package id="JetBrains.Platform.Lib.Microsoft.Deployment.WindowsInstaller" version="2.0.20140821.0" targetFramework="net46" />
   <package id="JetBrains.Platform.Lib.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net46" />
-  <package id="JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild" version="2.0.20140304.0" targetFramework="net46" />
   <package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net46" />
-  <package id="JetBrains.Platform.Symbols" version="105.0.20160414.153405" targetFramework="net46" />
-  <package id="JetBrains.Platform.Tests.Framework" version="105.0.20160414.153405" targetFramework="net46" />
-  <package id="JetBrains.Platform.VisualStudio" version="105.0.20160414.153405" targetFramework="net46" />
-  <package id="JetBrains.Psi.Features.Core" version="105.0.20160414.153845" targetFramework="net46" />
-  <package id="JetBrains.Psi.Features.Cpp.Src" version="105.0.20160414.155000" targetFramework="net46" />
-  <package id="JetBrains.Psi.Features.SolutionBuilder" version="105.0.20160414.153845" targetFramework="net46" />
-  <package id="JetBrains.Psi.Features.src" version="105.0.20160414.153845" targetFramework="net46" />
-  <package id="JetBrains.Psi.Features.Tasks" version="105.0.20160414.153845" targetFramework="net46" />
-  <package id="JetBrains.Psi.Features.test.Framework" version="105.0.20160414.153845" targetFramework="net46" />
-  <package id="JetBrains.Psi.Features.UnitTesting" version="105.0.20160414.153845" targetFramework="net46" />
-  <package id="JetBrains.Psi.Features.VisualStudio" version="105.0.20160414.153845" targetFramework="net46" />
-  <package id="JetBrains.ReSharper.SDK" version="2016.1.20160414.161610" targetFramework="net46" developmentDependency="true" />
-  <package id="JetBrains.ReSharper.SDK.Internal" version="105.0.20160414.161610" targetFramework="net46" />
-  <package id="JetBrains.WinDbg.SymStore" version="10.0.10586.20151201" targetFramework="net46" developmentDependency="true" />
-  <package id="Microsoft.VC100.CRT.JetBrains" version="10.00.40219.2" targetFramework="net46" />
-  <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net46" />
+  <package id="JetBrains.Platform.RdProtocol" version="106.0.20160818.163532" targetFramework="net46" />
+  <package id="JetBrains.Platform.Symbols" version="106.0.20160818.163532" targetFramework="net46" />
+  <package id="JetBrains.Platform.Tests.Framework" version="106.0.20160818.163532" targetFramework="net46" />
+  <package id="JetBrains.Psi.Features.Core" version="106.0.20160818.164034" targetFramework="net46" />
+  <package id="JetBrains.Psi.Features.src" version="106.0.20160818.164034" targetFramework="net46" />
+  <package id="JetBrains.Psi.Features.Tasks" version="106.0.20160818.164034" targetFramework="net46" />
+  <package id="JetBrains.Psi.Features.test.Framework" version="106.0.20160818.164034" targetFramework="net46" />
+  <package id="JetBrains.Psi.Features.UnitTesting" version="106.0.20160818.164034" targetFramework="net46" />
+  <package id="JetBrains.ReSharper.SDK" version="2016.2.20160818.171542" targetFramework="net46" developmentDependency="true" />
+  <package id="JetBrains.ReSharper.SDK.Internal" version="106.0.20160818.171542" targetFramework="net46" />
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net46" />
+  <package id="NetMQ" version="3.3.3.1" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net46" />
   <package id="Newtonsoft35.Json" version="7.0.1" targetFramework="net46" />
-  <package id="NuGet.Core" version="2.10.1" targetFramework="net46" />
+  <package id="NuGet.Core" version="2.12.0" targetFramework="net46" />
+  <package id="NuGet.Core.Ultimate" version="3.3.2" targetFramework="net46" />
   <package id="NUnit" version="2.6.4" targetFramework="net46" />
   <package id="NUnit.ReSharperRunner2" version="2.6.408" targetFramework="net46" />
   <package id="NUnit.ReSharperRunner3" version="3.0.12" targetFramework="net46" />
   <package id="NVelocity" version="1.0.3" targetFramework="net46" />
   <package id="SharpZipLib.JetBrains.Stripped" version="0.86.20150204.1" targetFramework="net46" />
   <package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net46" />
-  <package id="System.Runtime" version="4.0.0" targetFramework="net46" />
   <package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net46" />
-  <package id="Wave" version="5.0.0.0" targetFramework="net46" />
+  <package id="Wave" version="6.0.0.0" targetFramework="net46" />
   <package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net46" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net46" />
   <package id="xunit.abstractions.JetBrains" version="2.0.0" targetFramework="net46" />