Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
update to libgit2sharp 0.26.0
update to libgit2sharp 0.26.0
  • Loading branch information
arturcic committed Jun 24, 2019
commit c4e0d6826f803a462d88cb821aefc44a5f613eca
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

</PropertyGroup>
<PropertyGroup>
<PackageVersion_LibGit2Sharp>0.25.0-preview-0033</PackageVersion_LibGit2Sharp>
<PackageVersion_LibGit2Sharp>0.26.0</PackageVersion_LibGit2Sharp>
<PackageVersion_JetBrainsAnnotations>2019.1.1</PackageVersion_JetBrainsAnnotations>
<PackageVersion_YamlDotNet>6.1.1</PackageVersion_YamlDotNet>
</PropertyGroup>
Expand Down
4 changes: 0 additions & 4 deletions src/Docker/net472/linux/debian-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ FROM mono:5.14
LABEL maintainers="GitTools Maintainers"
ARG contentFolder

RUN sed -i '/jessie-updates/d' /etc/apt/sources.list && apt-get update && \
apt-get install -y libgit2-dev && \
ln -s /usr/lib/x86_64-linux-gnu/libgit2.so /lib/x86_64-linux-gnu/libgit2-15e1193.so

WORKDIR /app
COPY $contentFolder/ ./

Expand Down
8 changes: 3 additions & 5 deletions src/Docker/netcoreapp2.1/linux/centos-7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
FROM centos:7
LABEL maintainers="GitTools Maintainers"

ENV DOTNET_VERSION='2.1'
ENV DOTNET_VERSION='2.1'
ARG contentFolder

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

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

RUN ln -s /usr/lib64/libgit2.so /usr/lib64/libgit2-15e1193.so

WORKDIR /app
COPY $contentFolder/ ./

ENTRYPOINT ["dotnet", "GitVersion.dll"]
ENTRYPOINT ["dotnet", "GitVersion.dll"]
4 changes: 0 additions & 4 deletions src/Docker/netcoreapp2.1/linux/debian-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ FROM mcr.microsoft.com/dotnet/core/runtime:2.1
LABEL maintainers="GitTools Maintainers"
ARG contentFolder

RUN apt-get update && \
apt-get install -y libgit2-dev && \
ln -s /usr/lib/x86_64-linux-gnu/libgit2.so /lib/x86_64-linux-gnu/libgit2-15e1193.so

WORKDIR /app
COPY $contentFolder/ ./

Expand Down
10 changes: 4 additions & 6 deletions src/Docker/netcoreapp2.1/linux/fedora-27/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
FROM fedora:27
LABEL maintainers="GitTools Maintainers"

ENV DOTNET_VERSION='2.1'
ENV DOTNET_VERSION='2.1'
ARG contentFolder

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

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

RUN ln -s /usr/lib64/libgit2.so /usr/lib64/libgit2-15e1193.so

WORKDIR /app
COPY $contentFolder/ ./

ENTRYPOINT ["dotnet", "GitVersion.dll"]
ENTRYPOINT ["dotnet", "GitVersion.dll"]
4 changes: 1 addition & 3 deletions src/Docker/netcoreapp2.2/linux/centos-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ RUN rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-pro
&& yum update cache

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

RUN ln -s /usr/lib64/libgit2.so /usr/lib64/libgit2-15e1193.so

WORKDIR /app
COPY $contentFolder/ ./

Expand Down
4 changes: 0 additions & 4 deletions src/Docker/netcoreapp2.2/linux/debian-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ FROM mcr.microsoft.com/dotnet/core/runtime:2.2
LABEL maintainers="GitTools Maintainers"
ARG contentFolder

RUN apt-get update && \
apt-get install -y libgit2-dev && \
ln -s /usr/lib/x86_64-linux-gnu/libgit2.so /lib/x86_64-linux-gnu/libgit2-15e1193.so

WORKDIR /app
COPY $contentFolder/ ./

Expand Down
6 changes: 2 additions & 4 deletions src/Docker/netcoreapp2.2/linux/fedora-27/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ ENV DOTNET_VERSION='2.2'
ARG contentFolder

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

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

RUN ln -s /usr/lib64/libgit2.so /usr/lib64/libgit2-15e1193.so

WORKDIR /app
COPY $contentFolder/ ./

Expand Down
1 change: 1 addition & 0 deletions src/GitVersionCore.Tests/Mocks/MockRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ public IQueryableCommitLog Commits
public ObjectDatabase ObjectDatabase { get; set; }
public NoteCollection Notes { get; set; }
public SubmoduleCollection Submodules { get; set; }
public WorktreeCollection Worktrees { get; set; }
public Rebase Rebase { get; private set; }

public Ignore Ignore
Expand Down