Add support for resolving packages from https-nuget-v3:// URIs (Proto…

…build#181)
RedpointArchive · Nov 19, 2016 · f850ede · f850ede
1 parent 480d05c
commit f850ede
Show file tree

Hide file tree

Showing 13 changed files with 460 additions and 27 deletions.
diff --git a/Build/Projects/Protobuild.Internal.definition b/Build/Projects/Protobuild.Internal.definition
@@ -247,6 +247,7 @@
     <Compile Include="Packages\PackageMetadata\GitPackageMetadata.cs" />
     <Compile Include="Packages\PackageMetadata\ICachableBinaryPackageMetadata.cs" />
     <Compile Include="Packages\PackageMetadata\IPackageMetadata.cs" />
+    <Compile Include="Packages\PackageMetadata\NuGet3PackageMetadata.cs" />
     <Compile Include="Packages\PackageMetadata\ProtobuildPackageMetadata.cs" />
     <Compile Include="Packages\PackageMetadata\TransformedPackageMetadata.cs" />
     <Compile Include="Packages\PackageNameLookup.cs" />
@@ -255,6 +256,7 @@
     <Compile Include="Packages\PackageProtocol\LocalProtobuildPackageProtocol.cs" />
     <Compile Include="Packages\PackageProtocol\LocalTemplateGitPackageProtocol.cs" />
     <Compile Include="Packages\PackageProtocol\LocalTemplatePackageProtocol.cs" />
+    <Compile Include="Packages\PackageProtocol\NuGet3PackageProtocol.cs" />
     <Compile Include="Packages\PackageProtocol\NuGetPackageProtocol.cs" />
     <Compile Include="Packages\PackageProtocol\ProtobuildPackageProtocol.cs" />
     <Compile Include="Packages\PackageRedirector\IPackageRedirector.cs" />

diff --git a/Protobuild.Internal/DI/LightweightKernelModule.cs b/Protobuild.Internal/DI/LightweightKernelModule.cs
@@ -79,6 +79,7 @@ public static void BindPackages(this LightweightKernel kernel)
             kernel.Bind<IPackageProtocol, LocalTemplatePackageProtocol>();
             kernel.Bind<IPackageProtocol, LocalTemplateGitPackageProtocol>();
             kernel.Bind<IPackageProtocol, NuGetPackageProtocol>();
+            kernel.Bind<IPackageProtocol, NuGet3PackageProtocol>();
             kernel.Bind<IPackageProtocol, ProtobuildPackageProtocol>();
             kernel.Bind<IPackageProtocol, LocalProtobuildPackageProtocol>();
         }

diff --git a/Protobuild.Internal/Packages/PackageMetadata/ICachableBinaryPackageMetadata.cs b/Protobuild.Internal/Packages/PackageMetadata/ICachableBinaryPackageMetadata.cs
@@ -1,12 +1,17 @@
 namespace Protobuild
 {
-    internal interface ICachableBinaryPackageMetadata : IPackageMetadata
+    internal interface ICachableBinaryPackageMetadata : IBinaryPackageMetadata
     {
         string Platform { get; }
 
         string CanonicalURI { get; }
 
         string GitCommitOrRef { get; }
+    }
+
+    internal interface IBinaryPackageMetadata : IPackageMetadata
+    {
+        string BinaryUri { get; }
 
         string BinaryFormat { get; }
     }

diff --git a/Protobuild.Internal/Packages/PackageMetadata/NuGet3PackageMetadata.cs b/Protobuild.Internal/Packages/PackageMetadata/NuGet3PackageMetadata.cs
@@ -0,0 +1,55 @@
+namespace Protobuild
+{
+    internal class NuGet3PackageMetadata : ICachableBinaryPackageMetadata
+    {
+        public NuGet3PackageMetadata(
+            string repositoryIndexUri,
+            string packageName,
+            string packageType,
+            string sourceUri,
+            string platform,
+            string version,
+            string binaryFormat,
+            string binaryUri,
+            string commitHashForSourceResolve,
+            ResolveMetadataDelegate resolve)
+        {
+            RepositoryIndexUri = repositoryIndexUri;
+            PackageName = packageName;
+            PackageType = packageType;
+            SourceUri = sourceUri;
+            Platform = platform;
+            Version = version;
+            BinaryFormat = binaryFormat;
+            BinaryUri = binaryUri;
+            CommitHashForSourceResolve = commitHashForSourceResolve;
+            Resolve = resolve;
+        }
+
+        public string RepositoryIndexUri { get; }
+
+        public string PackageName { get; }
+
+        public string PackageType { get; }
+
+        public ResolveMetadataDelegate Resolve { get; }
+
+        public GetProtobuildPackageBinaryDelegate GetProtobuildPackageBinary => null;
+
+        public string SourceUri { get; }
+
+        public string Platform { get; }
+
+        string ICachableBinaryPackageMetadata.CanonicalURI => $"{RepositoryIndexUri}|{PackageName}";
+
+        string ICachableBinaryPackageMetadata.GitCommitOrRef => Version;
+
+        public string Version { get; }
+
+        public string CommitHashForSourceResolve { get; }
+
+        public string BinaryFormat { get; }
+
+        public string BinaryUri { get; }
+    }
+}
diff --git a/Protobuild.Internal/Packages/PackageMetadata/ProtobuildPackageMetadata.cs b/Protobuild.Internal/Packages/PackageMetadata/ProtobuildPackageMetadata.cs
@@ -19,7 +19,7 @@ public ProtobuildPackageMetadata(
             Platform = platform;
             GitCommit = gitCommit;
             BinaryFormat = binaryFormat;
-            BinaryURI = binaryUri;
+            BinaryUri = binaryUri;
             Resolve = resolve;
             GetProtobuildPackageBinary = getProtobuildPackageBinary;
         }
@@ -44,6 +44,6 @@ public ProtobuildPackageMetadata(
 
         public string BinaryFormat { get; }
 
-        public string BinaryURI { get; }
+        public string BinaryUri { get; }
     }
 }
diff --git a/Protobuild.Internal/Packages/PackageMetadata/TransformedPackageMetadata.cs b/Protobuild.Internal/Packages/PackageMetadata/TransformedPackageMetadata.cs
@@ -28,7 +28,9 @@ public TransformedPackageMetadata(
 
         string ICachableBinaryPackageMetadata.GitCommitOrRef => GitRef;
 
-        string ICachableBinaryPackageMetadata.BinaryFormat => PackageManager.ARCHIVE_FORMAT_TAR_LZMA;
+        string IBinaryPackageMetadata.BinaryUri => null;
+
+        string IBinaryPackageMetadata.BinaryFormat => PackageManager.ARCHIVE_FORMAT_TAR_LZMA;
 
         public string GitRef { get; }