Merge pull request #412 from LORD-MicroStrain/develop

Release 67.0.0
LORD-MicroStrain · Dec 19, 2024 · 9ca352e · 9ca352e
2 parents d5e470c + 125b2ee
commit 9ca352e
Show file tree

Hide file tree

Showing 77 changed files with 5,500 additions and 5,858 deletions.
diff --git a/.devcontainer/Dockerfile.ubuntu b/.devcontainer/Dockerfile.ubuntu
@@ -33,7 +33,7 @@ RUN set -ex \
 RUN set -ex && apt-get update && apt-get install -y python2-dev || apt-get install -y python-dev
 
 # Install additional python versions
-ARG PYTHON3_VERSIONS="3.5.10 3.6.15"
+ARG PYTHON3_VERSIONS="3.9.21 3.10.16"
 RUN set -ex \
     && for PYTHON3_VERSION in ${PYTHON3_VERSIONS}; do \
         curl -fsSLo /tmp/Python-${PYTHON3_VERSION}.tgz https://www.python.org/ftp/python/${PYTHON3_VERSION}/Python-${PYTHON3_VERSION}.tgz; \

diff --git a/.devcontainer/Dockerfile.windows b/.devcontainer/Dockerfile.windows
@@ -5,28 +5,28 @@ ARG WINDOWS_VERSION
 FROM ${WINDOWS_IMAGE}:${WINDOWS_VERSION}
 
 # Temporary directory
-ENV DOCKER_TEMP_DIR "C:\DockerTemp"
+ENV DOCKER_TEMP_DIR "C:/DockerTemp"
 
 # All dependencies will be installed in this directory
-ENV LIB_PATH "C:\lib"
+ENV LIB_PATH "C:/lib"
 
 # Restore the default Windows shell for correct batch processing.
 SHELL ["cmd", "/S", "/C"]
 
 # Install any additional certificates
