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: dotnet/Nerdbank.GitVersioning
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.4.231
Choose a base ref
...
head repository: dotnet/Nerdbank.GitVersioning
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.4.244
Choose a head ref
  • 16 commits
  • 36 files changed
  • 2 contributors

Commits on Aug 23, 2021

  1. Configuration menu
    Copy the full SHA
    9ead478 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2021

  1. Drop .NET Core 2.1 SDK support

    2.1 has fallen out of its LTS lifetime, and the docker images have been removed.
    AArnott committed Aug 28, 2021
    Configuration menu
    Copy the full SHA
    1c1be61 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #649 from dotnet/drop2.1

    Drop .NET Core 2.1 SDK support
    AArnott authored Aug 28, 2021
    Configuration menu
    Copy the full SHA
    0d49d20 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #644 from dotnet/IsNull

    Apply `is null` pattern and analyzer
    AArnott authored Aug 28, 2021
    Configuration menu
    Copy the full SHA
    0b29e5a View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2021

  1. Add test for version height with path filters and merge conflict

    This demonstrates the repro for #658
    AArnott committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    3866cd6 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2021

  1. Count merge commits in path filtered height if any parent changed it

    The managed git implementation had it correctly implemented, according to the code comments in the libgit2 implementation. But those code comments did not match the *code* in the libgit2 implementation. As a result, the managed git code did not match.
    In this commit I correct the libgit2 impl code comments to describe what the code *actually* does. Then I fix the identical code comment and code in the managed git implementation to match.
    
    Fixes #658
    AArnott committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    96be5aa View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2021

  1. Update nbgv to ship MSBuild 16.9

    This is the latest version that still supports netcoreapp3.1.
    This should fix the problem of parsing msbuild project files with metadata as xml attributes.
    AArnott committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    c13d166 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    496c359 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5e7a00e View commit details
    Browse the repository at this point in the history
  4. Update nbgv's NuGet dependency to 5.11.0

    Fixes #588
    AArnott committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    2b80c11 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #660 from dotnet/fix588

    Fix `nbgv` dependencies
    AArnott authored Sep 23, 2021
    Configuration menu
    Copy the full SHA
    2a3260a View commit details
    Browse the repository at this point in the history
  6. Merge pull request #659 from dotnet/fix658

    Count merge commits in path filtered height if any parent changed it
    AArnott authored Sep 23, 2021
    Configuration menu
    Copy the full SHA
    5496648 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2021

  1. Configuration menu
    Copy the full SHA
    e929e74 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #669 from dotnet/fix630

    Suppress `cloudBuild.buildNumber: null` being written for `nbgv prepare-release`
    AArnott authored Oct 11, 2021
    Configuration menu
    Copy the full SHA
    3b3db33 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2021

  1. Configuration menu
    Copy the full SHA
    5265bd9 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2021

  1. Merge pull request #675 from luboshl/feature/v3.4/vsts-set-cloud-buil…

    …d-variable-retry
    
    Add retry to SetCloudBuildVariable method in VisualStudioTeamServices
    AArnott authored Oct 23, 2021
    Configuration menu
    Copy the full SHA
    c60a072 View commit details
    Browse the repository at this point in the history
Loading