Update eBPF version to 0.13.0 #426
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit d049547.
saxena-anurag
changed the title
mtfriesen
reviewed
Dec 15, 2023
mtfriesen
reviewed
Dec 15, 2023
mtfriesen
reviewed
Dec 15, 2023
auto-merge was automatically disabled
December 15, 2023 06:25
Pull request was converted to draft
nibanks
reviewed
Dec 15, 2023
src/xdp/packages.config
Outdated
| <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| <package id="Microsoft.SourceLink.AzureRepos.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| <package id="eBPF-for-Windows" version="0.9.0" targetFramework="native" developmentDependency="true" /> | ||
| </packages> | ||
| </packages> |
There was a problem hiding this comment.
nit: please have trailing newline
nibanks
reviewed
Dec 15, 2023
src/xdp/xdp.vcxproj
Outdated
| @@ -195,4 +195,4 @@ | |||
| <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.SourceLink.AzureRepos.Git.1.0.0\build\Microsoft.SourceLink.AzureRepos.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.SourceLink.AzureRepos.Git.1.0.0\build\Microsoft.SourceLink.AzureRepos.Git.targets'))" /> | |||
| <Error Condition="!Exists('$(EbpfPackagePath)build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '$(EbpfPackagePath)build\native\ebpf-for-windows.props'))" /> | |||
| </Target> | |||
| </Project> | |||
| </Project> | |||
nibanks
reviewed
Dec 15, 2023
nibanks
reviewed
Dec 15, 2023
tools/setup.ps1
Outdated
Comment on lines
580
to
586
| if ($UseJitEbpf) { | ||
| Write-Verbose "msiexec.exe /i $EbpfMsiFullPath INSTALLFOLDER=$EbpfPath ADDLOCAL=eBPF_Runtime_Components,eBPF_Runtime_Components_JIT /qn /l*v $LogsDir\ebpfinstall.txt" | ||
| msiexec.exe /i $EbpfMsiFullPath INSTALLFOLDER=$EbpfPath ADDLOCAL=eBPF_Runtime_Components,eBPF_Runtime_Components_JIT /qn /l*v $LogsDir\ebpfinstall.txt | Write-Verbose | ||
| } else { | ||
| Write-Verbose "msiexec.exe /i $EbpfMsiFullPath INSTALLFOLDER=$EbpfPath ADDLOCAL=eBPF_Runtime_Components /qn /l*v $LogsDir\ebpfinstall.txt" | ||
| msiexec.exe /i $EbpfMsiFullPath INSTALLFOLDER=$EbpfPath ADDLOCAL=eBPF_Runtime_Components /qn /l*v $LogsDir\ebpfinstall.txt | Write-Verbose | ||
| } |
There was a problem hiding this comment.
IMHO, creating a variable to control which ADDLOCAL to supply would be easier to read than two almost identical lines.
nibanks
previously approved these changes
Dec 15, 2023
mtfriesen
previously approved these changes
Dec 15, 2023
saxena-anurag
dismissed stale reviews from mtfriesen and nibanks
via
de4c21a
mtfriesen
approved these changes
Dec 15, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note: For backward compatibility tests, JIT mode is also being installed for eBPF. Ideally the backward compat can be updated to use native modes, and then eBPF installation can be updated to only use native mode.