SQ remarks

Author: MichielOda

Sdk/CatalogService/HttpCatalogService.cs

@@ -131,8 +131,16 @@ public async Task<ArtifactUploadResult> RegisterCatalogAsync(byte[] catalogDetai
 
         public async Task<ArtifactUploadResult> UploadVersionAsync(byte[] package, string fileName, string key, string catalogId, string version, string description, CancellationToken cancellationToken)
         {
+            if (String.IsNullOrWhiteSpace(fileName)) throw new ArgumentNullException(nameof(fileName));
+            if (String.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
+            if (String.IsNullOrWhiteSpace(catalogId)) throw new ArgumentNullException(nameof(catalogId));
             if (String.IsNullOrWhiteSpace(version)) throw new ArgumentNullException(nameof(version));
 
+            return await UploadVersionInternalAsync(package, fileName, key, catalogId, version, description, cancellationToken);
+        }
+
+        private async Task<ArtifactUploadResult> UploadVersionInternalAsync(byte[] package, string fileName, string key, string catalogId, string version, string description, CancellationToken cancellationToken)
+        {
             string versionUploadPath = $"{VersionUploadPathStart}{catalogId}{VersionUploadPathEnd}";
             using (var formData = new MultipartFormDataContent())
             {
@@ -166,7 +174,9 @@ public async Task<ArtifactUploadResult> UploadVersionAsync(byte[] package, strin
                     if (response.IsSuccessStatusCode)
                     {
                         var returnedResult = JsonConvert.DeserializeObject<CatalogUploadResult>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
-                        return new ArtifactUploadResult { ArtifactId = returnedResult.AzureStorageId };
+                        {
+                            return new ArtifactUploadResult { ArtifactId = returnedResult.AzureStorageId };
+                        }
                     }
 
                     if (response.StatusCode is HttpStatusCode.Forbidden || response.StatusCode is HttpStatusCode.Unauthorized)

Sdk/Helpers/CatalogReferencesHelper.cs

@@ -18,7 +18,6 @@ public static bool TryResolveCatalogReferences(Project packageProject, out List<
             includedPackages = null;
             errorMessage = null;
 
-            string rootFolder = FileSystem.Instance.Directory.GetParentDirectory(packageProject.ProjectDirectory);
             const string xmlFileName = "CatalogReferences.xml";
             string xmlFilePath = FileSystem.Instance.Path.Combine(packageProject.ProjectDirectory, "PackageContent", xmlFileName);
 

Sdk/Tasks/DmappCreation.cs

@@ -247,7 +247,6 @@ private void PackageBasicFiles(PackageCreationData preparedData, AppPackage.AppP
 
             // Include Dashboards
             IncludeFromPackageContent("Dashboards", ZipType.Dashboard);
-            return;
 
             void IncludeFromPackageContent(string contentFolderName, ZipType contentType)
             {