Skip to content

Commit

Permalink
Update NuGet V3 client to 3.0.0-pre-20150220053309
Browse files Browse the repository at this point in the history
  • Loading branch information
Xiaomin Wu committed Feb 23, 2015
1 parent 709371d commit 67a281c
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 101 deletions.
42 changes: 21 additions & 21 deletions Kudu.Contracts/Kudu.Contracts.csproj
View file
Expand Up @@ -17,62 +17,62 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NuGet.Client, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Client, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150129084044\lib\net45\NuGet.Client.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150220053309\lib\net45\NuGet.Client.dll</HintPath>
</Reference>
<Reference Include="NuGet.Client.BaseTypes, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Client.BaseTypes, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.Types.3.0.0-pre-20150129082909\lib\net45\NuGet.Client.BaseTypes.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.Types.3.0.0-pre-20150220053306\lib\net45\NuGet.Client.BaseTypes.dll</HintPath>
</Reference>
<Reference Include="NuGet.Client.V2, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Client.V2, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150129084044\lib\net45\NuGet.Client.V2.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150220053309\lib\net45\NuGet.Client.V2.dll</HintPath>
</Reference>
<Reference Include="NuGet.Client.V2.VisualStudio, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Client.V2.VisualStudio, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150129084044\lib\net45\NuGet.Client.V2.VisualStudio.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150220053309\lib\net45\NuGet.Client.V2.VisualStudio.dll</HintPath>
</Reference>
<Reference Include="NuGet.Client.V3.VisualStudio, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Client.V3.VisualStudio, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150129084044\lib\net45\NuGet.Client.V3.VisualStudio.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150220053309\lib\net45\NuGet.Client.V3.VisualStudio.dll</HintPath>
</Reference>
<Reference Include="NuGet.Client.VisualStudio, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Client.VisualStudio, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.Types.3.0.0-pre-20150129082909\lib\net45\NuGet.Client.VisualStudio.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.Types.3.0.0-pre-20150220053306\lib\net45\NuGet.Client.VisualStudio.dll</HintPath>
</Reference>
<Reference Include="NuGet.Configuration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Configuration.1.0.0-pre-20150129080212\lib\net45\NuGet.Configuration.dll</HintPath>
<HintPath>..\packages\NuGet.Configuration.1.0.0-pre-20150220022717\lib\net45\NuGet.Configuration.dll</HintPath>
</Reference>
<Reference Include="NuGet.Core, Version=2.8.50926.602, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Core.2.8.3\lib\net40-Client\NuGet.Core.dll</HintPath>
<Aliases>nugetcore</Aliases>
</Reference>
<Reference Include="NuGet.Data, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Data, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150129084044\lib\net45\NuGet.Data.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150220053309\lib\net45\NuGet.Data.dll</HintPath>
</Reference>
<Reference Include="NuGet.Frameworks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150128082032\lib\net45\NuGet.Frameworks.dll</HintPath>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150220044603\lib\net45\NuGet.Frameworks.dll</HintPath>
</Reference>
<Reference Include="NuGet.Packaging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150128082032\lib\net45\NuGet.Packaging.dll</HintPath>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150220044603\lib\net45\NuGet.Packaging.dll</HintPath>
</Reference>
<Reference Include="NuGet.PackagingCore, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150128082032\lib\net45\NuGet.PackagingCore.dll</HintPath>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150220044603\lib\net45\NuGet.PackagingCore.dll</HintPath>
</Reference>
<Reference Include="NuGet.Resolver, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150128082032\lib\net45\NuGet.Resolver.dll</HintPath>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150220044603\lib\net45\NuGet.Resolver.dll</HintPath>
</Reference>
<Reference Include="NuGet.Versioning, Version=1.0.6.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<Reference Include="NuGet.Versioning, Version=1.0.7.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Versioning.1.0.6\lib\portable-net40+win\NuGet.Versioning.dll</HintPath>
<HintPath>..\packages\NuGet.Versioning.1.0.7\lib\portable-net40+win\NuGet.Versioning.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
19 changes: 1 addition & 18 deletions Kudu.Contracts/SiteExtensions/SiteExtensionInfo.cs
View file
Expand Up @@ -44,7 +44,7 @@ public SiteExtensionInfo(SiteExtensionInfo info)
public SiteExtensionInfo(UIPackageMetadata data)
{
Id = data.Identity.Id;
Title = data.Identity.Id;
Title = data.Title;
Type = SiteExtensionType.Gallery;
Summary = data.Summary;
Description = data.Description;
Expand All @@ -58,23 +58,6 @@ public SiteExtensionInfo(UIPackageMetadata data)
DownloadCount = data.DownloadCount;
}

