Build & publishing fixes (#471)

* Make AspectInjector executable * Fix release workflow - Remove tag updage in the schema link of Allure.Reqnroll's allureConfig.json - Fix release notes link update - Provide just the URL as the release notes link * Fix publishing - AspectInjector_Location being provided to a wrong step - Missing PackageId for specflow and xunit - Put PackageId if reqnroll on top - Remove extra publishing target leftover from xunit * Remove unused xunit.runner.reporter ref * Remove link to yet non-existent doc for reqnroll * Set explicit permissions in labeler
allure-framework · Mar 29, 2024 · d9e3e0a · d9e3e0a
1 parent 4550d29
commit d9e3e0a
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 18 deletions.
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -5,6 +5,9 @@ on:
 
 jobs:
   triage:
+    permissions:
+      contents: read
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/labeler@v5

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -26,24 +26,24 @@ jobs:
         run: |
           dotnet restore ${{ env.SOLUTION_PATH }}
 
+      # 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: 'Build project using dotnet'
         run: |
           dotnet build ${{ env.SOLUTION_PATH }}\
             --no-restore\
             --configuration ${{ env.BUILD_CONFIGURATION }}\
-            -p:ContinuousIntegrationBuild=true
+            -p:ContinuousIntegrationBuild=true\
+            "-p:AspectInjector_Location=${{ github.workspace }}/build/AspectInjector/linux-x64/AspectInjector"
 
-      # 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:AspectInjector_Location=${{ github.workspace }}/build/AspectInjector/linux-x64"
+            "-p:PackageOutputPath=${{ github.workspace }}/${{ env.PACKAGE_OUTPUT_PATH }}"
 
       - name: 'NuGet publish'
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -73,11 +73,9 @@ jobs:
           cat ./Allure.Reqnroll/allureConfig.Template.json
           sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.Reqnroll.Tests.Samples/allureConfig.json
           cat ./Allure.Reqnroll.Tests.Samples/allureConfig.json
-          sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.Reqnroll.Tests/allureConfig.json
-          cat ./Allure.Reqnroll.Tests/allureConfig.json
       - name: "Update release notes link"
         run: |
-          sed -i -e '/<PackageReleaseNotes>/,/<\/PackageReleaseNotes>/ s|/allure-csharp/releases/tag/.*\.|/allure-csharp/releases/tag/${{ inputs.nextVersion }}.|g' ./Directory.Build.props
+          sed -i -e '/<PackageReleaseNotes>/,/<\/PackageReleaseNotes>/ s|/tag/[0-9a-zA-Z.|-]*|/tag/${{ inputs.release_version }}|g' ./Directory.Build.props
           cat ./Directory.Build.props
       - name: "Commit release version and create tag"
         run: |

diff --git a/Allure.Reqnroll/Allure.Reqnroll.csproj b/Allure.Reqnroll/Allure.Reqnroll.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+        <PackageId>Allure.Reqnroll</PackageId>
         <AssemblyName>Allure.ReqnrollPlugin</AssemblyName>
         <RootNamespace>Allure.ReqnrollPlugin</RootNamespace>
         <TargetFramework>netstandard2.0</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
-        <PackageId>Allure.Reqnroll</PackageId>
         <Authors>Maksim Stepanov</Authors>
         <Description>Create beautiful reports from your Reqnroll tests.</Description>
         <PackageIcon>Allure-Color.png</PackageIcon>

diff --git a/Allure.SpecFlow/Allure.SpecFlow.csproj b/Allure.SpecFlow/Allure.SpecFlow.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+        <PackageId>Allure.SpecFlow</PackageId>
         <AssemblyName>Allure.SpecFlowPlugin</AssemblyName>
         <RootNamespace>Allure.SpecFlowPlugin</RootNamespace>
         <TargetFrameworks>netstandard2.0</TargetFrameworks>

diff --git a/Allure.Xunit/Allure.Xunit.csproj b/Allure.Xunit/Allure.Xunit.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+        <PackageId>Allure.Xunit</PackageId>
         <AssemblyName>Allure.Xunit.reporters</AssemblyName>
+        <RootNamespace>Allure.Xunit</RootNamespace>
         <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
         <IsPackable>true</IsPackable>
         <Authors>Shumakov Ivan</Authors>
@@ -10,10 +12,6 @@
         <PackageTags>$(PackageTags) xunit</PackageTags>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);PackAllureXunitReportersFiles</TargetsForTfmSpecificBuildOutput>
