Skip to content

Commit

Permalink
Merge pull request #2947 from fluentassertions/release-8.0
Browse files Browse the repository at this point in the history
Release 8.0
  • Loading branch information
dennisdoomen authored Jan 14, 2025
2 parents c5b2f9a + df7e9bf commit 901c8fa
Show file tree
Hide file tree
Showing 669 changed files with 46,339 additions and 49,303 deletions.
16 changes: 12 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,19 @@ dotnet_diagnostic.CA1307.severity = error
dotnet_diagnostic.CA1308.severity = error
# CA1309: Use ordinal StringComparison
dotnet_diagnostic.CA1309.severity = error

# Purpose: Rename virtual/interface member ITestFramework.Throw(string) so that it no longer conflicts with the reserved language keyword 'Throw'
# Reason: We don't care about other languages than C#
dotnet_diagnostic.CA1716.severity = none

# CA1724: Type names should not match namespaces
dotnet_diagnostic.CA1724.severity = none
# CA1819: Properties should not return arrays
dotnet_diagnostic.CA1819.severity = none
# CA1851: Possible multiple enumerations of IEnumerable collection. Related to GH-issue #2000
dotnet_diagnostic.CA1851.severity = suggestion
# CA1859: Use concrete types when possible for improved performance
dotnet_diagnostic.CA1859.severity = suggestion
# CA1860: Avoid using 'Enumerable.Any()' extension method
dotnet_diagnostic.CA1860.severity = warning
# CA1861: Avoid constant arrays as arguments
Expand Down Expand Up @@ -197,6 +204,11 @@ dotnet_diagnostic.SA1116.severity = none
dotnet_diagnostic.SA1117.severity = none
# SA1200: Using directive should appear within a namespace declaration
dotnet_diagnostic.SA1200.severity = none

# Purpose: Use string. Empty for empty strings
# Reason: There's no performance difference. See https://medium.com/@dk.kravtsov/string-empty-vs-in-c-70c64971161f
dotnet_diagnostic.SA1122.severity = none

# SA1124: Do not use regions
dotnet_diagnostic.SA1124.severity = none
# SA1201: A property should not follow a method
Expand Down Expand Up @@ -373,10 +385,6 @@ dotnet_diagnostic.RCS1237.severity = none
# RCS1228: Unused element in documentation comment. (Equivalent to SA1614)
dotnet_diagnostic.RCS1228.severity = suggestion

# Purpose: Use element access
# Reason: Don't want to force this in this branch
dotnet_diagnostic.RCS1246.severity = suggestion

# Use an overload that has a IEqualityComparer<string> or IComparer<string> parameter
dotnet_diagnostic.MA0002.severity = suggestion

Expand Down
6 changes: 0 additions & 6 deletions .github/FUNDING.yml

This file was deleted.