-COPY .devcontainer\extra_cas C:\DockerTemp\Certs
-RUN for %f in (%DOCKER_TEMP_DIR%\Certs\*.crt %DOCKER_TEMP_DIR%\Certs\*.pem) do ( `
-        powershell -Command "Import-Certificate -FilePath %f -CertStoreLocation Cert:\LocalMachine\Root" `
+COPY .devcontainer/extra_cas C:/DockerTemp/Certs
+RUN for %f in (%DOCKER_TEMP_DIR%/Certs/*.crt %DOCKER_TEMP_DIR%/Certs/*.pem) do ( `
+        powershell -Command "Import-Certificate -FilePath %f -CertStoreLocation Cert:/LocalMachine/Root" `
     )
 
 # Install Microsoft Buildtools
 RUN `
     # Download the Build Tools bootstrapper.
-    curl -SL --output %DOCKER_TEMP_DIR%\vs_buildtools.exe https://aka.ms/vs/15/release/vs_buildtools.exe `
+    curl -SL --output %DOCKER_TEMP_DIR%/vs_buildtools.exe https://aka.ms/vs/15/release/vs_buildtools.exe `
     `
     # Install Build Tools
     && echo Starting install `
-    && (start /w %DOCKER_TEMP_DIR%\vs_buildtools.exe --quiet --wait --norestart --nocache `
+    && (start /w %DOCKER_TEMP_DIR%/vs_buildtools.exe --quiet --wait --norestart --nocache `
         --add Microsoft.Net.Component.4.8.SDK `
         --add Microsoft.Net.Component.4.8.TargetingPack `
         --add Microsoft.Net.Component.4.TargetingPack `
@@ -37,173 +37,173 @@ RUN `
         --add Microsoft.VisualStudio.Component.VC.140 `
         --add Microsoft.VisualStudio.Component.Windows10SDK.19041 `
         --add Microsoft.Component.VC.Runtime.UCRTSDK `
-        --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" `
+        --installPath "%ProgramFiles(x86)%/Microsoft Visual Studio/2017/BuildTools" `
         || IF "%ERRORLEVEL%"=="3010" EXIT 0) `
     `
     # Cleanup
-    && del /q %DOCKER_TEMP_DIR%\vs_buildtools.exe
+    && del /q %DOCKER_TEMP_DIR%/vs_buildtools.exe
 
 # Install Boost
 ARG BOOST_VERSION=1.68.0
 ARG BOOST_VERSION_UNDERSCORE=1_68_0
 ARG BOOST_MSVC_VERSION=14.0
 RUN echo Installing Boost `
     # Download the boost installer
-    && curl -SL --output %DOCKER_TEMP_DIR%\boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe https://boostorg.jfrog.io/artifactory/main/release/%BOOST_VERSION%/binaries/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe `
-    && curl -SL --output %DOCKER_TEMP_DIR%\boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe https://boostorg.jfrog.io/artifactory/main/release/%BOOST_VERSION%/binaries/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe `
+    && curl -SL --output %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe https://boostorg.jfrog.io/artifactory/main/release/%BOOST_VERSION%/binaries/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe `
+    && curl -SL --output %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe https://boostorg.jfrog.io/artifactory/main/release/%BOOST_VERSION%/binaries/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe `
     `
-    # Install 
-    && (start /w %DOCKER_TEMP_DIR%\boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe /VERYSILENT /DIR=%LIB_PATH%\boost) `
-    && (start /w %DOCKER_TEMP_DIR%\boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe /VERYSILENT /DIR=%LIB_PATH%\boost) `
+    # Install
+    && (start /w %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe /VERYSILENT /DIR=%LIB_PATH%/boost) `
+    && (start /w %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe /VERYSILENT /DIR=%LIB_PATH%/boost) `
     `
     # Cleanup
-    && del /q %DOCKER_TEMP_DIR%\boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe `
-    && del /q %DOCKER_TEMP_DIR%\boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe
+    && del /q %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe `
+    && del /q %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe
 
 # Install CMake
 ARG CMAKE_VERSION=3.23.1
 RUN `
     # Download the cmake installer
-    curl -SL --output %DOCKER_TEMP_DIR%\cmake-%CMAKE_VERSION%-windows-x86_64.msi https://github.com/Kitware/CMake/releases/download/v%CMAKE_VERSION%/cmake-%CMAKE_VERSION%-windows-x86_64.msi `
+    curl -SL --output %DOCKER_TEMP_DIR%/cmake-%CMAKE_VERSION%-windows-x86_64.msi https://github.com/Kitware/CMake/releases/download/v%CMAKE_VERSION%/cmake-%CMAKE_VERSION%-windows-x86_64.msi `
     `
     # Install cmake
-    && msiexec /i %DOCKER_TEMP_DIR%\cmake-%CMAKE_VERSION%-windows-x86_64.msi /quiet /qn /norestart `
+    && msiexec /i %DOCKER_TEMP_DIR%/cmake-%CMAKE_VERSION%-windows-x86_64.msi /quiet /qn /norestart `
     `
     # Add Cmake to the path
-    && setx PATH "%PATH;C:\Program Files\CMake\bin" `
+    && setx PATH "%PATH;C:/Program Files/CMake/bin" `
     `
     # Cleanup
-    && del /q %DOCKER_TEMP_DIR%\cmake-%CMAKE_VERSION%-windows-x86_64.msi
+    && del /q %DOCKER_TEMP_DIR%/cmake-%CMAKE_VERSION%-windows-x86_64.msi
 
 # Install 7zip
 ARG 7ZIP_VERSION=2107
 RUN echo Installing 7zip `
     # Download the installer
-    && curl -SL --output %DOCKER_TEMP_DIR%\7z%7ZIP_VERSION%-x64.msi https://www.7-zip.org/a/7z%7ZIP_VERSION%-x64.msi `
+    && curl -SL --output %DOCKER_TEMP_DIR%/7z%7ZIP_VERSION%-x64.msi https://www.7-zip.org/a/7z%7ZIP_VERSION%-x64.msi `
     `
     # Run the installer
-    && msiexec /i %DOCKER_TEMP_DIR%\7z%7ZIP_VERSION%-x64.msi /quiet /qn /norestart `
+    && msiexec /i %DOCKER_TEMP_DIR%/7z%7ZIP_VERSION%-x64.msi /quiet /qn /norestart `
     `
     # Add 7zip the the path
-    && setx PATH "%PATH%;C:\Program Files\7-Zip" `
+    && setx PATH "%PATH%;C:/Program Files/7-Zip" `
     `
     # Cleanup
-    && del /q %DOCKER_TEMP_DIR%\7z%7ZIP_VERSION%-x64.msi
+    && del /q %DOCKER_TEMP_DIR%/7z%7ZIP_VERSION%-x64.msi
 
 # Install OpenSSL
 ARG OPENSSL_VERSION=1.1.0f
 ARG OPENSSL_MSVC_VERSION=2015
 RUN echo Installing OpenSSL `
     # Download the zip file
-    && curl -SL --output %DOCKER_TEMP_DIR%\openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z https://www.npcglib.org/~stathis/downloads/openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z `
+    && curl -SL --output %DOCKER_TEMP_DIR%/openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z https://www.npcglib.org/~stathis/downloads/openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z `
     `
     # Extract the artifacts
-    && 7z x %DOCKER_TEMP_DIR%\openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z "-o%LIB_PATH%" `
-    && move %LIB_PATH%\openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION% %LIB_PATH%\openssl `
+    && 7z x %DOCKER_TEMP_DIR%/openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z "-o%LIB_PATH%" `
+    && move %LIB_PATH%/openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION% %LIB_PATH%/openssl `
     `
     # Cleanup
-    && del /q %DOCKER_TEMP_DIR%\openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z
+    && del /q %DOCKER_TEMP_DIR%/openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z
 
 # Install Git
 ARG GIT_VERSION=2.36.0
 RUN echo Installing Git `
     # Download the installer
-    && curl -SL --output %DOCKER_TEMP_DIR%\Git-%GIT_VERSION%-64-bit.exe https://github.com/git-for-windows/git/releases/download/v%GIT_VERSION%.windows.1/Git-%GIT_VERSION%-64-bit.exe `
+    && curl -SL --output %DOCKER_TEMP_DIR%/Git-%GIT_VERSION%-64-bit.exe https://github.com/git-for-windows/git/releases/download/v%GIT_VERSION%.windows.1/Git-%GIT_VERSION%-64-bit.exe `
     `
     # Install
-    && (start /w %DOCKER_TEMP_DIR%\Git-%GIT_VERSION%-64-bit.exe /VERYSILENT /DIR="C:\Program Files\Git") `
+    && (start /w %DOCKER_TEMP_DIR%/Git-%GIT_VERSION%-64-bit.exe /VERYSILENT /DIR="C:/Program Files/Git") `
     `
     # Add Windows to the path
-    && setx PATH "%PATH%;C:\Program Files\Git\bin" `
+    && setx PATH "%PATH%;C:/Program Files/Git/bin" `
     `
     # Cleanup
-    && del /q %DOCKER_TEMP_DIR%\Git-%GIT_VERSION%-64-bit.exe
+    && del /q %DOCKER_TEMP_DIR%/Git-%GIT_VERSION%-64-bit.exe
 
 # Install Python3
-ARG PYTHON3_VERSIONS="3.5.0"
+ARG PYTHON3_VERSIONS="3.9.0"
 RUN echo Installing Python3 `
     && for %v in (%PYTHON3_VERSIONS%) do ( `
         echo Installing Python%v `
         `
         # Download the installer
-        && curl -SL --output %DOCKER_TEMP_DIR%\python-%v.exe https://www.python.org/ftp/python/%v/python-%v.exe `
-        && curl -SL --output %DOCKER_TEMP_DIR%\python-%v-amd64.exe https://www.python.org/ftp/python/%v/python-%v-amd64.exe `
+        && curl -SL --output %DOCKER_TEMP_DIR%/python-%v.exe https://www.python.org/ftp/python/%v/python-%v.exe `
+        && curl -SL --output %DOCKER_TEMP_DIR%/python-%v-amd64.exe https://www.python.org/ftp/python/%v/python-%v-amd64.exe `
         `
         # Install
-        && (start /w %DOCKER_TEMP_DIR%\python-%v.exe /quiet TargetDir="C:\Python%v-Win32") `
-        && (start /w %DOCKER_TEMP_DIR%\python-%v-amd64.exe /quiet TargetDir="C:\Python%v-x64") `
+        && (start /w %DOCKER_TEMP_DIR%/python-%v.exe /quiet TargetDir="C:/Python%v-Win32") `
+        && (start /w %DOCKER_TEMP_DIR%/python-%v-amd64.exe /quiet TargetDir="C:/Python%v-x64") `
         `
         # Cleanup
-        && del /q %DOCKER_TEMP_DIR%\python-%v.exe `
-        && del /q %DOCKER_TEMP_DIR%\python-%v-amd64.exe `
+        && del /q %DOCKER_TEMP_DIR%/python-%v.exe `
+        && del /q %DOCKER_TEMP_DIR%/python-%v-amd64.exe `
     )
 
 # Install Python2
 ARG PYTHON2_VERSION="2.7.18"
 RUN echo Install Python2 `
     `
     # Download the installer
-    && curl -SL --output %DOCKER_TEMP_DIR%\python-%PYTHON2_VERSION%.msi https://www.python.org/ftp/python/%PYTHON2_VERSION%/python-%PYTHON2_VERSION%.msi `
-    && curl -SL --output %DOCKER_TEMP_DIR%\python-%PYTHON2_VERSION%.amd64.msi https://www.python.org/ftp/python/%PYTHON2_VERSION%/python-%PYTHON2_VERSION%.amd64.msi `
+    && curl -SL --output %DOCKER_TEMP_DIR%/python-%PYTHON2_VERSION%.msi https://www.python.org/ftp/python/%PYTHON2_VERSION%/python-%PYTHON2_VERSION%.msi `
+    && curl -SL --output %DOCKER_TEMP_DIR%/python-%PYTHON2_VERSION%.amd64.msi https://www.python.org/ftp/python/%PYTHON2_VERSION%/python-%PYTHON2_VERSION%.amd64.msi `
     `
     # Install
-    && msiexec /i %DOCKER_TEMP_DIR%\python-%PYTHON2_VERSION%.msi /quiet /qn /norestart TargetDir="C:\Python2.7-Win32" `
-    && msiexec /i %DOCKER_TEMP_DIR%\python-%PYTHON2_VERSION%.amd64.msi /quiet /qn /norestart TargetDir="C:\Python2.7-x64" `
+    && msiexec /i %DOCKER_TEMP_DIR%/python-%PYTHON2_VERSION%.msi /quiet /qn /norestart TargetDir="C:/Python2.7-Win32" `
+    && msiexec /i %DOCKER_TEMP_DIR%/python-%PYTHON2_VERSION%.amd64.msi /quiet /qn /norestart TargetDir="C:/Python2.7-x64" `
     `
     # Cleanup
-    && del /q %DOCKER_TEMP_DIR%\python-%PYTHON2_VERSION%.msi `
-    && del /q %DOCKER_TEMP_DIR%\python-%PYTHON2_VERSION%.amd64.msi
+    && del /q %DOCKER_TEMP_DIR%/python-%PYTHON2_VERSION%.msi `
+    && del /q %DOCKER_TEMP_DIR%/python-%PYTHON2_VERSION%.amd64.msi
 
 # Install swig
 ARG SWIG_VERSION="4.0.2"
 RUN echo Installing SWIG `
     `
     # Download the zip file
-    && curl -SL --output %DOCKER_TEMP_DIR%\swigwin-%SWIG_VERSION%.zip https://sourceforge.net/projects/swig/files/swigwin/swigwin-%SWIG_VERSION%/swigwin-%SWIG_VERSION%.zip/download `
+    && curl -SL --output %DOCKER_TEMP_DIR%/swigwin-%SWIG_VERSION%.zip https://sourceforge.net/projects/swig/files/swigwin/swigwin-%SWIG_VERSION%/swigwin-%SWIG_VERSION%.zip/download `
     `
     # Extract to the library path
-    && 7z x %DOCKER_TEMP_DIR%\swigwin-%SWIG_VERSION%.zip "-o%LIB_PATH%" `
-    && move %LIB_PATH%\swigwin-%SWIG_VERSION% %LIB_PATH%\swig `
+    && 7z x %DOCKER_TEMP_DIR%/swigwin-%SWIG_VERSION%.zip "-o%LIB_PATH%" `
+    && move %LIB_PATH%/swigwin-%SWIG_VERSION% %LIB_PATH%/swig `
     `
     # Add to the path
-    && setx PATH "%PATH%;%LIB_PATH%\swig" `
+    && setx PATH "%PATH%;%LIB_PATH%/swig" `
     `
     # Cleanup
-    && del /q %DOCKER_TEMP_DIR%\swigwin-%SWIG_VERSION%.zip
+    && del /q %DOCKER_TEMP_DIR%/swigwin-%SWIG_VERSION%.zip
 
 # Install NaturalDocs
 ARG NATURAL_DOCS_VERSION="2.0.2"
 RUN echo Installing NaturalDocs `
     `
     # Download the zip file
-    && curl -SL --output %DOCKER_TEMP_DIR%\Natural_Docs_%NATURAL_DOCS_VERSION%.zip https://www.naturaldocs.org/download/natural_docs/%NATURAL_DOCS_VERSION%/Natural_Docs_%NATURAL_DOCS_VERSION%.zip `
+    && curl -SL --output %DOCKER_TEMP_DIR%/Natural_Docs_%NATURAL_DOCS_VERSION%.zip https://www.naturaldocs.org/download/natural_docs/%NATURAL_DOCS_VERSION%/Natural_Docs_%NATURAL_DOCS_VERSION%.zip `
     `
     # Extract to the library path
-    && 7z x %DOCKER_TEMP_DIR%\Natural_Docs_%NATURAL_DOCS_VERSION%.zip "-o%LIB_PATH%" `
-    && move "%LIB_PATH%\Natural Docs" %LIB_PATH%\NaturalDocs `
+    && 7z x %DOCKER_TEMP_DIR%/Natural_Docs_%NATURAL_DOCS_VERSION%.zip "-o%LIB_PATH%" `
+    && move "%LIB_PATH%/Natural Docs" %LIB_PATH%/NaturalDocs `
     `
     # Add to the path
-    && setx PATH "%PATH%;%LIB_PATH%\NaturalDocs" `
+    && setx PATH "%PATH%;%LIB_PATH%/NaturalDocs" `
     `
     # Cleanup
-    && del /q %DOCKER_TEMP_DIR%\Natural_Docs_%NATURAL_DOCS_VERSION%.zip
+    && del /q %DOCKER_TEMP_DIR%/Natural_Docs_%NATURAL_DOCS_VERSION%.zip
 
 # Install Turtle
 ARG TURTLE_VERSION="1.3.2"
 RUN echo Installing Turtle `
     `
     # Download the zip file
-    && curl -SL --output %DOCKER_TEMP_DIR%\turtle-%TURTLE_VERSION%.zip https://sourceforge.net/projects/turtle/files/turtle/%TURTLE_VERSION%/turtle-%TURTLE_VERSION%.zip/download `
+    && curl -SL --output %DOCKER_TEMP_DIR%/turtle-%TURTLE_VERSION%.zip https://sourceforge.net/projects/turtle/files/turtle/%TURTLE_VERSION%/turtle-%TURTLE_VERSION%.zip/download `
     `
     # Extract to the library path
-    && mkdir "%LIB_PATH%\turtle" `
-    && 7z x %DOCKER_TEMP_DIR%\turtle-%TURTLE_VERSION%.zip "-o%LIB_PATH%\turtle" `
+    && mkdir "%LIB_PATH%/turtle" `
+    && 7z x %DOCKER_TEMP_DIR%/turtle-%TURTLE_VERSION%.zip "-o%LIB_PATH%/turtle" `
     `
     # Cleanup
-    && del /q %DOCKER_TEMP_DIR%\turtle-%TURTLE_VERSION%.zip
+    && del /q %DOCKER_TEMP_DIR%/turtle-%TURTLE_VERSION%.zip
 
 # Allow users to execute powershell scripts
 RUN powershell -Command "Set-ExecutionPolicy RemoteSigned"
 
 # Set the entrypoint to powershell
-ENTRYPOINT ["powershell"]
+ENTRYPOINT ["powershell"]
diff --git a/.devcontainer/docker_build_debs.sh b/.devcontainer/docker_build_debs.sh
@@ -9,7 +9,7 @@ set -e
 # Get some arguments from the user
 arch="amd64"
 ubuntu_version="20.04"
-python3_versions="3.7.16 3.8.16 3.9.16 3.10.9 3.11.1"
+python3_versions="3.9.21 3.10.16 3.11.11 3.12.8 3.13.1"
 while [[ $# -gt 0 ]]; do
   case $1 in
     --arch)
@@ -78,6 +78,7 @@ docker run \
     git fetch origin --tags; \
     ./BuildScripts/build_linux.sh \
       ${python3_dirs_flag} \
+      --branch ${BRANCH_NAME} \
       --python2Dir /usr/lib/python2.7 \
       --buildDir /home/microstrain/MSCL/${build_dir_name} \
-  "
+  "
diff --git a/.devcontainer/docker_build_win.ps1 b/.devcontainer/docker_build_win.ps1
@@ -6,7 +6,7 @@
 param (
   [String]$windows_image,
   [String]$windows_version,
-  [String]$python3_versions = "3.7.0 3.8.0 3.9.0 3.10.0 3.11.0",
+  [String]$python3_versions = "3.9.0 3.10.0 3.11.0 3.12.0 3.13.0",
   [String]$arch = "x64"
 )
 
@@ -35,18 +35,18 @@ try {
   $project_dir = "${script_dir}/.."
   $dockerfile = "${script_dir}/Dockerfile.windows"
   $image_name = "microstrain/mscl_windows_builder:${windows_version}"
-  
+
   if ("${arch}" -eq "x86") {
     $cmake_arch = "Win32"
   } else {
     $cmake_arch = ${arch}
   }
 
   # Construct the flags that we will pass to the build script
-  $python2_build_script_flags = "-python2Dirs C:\Python2.7-${cmake_arch}"
+  $python2_build_script_flags = "-python2Dirs C:/Python2.7-${cmake_arch}"
   $python3_build_script_flags = "-python3Dirs "
   foreach ($python3_version in ${python3_versions}.split(" ")) {
-    $python3_build_script_flags += "C:\Python${python3_version}-${cmake_arch},"
+    $python3_build_script_flags += "C:/Python${python3_version}-${cmake_arch},"
   }
   $python3_build_script_flags = $python3_build_script_flags.TrimEnd(',')
 
@@ -75,13 +75,12 @@ try {
     --cpus="${num_cpus}" `
     --memory="${memory}g" `
     --isolation="process" `
-    -v "${project_dir}:C:\Projects\MSCL" `
-    -w "C:\projects\mscl" `
+    -v "${project_dir}:C:/Projects/MSCL" `
+    -w "C:/projects/mscl" `
     "${image_name}" -Command " `
       git config --global --add safe.directory C:/projects/mscl; `
       git fetch origin --tags; `
-      & 'C:\Projects\MSCL\BuildScripts\build_win.ps1' -arch ${cmake_arch} -buildDir C:\projects\mscl\docker_build\${cmake_arch} ${python2_build_script_flags} ${python3_build_script_flags}; `
-      & 'C:\Projects\MSCL\BuildScripts\zip_win.ps1' -arch ${arch}; `
+      & 'C:/Projects/MSCL/BuildScripts/build_win.ps1' -branch ${env:BRANCH_NAME} -arch ${cmake_arch} -buildDir C:/projects/mscl/build_windows_${arch} ${python2_build_script_flags} ${python3_build_script_flags}; `
     "
 }
 catch {

diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,12 @@ sample_mscl_cpp/
 /mscl_ubuntu_*.tar.bz2
 /mscl_centos_*.tar.bz2
 /[Oo]utput
+.*git-askpass
+
+## Ignore any CMake generated project files
+LibVersion.h
+AssemblyInfo.cs
+
 
 ## Ignore JetBrains files
 *.idea