Skip to content

Commit 7f724b4

Browse files
delatriedelatrie
authored
Repo reorganization (#643)
1 parent d92177c commit 7f724b4

File tree

263 files changed

+298
-328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+298
-328
lines changed

‎.github/labeler.yml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,41 @@
55
"theme:build":
66
- changed-files:
77
- any-glob-to-any-file:
8-
- "*.sln"
8+
- "*.slnx"
99
- "**/*.csproj"
10-
- "Directory.Build.props"
10+
- "**/Directory.Build.props"
11+
- "**/Directory.Build.targets"
12+
- "build/**/*"
1113
- ".gitignore"
1214

1315
"theme:core":
1416
- changed-files:
1517
- any-glob-to-any-file:
16-
- "Allure.Net.Commons/**"
17-
- "Allure.Net.Commons.Tests/**"
18+
- "src/Allure.Net.Commons/**"
19+
- "tests/Allure.Net.Commons.Tests/**"
1820

1921
"theme:xunit":
2022
- changed-files:
2123
- any-glob-to-any-file:
22-
- "Allure.Xunit/**"
23-
- "Allure.Xunit.Examples/**"
24+
- "src/Allure.Xunit/**"
25+
- "examples/Allure.Xunit.Examples/**"
2426

2527
"theme:nunit":
2628
- changed-files:
2729
- any-glob-to-any-file:
28-
- "Allure.NUnit/**"
29-
- "Allure.NUnit.Examples/**"
30+
- "src/Allure.NUnit/**"
31+
- "examples/Allure.NUnit.Examples/**"
3032

3133
"theme:specflow":
3234
- changed-files:
3335
- any-glob-to-any-file:
34-
- "Allure.SpecFlow/**"
35-
- "Allure.SpecFlow.Tests/**"
36-
- "Allure.SpecFlow.Tests.Samples/**"
36+
- "src/Allure.SpecFlow/**"
37+
- "tests/Allure.SpecFlow.Tests/**"
38+
- "tests/Allure.SpecFlow.Tests.Samples/**"
3739

3840
"theme:reqnroll":
3941
- changed-files:
4042
- any-glob-to-any-file:
41-
- "Allure.Reqnroll/**"
42-
- "Allure.Reqnroll.Tests/**"
43-
- "Allure.Reqnroll.Tests.Samples/**"
43+
- "src/Allure.Reqnroll/**"
44+
- "tests/Allure.Reqnroll.Tests/**"
45+
- "tests/Allure.Reqnroll.Tests.Samples/**"

‎.github/workflows/publish.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Publish
22

33
env:
4-
SOLUTION_PATH: allure-csharp.sln
4+
SOLUTION_PATH: allure-csharp.slnx
55
BUILD_CONFIGURATION: 'Publish'
6-
PACKAGE_OUTPUT_PATH: 'artifacts'
6+
PACKAGE_OUTPUT_PATH: './artifacts/package/release'
77

88
on:
99
release:
@@ -55,7 +55,7 @@ jobs:
5555
shell: pwsh
5656
run: |
5757
$SnExe = "${{ steps.find-snexe.outputs.path }}"
58-
Get-ChildItem "./*/bin/*/*/Allure.*.dll" -Exclude "Allure.SpecFlow*","Allure.Xunit*" | ForEach-Object {
58+
Get-ChildItem "./artifacts/bin/*/*/Allure.*.dll" -Exclude "Allure.SpecFlow*","Allure.Xunit*" | ForEach-Object {
5959
& $SnExe -vf $_.FullName
6060
}
6161
@@ -66,13 +66,12 @@ jobs:
6666
--no-restore `
6767
--no-build `
6868
--configuration ${{ env.BUILD_CONFIGURATION }} `
69-
"-p:PackageReleaseNotes=${{ github.event.release.html_url }}" `
70-
"-p:PackageOutputPath=${{ github.workspace }}/${{ env.PACKAGE_OUTPUT_PATH }}"
69+
"-p:PackageReleaseNotes=${{ github.event.release.html_url }}"
7170
7271
- name: 'NuGet publish'
7372
shell: pwsh
7473
run: |
75-
dotnet nuget push "${{ env.PACKAGE_OUTPUT_PATH }}\*.nupkg" `
74+
dotnet nuget push "${{ env.PACKAGE_OUTPUT_PATH }}/*.nupkg" `
7675
--api-key "$Env:NUGET_TOKEN" `
7776
--source "https://api.nuget.org/v3/index.json"
7877
env:

‎.github/workflows/release.yml‎

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -48,49 +48,57 @@ jobs:
4848
run: |
4949
git config --global user.name qameta-ci
5050
git config --global user.email [email protected]
51+
5152
- name: "Set release version"
5253
run: |
5354
sed -i -e '/<PropertyGroup>/,/<\/PropertyGroup>/ s|<Version>[0-9a-zA-Z.|-]*</Version>|<Version>${{ env.release_version }}</Version>|g' ./Directory.Build.props
5455
cat ./Directory.Build.props
56+
5557
- name: "Update schema links"
5658
run: |
57-
sed -i -e '/"$ref"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.NUnit/Schemas/allureConfig.schema.json
58-
cat ./Allure.NUnit/Schemas/allureConfig.schema.json
59-
sed -i -e '/"$ref"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.Xunit/Schemas/allureConfig.schema.json
60-
cat ./Allure.Xunit/Schemas/allureConfig.schema.json
61-
sed -i -e '/"$ref"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.SpecFlow/Schemas/allureConfig.schema.json
62-
cat ./Allure.SpecFlow/Schemas/allureConfig.schema.json
63-
sed -i -e '/"$ref"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.Reqnroll/Schemas/allureConfig.schema.json
64-
cat ./Allure.Reqnroll/Schemas/allureConfig.schema.json
65-
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.Net.Commons/allureConfig.Template.json
66-
cat ./Allure.Net.Commons/allureConfig.Template.json
67-
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.NUnit.Examples/allureConfig.json
68-
cat ./Allure.NUnit.Examples/allureConfig.json
69-
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.Xunit.Examples/allureConfig.json
70-
cat ./Allure.Xunit.Examples/allureConfig.json
71-
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.SpecFlow/allureConfig.Template.json
72-
cat ./Allure.SpecFlow/allureConfig.Template.json
73-
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.SpecFlow.Tests.Samples/allureConfig.json
74-
cat ./Allure.SpecFlow.Tests.Samples/allureConfig.json
75-
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.SpecFlow.Tests/allureConfig.json
76-
cat ./Allure.SpecFlow.Tests/allureConfig.json
77-
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.Reqnroll/allureConfig.Template.json
78-
cat ./Allure.Reqnroll/allureConfig.Template.json
79-
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.Reqnroll.Tests.Samples/allureConfig.json
80-
cat ./Allure.Reqnroll.Tests.Samples/allureConfig.json
59+
sed -i -e '/"$ref"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./src/Allure.NUnit/Schemas/allureConfig.schema.json
60+
cat ./src/Allure.NUnit/Schemas/allureConfig.schema.json
61+
sed -i -e '/"$ref"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./src/Allure.Xunit/Schemas/allureConfig.schema.json
62+
cat ./src/Allure.Xunit/Schemas/allureConfig.schema.json
63+
sed -i -e '/"$ref"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./src/Allure.SpecFlow/Schemas/allureConfig.schema.json
64+
cat ./src/Allure.SpecFlow/Schemas/allureConfig.schema.json
65+
sed -i -e '/"$ref"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./src/Allure.Reqnroll/Schemas/allureConfig.schema.json
66+
cat ./src/Allure.Reqnroll/Schemas/allureConfig.schema.json
67+
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./src/Allure.Net.Commons/allureConfig.Template.json
68+
cat ./src/Allure.Net.Commons/allureConfig.Template.json
69+
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./examples/Allure.NUnit.Examples/allureConfig.json
70+
cat ./examples/Allure.NUnit.Examples/allureConfig.json
71+
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./examples/Allure.Xunit.Examples/allureConfig.json
72+
cat ./examples/Allure.Xunit.Examples/allureConfig.json
73+
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./src/Allure.SpecFlow/allureConfig.Template.json
74+
cat ./src/Allure.SpecFlow/allureConfig.Template.json
75+
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./tests/Allure.SpecFlow.Tests.Samples/allureConfig.json
76+
cat ./tests/Allure.SpecFlow.Tests.Samples/allureConfig.json
77+
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./tests/Allure.SpecFlow.Tests/allureConfig.json
78+
cat ./tests/Allure.SpecFlow.Tests/allureConfig.json
79+
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./src/Allure.Reqnroll/allureConfig.Template.json
80+
cat ./src/Allure.Reqnroll/allureConfig.Template.json
81+
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./tests/Allure.Reqnroll.Tests.Samples/allureConfig.json
82+
cat ./tests/Allure.Reqnroll.Tests.Samples/allureConfig.json
83+
sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./tests/Allure.Reqnroll.Tests/allureConfig.json
84+
cat ./tests/Allure.Reqnroll.Tests/allureConfig.json
85+
8186
- name: "Commit release version and create tag"
8287
run: |
8388
git commit -am "release ${{ env.release_version }}"
8489
git tag ${{ env.release_version }}
8590
git push origin ${{ env.release_version }}
91+
8692
- name: "Set next development version"
8793
run: |
8894
sed -i -e '/<PropertyGroup>/,/<\/PropertyGroup>/ s|<Version>[0-9a-zA-Z.|-]*</Version>|<Version>${{ inputs.nextVersion }}-SNAPSHOT</Version>|g' ./Directory.Build.props
8995
cat ./Directory.Build.props
96+
9097
- name: "Commit next development version and push it"
9198
run: |
9299
git commit -am "set next development version ${{ inputs.nextVersion }}"
93100
git push origin ${{ github.ref }}
101+
94102
- name: "Publish Github Release"
95103
uses: octokit/[email protected]
96104
with:

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Test
22

33
env:
4-
SOLUTION_PATH: allure-csharp.sln
4+
SOLUTION_PATH: allure-csharp.slnx
55
BUILD_CONFIGURATION: 'Release'
66

77
on:
@@ -42,12 +42,12 @@ jobs:
4242
4343
- name: 'Run tests'
4444
run: |
45-
dotnet test Allure.Net.Commons.Tests\
45+
dotnet test ./tests/Allure.Net.Commons.Tests\
4646
--no-build\
4747
--configuration ${{ env.BUILD_CONFIGURATION }}
48-
dotnet test Allure.SpecFlow.Tests\
48+
dotnet test ./tests/Allure.SpecFlow.Tests\
4949
--no-build\
5050
--configuration ${{ env.BUILD_CONFIGURATION }}
51-
dotnet test Allure.Reqnroll.Tests\
51+
dotnet test ./tests/Allure.Reqnroll.Tests\
5252
--no-build\
5353
--configuration ${{ env.BUILD_CONFIGURATION }}

‎Directory.Build.props‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,23 @@
11
<Project>
2-
<!-- Metadata -->
2+
<!-- Common metadata -->
33
<PropertyGroup>
44
<Version>2.15-SNAPSHOT</Version>
55
<Company>Qameta Software</Company>
66
<RepositoryUrl>https://github.com/allure-framework/allure-csharp</RepositoryUrl>
77
<RepositoryType>git</RepositoryType>
88
</PropertyGroup>
99

10-
<!-- Common projects' properties -->
10+
<!-- Common build properties -->
1111
<PropertyGroup>
1212
<LangVersion>12</LangVersion>
1313
<CheckEolTargetFramework>false</CheckEolTargetFramework>
14-
<IsPackable>false</IsPackable>
15-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
16-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
17-
<PackageProjectUrl>https://allurereport.org/</PackageProjectUrl>
18-
<PackageReadmeFile>README.md</PackageReadmeFile>
19-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
20-
<PackageTags>allure</PackageTags>
14+
<UseArtifactsOutput>true</UseArtifactsOutput>
15+
<ArtifactsPath>$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), 'artifacts'))</ArtifactsPath>
2116
</PropertyGroup>
2217

2318
<!-- Signing properties -->
2419
<PropertyGroup>
2520
<SignAssembly>true</SignAssembly>
2621
<AssemblyOriginatorKeyFile>$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), 'build', 'identity.snk'))</AssemblyOriginatorKeyFile>
2722
</PropertyGroup>
28-
29-
<!-- Debug properties -->
30-
<PropertyGroup>
31-
<DebugSymbols>true</DebugSymbols>
32-
<DebugType>portable</DebugType>
33-
<IncludeSymbols>true</IncludeSymbols>
34-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
35-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
36-
</PropertyGroup>
37-
38-
<!-- Enable SourceLink for all projects -->
39-
<ItemGroup>
40-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
41-
</ItemGroup>
42-
43-
<!-- Include LICENSE to all packages -->
44-
<ItemGroup Condition="'$(IsPackable)' == 'true'">
45-
<None Include="$(MSBuildThisFileDirectory)LICENSE" Pack="true" PackagePath="\" />
46-
</ItemGroup>
4723
</Project>

‎Directory.Build.targets‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,4 @@
11
<Project>
2-
<PropertyGroup>
3-
<Allure_TransformReadmeSource>$(MSBuildThisFileDirectory)build\TransformReadmeForNuget.cs</Allure_TransformReadmeSource>
4-
</PropertyGroup>
5-
<ItemGroup>
6-
<NuGetPackInput Include="$(Allure_TransformReadmeSource)" />
7-
</ItemGroup>
8-
<UsingTask TaskName="Allure_TransformReadmeForNuget"
9-
TaskFactory="RoslynCodeTaskFactory"
10-
AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
11-
<ParameterGroup>
12-
<InputReadmePath Required="true" />
13-
<OutputDirPath Required="true" />
14-
<GeneratedReadmePath Output="true" />
15-
</ParameterGroup>
16-
<Task>
17-
<Using Namespace="System" />
18-
<Using Namespace="System.IO" />
19-
<Using Namespace="System.Linq" />
20-
<Using Namespace="System.Text" />
21-
<Using Namespace="System.Text.RegularExpressions" />
22-
<Code Type="Fragment"
23-
Language="cs"
24-
Source="$(Allure_TransformReadmeSource)"/>
25-
</Task>
26-
</UsingTask>
27-
28-
<!--
29-
NuGet don't support <img> (in particular, align, width and height).
30-
This task generates a new README file with those unsupported constructs removed.
31-
-->
32-
<Target Name="Allure_GenerateNugetReadmeFiles"
33-
BeforeTargets="GenerateNuspec"
34-
Condition="'$(IsPackable)' == 'true'"
35-
Inputs="@(NuGetPackInput)" Outputs="@(NuGetPackOutput)">
36-
<Allure_TransformReadmeForNuget
37-
InputReadmePath="README.md"
38-
OutputDirPath="$(IntermediateOutputPath)">
39-
<Output TaskParameter="GeneratedReadmePath"
40-
PropertyName="Allure_NugetTransformedReadmePath" />
41-
</Allure_TransformReadmeForNuget>
42-
<Message Text="A new README was generated for $(MSBuildProjectName) at $(Allure_NugetTransformedReadmePath)" Importance="high" />
43-
<ItemGroup>
44-
<_PackageFiles Remove="README.md" />
45-
<_PackageFiles Include="$(Allure_NugetTransformedReadmePath)">
46-
<BuildAction>None</BuildAction>
47-
<PackagePath>/README.md</PackagePath>
48-
</_PackageFiles>
49-
</ItemGroup>
50-
</Target>
51-
522
<!-- Some assemblies have strong names. We should resign them after AspectInjector before publishing on NuGet.
533
Otherwise, they won't pass the `sn.exe -vf <assembly>` check -->
544

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Allure C# Integrations
22

3-
[![Build](https://github.com/allure-framework/allure-csharp/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/allure-framework/allure-csharp/actions/workflows/build.yml)
3+
[![Build](https://github.com/allure-framework/allure-csharp/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/allure-framework/allure-csharp/actions/workflows/test.yml)
44

55
> This repository contains adapters for C# test frameworks.
66
@@ -19,13 +19,13 @@
1919

2020
| Package | Documentation | Author | Release |
2121
|:-----------------------------------|:-----------------------------------------------------------------------------------|:-----------------------------------------------|:-----------------------------------------------------------------------------------------------------------:|
22-
| [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/) |
23-
| [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/) |
24-
| [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/) |
25-
| [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/) |
22+
| [Allure.NUnit](./src/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/) |
23+
| [Allure.Reqnroll](./src/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/) |
24+
| [Allure.SpecFlow](./src/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/) |
25+
| [Allure.Xunit](./src/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/) |
2626

2727
## Allure.Net.Commons
2828

2929
[![](http://img.shields.io/nuget/v/Allure.Net.Commons.svg?style=flat)](https://www.nuget.org/packages/Allure.Net.Commons)
3030

31-
Use [this library](Allure.Net.Commons) to create custom Allure adapters for .Net test frameworks.
31+
Use [this library](./src/Allure.Net.Commons) to create custom Allure adapters for .Net test frameworks.

0 commit comments

Comments
 (0)