Skip to content

Commit d286ea1

Browse files
mkoertgenmkoertgen
committed
Updates
1 parent 2db4de8 commit d286ea1

File tree

11 files changed

+146
-26
lines changed

11 files changed

+146
-26
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Desktop (please complete the following information):**
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
30+
31+
**Smartphone (please complete the following information):**
32+
- Device: [e.g. iPhone6]
33+
- OS: [e.g. iOS8.1]
34+
- Browser [e.g. stock browser, safari]
35+
- Version [e.g. 22]
36+
37+
**Additional context**
38+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.github/workflows/build.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: build
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
8+
9+
jobs:
10+
build:
11+
runs-on: windows-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
with:
16+
fetch-depth: "0" # Use all history for gitversion, cf.: https://github.com/actions/checkout/issues/113
17+
18+
- uses: actions/setup-java@v2 # Setup Java 11 for Sonar
19+
with:
20+
distribution: "adopt"
21+
java-version: "11"
22+
23+
- run: .\build.ps1 CiBuild
24+
env:
25+
SONAR_LOGIN: "${{ secrets.SONAR_LOGIN }}"
26+
NUGET_API_KEY: "${{ secrets.NUGET_API_KEY }}"
27+
# Use Java 1 for Sonar Scanner, Pre-installed on windows-latest
28+
# cf.: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#java
29+
#JAVA_HOME: "${{ env.JAVA_HOME_11_X64 }}"

‎.gitignore‎

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
.sonarqube/
66

77

8-
# Created by https://www.toptal.com/developers/gitignore/api/sonarqube,visualstudio,visualstudiocode,intellij+all
9-
# Edit at https://www.toptal.com/developers/gitignore?templates=sonarqube,visualstudio,visualstudiocode,intellij+all
8+
# Created by https://www.toptal.com/developers/gitignore/api/sonarqube,intellij+all,visualstudio,visualstudiocode
9+
# Edit at https://www.toptal.com/developers/gitignore?templates=sonarqube,intellij+all,visualstudio,visualstudiocode
1010

1111
### Intellij+all ###
1212
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
@@ -19,6 +19,9 @@
1919
.idea/**/dictionaries
2020
.idea/**/shelf
2121

22+
# AWS User-specific
23+
.idea/**/aws.xml
24+
2225
# Generated files
2326
.idea/**/contentModel.xml
2427

@@ -103,6 +106,7 @@ modules.xml
103106
# https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner
104107
# Sonar Scanner working directories
105108
.sonar/
109+
.sonarqube/
106110
.scannerwork/
107111

108112
# http://www.sonarlint.org/commandline/
@@ -111,10 +115,15 @@ modules.xml
111115

