From d0411d624d9519847ddd7f5927504df9e5c0de42 Mon Sep 17 00:00:00 2001 From: Alexander Ovchinnikov <56644701+A-Ovchinnikov-mx@users.noreply.github.com> Date: Fri, 4 Dec 2020 16:44:42 +0100 Subject: [PATCH 1/6] Update libgit2 to v1.1.0 --- .../workflows/Build_and_publish_package.yml | 25 +++++++++---------- LibGit2Sharp/LibGit2Sharp.csproj | 2 +- mx_nuget.package/Mendix_package.nuspec | 12 ++++----- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.github/workflows/Build_and_publish_package.yml b/.github/workflows/Build_and_publish_package.yml index 1f3c080e..f0cf325f 100644 --- a/.github/workflows/Build_and_publish_package.yml +++ b/.github/workflows/Build_and_publish_package.yml @@ -3,13 +3,13 @@ name: Build and Deploy Packages on: push: branches: - - master + - mendix/releases env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: 'Release' - NUPKG_VERSION: '1.101.11' - + NUPKG_VERSION: '1.110.1' + jobs: build: # The CMake configure and build commands are platform agnostic and should work equally @@ -17,37 +17,36 @@ jobs: # cross-platform coverage. # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix runs-on: windows-latest - + steps: # Checkout repo into build area - uses: actions/checkout@v2 with: fetch-depth: 0 # avoid shallow clone so nbgv can do its work. - + # install nbgv please check https://github.com/dotnet/Nerdbank.GitVersioning for more info about nbgv - uses: dotnet/nbgv@master - id: nbgv - + id: nbgv + # Build and deploy nuget package # We include the GitHub package source so that we can reference current packages and also so that we can push to the package repo - name: Build Project and Package run: | - nuget source Add -Name "GitHub" -Source "https://nuget.pkg.github.com/mendix/index.json" -UserName srv-LibGit2sharp-mendix -Password ${{ secrets.GHPACKAGESTOKEN }} + nuget source Add -Name "GitHub" -Source "https://nuget.pkg.github.com/mendix/index.json" -UserName ${{ secrets.GHPACKAGESUSER }} -Password ${{ secrets.GHPACKAGESTOKEN }} dotnet build -c Release nuget pack .\mx_nuget.package\Mendix_package.nuspec -Version ${{ env.NUPKG_VERSION }} -NoPackageAnalysis shell: powershell #Keep as powershell and not pwsh - + - name: Upload build artifacts uses: actions/upload-artifact@v2 with: name: nuget package - path: ${{ github.workspace }}/**/*.nupkg + path: ${{ github.workspace }}/**/*.nupkg # After build we copy the binaries to package output folder - # Finally we pack and push the package to github packages + # Finally we pack and push the package to github packages - name: Deploy Package run: | - nuget source Add -Name "GitHub" -Source "https://nuget.pkg.github.com/mendix/index.json" -UserName srv-LibGit2sharp-mendix -Password ${{ secrets.GHPACKAGESTOKEN }} + nuget source Add -Name "GitHub" -Source "https://nuget.pkg.github.com/mendix/index.json" -UserName ${{ secrets.GHPACKAGESUSER }} -Password ${{ secrets.GHPACKAGESTOKEN }} nuget push **/Mendix.LibGit2Sharp*.nupkg -Source "GitHub" -SkipDuplicate shell: powershell #Keep as powershell and not pwsh - \ No newline at end of file diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj index d5e9abba..4e9bebfb 100644 --- a/LibGit2Sharp/LibGit2Sharp.csproj +++ b/LibGit2Sharp/LibGit2Sharp.csproj @@ -29,7 +29,7 @@ - + diff --git a/mx_nuget.package/Mendix_package.nuspec b/mx_nuget.package/Mendix_package.nuspec index 6fe56c7e..ef3a22f3 100644 --- a/mx_nuget.package/Mendix_package.nuspec +++ b/mx_nuget.package/Mendix_package.nuspec @@ -2,7 +2,7 @@ Mendix.LibGit2Sharp - 1.0.1-mx + 0.0.1 LibGit2Sharp contributors mendix https://raw.githubusercontent.com/libgit2/libgit2/master/COPYING @@ -12,18 +12,18 @@ false LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .Net and Mono. - + - + - - + + - + \ No newline at end of file From 059c0f036ed33e9229fade9a26c9518df8ebff3f Mon Sep 17 00:00:00 2001 From: A-Ovchinnikov-mx <56644701+A-Ovchinnikov-mx@users.noreply.github.com> Date: Wed, 9 Dec 2020 16:12:11 +0100 Subject: [PATCH 2/6] Update Build_and_publish_package.yml Explicitly use windows-2019 virtual CI environment --- .github/workflows/Build_and_publish_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build_and_publish_package.yml b/.github/workflows/Build_and_publish_package.yml index f0cf325f..8468bd27 100644 --- a/.github/workflows/Build_and_publish_package.yml +++ b/.github/workflows/Build_and_publish_package.yml @@ -16,7 +16,7 @@ jobs: # well on Windows or Mac. You can convert this to a matrix build if you need # cross-platform coverage. # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix - runs-on: windows-latest + runs-on: windows-2019 steps: # Checkout repo into build area From f92cccea547c22a58a9236ceaf1af5fc1c94764f Mon Sep 17 00:00:00 2001 From: Alexander Ovchinnikov <56644701+A-Ovchinnikov-mx@users.noreply.github.com> Date: Thu, 10 Dec 2020 15:21:43 +0100 Subject: [PATCH 3/6] Remove Mendix_package.nuspec Use LibGit2Sharp.csproj and dotnet pack instead --- .../workflows/Build_and_publish_package.yml | 16 ++++------ LibGit2Sharp/LibGit2Sharp.csproj | 6 ++++ mx_nuget.package/Mendix_package.nuspec | 29 ------------------- version.json | 6 +--- 4 files changed, 12 insertions(+), 45 deletions(-) delete mode 100644 mx_nuget.package/Mendix_package.nuspec diff --git a/.github/workflows/Build_and_publish_package.yml b/.github/workflows/Build_and_publish_package.yml index 8468bd27..57a53f3a 100644 --- a/.github/workflows/Build_and_publish_package.yml +++ b/.github/workflows/Build_and_publish_package.yml @@ -7,8 +7,7 @@ on: env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) - BUILD_TYPE: 'Release' - NUPKG_VERSION: '1.110.1' + BUILD_TYPE: Release jobs: build: @@ -24,17 +23,12 @@ jobs: with: fetch-depth: 0 # avoid shallow clone so nbgv can do its work. - # install nbgv please check https://github.com/dotnet/Nerdbank.GitVersioning for more info about nbgv - - uses: dotnet/nbgv@master - id: nbgv - # Build and deploy nuget package # We include the GitHub package source so that we can reference current packages and also so that we can push to the package repo - name: Build Project and Package run: | - nuget source Add -Name "GitHub" -Source "https://nuget.pkg.github.com/mendix/index.json" -UserName ${{ secrets.GHPACKAGESUSER }} -Password ${{ secrets.GHPACKAGESTOKEN }} - dotnet build -c Release - nuget pack .\mx_nuget.package\Mendix_package.nuspec -Version ${{ env.NUPKG_VERSION }} -NoPackageAnalysis + dotnet nuget add source "https://nuget.pkg.github.com/mendix/index.json" --name "GitHub" --username ${{ secrets.GHPACKAGESUSER }} --password ${{ secrets.GHPACKAGESTOKEN }} + dotnet pack --configuration Release --output "mx_nuget" LibGit2Sharp/LibGit2Sharp.csproj shell: powershell #Keep as powershell and not pwsh - name: Upload build artifacts @@ -47,6 +41,6 @@ jobs: # Finally we pack and push the package to github packages - name: Deploy Package run: | - nuget source Add -Name "GitHub" -Source "https://nuget.pkg.github.com/mendix/index.json" -UserName ${{ secrets.GHPACKAGESUSER }} -Password ${{ secrets.GHPACKAGESTOKEN }} - nuget push **/Mendix.LibGit2Sharp*.nupkg -Source "GitHub" -SkipDuplicate + dotnet nuget add source "https://nuget.pkg.github.com/mendix/index.json" --name "GitHub" --username ${{ secrets.GHPACKAGESUSER }} --password ${{ secrets.GHPACKAGESTOKEN }} + dotnet nuget push "mx_nuget/Mendix.LibGit2Sharp*.nupkg" --source "GitHub" --skip-duplicate shell: powershell #Keep as powershell and not pwsh diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj index 4e9bebfb..b352a946 100644 --- a/LibGit2Sharp/LibGit2Sharp.csproj +++ b/LibGit2Sharp/LibGit2Sharp.csproj @@ -16,6 +16,10 @@ ..\libgit2sharp.snk + + Mendix.LibGit2Sharp + + @@ -37,6 +41,7 @@ + diff --git a/mx_nuget.package/Mendix_package.nuspec b/mx_nuget.package/Mendix_package.nuspec deleted file mode 100644 index ef3a22f3..00000000 --- a/mx_nuget.package/Mendix_package.nuspec +++ /dev/null @@ -1,29 +0,0 @@ - - - - Mendix.LibGit2Sharp - 0.0.1 - LibGit2Sharp contributors - mendix - https://raw.githubusercontent.com/libgit2/libgit2/master/COPYING - https://github.com/mendix/libgit2sharp - - https://raw.githubusercontent.com/mendix/libgit2sharp/master/square-logo.png - false - LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .Net and Mono. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/version.json b/version.json index fd1bdbc4..63268d41 100644 --- a/version.json +++ b/version.json @@ -1,10 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.26.2", - "publicReleaseRefSpec": [ - "^refs/heads/master$", // we release out of master - "^refs/heads/maint/v\\d+(?:\\.\\d+)?$" // and maint/vNN branches - ], + "version": "1.110.1", "cloudBuild": { "buildNumber": { "enabled": true From 8ca7e2aa701284f7648c1639727ffac5344e93aa Mon Sep 17 00:00:00 2001 From: Alexander Ovchinnikov <56644701+A-Ovchinnikov-mx@users.noreply.github.com> Date: Thu, 10 Dec 2020 17:15:21 +0100 Subject: [PATCH 4/6] Fix NuGet publishing --- .github/workflows/Build_and_publish_package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Build_and_publish_package.yml b/.github/workflows/Build_and_publish_package.yml index 57a53f3a..91bc9231 100644 --- a/.github/workflows/Build_and_publish_package.yml +++ b/.github/workflows/Build_and_publish_package.yml @@ -21,14 +21,14 @@ jobs: # Checkout repo into build area - uses: actions/checkout@v2 with: - fetch-depth: 0 # avoid shallow clone so nbgv can do its work. + fetch-depth: 0 # avoid shallow clone so Nerdbank.GitVersioning can do its work. # Build and deploy nuget package # We include the GitHub package source so that we can reference current packages and also so that we can push to the package repo - name: Build Project and Package run: | dotnet nuget add source "https://nuget.pkg.github.com/mendix/index.json" --name "GitHub" --username ${{ secrets.GHPACKAGESUSER }} --password ${{ secrets.GHPACKAGESTOKEN }} - dotnet pack --configuration Release --output "mx_nuget" LibGit2Sharp/LibGit2Sharp.csproj + dotnet pack --configuration Release --output "mx_nuget" -p:PublicRelease=true LibGit2Sharp/LibGit2Sharp.csproj shell: powershell #Keep as powershell and not pwsh - name: Upload build artifacts @@ -42,5 +42,5 @@ jobs: - name: Deploy Package run: | dotnet nuget add source "https://nuget.pkg.github.com/mendix/index.json" --name "GitHub" --username ${{ secrets.GHPACKAGESUSER }} --password ${{ secrets.GHPACKAGESTOKEN }} - dotnet nuget push "mx_nuget/Mendix.LibGit2Sharp*.nupkg" --source "GitHub" --skip-duplicate + dotnet nuget push "**/mx_nuget/Mendix.LibGit2Sharp*.nupkg" --source "GitHub" --skip-duplicate shell: powershell #Keep as powershell and not pwsh From f0a32c0d1537b562b7f762b459d77304b086f8e4 Mon Sep 17 00:00:00 2001 From: A-Ovchinnikov-mx <56644701+A-Ovchinnikov-mx@users.noreply.github.com> Date: Thu, 10 Dec 2020 17:24:14 +0100 Subject: [PATCH 5/6] PackageIconUrl and PackageLicenseUrl for this fork --- LibGit2Sharp/LibGit2Sharp.csproj | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj index b352a946..aec9d592 100644 --- a/LibGit2Sharp/LibGit2Sharp.csproj +++ b/LibGit2Sharp/LibGit2Sharp.csproj @@ -51,4 +51,11 @@ --> + + + https://raw.githubusercontent.com/mendix/libgit2sharp/master/square-logo.png + https://raw.githubusercontent.com/mendix/libgit2sharp/master/LICENSE.md + + + From 1e75e183dd615b27ff5f5b05f6d740b0bcd39217 Mon Sep 17 00:00:00 2001 From: A-Ovchinnikov-mx <56644701+A-Ovchinnikov-mx@users.noreply.github.com> Date: Thu, 10 Dec 2020 17:25:02 +0100 Subject: [PATCH 6/6] Remove the old NuSpec properties --- LibGit2Sharp/LibGit2Sharp.csproj | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj index aec9d592..c5000ebf 100644 --- a/LibGit2Sharp/LibGit2Sharp.csproj +++ b/LibGit2Sharp/LibGit2Sharp.csproj @@ -41,16 +41,6 @@ - - https://raw.githubusercontent.com/mendix/libgit2sharp/master/square-logo.png