Merge pull request #1674 from hutson/refactor/win/file-name

refactor(windows): consistent file naming

helpers/GenerateResourcesAndImage.ps1

@@ -20,10 +20,10 @@ Function Get-PackerTemplatePath {
 
     switch ($ImageType) {
         ([ImageType]::Windows2016) {
-            $relativePath = "\images\win\Windows2016-Azure.json"
+            $relativePath = "\images\win\windows2016.json"
         }
         ([ImageType]::Windows2019) {
-            $relativePath = "\images\win\Windows2019-Azure.json"
+            $relativePath = "\images\win\windows2019.json"
         }
         ([ImageType]::Ubuntu1604) {
             $relativePath = "\images\linux\ubuntu1604.json"

images.CI/linux-and-win/azure-pipelines/windows2016.yml

@@ -16,5 +16,5 @@ pr:
 jobs:
 - template: image-generation.yml
   parameters:
-    image_type: Windows2016-Azure
+    image_type: windows2016
     image_readme_name: Windows2016-Readme.md

images.CI/linux-and-win/azure-pipelines/windows2019.yml

@@ -16,5 +16,5 @@ pr:
 jobs:
 - template: image-generation.yml
   parameters:
-    image_type: Windows2019-Azure
+    image_type: windows2019
     image_readme_name: Windows2019-Readme.md