Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nunit/nunit-console
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.13
Choose a base ref
...
head repository: nunit/nunit-console
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.13.1
Choose a head ref

Commits on Dec 16, 2021

  1. Copy the full SHA
    bcc8650 View commit details
  2. Merge pull request #1051 from nunit/issue-361

    Remove Rebracer.xml and NUnitConsole.sln.DotSettings
    CharliePoole authored Dec 16, 2021
    Copy the full SHA
    233d16e View commit details

Commits on Dec 20, 2021

  1. Update to Cake 1.3.0

    CharliePoole committed Dec 20, 2021
    Copy the full SHA
    28cf9b8 View commit details

Commits on Dec 21, 2021

  1. Merge pull request #1053 from nunit/issue-1047

    Update to Cake 1.3.0
    CharliePoole authored Dec 21, 2021
    Copy the full SHA
    4d0e9d8 View commit details
  2. Copy the full SHA
    8410de7 View commit details
  3. Copy the full SHA
    1ec8bb6 View commit details
  4. Copy the full SHA
    181e8db View commit details
  5. Refactor build.cake

    CharliePoole committed Dec 21, 2021
    Copy the full SHA
    6b75e38 View commit details
  6. Copy the full SHA
    22fa9ad View commit details
  7. Copy the full SHA
    0513876 View commit details
  8. Copy the full SHA
    b490b28 View commit details
  9. Copy the full SHA
    7b17c4e View commit details
  10. Copy the full SHA
    edf0beb View commit details
  11. Copy the full SHA
    3e4b184 View commit details

Commits on Dec 26, 2021

  1. Rewrite packaging code

    CharliePoole committed Dec 26, 2021
    Copy the full SHA
    52d9976 View commit details
  2. Refactor header checks

    CharliePoole committed Dec 26, 2021
    Copy the full SHA
    ed6d2fe View commit details

Commits on Dec 28, 2021

  1. Merge pull request #1054 from nunit/cake-scripts

    Refactor cake scripts
    CharliePoole authored Dec 28, 2021
    Copy the full SHA
    e77cf83 View commit details

Commits on Dec 30, 2021

  1. Copy the full SHA
    348a7e4 View commit details
  2. Merge pull request #1060 from nunit/issue-1059

    Upgrade cake to version 2.0.0
    CharliePoole authored Dec 30, 2021
    Copy the full SHA
    dbddf7a View commit details
  3. Copy the full SHA
    ace8bca View commit details
  4. Change tabs to spaces

    CharliePoole committed Dec 30, 2021
    Copy the full SHA
    f45794f View commit details
  5. Merge pull request #1062 from nunit/bld-pkg

    Let PackageDefinition build the package itself
    CharliePoole authored Dec 30, 2021
    Copy the full SHA
    435cfd9 View commit details

Commits on Dec 31, 2021

  1. Copy the full SHA
    24fec2c View commit details
  2. Copy the full SHA
    361b336 View commit details

Commits on Jan 1, 2022

  1. Use GitVersion 5.6.3

    CharliePoole committed Jan 1, 2022
    Copy the full SHA
    5e21e6d View commit details
  2. Merge pull request #1063 from nunit/issue-1061

    Use GitVersion for versioning
    CharliePoole authored Jan 1, 2022
    Copy the full SHA
    215c253 View commit details
  3. Add VERSIONING document

    CharliePoole committed Jan 1, 2022
    Copy the full SHA
    fda4940 View commit details
  4. Copy the full SHA
    4756bd0 View commit details
  5. Copy the full SHA
    e183767 View commit details
  6. Merge pull request #1066 from nunit/issue-1064

    Use Cake script to upload to MyGet
    CharliePoole authored Jan 1, 2022
    Copy the full SHA
    7c47bbf View commit details
  7. Copy the full SHA
    0f8974d View commit details
  8. Copy the full SHA
    c0cc41e View commit details
  9. Merge pull request #1067 from nunit/chore/use-strongly-typed-property

    fix: Use the SymbolPackageFormat property
    mikkelbu authored Jan 1, 2022
    Copy the full SHA
    0226812 View commit details
  10. Update VERSIONING.md

    Co-authored-by: Joseph Musser <me@jnm2.com>
    CharliePoole and jnm2 authored Jan 1, 2022
    Copy the full SHA
    15a0760 View commit details
  11. Merge pull request #1068 from nunit/issue-1064b

    Fix criteria for publising to MyGet
    CharliePoole authored Jan 1, 2022
    Copy the full SHA
    b334ebb View commit details
  12. Merge pull request #1056 from nunit/issue-1055

    Add VERSIONING document
    CharliePoole authored Jan 1, 2022
    Copy the full SHA
    d375683 View commit details

