Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies improve templates, fix CI workflow, support net46 #11

Merged
merged 25 commits into from
Oct 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7d423a1
Update Buildvana.Sdk 1.0.0-alpha.4 -> 1.0.0-alpha.7
rdeago Oct 5, 2020
9f63f11
Update Mono.Cecil 0.11.2 -> 0.11.3
rdeago Oct 5, 2020
3123e4f
Add properties no longer added by default by Buildvana.Sdk
rdeago Oct 5, 2020
4651b98
Add VS Code settings.
rdeago Oct 5, 2020
9337bdd
Improve changelog style.
rdeago Oct 5, 2020
3a781e8
Update editor / analyzer configuration files.
rdeago Oct 5, 2020
a294948
Standardize copyright holders across file headers, same as in license…
rdeago Oct 5, 2020
c4a87c1
Update ReSharper settings.
rdeago Oct 5, 2020
cc237e2
Update changelog.
rdeago Oct 5, 2020
f540a21
Improve wording in issue and PR templates.
rdeago Oct 5, 2020
a4adf4b
Remove additional NuGet source from CI workflow: Buildvana.Sdk is now…
rdeago Oct 5, 2020
55dfc81
Add a build matrix to CI worflow and use more granular steps: restore…
rdeago Oct 5, 2020
ce074ca
Use tag v2 for actions/checkout so no need to modify until v3.
rdeago Oct 5, 2020
7dcccb7
Use a release tag for actions/labeler instead of main.
rdeago Oct 5, 2020
5ad751c
Add dependency change to PR change checklist.
rdeago Oct 5, 2020
87c3990
Remove .NET 5.0 from build matrix: not recognized by setup-dotnet.
rdeago Oct 5, 2020
b15a93c
Remove dangling useless NuGet.config file.
rdeago Oct 5, 2020
74f8905
Setup both target and host .NET in CI workflow.
rdeago Oct 5, 2020
5f8c538
Revert double .NET setup as it didn't solve any problem.
rdeago Oct 5, 2020
0633a2b
Avoid useless message at dotnet first run.
rdeago Oct 5, 2020
dda43d9
Remove .NET 2.2 from build matrix, add .NET 5 RC1.
rdeago Oct 5, 2020
c88e51b
Add .NET Core 2.1 SDK (required by ReSharper.ExportAnnotations.Task).
rdeago Oct 5, 2020
dea857f
When a CI workflow fails, allow other workflows in the matrix to cont…
rdeago Oct 5, 2020
4cfb8aa
Support .NET Framework 4.6. Closes #12
rdeago Oct 6, 2020
8994d83
Update changelog.
rdeago Oct 6, 2020
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
15 changes: 13 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ dotnet_style_predefined_type_for_member_access = true:suggestion

# Parentheses preferences
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:suggestion
dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:suggestion
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion
dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:suggestion
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion

# Modifier preferences
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
Expand Down Expand Up @@ -218,3 +218,14 @@ dotnet_naming_style.begins_with_i.capitalization = pascal_case

dotnet_code_quality.CA1062.exclude_extension_method_this_parameter = true
dotnet_code_quality.dispose_ownership_transfer_at_constructor = true

### StyleCop configuration for rules not affected by stylecop.json

# SA1101: Prefix local calls with this
dotnet_diagnostic.SA1101.severity = none
# SX1101: Do not prefix local calls with this
dotnet_diagnostic.SX1101.severity = warning
# SA1309: Private instance field names must not begin with underscore
dotnet_diagnostic.SA1309.severity = none
# SX1309: Private instance field names must begin with underscore
dotnet_diagnostic.SX1309.severity = warning
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/03_blank_issue.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Blank issue
about: Something that doesn't fit the other categories
about: Something that doesn't fit any other category
title: ''
labels: ''
assignees: ''
Expand Down
13 changes: 7 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
<!--
What types of changes does the PR introduce?
Put an 'x' in the boxes that apply.
Please do not remove or reorder items.
Please do not remove, reorder, or add items.
-->

