Skip to content

Commit

Permalink
Reduce the AspectInjector reference to 2.8.1 (#401)
Browse files Browse the repository at this point in the history
We now include AspectInjector CLI 2.8.2 directly in the repo and
use it to build the packages while keeping the reference to 2.8.1.
Those particular versions are compatible.  That allow as to have
debug symbols included as well as to support Mac OS Arm users.
  • Loading branch information
delatrie committed Mar 27, 2024
1 parent 1aa99d7 commit f92c366
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
13 changes: 5 additions & 8 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,17 @@ jobs:
--configuration ${{ env.BUILD_CONFIGURATION }}\
-p:ContinuousIntegrationBuild=true
# Lower AspectInjector requirement for users of the packages to
# workaround #391 (build crash on macOS arm machines)
- name: Reduce AspectInjector requirement to 2.8.1
run: |
dotnet add Allure.Net.Commons package AspectInjector --version 2.8.1
dotnet add Allure.XUnit package AspectInjector --version 2.8.1
# Use AspectInjector 2.8.2 which, unlike 2.8.1, correctly sets PdbChecksum
# The only reason we're' still referencing 2.8.1 from projects is that
# 2.8.2 doesn't work well on Mac OS ARM
- name: 'Pack project'
run: |
dotnet pack ${{ env.SOLUTION_PATH }}\
--no-restore\
--no-build\
--configuration ${{ env.BUILD_CONFIGURATION }}\
"-p:PackageOutputPath=${{ github.workspace }}/${{ env.PACKAGE_OUTPUT_PATH }}"
"-p:PackageOutputPath=${{ github.workspace }}/${{ env.PACKAGE_OUTPUT_PATH }}"\
"-p:AspectInjector_Location=${{ github.workspace }}/build/AspectInjector/linux-x64"
- name: 'NuGet publish'
run: |
Expand Down
2 changes: 1 addition & 1 deletion Allure.Net.Commons/Allure.Net.Commons.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<None Include="README.md" Pack="true" PackagePath="\" />
<None Include="./../img/Allure-Color.png" Pack="true" PackagePath="\" />
<Content Include="allureConfig.Template.json" Pack="true" />
<PackageReference Include="AspectInjector" Version="2.8.2" />
<PackageReference Include="AspectInjector" Version="2.8.1" />
<PackageReference Include="MimeTypesMap" Version="1.0.8" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
Expand Down
Binary file added build/AspectInjector/linux-x64/AspectInjector
Binary file not shown.

0 comments on commit f92c366

Please sign in to comment.