112116
### VisualStudioCode ###
113117
.vscode/*
118+
!.vscode/settings.json
114119
!.vscode/tasks.json
115120
!.vscode/launch.json
121+
!.vscode/extensions.json
116122
*.code-workspace
117123

124+
# Local History for Visual Studio Code
125+
.history/
126+
118127
### VisualStudioCode Patch ###
119128
# Ignore all local history of files
120129
.history
@@ -213,6 +222,7 @@ StyleCopReport.xml
213222
*.tmp_proj
214223
*_wpftmp.csproj
215224
*.log
225+
*.tlog
216226
*.vspscc
217227
*.vssscc
218228
.builds
@@ -265,7 +275,9 @@ _TeamCity*
265275
!.axoCover/settings.json
266276

267277
# Coverlet is a free, cross platform Code Coverage Tool
268-
coverage*[.json, .xml, .info]
278+
coverage*.json
279+
coverage*.xml
280+
coverage*.info
269281

270282
# Visual Studio code coverage results
271283
*.coverage
@@ -326,6 +338,9 @@ PublishScripts/
326338
*.nuget.props
327339
*.nuget.targets
328340

341+
# Nuget personal access tokens and Credentials
342+
nuget.config
343+
329344
# Microsoft Azure Build Output
330345
csx/
331346
*.build.csdef
@@ -482,8 +497,21 @@ MigrationBackup/
482497
# Fody - auto-generated XML schema
483498
FodyWeavers.xsd
484499

500+
# VS Code files for those working on multiple tools
501+
502+
# Local History for Visual Studio Code
503+
504+
# Windows Installer files from build outputs
505+
*.cab
506+
*.msi
507+
*.msix
508+
*.msm
509+
*.msp
510+
511+
# JetBrains Rider
512+
*.sln.iml
513+
485514
### VisualStudio Patch ###
486515
# Additional files built by Visual Studio
487-
*.tlog
488516

489-
# End of https://www.toptal.com/developers/gitignore/api/sonarqube,visualstudio,visualstudiocode,intellij+all
517+
# End of https://www.toptal.com/developers/gitignore/api/sonarqube,intellij+all,visualstudio,visualstudiocode

‎FluentAssertions.Autofac.Tests/FluentAssertions.Autofac.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="Autofac" Version="6.2.0" />
19-
<PackageReference Include="FluentAssertions" Version="5.10.3" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
19+
<PackageReference Include="FluentAssertions" Version="6.0.0" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
2121
<PackageReference Include="NSubstitute" Version="4.2.2" />
2222
<PackageReference Include="xunit" Version="2.4.1" />
2323
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>
27-
<PackageReference Include="coverlet.collector" Version="3.0.3">
27+
<PackageReference Include="coverlet.collector" Version="3.1.0">
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
</PackageReference>

‎FluentAssertions.Autofac/FluentAssertions.Autofac.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212
<ItemGroup>
1313
<PackageReference Include="Autofac" Version="6.2.0" />
14-
<PackageReference Include="FluentAssertions" Version="5.10.3" />
15-
<PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
14+
<PackageReference Include="FluentAssertions" Version="6.0.0" />
15+
<PackageReference Include="GitVersion.MsBuild" Version="5.6.11">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>

‎SampleLib/SampleLib.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net5.0</TargetFrameworks>
3+
<TargetFramework>net5.0</TargetFramework>
44
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<PackageReference Include="Autofac" Version="6.2.0" />
10-
<PackageReference Include="FluentAssertions" Version="5.10.3" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
10+
<PackageReference Include="FluentAssertions" Version="6.0.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
1212
<PackageReference Include="xunit" Version="2.4.1" />
1313
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
1717
<PackageReference Include="NSubstitute" Version="4.2.2" />
18-
<PackageReference Include="coverlet.collector" Version="3.0.3">
18+
<PackageReference Include="coverlet.collector" Version="3.1.0">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
</PackageReference>

‎build.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ else {
5656
# Install by channel or version
5757
$DotNetDirectory = "$TempDirectory\dotnet-win"
5858
if (!(Test-Path variable:DotNetVersion)) {
59-
ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
59+
ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
6060
} else {
61-
ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
61+
ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
6262
}
6363
$env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
6464
}

‎build/Build.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using Nuke.Common;
3-
using Nuke.Common.CI;
43
using Nuke.Common.CI.AppVeyor;
54
using Nuke.Common.CI.AzurePipelines;
5+
using Nuke.Common.CI.GitHubActions;
66
using Nuke.Common.Execution;
77
using Nuke.Common.IO;
88
using Nuke.Common.ProjectModel;
@@ -19,6 +19,10 @@
1919
[CheckBuildProjectConfigurations]
2020
[UnsetVisualStudioEnvironmentVariables]
2121
// NUKE CI Integration: http://www.nuke.build/docs/authoring-builds/ci-integration.html
22+
[GitHubActions("build", GitHubActionsImage.WindowsLatest,
23+
AutoGenerate = false,
24+
InvokedTargets = new[] {nameof(CiBuild)})]
25+
2226
// cf.: https://github.com/nuke-build/nuke/blob/develop/azure-pipelines.yml
2327
[AzurePipelines(AzurePipelinesImage.WindowsLatest,
2428
AutoGenerate = false,
@@ -61,10 +65,10 @@ class Build : NukeBuild
6165

6266
[Parameter("Enable coverlet diagnostics (log.*.txt)")] readonly bool CoverletDiag;
6367

64-
[Parameter("Is CI Build (AppVeyor)")] readonly bool IsCiBuild = Host is AppVeyor;
68+
[Parameter("Is CI Build (AppVeyor)")] readonly bool IsCiBuild = Host is GitHubActions;
6569

6670
[Parameter("Push built NuGet package")]
67-
readonly bool IsPushTag = (Environment.GetEnvironmentVariable("APPVEYOR_REPO_TAG") ?? "-unset-") == "true";
71+
readonly bool IsPushTag = (Environment.GetEnvironmentVariable("GITHUB_REF") ?? "-unset-").StartsWith("refs/tags/");
6872

6973
[Parameter("NuGet API Key")] readonly string NuGetApiKey = Environment.GetEnvironmentVariable("NUGET_API_KEY");
7074
[Parameter("NuGet Source")] readonly string NuGetSource = "https://www.nuget.org";
@@ -116,7 +120,7 @@ class Build : NukeBuild
116120
.SetConfiguration(Configuration)
117121
.EnableNoBuild()
118122
.EnableBlameMode()
119-
.SetLogger("trx")
123+
.AddLoggers("trx")
120124
.EnableCollectCoverage()
121125
.SetDataCollector("XPlat Code Coverage")
122126
.SetSettingsFile("coverage.runsettings")

‎build/_build.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
<NoWarn>CS0649;CS0169</NoWarn>
77
<NukeRootDirectory>..</NukeRootDirectory>
88
<NukeScriptDirectory>..</NukeScriptDirectory>
9+
<NukeTelemetryVersion>1</NukeTelemetryVersion>
910
</PropertyGroup>
1011

1112
<ItemGroup>
12-
<PackageReference Include="Nuke.Common" Version="5.1.1" />
13-
<PackageDownload Include="GitVersion.Tool" Version="[5.6.9]" />
14-
<PackageDownload Include="NuGet.CommandLine" Version="[5.8.1]" />
15-
<PackageDownload Include="dotnet-sonarscanner" Version="[5.2.0]" />
16-
<PackageDownload Include="ReportGenerator" Version="[4.8.8]" />
13+
<PackageReference Include="Nuke.Common" Version="5.3.0" />
14+
<PackageDownload Include="GitVersion.Tool" Version="[5.6.11]" />
15+
<PackageDownload Include="NuGet.CommandLine" Version="[5.10.0]" />
16+
<PackageDownload Include="dotnet-sonarscanner" Version="[5.2.2]" />
17+
<PackageDownload Include="ReportGenerator" Version="[4.8.12]" />
1718
</ItemGroup>
1819

1920
</Project>

0 commit comments

Comments
 (0)