public SiteExtensionInfo(UISearchMetadata data)
{
Id = data.Identity.Id;
Title = data.Identity.Id;
Type = SiteExtensionType.Gallery;
Summary = data.LatestPackageMetadata.Summary;
Description = data.LatestPackageMetadata.Description;
Version = data.Identity.Version.ToNormalizedString();
ProjectUrl = data.LatestPackageMetadata.ProjectUrl == null ? null : data.LatestPackageMetadata.ProjectUrl.ToString();
IconUrl = data.LatestPackageMetadata.IconUrl == null ? "https://www.siteextensions.net/Content/Images/packageDefaultIcon-50x50.png" : data.LatestPackageMetadata.IconUrl.ToString();
LicenseUrl = data.LatestPackageMetadata.LicenseUrl == null ? null : data.LatestPackageMetadata.LicenseUrl.ToString();
Authors = data.LatestPackageMetadata.Authors.Split(new string[] { " " }, StringSplitOptions.RemoveEmptyEntries);
PublishedDateTime = data.LatestPackageMetadata.Published;
IsLatestVersion = data.Identity.Version.Equals(data.LatestPackageMetadata.Identity.Version);
DownloadCount = data.LatestPackageMetadata.DownloadCount;
}

[JsonProperty(PropertyName = "id")]
public string Id
{
Expand Down
10 changes: 5 additions & 5 deletions Kudu.Contracts/packages.config
View file
Expand Up @@ -5,10 +5,10 @@
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
<package id="NuGet.Configuration" version="1.0.0-pre-20150129080212" targetFramework="net45" />
<package id="NuGet.Configuration" version="1.0.0-pre-20150220022717" targetFramework="net45" />
<package id="NuGet.Core" version="2.8.3" targetFramework="net45" />
<package id="NuGet.Packaging" version="1.0.0-pre-20150128082032" targetFramework="net45" />
<package id="NuGet.Protocol.Types" version="3.0.0-pre-20150129082909" targetFramework="net45" />
<package id="NuGet.Protocol.V2V3" version="3.0.0-pre-20150129084044" targetFramework="net45" />
<package id="NuGet.Versioning" version="1.0.6" targetFramework="net45" />
<package id="NuGet.Packaging" version="1.0.0-pre-20150220044603" targetFramework="net45" />
<package id="NuGet.Protocol.Types" version="3.0.0-pre-20150220053306" targetFramework="net45" />
<package id="NuGet.Protocol.V2V3" version="3.0.0-pre-20150220053309" targetFramework="net45" />
<package id="NuGet.Versioning" version="1.0.7" targetFramework="net45" />
</packages>
42 changes: 21 additions & 21 deletions Kudu.Core/Kudu.Core.csproj
View file
Expand Up @@ -33,62 +33,62 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NuGet.Client, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Client, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150129084044\lib\net45\NuGet.Client.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150220053309\lib\net45\NuGet.Client.dll</HintPath>
</Reference>
<Reference Include="NuGet.Client.BaseTypes, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Client.BaseTypes, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.Types.3.0.0-pre-20150129082909\lib\net45\NuGet.Client.BaseTypes.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.Types.3.0.0-pre-20150220053306\lib\net45\NuGet.Client.BaseTypes.dll</HintPath>
</Reference>
<Reference Include="NuGet.Client.V2, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Client.V2, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150129084044\lib\net45\NuGet.Client.V2.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150220053309\lib\net45\NuGet.Client.V2.dll</HintPath>
</Reference>
<Reference Include="NuGet.Client.V2.VisualStudio, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Client.V2.VisualStudio, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150129084044\lib\net45\NuGet.Client.V2.VisualStudio.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150220053309\lib\net45\NuGet.Client.V2.VisualStudio.dll</HintPath>
</Reference>
<Reference Include="NuGet.Client.V3.VisualStudio, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Client.V3.VisualStudio, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150129084044\lib\net45\NuGet.Client.V3.VisualStudio.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150220053309\lib\net45\NuGet.Client.V3.VisualStudio.dll</HintPath>
</Reference>
<Reference Include="NuGet.Client.VisualStudio, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Client.VisualStudio, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.Types.3.0.0-pre-20150129082909\lib\net45\NuGet.Client.VisualStudio.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.Types.3.0.0-pre-20150220053306\lib\net45\NuGet.Client.VisualStudio.dll</HintPath>
</Reference>
<Reference Include="NuGet.Configuration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Configuration.1.0.0-pre-20150129080212\lib\net45\NuGet.Configuration.dll</HintPath>
<HintPath>..\packages\NuGet.Configuration.1.0.0-pre-20150220022717\lib\net45\NuGet.Configuration.dll</HintPath>
</Reference>
<Reference Include="NuGet.Core, Version=2.8.50926.602, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Core.2.8.3\lib\net40-Client\NuGet.Core.dll</HintPath>
<Aliases>nugetcore</Aliases>
</Reference>
<Reference Include="NuGet.Data, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Data, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150129084044\lib\net45\NuGet.Data.dll</HintPath>
<HintPath>..\packages\NuGet.Protocol.V2V3.3.0.0-pre-20150220053309\lib\net45\NuGet.Data.dll</HintPath>
</Reference>
<Reference Include="NuGet.Frameworks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150128082032\lib\net45\NuGet.Frameworks.dll</HintPath>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150220044603\lib\net45\NuGet.Frameworks.dll</HintPath>
</Reference>
<Reference Include="NuGet.Packaging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150128082032\lib\net45\NuGet.Packaging.dll</HintPath>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150220044603\lib\net45\NuGet.Packaging.dll</HintPath>
</Reference>
<Reference Include="NuGet.PackagingCore, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150128082032\lib\net45\NuGet.PackagingCore.dll</HintPath>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150220044603\lib\net45\NuGet.PackagingCore.dll</HintPath>
</Reference>
<Reference Include="NuGet.Resolver, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150128082032\lib\net45\NuGet.Resolver.dll</HintPath>
<HintPath>..\packages\NuGet.Packaging.1.0.0-pre-20150220044603\lib\net45\NuGet.Resolver.dll</HintPath>
</Reference>
<Reference Include="NuGet.Versioning, Version=1.0.6.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<Reference Include="NuGet.Versioning, Version=1.0.7.0, Culture=neutral, PublicKeyToken=2e465378e3b1a8dd, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Versioning.1.0.6\lib\portable-net40+win\NuGet.Versioning.dll</HintPath>
<HintPath>..\packages\NuGet.Versioning.1.0.7\lib\portable-net40+win\NuGet.Versioning.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
Expand Down
18 changes: 9 additions & 9 deletions Kudu.Core/SiteExtensions/FeedExtensions.cs
View file
@@ -1,15 +1,15 @@
using Ionic.Zip;
using Kudu.Core.Infrastructure;
using NuGet.Client;
using NuGet.Client.VisualStudio;
using NuGet.PackagingCore;
using NuGet.Versioning;
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Ionic.Zip;
using Kudu.Core.Infrastructure;
using NuGet.Client;
using NuGet.Client.VisualStudio;
using NuGet.PackagingCore;
using NuGet.Versioning;

namespace Kudu.Core.SiteExtensions
{
Expand All @@ -21,7 +21,7 @@ public static class FeedExtensions
/// <summary>
/// Query result by search term, always include pre-released
/// </summary>
public static async Task<IEnumerable<UISearchMetadata>> Search(this SourceRepository srcRepo, string searchTerm, SearchFilter filterOptions = null, int skip = 0, int take = 1000)
public static async Task<IEnumerable<UIPackageMetadata>> Search(this SourceRepository srcRepo, string searchTerm, SearchFilter filterOptions = null, int skip = 0, int take = 1000)
{
// always include pre-release package
if (filterOptions == null)
Expand All @@ -30,7 +30,7 @@ public static async Task<IEnumerable<UISearchMetadata>> Search(this SourceReposi
}

filterOptions.IncludePrerelease = true; // keep the good old behavior
var searchResource = await srcRepo.GetResourceAsync<UISearchResource>();
var searchResource = await srcRepo.GetResourceAsync<SearchLatestResource>();
return await searchResource.Search(searchTerm, filterOptions, skip, take, CancellationToken.None);
}

Expand Down

0 comments on commit 67a281c

Please sign in to comment.