Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
publish:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4

Expand All @@ -29,23 +29,20 @@ 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:AspectInjector_Location=${{ github.workspace }}/build/AspectInjector/linux-x64/AspectInjector"
-p:ContinuousIntegrationBuild=true

- name: 'Pack project'
run: |
dotnet pack ${{ env.SOLUTION_PATH }}\
--no-restore\
--no-build\
--configuration ${{ env.BUILD_CONFIGURATION }}\
"-p:PackageReleaseNotes=${{ github.event.release.html_url }}"\
"-p:PackageOutputPath=${{ github.workspace }}/${{ env.PACKAGE_OUTPUT_PATH }}"

- name: 'NuGet publish'
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ 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
- name: "Update release notes link"
run: |
sed -i -e '/<PackageReleaseNotes>/,/<\/PackageReleaseNotes>/ s|/tag/[0-9a-zA-Z.|-]*|/tag/${{ env.release_version }}|g' ./Directory.Build.props
cat ./Directory.Build.props
- name: "Commit release version and create tag"
run: |
git commit -am "release ${{ env.release_version }}"
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/build.yml → .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: Build
name: Test

env:
SOLUTION_PATH: allure-csharp.sln
BUILD_CONFIGURATION: 'Release'
PACKAGE_OUTPUT_PATH: 'artifacts'

on:
workflow_dispatch:
Expand All @@ -19,8 +18,7 @@ permissions:
contents: read

jobs:
build:
name: "Build"
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
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.1" />
<PackageReference Include="AspectInjector" Version="2.9.0" />
<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
27 changes: 25 additions & 2 deletions Allure.Net.Commons/Internal/AssemblyAttributes.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Allure.Net.Commons.Tests")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
[assembly: InternalsVisibleTo(
"Allure.Net.Commons.Tests, PublicKey=" +
"002400000480000094000000060200000024" +
"0000525341310004000001000100A5B2C91A" +
"39AB4B9F331EB97857938818181EFDE08132" +
"B2A00F27A007F8402C3CBAB29A13DAF3D226" +
"93D0A4BAF191D7AABF32004ACA499E65532A" +
"E484D37DAD74822D45DBA8ED5365C03B34F3" +
"72E6C534F609EAD50A3491497F0E5A3A7263" +
"986A5E670B69857D6BA01D61C43749132080" +
"BF8091D435E75F528E2A2C35EC34CBA0"
)]
[assembly: InternalsVisibleTo(
"DynamicProxyGenAssembly2, PublicKey=" +
"00240000048000009400000006020000" +
"00240000525341310004000001000100" +
"C547CAC37ABD99C8DB225EF2F6C8A360" +
"2F3B3606CC9891605D02BAA56104F4CF" +
"C0734AA39B93BF7852F7D9266654753C" +
"C297E7D2EDFE0BAC1CDCF9F717241550" +
"E0A7B191195B7667BB4F64BCB8E21213" +
"80FD1D9D46AD2D92D2D15605093924CC" +
"EAF74C4861EFF62ABF69B9291ED0A340" +
"E113BE11E6A7D3113E92484CF7045CC7"
)]
13 changes: 12 additions & 1 deletion Allure.Reqnroll/Internal/AssemblyAttributes.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Allure.Reqnroll.Tests")]
[assembly: InternalsVisibleTo(
"Allure.Reqnroll.Tests, PublicKey=" +
"002400000480000094000000060200000024" +
"0000525341310004000001000100A5B2C91A" +
"39AB4B9F331EB97857938818181EFDE08132" +
"B2A00F27A007F8402C3CBAB29A13DAF3D226" +
"93D0A4BAF191D7AABF32004ACA499E65532A" +
"E484D37DAD74822D45DBA8ED5365C03B34F3" +
"72E6C534F609EAD50A3491497F0E5A3A7263" +
"986A5E670B69857D6BA01D61C43749132080" +
"BF8091D435E75F528E2A2C35EC34CBA0"
)]
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<SignAssembly>false</SignAssembly>
<PublicSign>false</PublicSign>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions Allure.SpecFlow.Tests/Allure.SpecFlow.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<SignAssembly>false</SignAssembly>
<PublicSign>false</PublicSign>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions Allure.SpecFlow/Allure.SpecFlow.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<Description>Create beautiful reports from your SpecFlow tests.</Description>
<PackageIcon>Allure-SF-Color.png</PackageIcon>
<PackageTags>$(PackageTags) specflow</PackageTags>
<SignAssembly>false</SignAssembly>
<PublicSign>false</PublicSign>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions Allure.Xunit.Examples/Allure.Xunit.Examples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<SignAssembly>false</SignAssembly>
<PublicSign>false</PublicSign>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions Allure.Xunit/Allure.Xunit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<Description>Create beautiful reports from your xUnit.net tests.</Description>
<PackageIcon>Allure-X-Color.png</PackageIcon>
<PackageTags>$(PackageTags) xunit</PackageTags>
<SignAssembly>false</SignAssembly>
<PublicSign>false</PublicSign>
</PropertyGroup>

<ItemGroup>
Expand Down
13 changes: 10 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,20 @@
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageTags>allure</PackageTags>
<PackageReleaseNotes>https://github.com/allure-framework/allure-csharp/releases/tag/2.12.1</PackageReleaseNotes>
</PropertyGroup>

<!-- Signing properties -->
<PropertyGroup>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build/identity-key-public.snk</AssemblyOriginatorKeyFile>

<!-- Allows assemblies to behave like they are strong named even after AspectInjector modifies them.
This mode has some limitations (see https://github.com/dotnet/runtime/blob/main/docs/project/public-signing.md).
We're using it as a fallback in case sn.exe is not found on the machine to make it easier for developers to
work with the project.
Since we do the publishing on a Windows runner, the assemblies published to NuGet are always
strong named. -->
<PublicSign>true</PublicSign>
</PropertyGroup>

<!-- Debug properties -->
Expand Down
Binary file removed build/AspectInjector/linux-x64/AspectInjector
Binary file not shown.
Binary file added build/identity-key-pair.snk
Binary file not shown.
Binary file added build/identity-key-public.snk
Binary file not shown.
Loading