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

Upgrade dependencies and target frameworks #216

Merged
merged 11 commits into from
Oct 23, 2019
Merged

Upgrade dependencies and target frameworks #216

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c10aa32
Upgrade dependencies and target frameworks
erikzhang Oct 22, 2019
1efb09b
Update .travis.yml
erikzhang Oct 22, 2019
b75165c
Fix dotnet-format
erikzhang Oct 22, 2019
5a7ed93
Try with 3.1
shargon Oct 22, 2019
85960fc
Try to fix dotnet-format
erikzhang Oct 22, 2019
dd411b7
Remove Microsoft
erikzhang Oct 22, 2019
f36bd8a
Try coverage and dotnet format only on linux
shargon Oct 22, 2019
803232d
Revert and remove OSX
shargon Oct 22, 2019
8e581ba
Update .travis.yml
shargon Oct 22, 2019
8f9303a
Remove MyGet source
erikzhang Oct 22, 2019
2f2d43e
Remove before_script
shargon Oct 22, 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
7 changes: 1 addition & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ language: csharp

os:
- linux
- osx

dist: bionic
osx_image: xcode9.1

mono: none
dotnet: 2.2.300
dotnet: 3.0.100

before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ulimit -n 2048; fi
install:
- dotnet tool install -g dotnet-format --version 4.0.40103 --add-source https://dotnet.myget.org/F/format/api/v3/index.json
- export PATH="$PATH:$HOME/.dotnet/tools"
Expand Down
11 changes: 2 additions & 9 deletions src/neo-vm/neo-vm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Copyright>2016-2019 The Neo Project</Copyright>
<AssemblyTitle>Neo.VM</AssemblyTitle>
<Description>Neo.VM</Description>
<Version>3.0.0-preview1</Version>
<Authors>The Neo Project</Authors>
<TargetFrameworks>netstandard1.6;net461</TargetFrameworks>
<TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Neo.VM</AssemblyName>
<PackageId>Neo.VM</PackageId>
<PackageTags>NEO;AntShares;Blockchain;Smart Contract;VM</PackageTags>
<PackageProjectUrl>https://github.com/neo-project/neo-vm</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/neo-project/neo-vm.git</RepositoryUrl>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
<RootNamespace>Neo.VM</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="System.Numerics" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions tests/neo-vm.Tests/neo-vm.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace>Neo.Test</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down