Drop UefiApplicationEntryPoint library from shell apps

Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>

42 files changed, 1 insertions, 43 deletions

diff --git a/Lessons/Lesson_13/README.md b/Lessons/Lesson_13/README.md
index 0d42005..ffa7a40 100644
--- a/Lessons/Lesson_13/README.md
+++ b/Lessons/Lesson_13/README.md
@@ -32,13 +32,12 @@ With the necessary modifications the INF file would look like this:
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 ```
 Main changes:
 - `ENTRY_POINT = ShellCEntryLib` is added to the `[Defines]` section
-- `ShellCEntryLib` is added to the `[LibraryClasses]` section
+- `ShellCEntryLib` is added to the `[LibraryClasses]` section instead of `UefiApplicationEntryPoint`
 
 In the end it works this way. Shell C library is the main UEFI app with the standard entry point:
 ```
diff --git a/Lessons/Lesson_13/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf b/Lessons/Lesson_13/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
index da3d49b..371b967 100644
--- a/Lessons/Lesson_13/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
+++ b/Lessons/Lesson_13/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_14/UefiLessonsPkg/ListVariables/ListVariables.inf b/Lessons/Lesson_14/UefiLessonsPkg/ListVariables/ListVariables.inf
index 9b0f31b..b60b0ff 100644
--- a/Lessons/Lesson_14/UefiLessonsPkg/ListVariables/ListVariables.inf
+++ b/Lessons/Lesson_14/UefiLessonsPkg/ListVariables/ListVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_14/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf b/Lessons/Lesson_14/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
index da3d49b..371b967 100644
--- a/Lessons/Lesson_14/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
+++ b/Lessons/Lesson_14/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_15/UefiLessonsPkg/ListVariables/ListVariables.inf b/Lessons/Lesson_15/UefiLessonsPkg/ListVariables/ListVariables.inf
index 9b0f31b..b60b0ff 100644
--- a/Lessons/Lesson_15/UefiLessonsPkg/ListVariables/ListVariables.inf
+++ b/Lessons/Lesson_15/UefiLessonsPkg/ListVariables/ListVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_15/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf b/Lessons/Lesson_15/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
index c288e6e..f7da616 100644
--- a/Lessons/Lesson_15/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
+++ b/Lessons/Lesson_15/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_15/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf b/Lessons/Lesson_15/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
index da3d49b..371b967 100644
--- a/Lessons/Lesson_15/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
+++ b/Lessons/Lesson_15/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/ListVariables/ListVariables.inf b/Lessons/Lesson_16/UefiLessonsPkg/ListVariables/ListVariables.inf
index 9b0f31b..b60b0ff 100644
--- a/Lessons/Lesson_16/UefiLessonsPkg/ListVariables/ListVariables.inf
+++ b/Lessons/Lesson_16/UefiLessonsPkg/ListVariables/ListVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf b/Lessons/Lesson_16/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
index c288e6e..f7da616 100644
--- a/Lessons/Lesson_16/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
+++ b/Lessons/Lesson_16/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_16/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf b/Lessons/Lesson_16/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
index da3d49b..371b967 100644
--- a/Lessons/Lesson_16/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
+++ b/Lessons/Lesson_16/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_17/UefiLessonsPkg/ListVariables/ListVariables.inf b/Lessons/Lesson_17/UefiLessonsPkg/ListVariables/ListVariables.inf
index 9b0f31b..b60b0ff 100644
--- a/Lessons/Lesson_17/UefiLessonsPkg/ListVariables/ListVariables.inf
+++ b/Lessons/Lesson_17/UefiLessonsPkg/ListVariables/ListVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_17/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf b/Lessons/Lesson_17/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
index c288e6e..f7da616 100644
--- a/Lessons/Lesson_17/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
+++ b/Lessons/Lesson_17/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_17/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf b/Lessons/Lesson_17/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
index da3d49b..371b967 100644
--- a/Lessons/Lesson_17/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
+++ b/Lessons/Lesson_17/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_18/UefiLessonsPkg/GOPInfo/GOPInfo.inf b/Lessons/Lesson_18/UefiLessonsPkg/GOPInfo/GOPInfo.inf
index da7bfa6..6428a22 100644
--- a/Lessons/Lesson_18/UefiLessonsPkg/GOPInfo/GOPInfo.inf
+++ b/Lessons/Lesson_18/UefiLessonsPkg/GOPInfo/GOPInfo.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_18/UefiLessonsPkg/ListVariables/ListVariables.inf b/Lessons/Lesson_18/UefiLessonsPkg/ListVariables/ListVariables.inf
index 9b0f31b..b60b0ff 100644
--- a/Lessons/Lesson_18/UefiLessonsPkg/ListVariables/ListVariables.inf
+++ b/Lessons/Lesson_18/UefiLessonsPkg/ListVariables/ListVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_18/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf b/Lessons/Lesson_18/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
index c288e6e..f7da616 100644
--- a/Lessons/Lesson_18/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
+++ b/Lessons/Lesson_18/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_18/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf b/Lessons/Lesson_18/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
index da3d49b..371b967 100644
--- a/Lessons/Lesson_18/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
+++ b/Lessons/Lesson_18/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_19/UefiLessonsPkg/GOPInfo/GOPInfo.inf b/Lessons/Lesson_19/UefiLessonsPkg/GOPInfo/GOPInfo.inf
index da7bfa6..6428a22 100644
--- a/Lessons/Lesson_19/UefiLessonsPkg/GOPInfo/GOPInfo.inf
+++ b/Lessons/Lesson_19/UefiLessonsPkg/GOPInfo/GOPInfo.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_19/UefiLessonsPkg/ListVariables/ListVariables.inf b/Lessons/Lesson_19/UefiLessonsPkg/ListVariables/ListVariables.inf
index 9b0f31b..b60b0ff 100644
--- a/Lessons/Lesson_19/UefiLessonsPkg/ListVariables/ListVariables.inf
+++ b/Lessons/Lesson_19/UefiLessonsPkg/ListVariables/ListVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_19/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf b/Lessons/Lesson_19/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
index c288e6e..f7da616 100644
--- a/Lessons/Lesson_19/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
+++ b/Lessons/Lesson_19/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_19/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf b/Lessons/Lesson_19/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
index da3d49b..371b967 100644
--- a/Lessons/Lesson_19/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
+++ b/Lessons/Lesson_19/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_20/UefiLessonsPkg/ListVariables/ListVariables.inf b/Lessons/Lesson_20/UefiLessonsPkg/ListVariables/ListVariables.inf
index 9b0f31b..b60b0ff 100644
--- a/Lessons/Lesson_20/UefiLessonsPkg/ListVariables/ListVariables.inf
+++ b/Lessons/Lesson_20/UefiLessonsPkg/ListVariables/ListVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_20/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf b/Lessons/Lesson_20/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
index c288e6e..f7da616 100644
--- a/Lessons/Lesson_20/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
+++ b/Lessons/Lesson_20/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_20/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf b/Lessons/Lesson_20/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
index da3d49b..371b967 100644
--- a/Lessons/Lesson_20/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
+++ b/Lessons/Lesson_20/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_21/UefiLessonsPkg/ListVariables/ListVariables.inf b/Lessons/Lesson_21/UefiLessonsPkg/ListVariables/ListVariables.inf
index 9b0f31b..b60b0ff 100644
--- a/Lessons/Lesson_21/UefiLessonsPkg/ListVariables/ListVariables.inf
+++ b/Lessons/Lesson_21/UefiLessonsPkg/ListVariables/ListVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_21/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf b/Lessons/Lesson_21/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
index c288e6e..f7da616 100644
--- a/Lessons/Lesson_21/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
+++ b/Lessons/Lesson_21/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_21/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf b/Lessons/Lesson_21/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
index da3d49b..371b967 100644
--- a/Lessons/Lesson_21/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
+++ b/Lessons/Lesson_21/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_29/UefiLessonsPkg/ListVariables/ListVariables.inf b/Lessons/Lesson_29/UefiLessonsPkg/ListVariables/ListVariables.inf
index 9b0f31b..b60b0ff 100644
--- a/Lessons/Lesson_29/UefiLessonsPkg/ListVariables/ListVariables.inf
+++ b/Lessons/Lesson_29/UefiLessonsPkg/ListVariables/ListVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_29/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf b/Lessons/Lesson_29/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
index c288e6e..f7da616 100644
--- a/Lessons/Lesson_29/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
+++ b/Lessons/Lesson_29/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_29/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf b/Lessons/Lesson_29/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
index da3d49b..371b967 100644
--- a/Lessons/Lesson_29/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
+++ b/Lessons/Lesson_29/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/Lessons/Lesson_59/README.md b/Lessons/Lesson_59/README.md
index c5bcf55..bfe3784 100644
--- a/Lessons/Lesson_59/README.md
+++ b/Lessons/Lesson_59/README.md
@@ -25,7 +25,6 @@ Let's start with the second task. Create `DisplayHIIByGuid` UEFI Shell applicati
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 ```
diff --git a/Lessons/Lesson_59/UefiLessonsPkg/DisplayHIIByGuid/DisplayHIIByGuid.inf b/Lessons/Lesson_59/UefiLessonsPkg/DisplayHIIByGuid/DisplayHIIByGuid.inf
index bb22a5e..b9c3e15 100644
--- a/Lessons/Lesson_59/UefiLessonsPkg/DisplayHIIByGuid/DisplayHIIByGuid.inf
+++ b/Lessons/Lesson_59/UefiLessonsPkg/DisplayHIIByGuid/DisplayHIIByGuid.inf
@@ -20,7 +20,6 @@
   MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
   HiiLib
diff --git a/Lessons/Lesson_60/README.md b/Lessons/Lesson_60/README.md
index 7df9381..43e7ac2 100644
--- a/Lessons/Lesson_60/README.md
+++ b/Lessons/Lesson_60/README.md
@@ -172,7 +172,6 @@ INTN EFIAPI ShellAppMain(IN UINTN Argc, IN CHAR16 **Argv)
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 ```
diff --git a/Lessons/Lesson_60/UefiLessonsPkg/SetVariableExample/SetVariableExample.inf b/Lessons/Lesson_60/UefiLessonsPkg/SetVariableExample/SetVariableExample.inf
index 948e49a..414f334 100644
--- a/Lessons/Lesson_60/UefiLessonsPkg/SetVariableExample/SetVariableExample.inf
+++ b/Lessons/Lesson_60/UefiLessonsPkg/SetVariableExample/SetVariableExample.inf
@@ -19,6 +19,5 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
diff --git a/Lessons/Lesson_61/README.md b/Lessons/Lesson_61/README.md
index f0ef50b..faf7f48 100644
--- a/Lessons/Lesson_61/README.md
+++ b/Lessons/Lesson_61/README.md
@@ -132,7 +132,6 @@ Once again as we would parse command shell arguments it is better to create a sh
   ShellPkg/ShellPkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
   ShellLib
