From a628498329b8a856e85e4004871f6496e8a4b605 Mon Sep 17 00:00:00 2001 From: wfurt Date: Mon, 8 Aug 2022 10:17:25 -0700 Subject: [PATCH 1/2] Squashed commit of the following: commit d3625360ac69985282cadd7983d1f3f0fd828228 Author: wfurt Date: Sat Aug 6 13:34:53 2022 -0700 fix configuration commit a1bc8336928f6028b272e04ed2dc798c15071c98 Author: wfurt Date: Sat Aug 6 12:50:32 2022 -0700 buildargs commit 196a68635be724da224384f866cf2089b5b36dca Author: wfurt Date: Sat Aug 6 12:42:39 2022 -0700 _BuildConfig commit 23b8102af7f0e3c271b0a060a1f78f602f8616bc Author: wfurt Date: Sat Aug 6 11:38:43 2022 -0700 parallel! commit 174b6c5522747cbfe02c5fc77fb7c7e235d3bb4e Author: wfurt Date: Sat Aug 6 00:41:22 2022 -0700 parallel? commit 4b4ca46f64320f164721b0ac038f1f9f5dd3c7a4 Author: wfurt Date: Fri Aug 5 23:51:32 2022 -0700 PKGARCH commit 27b7768da254132d8cae21b7df8b1c6a071ddc9f Author: wfurt Date: Fri Aug 5 23:02:37 2022 -0700 fix path commit 21535e71dffafcfb2cfc3c589ada3011e15dd350 Author: wfurt Date: Fri Aug 5 22:37:30 2022 -0700 make-packages commit becaa703e2d9b10c1745d9850a13d04b08bfc6dd Author: wfurt Date: Fri Aug 5 21:17:03 2022 -0700 IgnoreStandardErrorWarningFormat commit b8022cc2b8dfa0fd31f0f493a5156e6130510b1c Author: wfurt Date: Fri Aug 5 20:51:42 2022 -0700 parallel 1 commit 6517539df638033610561fe8837108adb4249cda Author: wfurt Date: Fri Aug 5 20:45:04 2022 -0700 parallel 1 commit 52e31282a982126f939097048f3268ac54d7665d Author: wfurt Date: Fri Aug 5 19:57:56 2022 -0700 extraargs commit ecbb18764bfb60773eba52921005e446bf4008de Author: wfurt Date: Fri Aug 5 19:34:40 2022 -0700 _buildargs commit a2eaf41d22a79cd8c5560b3428ec9fee58b64ecd Author: wfurt Date: Fri Aug 5 19:02:29 2022 -0700 lltng commit 601bb78c50ad4fb326a47e701bd29173e88be612 Author: wfurt Date: Fri Aug 5 18:37:50 2022 -0700 disable parallel build commit 0403b37a2d4c0ec7aadcb8e25ffa75c05b3679ad Author: wfurt Date: Fri Aug 5 18:13:15 2022 -0700 fix quote commit 381686f6def28f3a001ef675d58ac8ea54afd362 Author: wfurt Date: Fri Aug 5 18:01:41 2022 -0700 updates commit 1aba3649bfc947c857c32006b34da12d97dcb427 Author: wfurt Date: Fri Aug 5 17:24:42 2022 -0700 fix TargetArchitecture commit c6bfad68e3c68d64c7da84022e0acfbc323aa1a7 Author: wfurt Date: Fri Aug 5 15:22:20 2022 -0700 update msquic commit f131fb8fa321c1c8b1883b6d08942d2c4828a735 Author: wfurt Date: Fri Aug 5 12:30:44 2022 -0700 fix arch commit 535733aeafd91a128d257e30d2151be3b2e5b455 Author: wfurt Date: Fri Aug 5 11:56:28 2022 -0700 pass arch commit f412d866d05caf61aab1c3e2a9928d755a89bc01 Merge: 7c4ad53 6878aec Author: wfurt Date: Fri Aug 5 11:08:53 2022 -0700 Merge branch 'main' of https://github.com/dotnet/msquic into armPipe2 commit 7c4ad53af8a906a4539086b878807a161bba8050 Author: wfurt Date: Fri Aug 5 11:08:05 2022 -0700 buildargs commit d57b39c73d0f89541c1c374a7652eea64fa6dbc1 Author: wfurt Date: Fri Aug 5 00:37:09 2022 -0700 cmake commit 274d295e4be6b16ad3ae8b4f842d1a40a5def98a Author: wfurt Date: Fri Aug 5 00:20:06 2022 -0700 curl commit 694b7eab8de92088a216f655ca0adff29e7aba99 Author: wfurt Date: Fri Aug 5 00:11:23 2022 -0700 echo commit 5c7034f1f0025f395a8bd8185ce5d48e699ea2ed Author: wfurt Date: Thu Aug 4 23:53:59 2022 -0700 fix tar commit c91a2361844bfcdd98d35b702484fa8b43fb4ccd Author: wfurt Date: Thu Aug 4 23:35:27 2022 -0700 pwsh commit fe864a6771a4493889b97faef5b991d34ec4ed98 Author: wfurt Date: Thu Aug 4 22:53:49 2022 -0700 sudo commit 7fcce5ca29d62a81a3e1ba756f58908824584cbc Author: wfurt Date: Thu Aug 4 22:43:37 2022 -0700 add ruby-dev commit d4f1e4a82caef0717d4df6b2ea7bbac90d5a1885 Author: wfurt Date: Thu Aug 4 22:34:11 2022 -0700 add ryby-dev commit ed82670104ac6b93470f37155f26856f5be59e48 Author: wfurt Date: Thu Aug 4 22:23:58 2022 -0700 fix sed commit 7b15470b217e9cdd2932ee427cf82978d78ca555 Author: wfurt Date: Thu Aug 4 22:12:50 2022 -0700 skip cmake commit 8412dd400e15a8054c8b959068d1ca3d3d95e1fc Author: wfurt Date: Thu Aug 4 21:58:49 2022 -0700 update commit 9c24a904b334bb44758f3c21ffd6cd9878c1924b Author: wfurt Date: Thu Aug 4 21:44:53 2022 -0700 update commit 2b3b6e63220dcb6ec18d78bdca67fbe5cbdee5da Author: wfurt Date: Thu Aug 4 21:35:08 2022 -0700 update commit 51a440ab262202f313e0bcda504abebd47156918 Author: wfurt Date: Thu Aug 4 21:12:16 2022 -0700 add wget commit 637b7a9e90c85dedc7e346249647bdd0499efef3 Author: wfurt Date: Thu Aug 4 21:02:04 2022 -0700 add wget commit 85fbfade11ea42606ce7f722b1c5fde897895ea5 Author: wfurt Date: Thu Aug 4 20:40:23 2022 -0700 add wget commit 5bafe4cb06c67c48f0302eb9180a93e1c8e4d4d9 Author: wfurt Date: Thu Aug 4 20:32:12 2022 -0700 add wget commit 8e67acd5908ccb84acd11c4af892d085cbcbc02f Author: wfurt Date: Thu Aug 4 20:20:20 2022 -0700 add wget commit cc1c77485c9b3a55f31fda96efb7c484976164a4 Author: wfurt Date: Thu Aug 4 18:54:40 2022 -0700 qemu-user-static commit f8ea9fd361b391430a5971f589b3789d9479028a Author: wfurt Date: Thu Aug 4 18:45:10 2022 -0700 add debug commit 62c4c5f734a4784ba1d21ce0d18ce57bbda12b7e Author: wfurt Date: Thu Aug 4 18:31:29 2022 -0700 add debug commit 3ce73e8ec3beba8d6816cc0faca8c8bcd3e9f23a Author: wfurt Date: Thu Aug 4 18:21:31 2022 -0700 update path commit 633f98fc351ec6b403d72dc4d4450912b7f9550d Author: wfurt Date: Thu Aug 4 18:18:27 2022 -0700 update path commit 9661bc0aff41e194cfc6eed2557fa42f24981002 Author: wfurt Date: Thu Aug 4 18:05:33 2022 -0700 not interactive commit aeeeea963c213239782fbb337b6654a74f8ead75 Author: wfurt Date: Thu Aug 4 17:56:15 2022 -0700 update variable commit 3fc517a8ee2d96e668365f5d6af351e234b349df Author: wfurt Date: Thu Aug 4 17:45:10 2022 -0700 update variable commit f2ff10bc4ceafd6698092a9bab4b4612da8c9543 Author: wfurt Date: Thu Aug 4 17:03:59 2022 -0700 update variable commit b4bdaad7bc77cc4ffd816cd5c8b5a98049af4233 Author: wfurt Date: Thu Aug 4 16:51:15 2022 -0700 update variable commit f227ac945cc8f1131f529b9fc7e0e8248263bf6a Author: wfurt Date: Thu Aug 4 16:49:46 2022 -0700 update variable commit 6c29fdf2e728c0a14fecc4c9b862c12ece2f12c6 Author: wfurt Date: Thu Aug 4 16:48:33 2022 -0700 update variable commit 4708c8143d2526905a61549ab538f2ddd22f442f Author: wfurt Date: Thu Aug 4 16:43:40 2022 -0700 update docker commit f4f0c6ba48c25eb12cbec11caae80890665dfc46 Author: wfurt Date: Thu Aug 4 16:38:20 2022 -0700 docker commit ff4eee53d10abf6434470a8f11aa3fa128a78f25 Author: wfurt Date: Thu Aug 4 16:25:37 2022 -0700 use -y commit 4ab42055133c2666a4568dd4d4d0fd53e7fe6031 Author: wfurt Date: Thu Aug 4 16:18:02 2022 -0700 use sudo commit ea62c7a6897a2b948ba8eb8909c69c5697091339 Author: wfurt Date: Thu Aug 4 16:09:53 2022 -0700 use demands commit 66f131b39d8338b8c02fdf6a9a22b6acae4f6b13 Author: wfurt Date: Thu Aug 4 15:46:47 2022 -0700 roll-back to 1es-ubuntu-2004 commit 7e6cca44011b22213c86ec9e4327f24f7baa2343 Author: wfurt Date: Thu Aug 4 14:54:00 2022 -0700 updates commit b691adb56a50548502a5f6130a7d3f0d390cd522 Author: wfurt Date: Thu Aug 4 13:59:50 2022 -0700 update names commit 0d7ff40f7a30beac093d78a8469cd09fb4ea5883 Author: wfurt Date: Thu Aug 4 13:39:01 2022 -0700 simplify commit 384414b68aada5639b8cefcc133621ec0f0af63c Author: wfurt Date: Thu Aug 4 13:37:02 2022 -0700 fix name commit 6773c6f6157f2d14471ae7e6008352cd9f605f03 Author: wfurt Date: Thu Aug 4 13:27:02 2022 -0700 remove line commit b34ddcb2bdeacf097ae24c372245fee93dacc294 Author: wfurt Date: Thu Aug 4 11:19:13 2022 -0700 use Build.Ubuntu.2004.x64 commit f785f60cad82fd43fee79a69ef40093ea1926bf7 Author: wfurt Date: Wed Aug 3 15:45:25 2022 -0700 try to add ARM pipeline --- Directory.Build.props | 28 +++ eng/pipelines/msquic.yml | 16 +- eng/pipelines/templates/build-job.yml | 28 +-- make-packages.sh | 191 ++++++++++++++++++ .../System.Net.MsQuic.Transport.csproj | 17 +- src/msquic | 2 +- 6 files changed, 260 insertions(+), 22 deletions(-) create mode 100755 make-packages.sh diff --git a/Directory.Build.props b/Directory.Build.props index d4f49dde..22bb8e06 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,32 @@ + + <_hostOS>Linux + <_hostOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">OSX + <_hostOS Condition="$([MSBuild]::IsOSPlatform('FREEBSD'))">FreeBSD + <_hostOS Condition="$([MSBuild]::IsOSPlatform('NETBSD'))">NetBSD + <_hostOS Condition="$([MSBuild]::IsOSPlatform('ILLUMOS'))">illumos + <_hostOS Condition="$([MSBuild]::IsOSPlatform('SOLARIS'))">Solaris + <_hostOS Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">windows + $(_hostOS) + $(_hostOS) + + + + <_hostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) + $(_hostArch) + arm + armv6 + armel + arm64 + loongarch64 + s390x + ppc64le + wasm + x64 + x64 + $(TargetArchitecture) + + diff --git a/eng/pipelines/msquic.yml b/eng/pipelines/msquic.yml index 8bb0c478..27fccf1a 100644 --- a/eng/pipelines/msquic.yml +++ b/eng/pipelines/msquic.yml @@ -62,7 +62,7 @@ stages: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: pool: vmImage: 'windows-latest' - + - template: /eng/pipelines/templates/build-job.yml parameters: osGroup: Linux @@ -80,6 +80,20 @@ stages: pool: vmImage: 'ubuntu-18.04' + - template: /eng/pipelines/templates/build-job.yml + parameters: + osGroup: Linux + archType: arm64 + runTests: false + pool: + name: NetCore1ESPool-Public + demands: ImageOverride -equals build.ubuntu.1804.amd64.open + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + isOfficialBuild: true + pool: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals build.ubuntu.1804.amd64 + - template: /eng/pipelines/templates/build-job.yml parameters: osGroup: macOS diff --git a/eng/pipelines/templates/build-job.yml b/eng/pipelines/templates/build-job.yml index bbc50170..017f10b2 100644 --- a/eng/pipelines/templates/build-job.yml +++ b/eng/pipelines/templates/build-job.yml @@ -54,6 +54,7 @@ jobs: - OPENSSL_ROOT_DIR: /usr/local/opt/openssl@1.1 - _testBuildArg: '' + - _docker: '' - ${{ if eq(parameters.runTests, true) }}: - _testBuildArg: -test @@ -71,33 +72,36 @@ jobs: - ${{ if eq(parameters.osGroup, 'Windows') }}: - _signingArgs: -sign /p:DotNetSignType=$(_SignType) + - _buildargs: -ci -c $(_BuildConfig) $(_testBuildArg) $(_signingArgs) $(_officialBuildArgs) /p:TargetArchitecture=${{ parameters.archType }} + - ${{ if eq(parameters.archType, 'arm64') }}: + - _buildScript: docker run --platform linux/arm64 --volume $BUILD_REPOSITORY_LOCALPATH:/msquic -t mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-arm64v8-20220803130954-bfcd90a bash -c "apt-get update && apt-get install -y wget curl liblttng-ust-dev && curl -L -o /tmp/pwsh.tgz https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-linux-arm64.tar.gz && tar xfz /tmp/pwsh.tgz -C /usr/local/bin/ && curl -o /tmp/cmake.tgz https://cmake.org/files/v3.23/cmake-3.23.1-linux-aarch64.tar.gz && tar xfz /tmp/cmake.tgz --strip 1 -C /usr/local/ && /msquic/build.sh -ci -c $(_BuildConfig) $(_testBuildArg) $(_signingArgs) $(_officialBuildArgs) /p:TargetArchitecture=${{ parameters.archType }}" + - _buildargs: '' steps: - checkout: self submodules: recursive + - ${{ if eq(parameters.archType, 'arm64') }}: + - script: sudo apt-get update && sudo apt-get install -y qemu binfmt-support qemu-user-static docker ruby-dev + - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + displayName: Setup QEMU + - ${{ if eq(parameters.osGroup, 'Windows') }}: - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force displayName: Install native dependencies - - ${{ if eq(parameters.osGroup, 'macOS') }}: + - ${{ if or(eq(parameters.osGroup, 'macOS'), eq(parameters.archType, 'arm64')) }}: # use cmake from Brew (that may be different) - - script: sed -i .ORI '/cmake/d' global.json + - script: sed -i.ORI '/cmake/d' global.json displayName: Remove cmake for macOS - - script: gem install fpm + - script: sudo gem install fpm displayName: Install fpm - - script: $(_buildScript) - -ci - -c $(_BuildConfig) - $(_testBuildArg) - $(_signingArgs) - $(_officialBuildArgs) - /p:TargetPlatform=${{ parameters.archType }} - displayName: Build and Publish + - script: $(_buildScript) $(_buildargs) + displayName: Build binaries - ${{ if ne(parameters.osGroup, 'Windows') }}: - - script: ./scripts/make-packages.sh -output $(_outputPath) + - script: ../../make-packages.sh -arch ${{ parameters.archType }} -config $(_BuildConfig) -output $(_outputPath) displayName: Make Unix packages workingDirectory: src/msquic diff --git a/make-packages.sh b/make-packages.sh new file mode 100755 index 00000000..d05169c8 --- /dev/null +++ b/make-packages.sh @@ -0,0 +1,191 @@ +#!/bin/bash + +usage() +{ + echo "Usage: $0 [-output ] [-config Debug]" + exit 1 +} + +OS=$(uname) +ARCH=$(uname -m) +PKGARCH=${ARCH} +FPM=`which fpm` 2>/dev/null +CONFIG=Release +NAME=libmsquic +CONFLICTS= +DESCRIPTION="Microsoft implementation of the IETF QUIC protocol" +VENDOR="Microsoft" +MAINTAINER="Microsoft QUIC Team " +VER_MAJOR=$(cat ./src/inc/msquic.ver | grep 'define VER_MAJOR'| cut -d ' ' -f 3) +VER_MINOR=$(cat ./src/inc/msquic.ver | grep 'define VER_MINOR'| cut -d ' ' -f 3) +VER_PATCH=$(cat ./src/inc/msquic.ver | grep 'define VER_PATCH'| cut -d ' ' -f 3) + +if [ -z "$FPM" ]; then + echo Install 'fpm' + exit 1 +fi + +if [ "$OS" == 'Linux' ]; then + OS=linux + LIBEXT=so + if [ "$ARCH" == 'x86_64' ]; then + ARCH='x64' + LIBDIR="lib64" + else + LIBDIR="lib" + if [ "$ARCH" == "aarch64" ]; then + ARCH=arm64 + else + if [ "$ARCH" == "armv7l" ]; then + ARCH=arm + else + ARCH=x86 + fi + fi + fi +else + if [ "$OS" == 'Darwin' ]; then + OS=macos + ARCH=x64 + LIBEXT=dylib + else + echo Only Linux and macOS packaging is supported at the moment. + exit 1 + fi +fi + +# process arguments and allow to override default values +while :; do + if [ $# -le 0 ]; then + break + fi + + lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" + case $lowerI in + -a|-arch|--arch) + shift + ARCH=$1 + if [ "$ARCH" == 'arm64' ]; then + PKGARCH=aarch64 + fi + ;; + -d|-debug|--debug) + CONFIG=Debug + ;; + -config|--config) + shift + CONFIG=$1 + ;; + -o|-output|--output) + shift + OUTPUT=$1 + ;; + -\?|-h|--help) + usage + exit 1 + ;; + *) + echo unknown argument + ;; + esac + + shift +done + +if [ ${CONFIG} != 'Release' ]; then + NAME=libmsquic-debug + CONFLICTS='libmsquic' +else + CONFLICTS='libmsquic-debug' +fi + +ARTIFACTS="artifacts/bin/${OS}/${ARCH}_${CONFIG}_openssl" + +if [ -z ${OUTPUT} ]; then + OUTPUT="artifacts/packages/${OS}/${ARCH}_${CONFIG}_openssl" +fi + +mkdir -p ${OUTPUT} + +if [ "$OS" == "linux" ]; then + # Create symlink + ln -s "${ARTIFACTS}/libmsquic.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}" "${ARTIFACTS}/libmsquic.${LIBEXT}.${VER_MAJOR}" + + # RedHat/CentOS + FILES="${ARTIFACTS}/libmsquic.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}=/usr/${LIBDIR}/libmsquic.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}" + FILES="${FILES} ${ARTIFACTS}/libmsquic.${LIBEXT}.${VER_MAJOR}=/usr/${LIBDIR}/libmsquic.${LIBEXT}.${VER_MAJOR}" + if [ -e "$ARTIFACTS/libmsquic.lttng.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}" ]; then + FILES="${FILES} ${ARTIFACTS}/libmsquic.lttng.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}=/usr/${LIBDIR}/libmsquic.lttng.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}" + fi + fpm \ + --force \ + --input-type dir \ + --output-type rpm \ + --architecture ${PKGARCH} \ + --name ${NAME} \ + --provides ${NAME} \ + --conflicts ${CONFLICTS} \ + --version ${VER_MAJOR}.${VER_MINOR}.${VER_PATCH} \ + --description "${DESCRIPTION}" \ + --vendor "${VENDOR}" \ + --maintainer "${MAINTAINER}" \ + --package "${OUTPUT}" \ + --license MIT \ + --url https://github.com/microsoft/msquic \ + --log error \ + ${FILES} + + # Debian/Ubuntu + if [ "$ARCH" == 'x64' ]; then + LIBDIR="lib/x86_64-linux-gnu" + fi + if [ "$ARCH" == 'arm64' ];then + LIBDIR="lib/aarch64-linux-gnu" + fi + if [ "$ARCH" == 'arm' ];then + LIBDIR="lib/arm-linux-gnueabihf" + fi + + FILES="${ARTIFACTS}/libmsquic.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}=/usr/${LIBDIR}/libmsquic.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}" + FILES="${FILES} ${ARTIFACTS}/libmsquic.${LIBEXT}.${VER_MAJOR}=/usr/${LIBDIR}/libmsquic.${LIBEXT}.${VER_MAJOR}" + if [ -e "$ARTIFACTS/libmsquic.lttng.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}" ]; then + FILES="${FILES} ${ARTIFACTS}/libmsquic.lttng.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}=/usr/${LIBDIR}/libmsquic.lttng.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}" + fi + fpm \ + --force \ + --input-type dir \ + --output-type deb \ + --architecture ${PKGARCH} \ + --name ${NAME} \ + --provides ${NAME} \ + --conflicts ${CONFLICTS} \ + --version ${VER_MAJOR}.${VER_MINOR}.${VER_PATCH} \ + --description "${DESCRIPTION}" \ + --vendor "${VENDOR}" \ + --maintainer "${MAINTAINER}" \ + --package "${OUTPUT}" \ + --license MIT \ + --url https://github.com/microsoft/msquic \ + --log error \ + ${FILES} +fi + +# macOS +if [ "$OS" == "macos" ]; then + fpm \ + --force \ + --input-type dir \ + --output-type osxpkg \ + --name ${NAME} \ + --provides ${NAME} \ + --conflicts ${CONFLICTS} \ + --version ${VER_MAJOR}.${VER_MINOR}.${VER_PATCH} \ + --description "${DESCRIPTION}" \ + --vendor "${VENDOR}" \ + --maintainer "${MAINTAINER}" \ + --package "${OUTPUT}" \ + --license MIT \ + --url https://github.com/microsoft/msquic \ + --log error \ + "$ARTIFACTS/libmsquic.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}.dylib"=/usr/local/lib/libmsquic.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}.dylib +fi diff --git a/src/System.Net.MsQuic.Transport/System.Net.MsQuic.Transport.csproj b/src/System.Net.MsQuic.Transport/System.Net.MsQuic.Transport.csproj index ac8489e8..a7374dde 100644 --- a/src/System.Net.MsQuic.Transport/System.Net.MsQuic.Transport.csproj +++ b/src/System.Net.MsQuic.Transport/System.Net.MsQuic.Transport.csproj @@ -14,27 +14,28 @@ - + + Command="pwsh scripts/build.ps1 -Config $(Configuration) -Arch x86 $(ExtraMsquicArgs) -UseSystemOpenSSLCrypto -DisableTools -DisableTest -DisablePerf" + WorkingDirectory="../msquic" Condition="'$(TargetOS)' == 'windows'"/> diff --git a/src/msquic b/src/msquic index f11df9c2..ce87781c 160000 --- a/src/msquic +++ b/src/msquic @@ -1 +1 @@ -Subproject commit f11df9c24daf313e543e17fa25a6a01ec224d5be +Subproject commit ce87781cb3e0a71fe4df7a07dd9f85cefdcda217 From 23958e4d4fa48f84e8d8aeec12c6b880e6fc3f39 Mon Sep 17 00:00:00 2001 From: wfurt Date: Mon, 8 Aug 2022 10:18:02 -0700 Subject: [PATCH 2/2] remove unused variable --- eng/pipelines/templates/build-job.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/templates/build-job.yml b/eng/pipelines/templates/build-job.yml index 017f10b2..07e950f9 100644 --- a/eng/pipelines/templates/build-job.yml +++ b/eng/pipelines/templates/build-job.yml @@ -54,7 +54,6 @@ jobs: - OPENSSL_ROOT_DIR: /usr/local/opt/openssl@1.1 - _testBuildArg: '' - - _docker: '' - ${{ if eq(parameters.runTests, true) }}: - _testBuildArg: -test