diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index aa68350c..e627b5c0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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: | diff --git a/Allure.Net.Commons/Allure.Net.Commons.csproj b/Allure.Net.Commons/Allure.Net.Commons.csproj index 741803c2..10fb17d0 100644 --- a/Allure.Net.Commons/Allure.Net.Commons.csproj +++ b/Allure.Net.Commons/Allure.Net.Commons.csproj @@ -14,7 +14,7 @@ - + diff --git a/build/AspectInjector/linux-x64/AspectInjector b/build/AspectInjector/linux-x64/AspectInjector new file mode 100644 index 00000000..f93bffa4 Binary files /dev/null and b/build/AspectInjector/linux-x64/AspectInjector differ