Commit 70afb241 authored by Jeremy Bokobza's avatar Jeremy Bokobza Committed by GitHub

Submodule update and move to core 2.0 (#230)

* updated full node submodule

* Updated Breeze.Daemon to dotnet core 2.0

* updated Travis build for dotnet core 2.0
parent 80cdb66b
language: csharp language: csharp
mono: none mono: none
dotnet: 1.0.4 dotnet: 2.0.0
matrix: matrix:
include: include:
- os: linux # Ubuntu 14.04 - os: linux # Ubuntu 14.04
dist: trusty dist: trusty
sudo: required sudo: required
env: os_identifier=ubuntu.14.04 env: os_identifier=ubuntu.14.04
- os: osx # OSX 10.11
osx_image: xcode7.3
env: os_identifier=osx.10.11
- os: osx # OSX 10.12 - os: osx # OSX 10.12
osx_image: xcode8.1 osx_image: xcode8.1
env: os_identifier=osx.10.12 env: os_identifier=osx.10.12
......
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio 15
VisualStudioVersion = 15.0.26730.12 VisualStudioVersion = 15.0.26730.16
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{807563C4-7259-434D-B604-A14C3DCF8E30}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{807563C4-7259-434D-B604-A14C3DCF8E30}"
EndProject EndProject
...@@ -36,6 +36,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin.Features.Co ...@@ -36,6 +36,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin.Features.Co
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin.Features.Wallet", "..\StratisBitcoinFullNode\Stratis.Bitcoin.Features.Wallet\Stratis.Bitcoin.Features.Wallet.csproj", "{14A999E3-B35E-42EE-9C45-5ECBF0B75E50}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin.Features.Wallet", "..\StratisBitcoinFullNode\Stratis.Bitcoin.Features.Wallet\Stratis.Bitcoin.Features.Wallet.csproj", "{14A999E3-B35E-42EE-9C45-5ECBF0B75E50}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin.Features.RPC", "..\StratisBitcoinFullNode\Stratis.Bitcoin.Features.RPC\Stratis.Bitcoin.Features.RPC.csproj", "{4EC9E180-1F68-4574-89D8-97495FE387D9}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -86,6 +88,10 @@ Global ...@@ -86,6 +88,10 @@ Global
{14A999E3-B35E-42EE-9C45-5ECBF0B75E50}.Debug|Any CPU.Build.0 = Debug|Any CPU {14A999E3-B35E-42EE-9C45-5ECBF0B75E50}.Debug|Any CPU.Build.0 = Debug|Any CPU
{14A999E3-B35E-42EE-9C45-5ECBF0B75E50}.Release|Any CPU.ActiveCfg = Release|Any CPU {14A999E3-B35E-42EE-9C45-5ECBF0B75E50}.Release|Any CPU.ActiveCfg = Release|Any CPU
{14A999E3-B35E-42EE-9C45-5ECBF0B75E50}.Release|Any CPU.Build.0 = Release|Any CPU {14A999E3-B35E-42EE-9C45-5ECBF0B75E50}.Release|Any CPU.Build.0 = Release|Any CPU
{4EC9E180-1F68-4574-89D8-97495FE387D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4EC9E180-1F68-4574-89D8-97495FE387D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EC9E180-1F68-4574-89D8-97495FE387D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4EC9E180-1F68-4574-89D8-97495FE387D9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -101,6 +107,7 @@ Global ...@@ -101,6 +107,7 @@ Global
{B5B03329-07DE-4B23-A6BC-C21C0F9D2A88} = {807563C4-7259-434D-B604-A14C3DCF8E30} {B5B03329-07DE-4B23-A6BC-C21C0F9D2A88} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{2D31A6F0-FB87-4887-978B-3D200DA12FBF} = {807563C4-7259-434D-B604-A14C3DCF8E30} {2D31A6F0-FB87-4887-978B-3D200DA12FBF} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{14A999E3-B35E-42EE-9C45-5ECBF0B75E50} = {807563C4-7259-434D-B604-A14C3DCF8E30} {14A999E3-B35E-42EE-9C45-5ECBF0B75E50} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{4EC9E180-1F68-4574-89D8-97495FE387D9} = {807563C4-7259-434D-B604-A14C3DCF8E30}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {45E7631F-9783-47C2-AB68-4E3B77E250B0} SolutionGuid = {45E7631F-9783-47C2-AB68-4E3B77E250B0}
......
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
<AssemblyName>Breeze.Daemon</AssemblyName> <AssemblyName>Breeze.Daemon</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<PackageId>Breeze.Daemon</PackageId> <PackageId>Breeze.Daemon</PackageId>
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion> <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute> <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
...@@ -23,12 +22,12 @@ ...@@ -23,12 +22,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" /> <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<RuntimeIdentifiers>win7-x86;win7-x64;win10-x86;win10-x64;osx.10.10-x64;osx.10.11-x64;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x86;win7-x64;win10-x86;win10-x64;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
Subproject commit b0689fcfa251fa32e7e8a85aa3fa4b7ac27b5a20 Subproject commit 3c351be772f48b6bf0b32c8912ada83bb45f720d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment