Target the latest infer main branch (#171)

* Update Dockerfile

* Update instructions

.build/azure-pipelines-example-multistage.yml

@@ -35,7 +35,7 @@ jobs:
   pool:
     vmImage: 'ubuntu-20.04'
   container:
-    image: mcr.microsoft.com/infersharp:v1.3
+    image: mcr.microsoft.com/infersharp:v1.4
 
   steps:
   # Download binaries
@@ -48,7 +48,7 @@ jobs:
       downloadPath: '$(System.ArtifactsDirectory)'
 
   - script: |
-      curl -o run_infersharp.sh https://raw.githubusercontent.com/microsoft/infersharpaction/v1.3/run_infersharp_ci.sh
+      curl -o run_infersharp.sh https://raw.githubusercontent.com/microsoft/infersharpaction/v1.4/run_infersharp_ci.sh
       chmod +x run_infersharp.sh
       ./run_infersharp.sh $(System.ArtifactsDirectory)
     displayName: 'Run Infer# analysis'

Dockerfile

@@ -33,12 +33,9 @@ RUN apt-get update && \
 # Without this opam fails to compile OCaml for some reason. We don't need sandboxing inside a Docker container anyway.
 RUN opam init --reinit --bare --disable-sandboxing
 
-# Download the latest Infer master
+# Download the latest Infer main
 RUN cd / && \
-    git clone https://github.com/xi-liu-ds/infer.git && \
-    cd infer && \
-    git checkout xi-liu-ds/pull_incre && \
-    cd ..
+    git clone https://github.com/facebook/infer.git
 
 # build in non-optimized mode by default to speed up build times
 ENV BUILD_MODE=dev
@@ -83,4 +80,4 @@ COPY --from=backend /Cilsil/bin/Release/net5.0/linux-x64/publish/ /infersharp/Ci
 COPY --from=backend .inferconfig /infersharp/
 COPY --from=backend run_infersharp.sh /infersharp/
 COPY --from=backend /.build/NOTICE.txt /
-COPY --from=backend LICENSE /
+COPY --from=backend LICENSE /

RUNNING_INFERSHARP_ON_WINDOWS.md

@@ -7,12 +7,12 @@
 1. From Windows Command Prompt, download and set up the InferSharp custom distro by executing the following commands:
 
 ```
-wget https://github.com/microsoft/infersharp/releases/download/v1.3/infersharp-wsl-distro-v1.3.tar.gz && wsl --import infersharp1.3 C:\wslDistroStorage\infersharp1.3 infersharp-wsl-distro-v1.3.tar.gz && rm infersharp-wsl-distro-v1.3.tar.gz
+wget https://github.com/microsoft/infersharp/releases/download/v1.4/infersharp-wsl-distro-v1.4.tar.gz && wsl --import infersharp1.4 C:\wslDistroStorage\infersharp1.4 infersharp-wsl-distro-v1.4.tar.gz && rm infersharp-wsl-distro-v1.4.tar.gz
 ```
 
 2. Launch the InferSharp custrom distro:
 ```
-wsl ~ -d infersharp1.3
+wsl ~ -d infersharp1.4
 ```
 
 3. Go to the `infersharp` folder:

RUNNING_IN_DOCKER.md

@@ -4,7 +4,7 @@
 
 Use Windows Command Prompt or PowerShell:
 ```
-docker run -v <path_to_binary_folder>:/infersharp/binary_path --rm mcr.microsoft.com/infersharp:v1.3 /bin/bash -c "./run_infersharp.sh binary_path; cp infer-out/report.txt /infersharp/binary_path/report.txt"
+docker run -v <path_to_binary_folder>:/infersharp/binary_path --rm mcr.microsoft.com/infersharp:v1.4 /bin/bash -c "./run_infersharp.sh binary_path; cp infer-out/report.txt /infersharp/binary_path/report.txt"
 ```
 
 For example, `path_to_binary_folder` is `C:\Project1\bin`, the analysis result `report.txt` will appear at the root of the mounted volume - `C:\Project1\bin` in this case.
@@ -12,8 +12,8 @@ For example, `path_to_binary_folder` is `C:\Project1\bin`, the analysis result `
 ## Interactive Mode
 
 ```
-docker pull mcr.microsoft.com/infersharp:v1.3
-docker run -it mcr.microsoft.com/infersharp:v1.3
+docker pull mcr.microsoft.com/infersharp:v1.4
+docker run -it mcr.microsoft.com/infersharp:v1.4
 ./run_infersharp.sh Examples
 ```