Merge branch 'master' of github.com:fsprojects/Paket.VisualStudio int…

…o solution_restore
fsprojects · Aug 26, 2017 · 2780294 · 2780294
2 parents e273e63 + 60d4759
commit 2780294
Show file tree

Hide file tree

Showing 8 changed files with 551 additions and 409 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,11 @@
-#### 0.31.6 - 13.03.2017
-* Update Paket.Core to 3.36.2
+#### 0.33.0 - 10.08.2017
+* Update Paket.Core to 5.85
+
+#### 0.32.3 - 14.07.2017
+* Update Paket.Core to 5.6.12
+
+#### 0.32.2 - 28.06.2017
+* Update Paket.Core to 5
 
 #### 0.31.5 - 30.01.2017
 * Update Paket.Core to 3.35.0

diff --git a/paket.dependencies b/paket.dependencies
@@ -3,6 +3,7 @@ framework: >= net45
 
 nuget MahApps.Metro
 nuget Paket.Core
+nuget FSharp.Core redirects:force
 nuget Mono.Cecil prerelease redirects:force
 //nuget Microsoft.VisualStudio.Sdk.BuildTasks.14.0 prerelease
 nuget VSSDK.DTE.8 copy_local: false

diff --git a/paket.lock b/paket.lock
diff --git a/src/Paket.VisualStudio/IntelliSense/CompletionProviders/NuGetNameCompletionListProvider.cs b/src/Paket.VisualStudio/IntelliSense/CompletionProviders/NuGetNameCompletionListProvider.cs
@@ -30,6 +30,7 @@ public IEnumerable<Completion> GetCompletionEntries(CompletionContext context)
                     NuGetV3.FindPackages(FSharpOption<Paket.PackageSources.NugetSourceAuthentication>.None, Constants.DefaultNuGetStream, searchTerm, 20),
                     FSharpOption<int>.None,
                     FSharpOption<CancellationToken>.None);
+
             if (searchResults.IsOk)
             {
                 foreach (var value in searchResults.ResultValue)
@@ -48,4 +49,4 @@ private static ImageSource GetImageSource()
             return imageSource;
         }
     }
-}
+}
diff --git a/src/Paket.VisualStudio/Properties/AssemblyInfo.cs b/src/Paket.VisualStudio/Properties/AssemblyInfo.cs
@@ -6,15 +6,15 @@
 [assembly: AssemblyTitleAttribute("Paket.VisualStudio")]
 [assembly: AssemblyProductAttribute("Paket.VisualStudio")]
 [assembly: AssemblyDescriptionAttribute("Manage your Paket dependencies from Visual Studio!")]
-[assembly: AssemblyVersionAttribute("0.31.6")]
-[assembly: AssemblyFileVersionAttribute("0.31.6")]
+[assembly: AssemblyVersionAttribute("0.33.0")]
+[assembly: AssemblyFileVersionAttribute("0.33.0")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const System.String InternalsVisibleTo = "Paket.VisualStudio.Tests";
         internal const System.String AssemblyTitle = "Paket.VisualStudio";
         internal const System.String AssemblyProduct = "Paket.VisualStudio";
         internal const System.String AssemblyDescription = "Manage your Paket dependencies from Visual Studio!";
-        internal const System.String AssemblyVersion = "0.31.6";
-        internal const System.String AssemblyFileVersion = "0.31.6";
+        internal const System.String AssemblyVersion = "0.33.0";
+        internal const System.String AssemblyFileVersion = "0.33.0";
     }
 }
diff --git a/src/Paket.VisualStudio/app.config b/src/Paket.VisualStudio/app.config
@@ -3,10 +3,6 @@
   <runtime>
 
   <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-  <dependentAssembly>
-    <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.4.0.0" />
-  </dependentAssembly>
   <dependentAssembly>
     <assemblyIdentity name="RazorEngine" publicKeyToken="9ee697374c7e744a" culture="neutral" />
     <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="3.7.0.0" />
@@ -135,6 +131,11 @@
     <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
     <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.5.0.0" />
   </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
+  </dependentAssembly>
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="Mono.Cecil" publicKeyToken="50cebf1cceb9d05e" culture="neutral" />

diff --git a/src/Paket.VisualStudio/paket.references b/src/Paket.VisualStudio/paket.references
@@ -10,4 +10,5 @@ VSSDK.Shell.12
 VSSDK.Shell.Interop.12
 reactiveui
 reactiveui-events
-MahApps.Metro
+MahApps.Metro
+FSharp.Core
diff --git a/src/Paket.VisualStudio/source.extension.vsixmanifest b/src/Paket.VisualStudio/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="Paket.VisualStudio" Publisher="Igal Tabachnik, Steffen Forkmann" Version="0.31.6" Language="en" />
+    <Identity Id="Paket.VisualStudio" Publisher="Igal Tabachnik, Steffen Forkmann" Version="0.33.0" Language="en" />
     <DisplayName>Paket for Visual Studio</DisplayName>
     <Description xml:space="preserve">Manage your Paket dependencies from Visual Studio!</Description>
     <MoreInfo>https://fsprojects.github.io/Paket/</MoreInfo>