[edk2-test][PATCH v1 18/30] RIVL/Protocol: Fix inf files for Udp6 protocol tests.

[Supreeth Venkatesh <supreeth.venkatesh@arm.com>]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
---
 .../RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf  | 31 +++++++++----------
 .../Udp6ServiceBindingENTSTest.inf            | 30 +++++++++---------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf
index 6dbde295..359a2e42 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.<BR>
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -25,32 +26,30 @@
 #--*/
 
 [defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Udp6_ENTSTest
 FILE_GUID            = 9BDED151-34DA-4b54-890F-55CD1467A603
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Udp6ENTSTestMain
 
 [sources.common]
   Udp6ENTSTest.c
   Udp6ENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Udp6ENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiUdp6ProtocolGuid
\ No newline at end of file
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.inf
index 097c06ea..8d4da726 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.<BR>
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -25,32 +26,31 @@
 #--*/
 
 [Defines]
+INF_VERSION          = 0x00010005
 BASE_NAME            = Udp6ServiceBinding_ENTSTest
 FILE_GUID            = D19405F6-7886-4cb2-9334-EF1188CDC401
 COMPONENT_TYPE       = BS_DRIVER
+MODULE_TYPE          = UEFI_DRIVER
+VERSION_STRING       = 1.0
+ENTRY_POINT          = Udp6ServiceBindingENTSTestMain
 
 [Sources.common]
   Udp6ServiceBindingENTSTest.c
   Udp6ServiceBindingENTSTestCase.h
   Udp6ServiceBindingENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Udp6ServiceBindingENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiUdp6ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1