Merge pull request #66 from open-amt-cloud-toolkit/v2

docs(changelog): add v2 changelog
Merge branch 'master' into v2
2021-09-15 16:10:13 -07:00 · 2021-09-15 15:33:54 -07:00 · 2021-09-15 15:29:11 -07:00 · 2021-09-10 11:15:48 -07:00 · 2021-09-09 16:29:21 -07:00 · 2021-08-31 10:11:55 -07:00
10 changed files with 45 additions and 12 deletions
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@@ -24,7 +24,7 @@ jobs:
      - name: Create Build Dir
        run: mkdir build
      - name: Clone
-        run: git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git
+        run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
      - name: Build VCPKG
        run: cd vcpkg && bootstrap-vcpkg.bat
        shell: cmd
@@ -71,7 +71,7 @@ jobs:
      - name: Create Build Dir
        run: mkdir build
      - name: Clone
-        run: git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git
+        run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
      - name: Build VCPKG
        run: cd vcpkg && ./bootstrap-vcpkg.sh
        shell: bash
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
    - name: Create Build Dir
      run: mkdir build
    - name: Clone
-      run: git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git
+      run: git clone https://github.com/microsoft/vcpkg.git  && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
    - name: Build VCPKG
      run: cd vcpkg && bootstrap-vcpkg.bat
      shell: cmd
@@ -54,7 +54,7 @@ jobs:
    - name: Create Build Dir
      run: mkdir build
    - name: Clone
-      run: git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git
+      run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
    - name: Build VCPKG
      run: cd vcpkg && ./bootstrap-vcpkg.sh
      shell: bash
--- a/Build.md
+++ b/Build.md
@@ -25,8 +25,9 @@ sudo apt install git cmake build-essential curl zip unzip tar pkg-config
 Open a Terminal window.

 ```
-git clone -b 2020.11-1 https://github.com/microsoft/vcpkg.git
+git clone https://github.com/microsoft/vcpkg.git
 cd vcpkg
+git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
 ./bootstrap-vcpkg.sh
 ./vcpkg install cpprestsdk[websockets]
 ```
@@ -68,8 +69,9 @@ Steps below are for Windows 10 and Visual Studio 2019 Professional.
 Open an x64 Native Tools Command Prompt for Visual Studio 2019.

 ```
-git clone -b 2020.11-1 https://github.com/microsoft/vcpkg.git
+git clone https://github.com/microsoft/vcpkg.git
 cd vcpkg
+git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
 bootstrap-vcpkg.bat
 vcpkg install cpprestsdk[websockets]:x64-windows-static
 ```
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+<a name="v2.0.0"></a>
+## v2.0.0
+
+### Build
+- bump version to v1.3.0
+- bump version to v2.0.0
+
+### Ci
+- update scanning
+
+### Docs
+- **readme:** wording
+- **readme:** update readme
+- **security:** added SECURITY.md file
+
+### Feat
+- update to OpenSSL 1.1.1l
+- update workflows and Docker build.
+- Update to latest vcpkg
+- Update docs and scripts for Windows and Ubuntu.
+- format json status messages
+- add AMT wireless adapter info to amtinfo LAN settings.
+
+### Fix
+- klockwork reported success / failure check fix
+- **spelling:** lan inteface -> lan interface in amtinfo
+
 <a name="v1.2.2"></a>
 ## [v1.2.2] - 2021-06-22
 ### Ci
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.1)

-project (rpc VERSION 1.3.0)
+project (rpc VERSION 2.0.0)

 set (CMAKE_CXX_STANDARD 11)

--- a/CentOS7.md
+++ b/CentOS7.md
@@ -50,8 +50,9 @@ export PATH=/home/user/Downloads/git:$PATH
 Using a Terminal window with the PATH and devtoolset enabled per the Dependencies.

 ```
-git clone -b 2020.11-1 https://github.com/microsoft/vcpkg.git
+git clone https://github.com/microsoft/vcpkg.git
 cd vcpkg
+git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
 ./bootstrap-vcpkg.sh
 ./vcpkg install cpprestsdk[websockets]
 ```
