Revert "Allow custom Unity scopes"

This reverts commit fd56633.

Author: bobuc-havok

src/UnityNuGet/RegistryCache.cs

@@ -236,15 +236,14 @@ private async Task BuildInternal()
                 }
 
                 var packageId = packageName.ToLowerInvariant();
-                var unityScope = (packageEntry.UnityScope ?? _unityScope).ToLowerInvariant();
-                var npmPackageId = $"{unityScope}.{packageId}";
+                var npmPackageId = $"{_unityScope}.{packageId}";
                 NpmPackageCacheEntry? cacheEntry = null;
                 NpmPackage? npmPackage = null;
                 NpmPackageInfo? npmPackageInfo = null;
 
                 if (!forceUpdate && !_npmPackageRegistry.Packages.TryGetValue(npmPackageId, out npmPackage))
                 {
-                    if (TryReadPackageCacheEntry(unityScope, packageId, out cacheEntry))
+                    if (TryReadPackageCacheEntry(packageId, out cacheEntry))
                     {
                         npmPackage = cacheEntry.Package!;
                         npmPackageInfo = cacheEntry.Info!;
@@ -271,8 +270,8 @@ private async Task BuildInternal()
                     if (npmPackage != null && npmPackage.Versions.TryGetValue(npmCurrentVersion, out var existingVersion))
                     {
                         // If the package tgz exists, we don't need to regenerate it again
-                        var packageTgz = new FileInfo(GetUnityPackagePath(unityScope, packageIdentity, existingVersion));
-                        var packageSha1 = new FileInfo(GetUnityPackageSha1Path(unityScope, packageIdentity, existingVersion));
+                        var packageTgz = new FileInfo(GetUnityPackagePath(packageIdentity, existingVersion));
+                        var packageSha1 = new FileInfo(GetUnityPackageSha1Path(packageIdentity, existingVersion));
 
                         if (packageTgz.Exists && packageTgz.Length > 0 && packageSha1.Exists && packageSha1.Length > 0)
                         {
@@ -348,7 +347,7 @@ private async Task BuildInternal()
                         Author = npmPackageInfo.Author,
                         DisplayName = packageMeta.Title + _packageNameNuGetPostFix
                     };
-                    npmVersion.Distribution.Tarball = new Uri(_rootHttpUri, $"{npmPackage.Id}/-/{GetUnityPackageFileName(unityScope, packageIdentity, npmVersion)}");
+                    npmVersion.Distribution.Tarball = new Uri(_rootHttpUri, $"{npmPackage.Id}/-/{GetUnityPackageFileName(packageIdentity, npmVersion)}");
                     npmVersion.Unity = _minimumUnityVersion;
                     npmPackage.Versions[npmVersion.Version] = npmVersion;
 
@@ -423,8 +422,7 @@ private async Task BuildInternal()
 
                             // Otherwise add the package as a dependency
                             var depsId = resolvedDeps.Id.ToLowerInvariant();
-                            var depsUnityScope = (packageEntryDep!.UnityScope ?? _unityScope).ToLowerInvariant();
-                            var key = $"{depsUnityScope}.{depsId}";
+                            var key = $"{_unityScope}.{depsId}";
                             if (!npmVersion.Dependencies.ContainsKey(key))
                             {
                                 npmVersion.Dependencies.Add(key, GetNpmVersion(resolvedDeps.VersionRange.MinVersion));
@@ -435,8 +433,8 @@ private async Task BuildInternal()
                     // If we don't have any dependencies error, generate the package
                     if (!hasDependencyErrors)
                     {
-                        bool packageConverted = await ConvertNuGetToUnityPackageIfDoesNotExist(unityScope, packageIdentity, npmPackageInfo, npmVersion, packageMeta, forceUpdate, packageEntry);
-                        npmPackage.Time[npmCurrentVersion] = packageMeta.Published?.UtcDateTime ?? GetUnityPackageFileInfo(unityScope, packageIdentity, npmVersion).CreationTimeUtc;
+                        bool packageConverted = await ConvertNuGetToUnityPackageIfDoesNotExist(packageIdentity, npmPackageInfo, npmVersion, packageMeta, forceUpdate, packageEntry);
+                        npmPackage.Time[npmCurrentVersion] = packageMeta.Published?.UtcDateTime ?? GetUnityPackageFileInfo(packageIdentity, npmVersion).CreationTimeUtc;
 
                         // Copy repository info if necessary
                         if (update)
@@ -445,7 +443,7 @@ private async Task BuildInternal()
                         }
 
                         // Update the cache entry
-                        await WritePackageCacheEntry(unityScope, packageId, cacheEntry);
+                        await WritePackageCacheEntry(packageId, cacheEntry);
 
                         if (packageConverted && IsRunningOnAzure)
                         {
@@ -486,7 +484,6 @@ private static string GetNpmVersion(NuGetVersion currentVersion)
         /// </summary>
         private async Task<bool> ConvertNuGetToUnityPackageIfDoesNotExist
         (
-            string unityScope,
             PackageIdentity identity,
             NpmPackageInfo npmPackageInfo,
             NpmPackageVersion npmPackageVersion,
@@ -498,18 +495,18 @@ RegistryEntry packageEntry
             // If we need to force the update, we delete the previous package+sha1 files
             if (forceUpdate)
             {
-                DeleteUnityPackage(unityScope, identity, npmPackageVersion);
+                DeleteUnityPackage(identity, npmPackageVersion);
             }
 
-            if (!IsUnityPackageValid(unityScope, identity, npmPackageVersion) || !IsUnityPackageSha1Valid(unityScope, identity, npmPackageVersion))
+            if (!IsUnityPackageValid(identity, npmPackageVersion) || !IsUnityPackageSha1Valid(identity, npmPackageVersion))
             {
-                await ConvertNuGetPackageToUnity(unityScope, identity, npmPackageInfo, npmPackageVersion, packageMeta, packageEntry);
+                await ConvertNuGetPackageToUnity(identity, npmPackageInfo, npmPackageVersion, packageMeta, packageEntry);
 
                 return true;
             }
             else
             {
-                npmPackageVersion.Distribution.Shasum = await ReadUnityPackageSha1(unityScope, identity, npmPackageVersion);
+                npmPackageVersion.Distribution.Shasum = await ReadUnityPackageSha1(identity, npmPackageVersion);
 
                 return false;
             }
@@ -520,15 +517,14 @@ RegistryEntry packageEntry
         /// </summary>
         private async Task ConvertNuGetPackageToUnity
         (
-            string unityScope,
             PackageIdentity identity,
             NpmPackageInfo npmPackageInfo,
             NpmPackageVersion npmPackageVersion,
             IPackageSearchMetadata packageMeta,
             RegistryEntry packageEntry
         )
         {
-            var unityPackageFileName = GetUnityPackageFileName(unityScope, identity, npmPackageVersion);
+            var unityPackageFileName = GetUnityPackageFileName(identity, npmPackageVersion);
             var unityPackageFilePath = Path.Combine(_rootPersistentFolder, unityPackageFileName);
 
             LogInformation($"Converting NuGet package {identity} to Unity `{unityPackageFileName}`");
@@ -907,7 +903,7 @@ RegistryEntry packageEntry
                 using (var stream = File.OpenRead(unityPackageFilePath))
                 {
                     var sha1 = Sha1sum(stream);
-                    await WriteUnityPackageSha1(unityScope, identity, npmPackageVersion, sha1);
+                    await WriteUnityPackageSha1(identity, npmPackageVersion, sha1);
                     npmPackageVersion.Distribution.Shasum = sha1;
                 }
             }
@@ -931,75 +927,72 @@ private static Guid GetStableGuid(PackageIdentity identity, string name)
             return StringToGuid($"{identity.Id}/{name}*");
         }
 
-        private FileInfo GetUnityPackageFileInfo(string unityScope, PackageIdentity identity, NpmPackageVersion packageVersion)
+        private FileInfo GetUnityPackageFileInfo(PackageIdentity identity, NpmPackageVersion packageVersion)
         {
-            return new FileInfo(GetUnityPackagePath(unityScope, identity, packageVersion));
+            return new FileInfo(GetUnityPackagePath(identity, packageVersion));
         }
 
-        private string GetUnityPackageFileName(string unityScope, PackageIdentity identity, NpmPackageVersion packageVersion)
+        private string GetUnityPackageFileName(PackageIdentity identity, NpmPackageVersion packageVersion)
         {
-            return $"{unityScope}.{identity.Id.ToLowerInvariant()}-{packageVersion.Version}.tgz";
+            return $"{_unityScope}.{identity.Id.ToLowerInvariant()}-{packageVersion.Version}.tgz";
         }
 
-        private string GetUnityPackageDescFileName(string unityScope, string packageName)
+        private string GetUnityPackageDescFileName(string packageName)
         {
-            return $"{unityScope}.{packageName}.json";
+            return $"{_unityScope}.{packageName}.json";
         }
 
-        private string GetUnityPackageSha1FileName(string unityScope, PackageIdentity identity, NpmPackageVersion packageVersion)
+        private string GetUnityPackageSha1FileName(PackageIdentity identity, NpmPackageVersion packageVersion)
         {
-            return $"{unityScope}.{identity.Id.ToLowerInvariant()}-{packageVersion.Version}.sha1";
+            return $"{_unityScope}.{identity.Id.ToLowerInvariant()}-{packageVersion.Version}.sha1";
         }
 
-        private void DeleteUnityPackage(string unityScope, PackageIdentity identity, NpmPackageVersion packageVersion)
+        private void DeleteUnityPackage(PackageIdentity identity, NpmPackageVersion packageVersion)
         {
-            var packageFile = new FileInfo(GetUnityPackagePath(unityScope, identity, packageVersion));
+            var packageFile = new FileInfo(GetUnityPackagePath(identity, packageVersion));
             if (packageFile.Exists)
             {
                 packageFile.Delete();
             }
-            var sha1File = new FileInfo(GetUnityPackageSha1Path(unityScope, identity, packageVersion));
+            var sha1File = new FileInfo(GetUnityPackageSha1Path(identity, packageVersion));
             if (sha1File.Exists)
             {
                 sha1File.Delete();
             }
         }
 
-        private bool IsUnityPackageValid(string unityScope, PackageIdentity identity, NpmPackageVersion packageVersion)
+        private bool IsUnityPackageValid(PackageIdentity identity, NpmPackageVersion packageVersion)
         {
-            var packageFile = new FileInfo(GetUnityPackagePath(unityScope, identity, packageVersion));
+            var packageFile = new FileInfo(GetUnityPackagePath(identity, packageVersion));
             return packageFile.Exists && packageFile.Length > 0;
         }
 
-        private bool IsUnityPackageSha1Valid(string unityScope, PackageIdentity identity, NpmPackageVersion packageVersion)
+        private bool IsUnityPackageSha1Valid(PackageIdentity identity, NpmPackageVersion packageVersion)
         {
-            var sha1File = new FileInfo(GetUnityPackageSha1Path(unityScope, identity, packageVersion));
+            var sha1File = new FileInfo(GetUnityPackageSha1Path(identity, packageVersion));
             return sha1File.Exists && sha1File.Length > 0;
         }
 
-        private async Task<string> ReadUnityPackageSha1(string unityScope, PackageIdentity identity, NpmPackageVersion packageVersion)
+        private async Task<string> ReadUnityPackageSha1(PackageIdentity identity, NpmPackageVersion packageVersion)
         {
-            return await File.ReadAllTextAsync(GetUnityPackageSha1Path(unityScope, identity, packageVersion));
+            return await File.ReadAllTextAsync(GetUnityPackageSha1Path(identity, packageVersion));
         }
 
-        private async Task WriteUnityPackageSha1(string unityScope, PackageIdentity identity, NpmPackageVersion packageVersion, string sha1)
+        private async Task WriteUnityPackageSha1(PackageIdentity identity, NpmPackageVersion packageVersion, string sha1)
         {
-            await File.WriteAllTextAsync(GetUnityPackageSha1Path(unityScope, identity, packageVersion), sha1);
+            await File.WriteAllTextAsync(GetUnityPackageSha1Path(identity, packageVersion), sha1);
         }
 
-        private string GetUnityPackagePath(string unityScope, PackageIdentity identity, NpmPackageVersion packageVersion)
-            => Path.Combine(_rootPersistentFolder, GetUnityPackageFileName(unityScope, identity, packageVersion));
+        private string GetUnityPackagePath(PackageIdentity identity, NpmPackageVersion packageVersion) => Path.Combine(_rootPersistentFolder, GetUnityPackageFileName(identity, packageVersion));
 
-        private string GetUnityPackageSha1Path(string unityScope, PackageIdentity identity, NpmPackageVersion packageVersion)
-            => Path.Combine(_rootPersistentFolder, GetUnityPackageSha1FileName(unityScope, identity, packageVersion));
+        private string GetUnityPackageSha1Path(PackageIdentity identity, NpmPackageVersion packageVersion) => Path.Combine(_rootPersistentFolder, GetUnityPackageSha1FileName(identity, packageVersion));
 
-        private string GetUnityPackageDescPath(string unityScope, string packageName)
-            => Path.Combine(_rootPersistentFolder, GetUnityPackageDescFileName(unityScope, packageName));
+        private string GetUnityPackageDescPath(string packageName) => Path.Combine(_rootPersistentFolder, GetUnityPackageDescFileName(packageName));
 
-        private bool TryReadPackageCacheEntry(string unityScope, string packageName, [NotNullWhen(true)] out NpmPackageCacheEntry? cacheEntry)
+        private bool TryReadPackageCacheEntry(string packageName, [NotNullWhen(true)] out NpmPackageCacheEntry? cacheEntry)
         {
             cacheEntry = null;
-            var path = GetUnityPackageDescPath(unityScope, packageName);
+            var path = GetUnityPackageDescPath(packageName);
 
             if (!File.Exists(path)) return false;
 
@@ -1021,9 +1014,9 @@ private bool TryReadPackageCacheEntry(string unityScope, string packageName, [No
             return false;
         }
 
-        private async Task WritePackageCacheEntry(string unityScope, string packageName, NpmPackageCacheEntry cacheEntry)
+        private async Task WritePackageCacheEntry(string packageName, NpmPackageCacheEntry cacheEntry)
         {
-            var path = GetUnityPackageDescPath(unityScope, packageName);
+            var path = GetUnityPackageDescPath(packageName);
             var newJson = cacheEntry.ToJson();
             // Only update if entry is different
             if (!string.Equals(newJson, cacheEntry.Json, StringComparison.InvariantCulture))

src/UnityNuGet/RegistryEntry.cs

@@ -15,9 +15,6 @@ public class RegistryEntry
         [JsonProperty("listed")]
         public bool Listed { get; set; }
 
-        [JsonProperty("scope")]
-        public string? UnityScope { get; set; }
-
         [JsonProperty("version")]
         public VersionRange? Version { get; set; }