- [ ] Bugfix
- [ ] Enhancement (new and/or improved behavior)
- [ ] Refactoring (no functional changes)
- [ ] Code style update (no functional changes)
- [ ] Dependencies added, updated, or removed
- [ ] Build related changes
- [ ] CI related changes
- [ ] Documentation update
Expand All @@ -18,17 +19,17 @@ Please do not remove or reorder items.
## Proposed changes / fixed issues

<!--
Bugfixes and enhancement PRs MUST refer to existing issues.
Bugfix and enhancement PRs MUST refer to existing issues.
Example:

Fixes: #nnnn #nnnn
Partially fixes: #nnnn (brief explanation, or "see below")
Closes #nnnn #nnnn
Partial fix for #nnnn (followed by a brief explanation, or "see below")

For other PR types, delete the two lines below and add a clear and concise description of your changes.
-->

Fixes:
Partially fixes:
Closes #
Partial fix for #

## Checklist

Expand Down
37 changes: 29 additions & 8 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,47 @@ on:

env:
ContinuousIntegrationBuild: "true"
DOTNET_NOLOGO: "true"

jobs:

test:
name: Unit testing and code coverage reporting
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest ]
net: [ 3.1.x, 5.0.100-rc.1.20452.10 ]
runs-on: ${{ matrix.os }}
steps:

- name: Checkout
uses: actions/[email protected]
- name: Setup .NET Core
uses: actions/checkout@v2

- name: Setup .NET Core 2.1 SDK (required by ExportAnnotations)
uses: actions/setup-dotnet@v1
with:
dotnet-version: 2.1.x

- name: Setup .NET ${{ matrix.net }}
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.x
- name: Configure access to GitHub Packages
run: dotnet nuget update source Buildvana -u ${{ github.repository_owner }} -p ${{ github.token }} --store-password-in-clear-text
dotnet-version: ${{ matrix.net }}

- name: Restore dependencies
run: dotnet restore /p:Configuration=Release

- name: Build solution
run: dotnet build -c Release --no-restore /maxCpuCount:1

- name: Run unit tests, collect code coverage information
run: dotnet test /p:CollectCoverage=true /p:CoverletOutput="${{ github.workspace }}/.coverage/lcov-${{ matrix.os }}.info" /p:CoverletOutputFormat=lcov -c Release
run: dotnet test -c Release --no-build /p:CollectCoverage=true /p:CoverletOutput="${{ github.workspace }}/.coverage/lcov_${{ matrix.os }}_${{ matrix.net }}.info" /p:CoverletOutputFormat=lcov

- name: Create .NET local tool manifest file
run: dotnet new tool-manifest

- name: Install Codecov tool
run: dotnet tool install Codecov.Tool

- name: Upload coverage reports
run: dotnet tool run codecov -f .coverage/lcov-${{ matrix.os }}.info --no-color --required
run: dotnet tool run codecov -f .coverage/lcov_${{ matrix.os }}_${{ matrix.net }}.info --no-color --required
2 changes: 1 addition & 1 deletion .github/workflows/define-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v2.3.3
uses: actions/checkout@v2

- name: Update repository labels
uses: lannonbr/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/label-pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v2.3.3
uses: actions/checkout@v2

- name: Update repository labels
uses: lannonbr/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Assign labels to pull request
uses: actions/labeler@main
uses: actions/labeler@2.2.0
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
21 changes: 21 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp

// List of extensions which should be recommended for users of this workspace.
"recommendations": [
"bierner.github-markdown-preview",
"codezombiech.gitignore",
"editorconfig.editorconfig",
"github.vscode-pull-request-github",
"ms-dotnettools.csharp",
"redhat.vscode-xml",
"redhat.vscode-yaml",
"tintoy.msbuild-project-tools",
"yzhang.markdown-all-in-one"
],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": [

]
}
27 changes: 27 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/tests/Cecil.XmlDocNames.Tests/bin/Debug/netcoreapp3.1/Cecil.XmlDocNames.Tests.dll",
"args": [],
"cwd": "${workspaceFolder}/tests/Cecil.XmlDocNames.Tests",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
}
]
}
Loading