ConvertNuGetPackageToUnity returns boolean

Author: anton-trackman

src/UnityNuGet/RegistryCache.cs

@@ -436,7 +436,18 @@ private async Task BuildInternal()
                     // If we don't have any dependencies error, generate the package
                     if (!hasDependencyErrors)
                     {
-                        bool packageConverted = await ConvertNuGetToUnityPackageIfDoesNotExist(packageIdentity, npmPackageInfo, npmVersion, packageMeta, forceUpdate, packageEntry);
+                        bool packageAvailable = await ConvertNuGetToUnityPackageIfDoesNotExist(packageIdentity, npmPackageInfo, npmVersion, packageMeta, forceUpdate, packageEntry);
+
+                        if (!packageAvailable)
+                        {
+                            npmPackage.Versions.Remove(npmVersion.Version);
+
+                            if (npmPackageInfo.Versions.TryGetValue(npmCurrentVersion, out var tagValue) && tagValue == "latest")
+                                npmPackageInfo.Versions.Remove(npmCurrentVersion);
+
+                            continue;
+                        }
+
                         npmPackage.Time[npmCurrentVersion] = packageMeta.Published?.UtcDateTime ?? GetUnityPackageFileInfo(packageIdentity, npmVersion).CreationTimeUtc;
 
                         // Copy repository info if necessary
@@ -448,7 +459,7 @@ private async Task BuildInternal()
                         // Update the cache entry
                         await WritePackageCacheEntry(packageId, cacheEntry);
 
-                        if (packageConverted && IsRunningOnAzure)
+                        if (packageAvailable && IsRunningOnAzure)
                         {
                             string localPackagePath = Path.Combine(globalPackagesFolder, packageIdentity.Id.ToLowerInvariant(), packageIdentity.Version.ToString());
 
@@ -503,22 +514,18 @@ RegistryEntry packageEntry
 
             if (!IsUnityPackageValid(identity, npmPackageVersion) || !IsUnityPackageSha1Valid(identity, npmPackageVersion))
             {
-                await ConvertNuGetPackageToUnity(identity, npmPackageInfo, npmPackageVersion, packageMeta, packageEntry);
-
-                return true;
+                return await ConvertNuGetPackageToUnity(identity, npmPackageInfo, npmPackageVersion, packageMeta, packageEntry);
             }
-            else
-            {
-                npmPackageVersion.Distribution.Shasum = await ReadUnityPackageSha1(identity, npmPackageVersion);
 
-                return false;
-            }
+            npmPackageVersion.Distribution.Shasum = await ReadUnityPackageSha1(identity, npmPackageVersion);
+
+            return true;
         }
 
         /// <summary>
         /// Converts a NuGet package to a Unity package.
         /// </summary>
-        private async Task ConvertNuGetPackageToUnity
+        private async Task<bool> ConvertNuGetPackageToUnity
         (
             PackageIdentity identity,
             NpmPackageInfo npmPackageInfo,
@@ -556,38 +563,38 @@ RegistryEntry packageEntry
             {
                 using var memStream = new MemoryStream();
 
-                using (var outStream = File.Create(unityPackageFilePath))
-                using (var gzoStream = new GZipOutputStream(outStream)
-                {
-                    ModifiedTime = packageMeta.Published?.UtcDateTime
-                })
-                using (var tarArchive = new TarOutputStream(gzoStream, Encoding.UTF8))
-                {
-                    // Select the framework version that is the closest or equal to the latest configured framework version
-                    var versions = await packageReader.GetLibItemsAsync(CancellationToken.None);
+                // Select the framework version that is the closest or equal to the latest configured framework version
+                var versions = await packageReader.GetLibItemsAsync(CancellationToken.None);
 
-                    var closestVersions = NuGetHelper.GetClosestFrameworkSpecificGroups(versions, _targetFrameworks);
+                var closestVersions = NuGetHelper.GetClosestFrameworkSpecificGroups(versions, _targetFrameworks);
 
-                    var collectedItems = new Dictionary<FrameworkSpecificGroup, HashSet<RegistryTargetFramework>>();
+                var collectedItems = new Dictionary<FrameworkSpecificGroup, HashSet<RegistryTargetFramework>>();
 
-                    foreach (var (item, targetFramework) in closestVersions)
+                foreach (var (item, targetFramework) in closestVersions)
+                {
+                    if (!collectedItems.TryGetValue(item, out var frameworksPerGroup))
                     {
-                        if (!collectedItems.TryGetValue(item, out var frameworksPerGroup))
-                        {
-                            frameworksPerGroup = new HashSet<RegistryTargetFramework>();
-                            collectedItems.Add(item, frameworksPerGroup);
-                        }
-                        frameworksPerGroup.Add(targetFramework);
+                        frameworksPerGroup = new HashSet<RegistryTargetFramework>();
+                        collectedItems.Add(item, frameworksPerGroup);
                     }
+                    frameworksPerGroup.Add(targetFramework);
+                }
 
-                    if (!packageEntry.Analyzer && collectedItems.Count == 0)
-                    {
-                        LogWarning(
-                            $"Skipping package `{identity}` because it does not contain a compatible .NET assembly " +
-                            $"for {string.Join(",", _targetFrameworks.Select(x => x.Name))}.");
-                        return;
-                    }
+                if (!packageEntry.Analyzer && collectedItems.Count == 0)
+                {
+                    LogWarning(
+                        $"Skipping package `{identity}` because it does not contain a compatible .NET assembly " +
+                        $"for {string.Join(",", _targetFrameworks.Select(x => x.Name))}.");
+                    return false;
+                }
 
+                using (var outStream = File.Create(unityPackageFilePath))
+                using (var gzoStream = new GZipOutputStream(outStream)
+                {
+                    ModifiedTime = packageMeta.Published?.UtcDateTime
+                })
+                using (var tarArchive = new TarOutputStream(gzoStream, Encoding.UTF8))
+                {
                     var isPackageNetStandard21Assembly = DotNetHelper.IsNetStandard21Assembly(identity.Id);
                     var hasMultiNetStandard = collectedItems.Count > 1;
                     var hasOnlyNetStandard21 = collectedItems.Count == 1 && collectedItems.Values.First().All(x => x.Name == "netstandard2.1");
@@ -834,7 +841,7 @@ RegistryEntry packageEntry
                         LogWarning(
                             $"Skipping package `{identity}` because it does not contain a compatible .NET assembly " +
                             $"for {string.Join(",", _targetFrameworks.Select(x => x.Name))}.");
-                        return;
+                        return false;
                     }
 
                     // Write the native libraries
@@ -905,6 +912,7 @@ RegistryEntry packageEntry
                             // Try to fetch the license from an URL
                             using (var httpClient = new HttpClient())
                             {
+                                httpClient.Timeout = TimeSpan.FromSeconds(15);
                                 licenseUrlText = await httpClient.GetStringAsync(licenseUrl);
                             }
 
@@ -969,7 +977,10 @@ RegistryEntry packageEntry
                 }
 
                 LogWarning($"Error while processing package `{identity}`. Reason: {ex}");
+                return false;
             }
+
+            return true;
         }
 
         private static Guid GetStableGuid(PackageIdentity identity, string name)
@@ -1183,4 +1194,4 @@ private static List<string> SplitCommaSeparatedString(string input)
             return list;
         }
     }
-}
+}