Commits on Jan 2, 2022

  1. Copy the full SHA
    66f1f7d View commit details
  2. Merge pull request #1069 from nunit/issue-1065

    Publish to NuGet and Chocolatey
    CharliePoole authored Jan 2, 2022
    Copy the full SHA
    fb6f046 View commit details
  3. Copy the full SHA
    a836809 View commit details
  4. Merge pull request #1071 from nunit/issue-1070

    Create Draft release on release branch
    CharliePoole authored Jan 2, 2022
    Copy the full SHA
    84f4a2e View commit details
  5. Copy the full SHA
    b0bca52 View commit details

Commits on Jan 3, 2022

  1. Merge pull request #1074 from nunit/issue-1072

    Code to perform a production release on GitHub
    CharliePoole authored Jan 3, 2022
    Copy the full SHA
    32b9434 View commit details

Commits on Jan 4, 2022

  1. Copy the full SHA
    6c05946 View commit details
  2. Copy the full SHA
    c80178a View commit details
  3. Merge pull request #1076 from nunit/release-3.13.1

    Release 3.13.1
    CharliePoole authored Jan 4, 2022
    Copy the full SHA
    6332769 View commit details
Showing with 2,041 additions and 2,150 deletions.
  1. +12 −0 .config/dotnet-tools.json
  2. +1 −2 .gitignore
  3. +6 −27 BUILDING.md
  4. +53 −0 GitReleaseManager.yaml
  5. +12 −0 GitVersion.yml
  6. +31 −0 NUnitConsole.sln
  7. +0 −177 NUnitConsole.sln.DotSettings
  8. +0 −96 Rebracer.xml
  9. +81 −0 VERSIONING.md
  10. +10 −10 appveyor.yml
  11. +5 −7 azure-pipelines.yml
  12. +368 −533 build.cake
  13. +11 −2 build.cmd
  14. +9 −252 build.ps1
  15. +7 −112 build.sh
  16. +78 −0 cake/constants.cake
  17. +6 −2 { → cake}/header-check.cake
  18. +223 −0 cake/package-checks.cake
  19. +345 −0 cake/package-definitions.cake
  20. +124 −0 cake/package-tester.cake
  21. +95 −0 cake/package-tests.cake
  22. 0 { → cake}/test-results.cake
  23. +261 −0 cake/utilities.cake
  24. +114 −0 cake/versioning.cake
  25. +48 −0 choco/nunit-console-runner.nuspec
  26. +0 −42 ci.cake
  27. +0 −30 local-tasks.cake
  28. +6 −6 nuget/engine/nunit.engine.api.nuspec
  29. +55 −55 nuget/engine/nunit.engine.nuspec
  30. +2 −2 nuget/runners/nunit.console-runner-with-extensions.nuspec
  31. +17 −17 nuget/runners/nunit.console-runner.netcore.nuspec
  32. +48 −48 nuget/runners/nunit.console-runner.nuspec
  33. +0 −323 package-checks.cake
  34. +0 −399 package-tests.cake
  35. +2 −2 src/NUnitConsole/ConsoleVersion.cs
  36. +1 −1 src/NUnitEngine/EngineApiVersion.cs
  37. +2 −2 src/NUnitEngine/EngineVersion.cs
  38. +1 −1 src/NUnitEngine/nunit.engine.tests/Helpers/{ProcessUtils.cs → ProcessTester.cs}
  39. +1 −1 src/NUnitEngine/nunit.engine.tests/Integration/RemoteAgentTests.cs
  40. +1 −1 tools/packages.config
  41. +5 −0 zip/nunit.bundle.addins
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"cake.tool": {
"version": "2.0.0",
"commands": [
"dotnet-cake"
]
}
}
}
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -183,8 +183,7 @@ MockAssemblyResult.xml
PortabilityAnalysis*.html
tools
!tools/packages.config
extension-packages
zip-image
bundled-extensions

