removing extra dash because it's already added in ctor (#406)

* removing extra dash because it's already added in ctor

* resourceId wasn't getting assigned

Author: joeyeng

src/APIM_ARMTemplate/apimtemplate/Common/FileHandlers/FileNameGenerator.cs

@@ -49,9 +49,6 @@ public string GenerateCreatorAPIFileName(string apiName, bool isSplitAPI, bool i
 
         public string GenerateExtractorAPIFileName(string singleAPIName, string baseFileName)
         {
-            if (baseFileName.Length > 0)
-                baseFileName += "-";
-
             return singleAPIName == null ? $@"/{baseFileName}apis.template.json" : $@"/{baseFileName}{singleAPIName}-api.template.json";
         }
 

src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/LoggerExtractor.cs

@@ -56,10 +56,7 @@ public Template SetLoggerResourceId(Template loggerTemplate)
             foreach (LoggerTemplateResource resource in loggerResources)
             {
                 string validLoggerName = GetValidLoggerParamName(resource.name);
-                if (resource.properties.resourceId != null)
-                {
-                    resource.properties.resourceId = $"[parameters('{ParameterNames.LoggerResourceId}').{validLoggerName}]";
-                }
+                resource.properties.resourceId = $"[parameters('{ParameterNames.LoggerResourceId}').{validLoggerName}]";
                 nLoggerResource.Add(resource);
             }
             loggerTemplate.resources = nLoggerResource.ToArray();