From 2b5530e46deb7fb6988c3dddbc665620f54b4d6a Mon Sep 17 00:00:00 2001
From: wewang3 <66647757+wewang3@users.noreply.github.com>
Date: Tue, 16 Mar 2021 12:38:12 -0700
Subject: [PATCH] Move CMakeList.txt into src/Linux and updated ReadMe file
 (#132)

* changed CMakeLists.txt location

* update ReadME and version file

* added sudo in a command

* changed version description for Linux

* used abbreviated month name instead of full month

Co-authored-by: Ubuntu <wewang3@ubuntu18.sf0osaqbaqjupfwvxnowz53tlc.zx.internal.cloudapp.net>
---
 src/{ => Linux}/CMakeLists.txt                       |  0
 src/Linux/README.MD                                  | 12 ++++++++++++
 src/Linux/debian/changelog                           |  4 ++--
 .../GeneratePackage/Azure.DCAP.Windows.nuspec        |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)
 rename src/{ => Linux}/CMakeLists.txt (100%)

diff --git a/src/CMakeLists.txt b/src/Linux/CMakeLists.txt
similarity index 100%
rename from src/CMakeLists.txt
rename to src/Linux/CMakeLists.txt
diff --git a/src/Linux/README.MD b/src/Linux/README.MD
index 06e8f7b1..4affbc35 100644
--- a/src/Linux/README.MD
+++ b/src/Linux/README.MD
@@ -32,6 +32,18 @@ make
 sudo make install
 ```
 
+## Run Google Test
+```
+cmake CMakeLists.txt
+make
+./dcap_provider_utests
+
+If cmake needs to update, please run:
+sudo apt remove cmake
+sudo apt-get install python-pip
+sudo pip install cmake --upgrade
+```
+
 ## Step-by-Step
 1. `./configure`
     * This pulls down prerequisites from other projects, finds correct local
diff --git a/src/Linux/debian/changelog b/src/Linux/debian/changelog
index 1f688fe1..e44d84bb 100644
--- a/src/Linux/debian/changelog
+++ b/src/Linux/debian/changelog
@@ -1,7 +1,7 @@
 az-dcap-client (1.7) stable; urgency=medium
-  * Use the Cache-Control header to determine how long collateral should be cached for. Cleanup of error handling logs in Windows
+  * Enable v3 for icx and coffelake. Use the Cache-Control header to determine how long collateral should be cached for. Cleanup of error handling logs in Windows
 
- -- Derek Schumacher <deschuma@microsoft.com>  Wed, 09 Sep 2020 9:42:00 -0700
+ -- Wei Wang <wewang3@microsoft.com>  Fri, 12 Mar 2021 4:42:00 -0700
 
 az-dcap-client (1.6) stable; urgency=medium
   * Fix crash in preivous version when no logging was enabled
diff --git a/src/Windows/GeneratePackage/Azure.DCAP.Windows.nuspec b/src/Windows/GeneratePackage/Azure.DCAP.Windows.nuspec
index 029c9490..324e3ef3 100644
--- a/src/Windows/GeneratePackage/Azure.DCAP.Windows.nuspec
+++ b/src/Windows/GeneratePackage/Azure.DCAP.Windows.nuspec
@@ -7,7 +7,7 @@
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <releaseNotes>Use the Cache-Control header to determine how long collateral should be cached for. Cleanup of error handling logs in Windows</releaseNotes>
+        <releaseNotes>Enable v3 for icx and coffelake and Use the Cache-Control header to determine how long collateral should be cached for. Cleanup of error handling logs in Windows</releaseNotes>
         <description>
             This library serves as a quoting data provider plugin for the Intel SGX Data Center Attestation Primitives (DCAP). Specifically, the Intel DCAP library will search out and load provider plugins, such as the Azure DCAP Client.
             This provider plugin is then used to fetch certain data files, such as platform certificates, TCB structures, and revocation lists.