# =========================
# Docker Mono build packages
33 changes: 6 additions & 27 deletions BUILDING.md
Original file line number Diff line number Diff line change
@@ -35,40 +35,19 @@ and ensure that Cake is properly installed before trying to run the cake script.
build to work on CI servers using newly created agents to run the build and we generally run it
the same way on our own machines.

The build shell script and build.cmd script are provided as an easy way to run the above commands.
In addition to passing their arguments through to build.cake, they can supply added arguments
through the CAKE_ARGS environment variable. The rest of this document will assume use of these commands.

There is one case in which use of the CAKE_ARGS environment variable will be essential, if not necessary.
If you are running builds on a 32-bit Windows system, you must always supply the -Experimental argument
to the build. Use set CAKE_ARGS=-Experimental to ensure this is always done and avoid having to type
it out each time.

Key arguments to build.cmd / build:
* -Target, -t <task> The task to run - see below.
* -Configuration, -c [Release|Debug] The configuration to use (default is Release)
* -ShowDescription Shows all of the build tasks and their descriptions
* -Experimental, -e Use the experimental build of Roslyn

Key arguments to build.cmd / build.ps1 / build.sh :
* --target=<task> The task to run (default is Build)
* --configuration=[Release|Debug] The configuration to use (default is Release)

The build.cake script contains a large number of interdependent tasks. The most
important top-level tasks to use are listed here:

```
* Build Builds everything. This is the default if no target is given.
* Rebuild Cleans the output directory and builds everything
* Test Runs all tests. Dependent on Build.
* Package Creates all packages without building first. See Note below.
* Test Runs all unit tests. Dependent on Build.
* Package Builds, Verifies and Tests all packages. Dependent on Build.
```

For a full list of tasks, run `build.cmd -ShowDescription`.

### Notes:
1. By design, the Package target does not depend on Build. This is to allow re-packaging
when necessary without changing the binaries themselves. Of course, this means that
you have to be very careful that the build is up to date before packaging.

2. For additional targets, refer to the build.cake script itself.

### Building and testing for Linux on a Windows machine

Most of the time, it's not necessary to build or run tests on platforms other than your primary
53 changes: 53 additions & 0 deletions GitReleaseManager.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# NOTE: The milestone must not contain any closed issues without one
# of the labels listed here under issue-labels-include or issue-labels-exclude.
# If no such label is found, then GRM fails with an error.

