Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/cd-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: echo NUGET_VERSION=${GITHUB_REF#refs/tags/v} >> $GITHUB_ENV

- name: Replace version number in nuspec files
run: 'sed -i -e "s/{{NuGetVersion}}/$NUGET_VERSION/g" *.nuspec **/*.targets'
run: 'sed -i -e "s/{{NuGetVersion}}/$NUGET_VERSION/g" *.nuspec'

- name: Setup NuGet.exe for use with actions
uses: NuGet/setup-nuget@v1.2.0
Expand All @@ -32,6 +32,6 @@ jobs:
run: nuget pack Neolution.CodeAnalysis.TestsRuleset.nuspec

- name: Push all packages to Nuget.org
run: dotnet nuget push --skip-duplicate -s $ARTIFACTS_FEED_URL -k $NUGET_AUTH_TOKEN **/*.nupkg
run: dotnet nuget push --skip-duplicate -s $ARTIFACTS_FEED_URL -k $NUGET_AUTH_TOKEN **/*.nupkg
env:
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY_NEOLUTION }}
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
run: echo NUGET_VERSION=0.$(date '+%Y.%m')-ci.$(date '+%d%H%M%S') >> $GITHUB_ENV

- name: Replace version number in nuspec files
run: 'sed -i -e "s/{{NuGetVersion}}/$NUGET_VERSION/g" *.nuspec **/*.targets'
run: 'sed -i -e "s/{{NuGetVersion}}/$NUGET_VERSION/g" *.nuspec'

- name: Setup NuGet.exe for use with actions
uses: NuGet/setup-nuget@v1.2.0
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
type: choice
description: Semantic Version Type
options:
- no-version-update
- automatic
- patch
- minor
- major
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
run: |
params=()

if [[ ${{ github.event.inputs.version_type }} != "no-version-update" ]]; then
if [[ ${{ github.event.inputs.version_type }} != "automatic" ]]; then
params+=(${{ github.event.inputs.version_type }})
fi

Expand All @@ -62,6 +62,7 @@ jobs:

params+=(--ci)

release-it -y "${params[@]}"
echo "command: release-it ${params[@]}"
release-it "${params[@]}"
env:
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

*.nupkg

*.exe
2 changes: 1 addition & 1 deletion .release-it.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"filename": "CHANGELOG.md",
"addVersionUrl": true,
"addUnreleased": true,
"strictLatest": false
"strictLatest": true
}
},
"hooks": {
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ and adheres to a project-specific [Versioning](/README.md).

## [Unreleased]

### Changed

- Stopped changing all rules to error first and instead use the default rulesets of the Analyzers as the base ru
- Migrate from \*.ruleset files to \*.globalconfig files
- Migrate from \*.targets to \*. props files
- Simplified and decluttered README file

### Removed

- Removed FxCop Analyzer because it is now bundled with .NET SDK

## [2.7.1] - 2023-06-14

### Added
Expand Down
7 changes: 0 additions & 7 deletions GitVersion.yml

This file was deleted.

14 changes: 5 additions & 9 deletions Neolution.CodeAnalysis.TestsRuleset.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,14 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<developmentDependency>true</developmentDependency>
<dependencies>
<dependency id="StyleCop.Analyzers" version="1.1.118" />
<dependency id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="3.3.1" />
<dependency id="StyleCop.Analyzers" version="1.2.0-beta.435" />
<dependency id="SonarAnalyzer.CSharp" version="8.52.0.60960" />
</dependencies>
</metadata>
<files>
<file src="build\Neolution.CodeAnalysis.TestsRuleset.targets" target="build\Neolution.CodeAnalysis.TestsRuleset.targets" />
<file src="Neolution.Debug.ruleset" target="Neolution.Debug.ruleset" />
<file src="Neolution.Release.ruleset" target="Neolution.Release.ruleset" />
<file src="Neolution.Tests.Debug.ruleset" target="Neolution.Tests.Debug.ruleset" />
<file src="Neolution.Tests.Release.ruleset" target="Neolution.Tests.Release.ruleset" />
<file src="stylecop.json" target="stylecop.json" />
<file src="build\Neolution.CodeAnalysis.TestsRuleset.props" target="build\Neolution.CodeAnalysis.TestsRuleset.props" />
<file src="build\Neolution.Tests.globalconfig" target="build\Neolution.Tests.globalconfig" />
<file src="build\stylecop.json" target="build\stylecop.json" />
<file src="README.md" target="docs\" />
</files>
</package>
</package>
12 changes: 5 additions & 7 deletions Neolution.CodeAnalysis.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,14 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<developmentDependency>true</developmentDependency>
<dependencies>
<dependency id="StyleCop.Analyzers" version="1.1.118" />
<dependency id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="3.3.1" />
<dependency id="StyleCop.Analyzers" version="1.2.0-beta.435" />
<dependency id="SonarAnalyzer.CSharp" version="8.52.0.60960" />
</dependencies>
</metadata>
<files>
<file src="build\Neolution.CodeAnalysis.targets" target="build\Neolution.CodeAnalysis.targets" />
<file src="Neolution.Debug.ruleset" target="Neolution.Debug.ruleset" />
<file src="Neolution.Release.ruleset" target="Neolution.Release.ruleset" />
<file src="stylecop.json" target="stylecop.json" />
<file src="build\Neolution.CodeAnalysis.props" target="build\Neolution.CodeAnalysis.props" />
<file src="build\Neolution.globalconfig" target="build\Neolution.globalconfig" />
<file src="build\stylecop.json" target="build\stylecop.json" />
<file src="README.md" target="docs\" />
</files>
</package>
</package>
Loading