Skip to content

Commit

Permalink
Build Microsoft.Native.Quic.MsQuic.XDP.OpenSSL nuget package (#3570)
Browse files Browse the repository at this point in the history
TCP_FAIL_CONNECT_ON_ICMP_ERROR
  • Loading branch information
csujedihy authored Apr 18, 2023
1 parent 13cc38f commit 8a9cc6f
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .azure/OneBranch.Official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ extends:
- template: .azure/obtemplates/build-winuser-xdp.yml@self
parameters:
config: Release
tls: schannel
- template: .azure/obtemplates/build-winuser-xdp.yml@self
parameters:
config: Release
tls: openssl
- template: .azure/obtemplates/build-winuser-xdp.yml@self
parameters:
config: Debug
Expand Down
15 changes: 14 additions & 1 deletion .azure/obtemplates/build-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ jobs:
inputs:
artifact: drop_build_windows_xdp_build_windows_schannel_Release_xdp
path: $(Build.SourcesDirectory)\artifacts\bin\windows

- task: DownloadPipelineArtifact@2
inputs:
artifact: drop_build_windows_xdp_build_windows_openssl_Release_xdp
path: $(Build.SourcesDirectory)\artifacts\bin\windows

- task: PowerShell@2
displayName: Package Nuget
inputs:
Expand Down Expand Up @@ -105,6 +109,15 @@ jobs:
${{ if eq(parameters.release, true) }}:
arguments: -Tls schannel -ReleaseBuild -XDP

- task: PowerShell@2
displayName: Package Nuget
inputs:
pwsh: false
filePath: scripts/package-nuget.ps1
${{ if eq(parameters.release, false) }}:
arguments: -Tls openssl -XDP
${{ if eq(parameters.release, true) }}:
arguments: -Tls openssl -ReleaseBuild -XDP

- task: onebranch.pipeline.signing@1
inputs:
Expand Down
14 changes: 14 additions & 0 deletions .azure/templates/build-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ jobs:
tls: schannel
extraArtifactDir: _xdp

- template: ./download-artifacts.yml
parameters:
platform: windows
arch: x64
tls: openssl
extraArtifactDir: _xdp

- task: PowerShell@2
displayName: Prepare Build Machine
inputs:
Expand Down Expand Up @@ -113,6 +120,13 @@ jobs:
filePath: scripts/package-nuget.ps1
arguments: -Tls schannel -XDP

- task: PowerShell@2
displayName: Package Nuget
inputs:
pwsh: true
filePath: scripts/package-nuget.ps1
arguments: -Tls openssl -XDP

- task: CopyFiles@2
displayName: Move Nuget
inputs:
Expand Down
18 changes: 18 additions & 0 deletions src/distribution/Microsoft.Native.Quic.MsQuic.XDP.OpenSSL.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Microsoft.Native.Quic.MsQuic.XDP.OpenSSL</id>
<version>0.0.0</version>
<title>MsQuic XDP (OpenSSL)</title>
<authors>Microsoft</authors>
<license type="expression">MIT</license>
<icon>pkgicon.png</icon>
<readme>README.md</readme>
<projectUrl>https://github.com/microsoft/msquic</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<description>MsQuic native library for x64, x86 and arm64 using openssl for TLS and XDP datapath</description>
<repository type="git" url="$RepoRemote$" commit="$CommitHash$" />
<tags>native quic msquic openssl xdp</tags>
</metadata>
</package>
21 changes: 21 additions & 0 deletions src/distribution/Microsoft.Native.Quic.MsQuic.XDP.OpenSSL.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link Condition="'$(Platform.ToLower())' == 'x64'">
<AdditionalDependencies>$(MSBuildThisFileDirectory)lib/x64/msquic.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<!-- <Link Condition="'$(Platform.ToLower())' == 'arm64'">
<AdditionalDependencies>$(MSBuildThisFileDirectory)lib/arm64/msquic.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> -->
</ItemDefinitionGroup>
<Target Name="msquic_AfterBuild" AfterTargets="AfterBuild" />
<Target Name="msquic_AfterBuild_x64" Label="x64" Condition="'$(Platform.ToLower())' == 'x64'" AfterTargets="msquic_AfterBuild">
<Copy SourceFiles="$(MSBuildThisFileDirectory)bin/x64/msquic.dll" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
</Target>
<!-- <Target Name="msquic_AfterBuild_arm64" Label="arm64" Condition="'$(Platform.ToLower())' == 'arm64'" AfterTargets="msquic_AfterBuild">
<Copy SourceFiles="$(MSBuildThisFileDirectory)bin/arm64/msquic.dll" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
</Target> -->
</Project>

0 comments on commit 8a9cc6f

Please sign in to comment.