Rename 'macOS-11.0' to 'macOS-11' everywhere (#3417)

* rename 'macos11.0' to 'macos-11' * fix nitpicks * resolve conflicts
actions · May 19, 2021 · c60f540 · c60f540 · gtalarico · Jun 3, 2021
1 parent 729b562
commit c60f540
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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 → images.CI/macos/azure-pipelines/macos11.yml b/images.CI/macos/azure-pipelines/macos110.yml → 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 → images/macos/macos-11-Readme.md b/images/macos/macos-11.0-Readme.md → 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 → images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.0.json → 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 → images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.0.json → images/macos/toolsets/toolset-11.json
@@ -216,4 +216,4 @@
             "5.0"
         ]
     }
-}
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -299,4 +299,3 @@
		\| ANDROID_SDK_ROOT \| /Users/runner/Library/Android/sdk \|
-Original file line number
+Diff line change
@@ Expand Up / @@ -216,4 +216,4 @@ @@
                 "5.0"
             ]
         }
-    }
+    }