-    </PropertyGroup>
-
     <ItemGroup>
         <None Include="README.md" Pack="true" PackagePath="\" />
         <None Include="./../img/Allure-X-Color.png" Pack="true" PackagePath="\" />
@@ -24,7 +22,6 @@
         <PackageReference Include="xunit.runner.utility" Version="2.4.1" />
         <PackageReference Include="xunit.assert" Version="2.4.1" />
         <PackageReference Include="xunit.core" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.reporters" Version="2.4.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -18,7 +18,7 @@
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
         <PackageTags>allure</PackageTags>
-        <PackageReleaseNotes>See the release notes here: https://github.com/allure-framework/allure-csharp/releases/tag/2.11.0.</PackageReleaseNotes>
+        <PackageReleaseNotes>https://github.com/allure-framework/allure-csharp/releases/tag/2.11.0</PackageReleaseNotes>
     </PropertyGroup>
 
     <!-- Signing properties -->
@@ -40,7 +40,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
-    
+
     <!-- Include LICENSE to all packages -->
     <ItemGroup Condition="'$(IsPackable)' == 'true'">
         <None Include="$(MSBuildThisFileDirectory)LICENSE" Pack="true" PackagePath="\" />

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@
 | Package                            |             Documentation                                                          |                     Author                     |                                                   Release                                                   |
 |:-----------------------------------|:-----------------------------------------------------------------------------------|:-----------------------------------------------|:-----------------------------------------------------------------------------------------------------------:|
 | [Allure.NUnit](Allure.NUnit)       | [https://allurereport.org/docs/nunit/](https://allurereport.org/docs/nunit/)       | [Nick Chursin](https://github.com/unickq)      | [![Nuget](https://img.shields.io/nuget/v/Allure.NUnit)](https://www.nuget.org/packages/Allure.NUnit/)       |
-| [Allure.Reqnroll](Allure.Reqnroll) | [https://allurereport.org/docs/reqnroll/](https://allurereport.org/docs/reqnroll/) | Maksim Stepanov                                | [![Nuget](https://img.shields.io/nuget/v/Allure.Reqnroll)](https://www.nuget.org/packages/Allure.Reqnroll/) |
+| [Allure.Reqnroll](Allure.Reqnroll) | In progress...                                                                     | Maksim Stepanov                                | [![Nuget](https://img.shields.io/nuget/v/Allure.Reqnroll)](https://www.nuget.org/packages/Allure.Reqnroll/) |
 | [Allure.SpecFlow](Allure.SpecFlow) | [https://allurereport.org/docs/specflow/](https://allurereport.org/docs/specflow/) | Alexander Bakanov                              | [![Nuget](https://img.shields.io/nuget/v/Allure.SpecFlow)](https://www.nuget.org/packages/Allure.SpecFlow/) |
 | [Allure.Xunit](Allure.Xunit)       | [https://allurereport.org/docs/xunit/](https://allurereport.org/docs/xunit/)       | [Shumakov Ivan](https://github.com/IvanWR1995) | [![Nuget](https://img.shields.io/nuget/v/Allure.Xunit)](https://www.nuget.org/packages/Allure.Xunit/)       |
 

diff --git a/build/AspectInjector/linux-x64/AspectInjector b/build/AspectInjector/linux-x64/AspectInjector