# The labels that will be used to include issues in release notes.
issue-labels-include:
- Breaking Change
- Feature
- Enhancement
- Bug
- Build
- Documentation
# The labels that will NOT be used when including issues in release notes.
issue-labels-exclude:
- Refactor
# Overrides default pluralization and header names for specific labels.
issue-labels-alias:
- name: Build
header: Build
plural: Build
- name: Documentation
header: Documentation
plural: Documentation
# Configuration values used when creating new releases
create:
include-footer: true
footer-heading: Choosing a Package
footer-content: >-
The package `nunit-console-runner.nupkg` is a Chocolatey package and
should be installed using `choco.exe`. It is also available at
[chocolatey.org](https://chocolatey.org/packages/nunit-console-runner/).
All other `.nupkg` packages are intended for use with `nuget.exe` and may
be downloaded from [nuget.org](https://nuget.org) as well as here.
footer-includes-milestone: false
include-sha-section: true
sha-section-heading: "SHA256 Hashes of the release artifacts"
sha-section-line-format: "- `{1}\t{0}`"
allow-update-to-published: false
# Configuration values used when exporting release notes
export:
include-created-date-in-title: true
created-date-string-format: MMMM dd, yyyy
perform-regex-removal: false
close:
# Whether to add comments to issues closed with the published milestone release.
use-issue-comments: true
issue-comment: |-
This issue has been resolved in version {milestone}
The release is available on:
[GitHub](https://github.com/{owner}/{repository}/releases/tag/{milestone}).
NuGet packages are also available [NuGet.org](https://www.nuget.org) and
Chocolatey Packages may be found at [Chocolatey.org](https://chocolatey.org)
12 changes: 12 additions & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
next-version: 3.14.0
mode: ContinuousDelivery
legacy-semver-padding: 5
build-metadata-padding: 5
commits-since-version-source-padding: 5
branches:
master:
tag: dev
release:
tag: pre
pull-request:
tag: pr
31 changes: 31 additions & 0 deletions NUnitConsole.sln
Original file line number Diff line number Diff line change
@@ -11,11 +11,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
appveyor.yml = appveyor.yml
azure-pipelines.yml = azure-pipelines.yml
build.cake = build.cake
build.ps1 = build.ps1
build.sh = build.sh
BUILDING.md = BUILDING.md
CHANGES.txt = CHANGES.txt
ci.cake = ci.cake
CONTRIBUTING.md = CONTRIBUTING.md
src\Directory.Build.props = src\Directory.Build.props
GitReleaseManager.yaml = GitReleaseManager.yaml
GitVersion.yml = GitVersion.yml
header-check.cake = header-check.cake
LICENSE.txt = LICENSE.txt
NetFXTests.nunit = NetFXTests.nunit
@@ -26,6 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
package-tests.cake = package-tests.cake
README.md = README.md
test-results.cake = test-results.cake
VERSIONING.md = VERSIONING.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{A972031D-2F61-4183-AF75-99EE1A9F6B32}"
@@ -104,6 +109,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated",
choco\deprecated\nunit-console-with-extensions.nuspec = choco\deprecated\nunit-console-with-extensions.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cake", "cake", "{9BCA00E2-D072-424B-A6DF-5BECF719C1FB}"
ProjectSection(SolutionItems) = preProject
cake\constants.cake = cake\constants.cake
cake\header-check.cake = cake\header-check.cake
cake\package-checks.cake = cake\package-checks.cake
cake\package-definitions.cake = cake\package-definitions.cake
cake\package-tester.cake = cake\package-tester.cake
cake\package-tests.cake = cake\package-tests.cake
cake\test-results.cake = cake\test-results.cake
cake\utilities.cake = cake\utilities.cake
cake\versioning.cake = cake\versioning.cake
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{0C0D20CE-70CD-4CEF-BE9B-AEB8A2DE9C8A}"
ProjectSection(SolutionItems) = preProject
msi\resources\nunit.bundle.addins = msi\resources\nunit.bundle.addins
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "zip", "zip", "{20005864-BE82-412D-99BF-288E2D8370E9}"
ProjectSection(SolutionItems) = preProject
zip\nunit.bundle.addins = zip\nunit.bundle.addins
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -176,6 +204,9 @@ Global
{333D2FBC-CCA7-46AF-9453-C310671A67B0} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{9D3015EE-5B84-41B3-A1D3-1A439370C392} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{068F6CA9-6108-4F45-8540-351AA5227259} = {4FDF7BFA-A337-41D3-898D-C6A98278E6AD}
{9BCA00E2-D072-424B-A6DF-5BECF719C1FB} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
{0C0D20CE-70CD-4CEF-BE9B-AEB8A2DE9C8A} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
{20005864-BE82-412D-99BF-288E2D8370E9} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}
Loading