13 changes: 7 additions & 6 deletions .github/ISSUE_TEMPLATE/01_bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: 🐞 Bug Report
description: Create a report to help us improve
description: Create a report to help us improve
labels: ["bug", "triage"]
body:
- type: markdown
attributes:
value: |
We welcome bug reports! Please see our [contribution guidelines](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#writing-a-good-bug-report) for more information on writing a good bug report.
**Before continuing, have you:**
* Tried upgrading to newest version of Fluent Assertions, to see if your issue has already been resolved and released?
Expand Down Expand Up @@ -88,7 +88,7 @@ body:
description: |
Please provide more information on your .NET configuration:
* Which version of Fluent Assertions are you using?
* Which .NET runtime and version are you targeting? E.g. .NET framework 4.7.1 or .NET 6.
* Which .NET runtime and version are you targeting? E.g. .NET framework 4.7.2 or .NET 6.0.
placeholder: Configuration
validations:
required: false
Expand All @@ -104,10 +104,11 @@ body:
- type: dropdown
id: pull-request
attributes:
label: Could you help with a pull-request?
description: Make sure you have read the sections about [contributing changes](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#contributing-changes) and [dos and don'ts](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#dos-and-donts).
label: Are you willing to help with a pull-request?
description: |
Make sure you have read the sections about [contributing changes](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#contributing-changes) and [dos and don'ts](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#dos-and-donts).
options:
- "No"
- "Yes"
- "Yes, please assign this issue to me."
validations:
required: true
8 changes: 5 additions & 3 deletions .github/ISSUE_TEMPLATE/02_api_proposal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,12 @@ body:
- type: dropdown
id: pull-request
attributes:
label: Could you help with a proof-of-concept (as PR in that or a separate repo) first and as pull-request later on?
description: This is mainly to help demonstrate your suggestion. Please also make sure you have read the sections about [contributing changes](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#contributing-changes) and [dos and don'ts](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#dos-and-donts).
label: Are you willing to help with a proof-of-concept (as PR in that or a separate repo) first and as pull-request later on?
description: |
This is mainly to help demonstrate your suggestion.
Please also make sure you have read the sections about [contributing changes](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#contributing-changes) and [dos and don'ts](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#dos-and-donts).
options:
- "No"
- "Yes"
- "Yes, please assign this issue to me."
validations:
required: true
7 changes: 4 additions & 3 deletions .github/ISSUE_TEMPLATE/03_general_feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ body:
- type: dropdown
id: pull-request
attributes:
label: Could you help with a pull-request?
description: Make sure you have read the sections about [contributing changes](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#contributing-changes) and [dos and don'ts](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#dos-and-donts).
label: Are you willing help with a pull-request?
description: |
Make sure you have read the sections about [contributing changes](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#contributing-changes) and [dos and don'ts](https://github.com/fluentassertions/fluentassertions/blob/develop/CONTRIBUTING.md#dos-and-donts).
options:
- "No"
- "Yes"
- "Yes, please assign this issue to me."
validations:
required: true
50 changes: 50 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
day: "monday"
time: "16:00"
timezone: "Europe/Copenhagen"

- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
day: "monday"
time: "16:00"
timezone: "Europe/Copenhagen"

- package-ecosystem: "bundler"
directory: "/docs"
schedule:
interval: "weekly"
day: "monday"
time: "16:00"
timezone: "Europe/Copenhagen"

- package-ecosystem: "nuget"
directory: "/"
schedule:
interval: "weekly"
day: "monday"
time: "16:00"
timezone: "Europe/Copenhagen"
ignore:
- dependency-name: "System.Collections.Immutable"
- dependency-name: "System.Threading.Tasks.Extensions"
groups:
xunit:
patterns:
- "xunit*"
- "Verify*"
mstest:
patterns:
- "MSTest*"
nuke:
patterns:
- "Nuke*"
nunit:
patterns:
- "NUnit*"
49 changes: 45 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: build
name: Build

on: [push, pull_request]

jobs:
build:

name: "Build, Test, Analyze and Publish"
runs-on: windows-latest

env:
Expand All @@ -23,6 +23,13 @@ jobs:
7.0.x
8.0.x
- name: Cache .nuke/temp
uses: actions/cache@v4
with:
path: |
.nuke/temp
key: ${{ runner.os }}-${{ hashFiles('NodeVersion') }}

- name: Run NUKE
run: ./build.ps1
env:
Expand All @@ -42,11 +49,16 @@ jobs:
file: TestResults/reports/lcov.info

- name: Upload artifacts
if: always()
uses: actions/upload-artifact@v4
with:
path: ./Artifacts/*
only-unit-tests:
name: windows-artifacts
path: |
./Artifacts/*
./TestResults/*.trx
only-unit-tests:
name: "Run Unit Tests Only"
strategy:
matrix:
os: [ubuntu-24.04, macos-15]
Expand All @@ -68,3 +80,32 @@ jobs:
- name: Run NUKE
run: ./build.sh UnitTests

- name: Upload artifacts
if: always()
uses: actions/upload-artifact@v4
with:
name: ${{ runner.os }}-artifacts
path: |
./TestResults/*.trx
publish-test-results:
name: "Publish Tests Results"
needs: [ build, only-unit-tests ]
runs-on: ubuntu-latest
permissions:
checks: write
pull-requests: write
if: always()

steps:
- name: Download Artifacts
uses: actions/download-artifact@v4
with:
path: artifacts

- name: Publish Test Results
uses: EnricoMi/publish-unit-test-result-action@v2
with:
comment_mode: always
files: "artifacts/**/**/*.trx"
57 changes: 57 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: "CodeQL"

on:
push:
branches: [ "develop", "main", "release*" ]
pull_request:
branches: [ "develop", "main", "release*" ]
schedule:
- cron: '00 15 * * 1'

jobs:
analyze:
name: Analyze
runs-on: 'ubuntu-latest'
timeout-minutes: 360
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'csharp' ]

steps:
- name: Setup .NET SDKs
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.0.x
- name: Checkout repository

uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

- name: Build
run: |
dotnet restore FluentAssertions.sln --configfile nuget.config
dotnet build FluentAssertions.sln --configuration CI --no-restore
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
15 changes: 13 additions & 2 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,17 @@
"Clean",
"CodeCoverage",
"Compile",
"InstallNode",
"Pack",
"Push",
"Restore",
"SpellCheck",
"TestFrameworks",
"TestingPlatformFrameworks",
"UnitTests",
"UnitTestsNetCore",
"UnitTestsNetFramework"
"UnitTestsNet47",
"UnitTestsNet6OrGreater",
"VSTestFrameworks"
]
},
"Verbosity": {
Expand Down Expand Up @@ -110,6 +113,14 @@
"allOf": [
{
"properties": {
"Configuration": {
"type": "string",
"description": "The solution configuration to build. Default is 'Debug' (local) or 'CI' (server)",
"enum": [
"CI",
"Debug"
]
},
"GenerateBinLog": {
"type": [
"boolean",
Expand Down
Loading

0 comments on commit 901c8fa

Please sign in to comment.