--- a/CentOS8.md
+++ b/CentOS8.md
@@ -28,8 +28,9 @@ sudo yum install cmake
 Using a Terminal window with the PATH and devtoolset enabled per the Dependencies.

 ```
-git clone -b 2020.11-1 https://github.com/microsoft/vcpkg.git
+git clone https://github.com/microsoft/vcpkg.git
 cd vcpkg
+git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
 ./bootstrap-vcpkg.sh
 ./vcpkg install cpprestsdk[websockets]
 ```
--- a/2
+++ b/2
@@ -15,7 +15,7 @@ RUN \
 RUN git clone https://github.com/open-amt-cloud-toolkit/rpc.git
 WORKDIR /rpc
 RUN mkdir -p build
-RUN git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git
+RUN git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
 RUN cd vcpkg && ./bootstrap-vcpkg.sh
 RUN ./vcpkg/vcpkg install cpprestsdk[websockets]

--- a/scripts/jenkins-pre-build.cmd
+++ b/scripts/jenkins-pre-build.cmd
@@ -15,8 +15,9 @@ set VCPKG_DIR=C:\opt\vcpkg-source
 cd %VCPKG_DIR%

 REM build vcpkg
-git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git
+git clone https://github.com/microsoft/vcpkg.git
 cd vcpkg
+git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
 cmd /c bootstrap-vcpkg.bat

 REM install CPPRestSDK
--- a/scripts/jenkins-pre-build.sh
+++ b/scripts/jenkins-pre-build.sh
@@ -12,8 +12,9 @@ apt install git cmake build-essential curl zip unzip tar pkg-config -y

 #cd "$BASE_DIR"/rpc
 ## build vcpkg
-git -C vcpkg pull || git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git vcpkg
+git -C vcpkg pull || git clone https://github.com/microsoft/vcpkg.git vcpkg
 cd vcpkg
+git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
 ./bootstrap-vcpkg.sh

 ## install CPPRestSDK
Author	SHA1	Message	Date
Mike	d4df37c500	Merge pull request #66 from open-amt-cloud-toolkit/v2 docs(changelog): add v2 changelog	2021-09-15 16:10:13 -07:00
Mike	6c7443e7e4	Merge branch 'master' into v2	2021-09-15 15:33:54 -07:00
Mike	d6db3c32cc	docs(changelog): add v2 changelog	2021-09-15 15:29:11 -07:00
mpvats-intel	e06d4cbe29	Merge pull request #65 from open-amt-cloud-toolkit/feat_update_openssl feat: update to OpenSSL 1.1.1l	2021-09-10 11:15:48 -07:00
Mudit Vats	d596186fea	feat: update to OpenSSL 1.1.1l	2021-09-09 16:29:21 -07:00
mpvats-intel	61678dc9f6	Merge pull request #64 from open-amt-cloud-toolkit/feat_update_version feat: update version for release	2021-08-31 10:11:55 -07:00
Mudit Vats	739992cf29	feat: update version for release	2021-08-31 09:50:29 -07:00
mpvats-intel	a9b8d8e5f8	Merge pull request #63 from open-amt-cloud-toolkit/feat_update_vcpkg feat: Update docs and scripts for Windows and Ubuntu.	2021-08-27 06:41:31 -07:00
Mudit Vats	2a460e90dc	feat: update workflows and Docker build.	2021-08-26 13:27:36 -07:00
Mudit Vats	59a8d29ac4	Merge branch 'feat_update_vcpkg' of https://github.com/open-amt-cloud-toolkit/rpc into feat_update_vcpkg	2021-08-26 12:54:52 -07:00
Mudit Vats	cb9539639a	feat: Update to latest vcpkg	2021-08-26 12:54:43 -07:00
mpvats-intel	a151146e8a	Merge branch 'master' into feat_update_vcpkg	2021-08-25 08:25:25 -07:00
Mudit Vats	bb8211ae03	feat: Update docs and scripts for Windows and Ubuntu.	2021-08-25 08:19:02 -07:00
mpvats-intel	ed5480c7d1	Merge pull request #62 from open-amt-cloud-toolkit/spelling-fix fix(spelling): lan inteface -> lan interface in amtinfo	2021-08-24 17:00:39 -07:00