diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2016-11-22 18:22:02 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2016-11-22 18:22:02 +0300 |
| commit | 58f8910c57d2758c7adff90abaf75c06afd8980e (patch) | |
| tree | 5cc89472e72643624c911755ae381c2da00aa82e | |
| parent | 2bb2a79e2c0c516c28432a489de01f9c80830548 (diff) | |
| parent | 5c19f202d20d56b4f6a3b43ff5c678c5626c4588 (diff) | |
Merge branch '3.5.0'
Conflicts:
nuget.exe
| -rw-r--r-- | Lucene.Net.dll | bin | 753664 -> 761536 bytes |
| -rw-r--r-- | Microsoft.Web.XmlTransform.dll | bin | 81600 -> 90840 bytes |
| -rw-r--r-- | NuGet.Client.dll | bin | 12800 -> 30936 bytes |
| -rw-r--r-- | NuGet.Commands.dll | bin | 141824 -> 237272 bytes |
| -rw-r--r-- | NuGet.Common.dll | bin | 27648 -> 53464 bytes |
| -rw-r--r-- | NuGet.Configuration.dll | bin | 56320 -> 81112 bytes |
| -rw-r--r-- | NuGet.ContentModel.dll | bin | 23040 -> 41688 bytes |
| -rw-r--r-- | NuGet.Core.dll | bin | 548528 -> 671448 bytes |
| -rw-r--r-- | NuGet.Credentials.dll | bin | 22016 -> 41688 bytes |
| -rw-r--r-- | NuGet.DependencyResolver.Core.dll | bin | 41984 -> 58072 bytes |
| -rw-r--r-- | NuGet.DependencyResolver.dll | bin | 14336 -> 33496 bytes |
| -rw-r--r-- | NuGet.Frameworks.dll | bin | 83456 -> 101592 bytes |
| -rw-r--r-- | NuGet.Indexing.dll | bin | 31744 -> 50392 bytes |
| -rw-r--r-- | NuGet.LibraryModel.dll | bin | 18432 -> 38104 bytes |
| -rw-r--r-- | NuGet.Logging.dll | bin | 5632 -> 0 bytes |
| -rw-r--r-- | NuGet.PackageManagement.dll | bin | 176128 -> 212696 bytes |
| -rw-r--r-- | NuGet.Packaging.Core.Types.dll | bin | 15360 -> 32472 bytes |
| -rw-r--r-- | NuGet.Packaging.Core.dll | bin | 13824 -> 35032 bytes |
| -rw-r--r-- | NuGet.Packaging.dll | bin | 139776 -> 178392 bytes |
| -rw-r--r-- | NuGet.ProjectManagement.dll | bin | 101888 -> 121048 bytes |
| -rw-r--r-- | NuGet.ProjectModel.dll | bin | 66560 -> 98008 bytes |
| -rw-r--r-- | NuGet.Protocol.Core.Types.dll | bin | 36352 -> 56024 bytes |
| -rw-r--r-- | NuGet.Protocol.Core.v2.dll | bin | 37376 -> 0 bytes |
| -rw-r--r-- | NuGet.Protocol.Core.v3.dll | bin | 240640 -> 331992 bytes |
| -rw-r--r-- | NuGet.Protocol.VisualStudio.dll | bin | 33280 -> 32984 bytes |
| -rw-r--r-- | NuGet.Repositories.dll | bin | 7680 -> 26328 bytes |
| -rw-r--r-- | NuGet.Resolver.dll | bin | 42496 -> 65240 bytes |
| -rw-r--r-- | NuGet.RuntimeModel.dll | bin | 23552 -> 40152 bytes |
| -rw-r--r-- | NuGet.Versioning.dll | bin | 28672 -> 46808 bytes |
| -rw-r--r-- | nuget.exe | bin | 3957976 -> 4266712 bytes |
30 files changed, 0 insertions, 0 deletions
diff --git a/Lucene.Net.dll b/Lucene.Net.dll Binary files differindex cbf0220..2b48aeb 100644 --- a/Lucene.Net.dll +++ b/Lucene.Net.dll diff --git a/Microsoft.Web.XmlTransform.dll b/Microsoft.Web.XmlTransform.dll Binary files differindex 98c9d56..a265d57 100644 --- a/Microsoft.Web.XmlTransform.dll +++ b/Microsoft.Web.XmlTransform.dll diff --git a/NuGet.Client.dll b/NuGet.Client.dll Binary files differindex d288473..314b459 100644 --- a/NuGet.Client.dll +++ b/NuGet.Client.dll diff --git a/NuGet.Commands.dll b/NuGet.Commands.dll Binary files differindex e739f31..1314b8a 100644 --- a/NuGet.Commands.dll +++ b/NuGet.Commands.dll diff --git a/NuGet.Common.dll b/NuGet.Common.dll Binary files differindex f0f8928..ec02d4d 100644 --- a/NuGet.Common.dll +++ b/NuGet.Common.dll diff --git a/NuGet.Configuration.dll b/NuGet.Configuration.dll Binary files differindex 73f17d3..43c04b4 100644 --- a/NuGet.Configuration.dll +++ b/NuGet.Configuration.dll diff --git a/NuGet.ContentModel.dll b/NuGet.ContentModel.dll Binary files differindex 50bdef0..38333ec 100644 --- a/NuGet.ContentModel.dll +++ b/NuGet.ContentModel.dll diff --git a/NuGet.Core.dll b/NuGet.Core.dll Binary files differindex 2144778..4db8078 100644 --- a/NuGet.Core.dll +++ b/NuGet.Core.dll diff --git a/NuGet.Credentials.dll b/NuGet.Credentials.dll Binary files differindex e9b43b8..ec90928 100644 --- a/NuGet.Credentials.dll +++ b/NuGet.Credentials.dll diff --git a/NuGet.DependencyResolver.Core.dll b/NuGet.DependencyResolver.Core.dll Binary files differindex 0a68ba6..a60c979 100644 --- a/NuGet.DependencyResolver.Core.dll +++ b/NuGet.DependencyResolver.Core.dll diff --git a/NuGet.DependencyResolver.dll b/NuGet.DependencyResolver.dll Binary files differindex ee09a79..b8b4bde 100644 --- a/NuGet.DependencyResolver.dll +++ b/NuGet.DependencyResolver.dll diff --git a/NuGet.Frameworks.dll b/NuGet.Frameworks.dll Binary files differindex 3138955..ac33391 100644 --- a/NuGet.Frameworks.dll +++ b/NuGet.Frameworks.dll diff --git a/NuGet.Indexing.dll b/NuGet.Indexing.dll Binary files differindex d34d762..d2fc960 100644 --- a/NuGet.Indexing.dll +++ b/NuGet.Indexing.dll diff --git a/NuGet.LibraryModel.dll b/NuGet.LibraryModel.dll Binary files differindex c24e7f0..7321908 100644 --- a/NuGet.LibraryModel.dll +++ b/NuGet.LibraryModel.dll diff --git a/NuGet.Logging.dll b/NuGet.Logging.dll Binary files differdeleted file mode 100644 index 2934b2a..0000000 --- a/NuGet.Logging.dll +++ /dev/null diff --git a/NuGet.PackageManagement.dll b/NuGet.PackageManagement.dll Binary files differindex b0630ca..62cee0e 100644 --- a/NuGet.PackageManagement.dll +++ b/NuGet.PackageManagement.dll diff --git a/NuGet.Packaging.Core.Types.dll b/NuGet.Packaging.Core.Types.dll Binary files differindex b2d4894..731a33d 100644 --- a/NuGet.Packaging.Core.Types.dll +++ b/NuGet.Packaging.Core.Types.dll diff --git a/NuGet.Packaging.Core.dll b/NuGet.Packaging.Core.dll Binary files differindex 3c893c2..082d9e8 100644 --- a/NuGet.Packaging.Core.dll +++ b/NuGet.Packaging.Core.dll diff --git a/NuGet.Packaging.dll b/NuGet.Packaging.dll Binary files differindex 4f94cf7..9da16f7 100644 --- a/NuGet.Packaging.dll +++ b/NuGet.Packaging.dll diff --git a/NuGet.ProjectManagement.dll b/NuGet.ProjectManagement.dll Binary files differindex f8eb8cf..290f234 100644 --- a/NuGet.ProjectManagement.dll +++ b/NuGet.ProjectManagement.dll diff --git a/NuGet.ProjectModel.dll b/NuGet.ProjectModel.dll Binary files differindex 6eb60d8..38ef6ee 100644 --- a/NuGet.ProjectModel.dll +++ b/NuGet.ProjectModel.dll diff --git a/NuGet.Protocol.Core.Types.dll b/NuGet.Protocol.Core.Types.dll Binary files differindex eeb7172..acf65f9 100644 --- a/NuGet.Protocol.Core.Types.dll +++ b/NuGet.Protocol.Core.Types.dll diff --git a/NuGet.Protocol.Core.v2.dll b/NuGet.Protocol.Core.v2.dll Binary files differdeleted file mode 100644 index edc1087..0000000 --- a/NuGet.Protocol.Core.v2.dll +++ /dev/null diff --git a/NuGet.Protocol.Core.v3.dll b/NuGet.Protocol.Core.v3.dll Binary files differindex d6be74c..9b230fa 100644 --- a/NuGet.Protocol.Core.v3.dll +++ b/NuGet.Protocol.Core.v3.dll diff --git a/NuGet.Protocol.VisualStudio.dll b/NuGet.Protocol.VisualStudio.dll Binary files differindex e5943c4..7f0f4e5 100644 --- a/NuGet.Protocol.VisualStudio.dll +++ b/NuGet.Protocol.VisualStudio.dll diff --git a/NuGet.Repositories.dll b/NuGet.Repositories.dll Binary files differindex 1c381a3..b3d222e 100644 --- a/NuGet.Repositories.dll +++ b/NuGet.Repositories.dll diff --git a/NuGet.Resolver.dll b/NuGet.Resolver.dll Binary files differindex c8b1f4e..1ad3c5e 100644 --- a/NuGet.Resolver.dll +++ b/NuGet.Resolver.dll diff --git a/NuGet.RuntimeModel.dll b/NuGet.RuntimeModel.dll Binary files differindex ee1b1ae..3b73c89 100644 --- a/NuGet.RuntimeModel.dll +++ b/NuGet.RuntimeModel.dll diff --git a/NuGet.Versioning.dll b/NuGet.Versioning.dll Binary files differBinary files differindex 40ea5c5..ed267eb 100644 --- a/NuGet.Versioning.dll +++ b/NuGet.Versioning.dll |