Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Upgrade dependencies and target frameworks #477

Merged
merged 9 commits into from
Nov 26, 2019
Merged

Upgrade dependencies and target frameworks #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
28d719b
Dotnet 3.0
shargon Oct 20, 2019
27a5df9
Merge branch 'master' into dotnet-3x
shargon Oct 20, 2019
9adb0c5
Update neo-cli.csproj
shargon Oct 20, 2019
701659c
Update Dockerfile
shargon Oct 20, 2019
48e9b31
Update Dockerfile
shargon Oct 20, 2019
a64a78c
Update neo-cli.csproj
shargon Oct 20, 2019
90cc4f0
Merge branch 'master' into dotnet-3x
lock9 Nov 6, 2019
94d4d5c
Update neo-cli.csproj
erikzhang Nov 26, 2019
aa64c42
Upgrade dependencies
erikzhang Nov 26, 2019
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
4 changes: 2 additions & 2 deletions ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.1-sdk
FROM mcr.microsoft.com/dotnet/core/sdk:3.0

# Install dependencies:
RUN apt-get update && apt-get install -y \
Expand Down Expand Up @@ -26,6 +26,6 @@ WORKDIR /opt/neo-cli-github
# Build the project
RUN dotnet restore
RUN dotnet publish -c Release
RUN mv bin/Release/netcoreapp2.1/publish /opt/neo-cli
RUN mv bin/Release/netcoreapp3.0/publish /opt/neo-cli

WORKDIR /opt
6 changes: 3 additions & 3 deletions neo-cli/neo-cli.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AssemblyTitle>Neo.CLI</AssemblyTitle>
<Version>3.0.0-preview1</Version>
<Authors>The Neo Project</Authors>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AssemblyName>neo-cli</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>Neo.CLI</PackageId>
Expand All @@ -28,8 +28,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Neo" Version="3.0.0-preview1" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
<PackageReference Include="Neo" Version="3.0.0-CI00797" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
</ItemGroup>

</Project>