Skip to content

Commit 0fb4cac

Browse files
committed
libgit2sharp update
1 parent 406bebd commit 0fb4cac

File tree

9 files changed

+13
-32
lines changed

9 files changed

+13
-32
lines changed

src/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
</PropertyGroup>
1616
<PropertyGroup>
17-
<PackageVersion_LibGit2Sharp>0.25.0-preview-0033</PackageVersion_LibGit2Sharp>
18-
<PackageVersion_LibGit2SharpNativeBinaries>[1.0.185]</PackageVersion_LibGit2SharpNativeBinaries>
17+
<PackageVersion_LibGit2Sharp>0.26.0</PackageVersion_LibGit2Sharp>
18+
<PackageVersion_LibGit2SharpNativeBinaries>[2.0.267]</PackageVersion_LibGit2SharpNativeBinaries>
1919
<PackageVersion_JetBrainsAnnotations>2019.1.1</PackageVersion_JetBrainsAnnotations>
2020
<PackageVersion_YamlDotNet>6.0.0</PackageVersion_YamlDotNet>
2121
</PropertyGroup>

src/Docker/net472/linux/debian-9/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ FROM mono:5.14
22
LABEL maintainers="GitTools Maintainers"
33
ARG contentFolder
44

5-
RUN sed -i '/jessie-updates/d' /etc/apt/sources.list && apt-get update && \
6-
apt-get install -y libgit2-dev && \
7-
ln -s /usr/lib/x86_64-linux-gnu/libgit2.so /lib/x86_64-linux-gnu/libgit2-15e1193.so
8-
95
WORKDIR /app
106
COPY $contentFolder/ ./
117

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
FROM centos:7
22
LABEL maintainers="GitTools Maintainers"
33

4-
ENV DOTNET_VERSION='2.1'
4+
ENV DOTNET_VERSION='2.1'
55
ARG contentFolder
66

77
# https://dotnet.microsoft.com/download/linux-package-manager/rhel/sdk-current
88
RUN rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm \
99
&& yum update cache
1010

1111
# if you need SDK use dotnet-sdk-$DOTNET_VERSION
12-
RUN yum install -y dotnet-runtime-$DOTNET_VERSION.x86_64 unzip libgit2-devel.x86_64 \
12+
RUN yum install -y dotnet-runtime-$DOTNET_VERSION.x86_64 \
1313
&& yum clean all \
1414
&& rm -rf /tmp/*
1515

16-
RUN ln -s /usr/lib64/libgit2.so /usr/lib64/libgit2-15e1193.so
17-
1816
WORKDIR /app
1917
COPY $contentFolder/ ./
2018

21-
ENTRYPOINT ["dotnet", "GitVersion.dll"]
19+
ENTRYPOINT ["dotnet", "GitVersion.dll"]

src/Docker/netcoreapp2.1/linux/debian-9/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ FROM mcr.microsoft.com/dotnet/core/runtime:2.1
22
LABEL maintainers="GitTools Maintainers"
33
ARG contentFolder
44

5-
RUN apt-get update && \
6-
apt-get install -y libgit2-dev && \
7-
ln -s /usr/lib/x86_64-linux-gnu/libgit2.so /lib/x86_64-linux-gnu/libgit2-15e1193.so
8-
95
WORKDIR /app
106
COPY $contentFolder/ ./
117

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
FROM fedora:27
22
LABEL maintainers="GitTools Maintainers"
33

4-
ENV DOTNET_VERSION='2.1'
4+
ENV DOTNET_VERSION='2.1'
55
ARG contentFolder
66

77
# https://dotnet.microsoft.com/download/linux-package-manager/rhel/sdk-current
8-
RUN rpm -Uvh https://packages.microsoft.com/config/fedora/27/packages-microsoft-prod.rpm
8+
RUN rpm -Uvh https://packages.microsoft.com/config/fedora/27/packages-microsoft-prod.rpm
99

1010
# if you need SDK use dotnet-sdk-$DOTNET_VERSION
11-
RUN yum install -y dotnet-runtime-$DOTNET_VERSION.x86_64 unzip libgit2-devel.x86_64 \
11+
RUN yum install -y dotnet-runtime-$DOTNET_VERSION.x86_64\
1212
&& yum clean all \
1313
&& rm -rf /tmp/*
1414

15-
RUN ln -s /usr/lib64/libgit2.so /usr/lib64/libgit2-15e1193.so
16-
1715
WORKDIR /app
1816
COPY $contentFolder/ ./
1917

20-
ENTRYPOINT ["dotnet", "GitVersion.dll"]
18+
ENTRYPOINT ["dotnet", "GitVersion.dll"]

src/Docker/netcoreapp2.2/linux/centos-7/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ RUN rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-pro
99
&& yum update cache
1010

1111
# if you need SDK use dotnet-sdk-$DOTNET_VERSION
12-
RUN yum install -y dotnet-runtime-$DOTNET_VERSION.x86_64 unzip libgit2-devel.x86_64 \
12+
RUN yum install -y dotnet-runtime-$DOTNET_VERSION.x86_64 \
1313
&& yum clean all \
1414
&& rm -rf /tmp/*
1515

16-
RUN ln -s /usr/lib64/libgit2.so /usr/lib64/libgit2-15e1193.so
17-
1816
WORKDIR /app
1917
COPY $contentFolder/ ./
2018

src/Docker/netcoreapp2.2/linux/debian-9/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ FROM mcr.microsoft.com/dotnet/core/runtime:2.2
22
LABEL maintainers="GitTools Maintainers"
33
ARG contentFolder
44

5-
RUN apt-get update && \
6-
apt-get install -y libgit2-dev && \
7-
ln -s /usr/lib/x86_64-linux-gnu/libgit2.so /lib/x86_64-linux-gnu/libgit2-15e1193.so
8-
95
WORKDIR /app
106
COPY $contentFolder/ ./
117

src/Docker/netcoreapp2.2/linux/fedora-27/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ ENV DOTNET_VERSION='2.2'
55
ARG contentFolder
66

77
# https://dotnet.microsoft.com/download/linux-package-manager/rhel/sdk-current
8-
RUN rpm -Uvh https://packages.microsoft.com/config/fedora/27/packages-microsoft-prod.rpm
8+
RUN rpm -Uvh https://packages.microsoft.com/config/fedora/27/packages-microsoft-prod.rpm
99

1010
# if you need SDK use dotnet-sdk-$DOTNET_VERSION
11-
RUN yum install -y dotnet-runtime-$DOTNET_VERSION.x86_64 unzip libgit2-devel.x86_64 \
11+
RUN yum install -y dotnet-runtime-$DOTNET_VERSION.x86_64 \
1212
&& yum clean all \
1313
&& rm -rf /tmp/*
1414

15-
RUN ln -s /usr/lib64/libgit2.so /usr/lib64/libgit2-15e1193.so
16-
1715
WORKDIR /app
1816
COPY $contentFolder/ ./
1917

src/GitVersionCore.Tests/Mocks/MockRepository.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ public IQueryableCommitLog Commits
225225
public ObjectDatabase ObjectDatabase { get; set; }
226226
public NoteCollection Notes { get; set; }
227227
public SubmoduleCollection Submodules { get; set; }
228+
public WorktreeCollection Worktrees { get; set; }
228229
public Rebase Rebase { get; private set; }
229230

230231
public Ignore Ignore

0 commit comments

Comments
 (0)