From 8d8e72387ef42f534e244af1bcba48eb917cd24d Mon Sep 17 00:00:00 2001
From: piranna <piranna@users.noreply.github.com>
Date: Tue, 8 Jun 2021 00:57:49 +0000
Subject: [PATCH] 2021.6.7

---
 data/OS lifecycle.json | 30 +++++++++++++++++++++++++-----
 index.json             | 12 ++++++------
 package-lock.json      |  2 +-
 package.json           |  2 +-
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/data/OS lifecycle.json b/data/OS lifecycle.json
index a5fa8f2..596fab0 100644
--- a/data/OS lifecycle.json	
+++ b/data/OS lifecycle.json	
@@ -54,7 +54,7 @@
       "OS Family": "Windows Server",
       "Operating System": "Windows Server 2016",
       "Latest Update or Service Pack": "",
-      "SCS Support Status": "Active (Default)",
+      "SCS Support Status": "Containment",
       "Vendor Release Date": "26 Sep 2016",
       "Start of SCS Support": "1 Jan 2017",
       "End of SCS Support": "11 Jan 2027",
@@ -104,7 +104,7 @@
       "OS Family": "OS X / macOS",
       "Operating System": "macOS Mojave\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tupgrade note",
       "Latest Update or Service Pack": "10.14",
-      "SCS Support Status": "Containment",
+      "SCS Support Status": "Phasing Out",
       "Vendor Release Date": "24 Sep 2018",
       "Start of SCS Support": "3 Dec 2018",
       "End of SCS Support": "Nov 2021",
@@ -264,7 +264,7 @@
       "OS Family": "Windows Desktop",
       "Operating System": "Windows 10\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tSemi-Annual Channel",
       "Latest Update or Service Pack": "1809",
-      "SCS Support Status": "Active (Default)",
+      "SCS Support Status": "Phasing Out",
       "Vendor Release Date": "28 Mar 2019",
       "Start of SCS Support": "1 Apr 2019",
       "End of SCS Support": "11 May 2021",
@@ -284,7 +284,7 @@
       "OS Family": "OS X / macOS",
       "Operating System": "macOS High Sierra",
       "Latest Update or Service Pack": "10.13",
-      "SCS Support Status": "Phasing Out",
+      "SCS Support Status": "EOL",
       "Vendor Release Date": "25 Sep 2017",
       "Start of SCS Support": "5 Mar 2018",
       "End of SCS Support": "Dec 2020",
@@ -299,8 +299,28 @@
       "Start of SCS Support": "Jan 2021",
       "End of SCS Support": "Apr 2025",
       "Latest Vendor EOL Date": "Apr 2025"
+    },
+    {
+      "OS Family": "Windows Desktop",
+      "Operating System": "Windows 10\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tSemi-Annual Channel",
+      "Latest Update or Service Pack": "20H2",
+      "SCS Support Status": "Active (Default)",
+      "Vendor Release Date": "20 Oct 2020",
+      "Start of SCS Support": "9 Jan 2021",
+      "End of SCS Support": "9 May 2023",
+      "Latest Vendor EOL Date": "9 May 2023"
+    },
+    {
+      "OS Family": "Windows Server",
+      "Operating System": "Windows Server 2019",
+      "Latest Update or Service Pack": "",
+      "SCS Support Status": "Active (Default)",
+      "Vendor Release Date": "13 Nov 2018",
+      "Start of SCS Support": "9 Jan 2020",
+      "End of SCS Support": "9 Jan 2029",
+      "Latest Vendor EOL Date": "9 Jan 2029"
     }
   ],
   "url": "https://computing.cs.cmu.edu/desktop/os-lifecycle.html",
-  "date": "2021-05-05"
+  "date": "2021-06-07"
 }
\ No newline at end of file
diff --git a/index.json b/index.json
index ab7b20b..0cfe6f6 100644
--- a/index.json
+++ b/index.json
@@ -1,9 +1,9 @@
 [
   {
-    "eol": "2021-05-11",
+    "eol": "2023-05-09",
     "name": "Windows",
-    "release": "2019-03-28",
-    "version": "10.1809"
+    "release": "2020-10-20",
+    "version": "10.20H2"
   },
   {
     "eol": "2023-01-10",
@@ -30,10 +30,10 @@
     "version": "XP SP3"
   },
   {
-    "eol": "2015-07-14",
+    "eol": "2029-01-09",
     "name": "Windows Server",
-    "release": "2003-04-24",
-    "version": "2003 R2"
+    "release": "2018-11-13",
+    "version": "2019 "
   },
   {
     "eol": "2023-10-10",
diff --git a/package-lock.json b/package-lock.json
index a4ccfc2..7c02a0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@projectlint/os-lifecycle",
-  "version": "2021.5.3",
+  "version": "2021.5.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ad1b59e..4e52cc0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@projectlint/os-lifecycle",
-  "version": "2021.5.5",
+  "version": "2021.6.7",
   "description": "Operating System support lifecycle",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"