diff --git a/Lessons/Lesson_61/UefiLessonsPkg/UpdateDmpstoreDump/UpdateDmpstoreDump.inf b/Lessons/Lesson_61/UefiLessonsPkg/UpdateDmpstoreDump/UpdateDmpstoreDump.inf
index eef23cc..02c118a 100644
--- a/Lessons/Lesson_61/UefiLessonsPkg/UpdateDmpstoreDump/UpdateDmpstoreDump.inf
+++ b/Lessons/Lesson_61/UefiLessonsPkg/UpdateDmpstoreDump/UpdateDmpstoreDump.inf
@@ -20,7 +20,6 @@
   ShellPkg/ShellPkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
   ShellLib
diff --git a/UefiLessonsPkg/DisplayHIIByGuid/DisplayHIIByGuid.inf b/UefiLessonsPkg/DisplayHIIByGuid/DisplayHIIByGuid.inf
index bb22a5e..b9c3e15 100644
--- a/UefiLessonsPkg/DisplayHIIByGuid/DisplayHIIByGuid.inf
+++ b/UefiLessonsPkg/DisplayHIIByGuid/DisplayHIIByGuid.inf
@@ -20,7 +20,6 @@
   MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
   HiiLib
diff --git a/UefiLessonsPkg/ListVariables/ListVariables.inf b/UefiLessonsPkg/ListVariables/ListVariables.inf
index 9b0f31b..b60b0ff 100644
--- a/UefiLessonsPkg/ListVariables/ListVariables.inf
+++ b/UefiLessonsPkg/ListVariables/ListVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/UefiLessonsPkg/SetVariableExample/SetVariableExample.inf b/UefiLessonsPkg/SetVariableExample/SetVariableExample.inf
index 948e49a..414f334 100644
--- a/UefiLessonsPkg/SetVariableExample/SetVariableExample.inf
+++ b/UefiLessonsPkg/SetVariableExample/SetVariableExample.inf
@@ -19,6 +19,5 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
diff --git a/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf b/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
index c288e6e..f7da616 100644
--- a/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
+++ b/UefiLessonsPkg/ShowBootVariables/ShowBootVariables.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf b/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
index da3d49b..371b967 100644
--- a/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
+++ b/UefiLessonsPkg/SimpleShellApp/SimpleShellApp.inf
@@ -19,7 +19,6 @@
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
 
diff --git a/UefiLessonsPkg/UpdateDmpstoreDump/UpdateDmpstoreDump.inf b/UefiLessonsPkg/UpdateDmpstoreDump/UpdateDmpstoreDump.inf
index eef23cc..02c118a 100644
--- a/UefiLessonsPkg/UpdateDmpstoreDump/UpdateDmpstoreDump.inf
+++ b/UefiLessonsPkg/UpdateDmpstoreDump/UpdateDmpstoreDump.inf
@@ -20,7 +20,6 @@
   ShellPkg/ShellPkg.dec
 
 [LibraryClasses]
-  UefiApplicationEntryPoint
   UefiLib
   ShellCEntryLib
   ShellLib