From c60f54012ab18029c1efe8a74bca16ed89a25791 Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <maxim-lobanov@github.com>
Date: Wed, 19 May 2021 14:16:51 +0300
Subject: [PATCH] Rename 'macOS-11.0' to 'macOS-11' everywhere (#3417)

* rename 'macos11.0' to 'macos-11'

* fix nitpicks

* resolve conflicts
---
 .github/ISSUE_TEMPLATE/announcement.md        |  2 +-
 .github/ISSUE_TEMPLATE/bug-report.md          |  2 +-
 .github/ISSUE_TEMPLATE/tool-request.md        |  2 +-
 .../{macos110.yml => macos11.yml}             | 46 +++++++++----------
 ...acos-11.0-Readme.md => macos-11-Readme.md} |  1 -
 .../{macOS-11.0.json => macOS-11.json}        |  2 +-
 .../{toolset-11.0.json => toolset-11.json}    |  2 +-
 7 files changed, 28 insertions(+), 29 deletions(-)
 rename images.CI/macos/azure-pipelines/{macos110.yml => macos11.yml} (62%)
 rename images/macos/{macos-11.0-Readme.md => macos-11-Readme.md} (99%)
 rename images/macos/templates/{macOS-11.0.json => macOS-11.json} (99%)
 rename images/macos/toolsets/{toolset-11.0.json => toolset-11.json} (99%)

diff --git a/.github/ISSUE_TEMPLATE/announcement.md b/.github/ISSUE_TEMPLATE/announcement.md
index 0d501f6fe..9c4737158 100644
--- a/.github/ISSUE_TEMPLATE/announcement.md
+++ b/.github/ISSUE_TEMPLATE/announcement.md
@@ -26,7 +26,7 @@ assignees: ''
 - [ ] macOS 10.13
 - [ ] macOS 10.14
 - [ ] macOS 10.15
-- [ ] macOS 11.0
+- [ ] macOS 11
 - [ ] Windows Server 2016 R2
 - [ ] Windows Server 2019
 
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 957a479ef..8bcb55bf8 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -21,7 +21,7 @@ A clear and concise description of what the bug is, and why you consider it to b
 - [ ] Ubuntu 18.04
 - [ ] Ubuntu 20.04
 - [ ] macOS 10.15
-- [ ] macOS 11.0
+- [ ] macOS 11
 - [ ] Windows Server 2016 R2
 - [ ] Windows Server 2019
 
diff --git a/.github/ISSUE_TEMPLATE/tool-request.md b/.github/ISSUE_TEMPLATE/tool-request.md
index 72fdd0064..3474b9987 100644
--- a/.github/ISSUE_TEMPLATE/tool-request.md
+++ b/.github/ISSUE_TEMPLATE/tool-request.md
@@ -29,7 +29,7 @@ assignees: ''
 - [ ] Ubuntu 18.04
 - [ ] Ubuntu 20.04
 - [ ] macOS 10.15
-- [ ] macOS 11.0
+- [ ] macOS 11
 - [ ] Windows Server 2016 R2
 - [ ] Windows Server 2019
 
diff --git a/images.CI/macos/azure-pipelines/macos110.yml b/images.CI/macos/azure-pipelines/macos11.yml
similarity index 62%
rename from images.CI/macos/azure-pipelines/macos110.yml
rename to images.CI/macos/azure-pipelines/macos11.yml
index ada6dcfe1..bf78b9666 100644
--- a/images.CI/macos/azure-pipelines/macos110.yml
+++ b/images.CI/macos/azure-pipelines/macos11.yml
@@ -1,23 +1,23 @@
-name: macOS-11.0_$(date:yyyyMMdd)$(rev:.r)_unstable
-schedules:
-- cron: "0 0 * * *"
-  displayName: Daily
-  branches:
-    include:
-    - main
-  always: true
-
-trigger: none
-pr:
-  autoCancel: true
-  branches:
-    include:
-    - main
-
-jobs:
-- template: image-generation.yml
-  parameters:
-    image_label: 'macOS Big Sur'
-    base_image_name: 'clean-macOS-11.0-380Gb-runner'
-    template_path: 'templates/macOS-11.0.json'
-    target_datastore: 'ds-image'
+name: macOS-11_$(date:yyyyMMdd)$(rev:.r)_unstable
+schedules:
+- cron: "0 0 * * *"
+  displayName: Daily
+  branches:
+    include:
+    - main
+  always: true
+
+trigger: none
+pr:
+  autoCancel: true
+  branches:
+    include:
+    - main
+
+jobs:
+- template: image-generation.yml
+  parameters:
+    image_label: 'macOS Big Sur'
+    base_image_name: 'clean-macOS-11-380Gb-runner'
+    template_path: 'templates/macOS-11.json'
+    target_datastore: 'ds-image'
diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11-Readme.md
similarity index 99%
rename from images/macos/macos-11.0-Readme.md
rename to images/macos/macos-11-Readme.md
index ea87d29e7..635ac814a 100644
--- a/images/macos/macos-11.0-Readme.md
+++ b/images/macos/macos-11-Readme.md
@@ -299,4 +299,3 @@
 | ANDROID_SDK_ROOT        | /Users/runner/Library/Android/sdk                                                                  |
 
 
-
diff --git a/images/macos/templates/macOS-11.0.json b/images/macos/templates/macOS-11.json
similarity index 99%
rename from images/macos/templates/macOS-11.0.json
rename to images/macos/templates/macOS-11.json
index 33c3f0085..948f00042 100644
--- a/images/macos/templates/macOS-11.0.json
+++ b/images/macos/templates/macOS-11.json
@@ -88,7 +88,7 @@
         },
         {
             "type": "file",
-            "source": "./toolsets/toolset-11.0.json",
+            "source": "./toolsets/toolset-11.json",
             "destination": "~/image-generation/toolset.json"
         },
         {
diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.json
similarity index 99%
rename from images/macos/toolsets/toolset-11.0.json
rename to images/macos/toolsets/toolset-11.json
index 9291d71c8..7e0eca72a 100644
--- a/images/macos/toolsets/toolset-11.0.json
+++ b/images/macos/toolsets/toolset-11.json
@@ -216,4 +216,4 @@
             "5.0"
         ]
     }
-}
+}
\ No newline at end of file