Commit 889ac2fe authored by Dan Gershony's avatar Dan Gershony Committed by GitHub

Merge pull request #164 from netsfx/master

Updated Breeze to use NStratis submodule via StratisBitcoinFullnode submodule.
parents 915941d1 87248a0f
...@@ -30,6 +30,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin", "..\Strat ...@@ -30,6 +30,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin", "..\Strat
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin.Common", "..\StratisBitcoinFullNode\Stratis.Bitcoin.Common\Stratis.Bitcoin.Common.csproj", "{330D169F-1C9A-41B4-834B-AE363FF85811}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin.Common", "..\StratisBitcoinFullNode\Stratis.Bitcoin.Common\Stratis.Bitcoin.Common.csproj", "{330D169F-1C9A-41B4-834B-AE363FF85811}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBitcoin", "..\StratisBitcoinFullNode\NStratis\NBitcoin\NBitcoin.csproj", "{05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HashLib", "..\StratisBitcoinFullNode\NStratis\Hashing\HashLib\HashLib.csproj", "{25A26C47-210F-4B7F-A48C-71760D0C9475}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -68,6 +72,14 @@ Global ...@@ -68,6 +72,14 @@ Global
{330D169F-1C9A-41B4-834B-AE363FF85811}.Debug|Any CPU.Build.0 = Debug|Any CPU {330D169F-1C9A-41B4-834B-AE363FF85811}.Debug|Any CPU.Build.0 = Debug|Any CPU
{330D169F-1C9A-41B4-834B-AE363FF85811}.Release|Any CPU.ActiveCfg = Release|Any CPU {330D169F-1C9A-41B4-834B-AE363FF85811}.Release|Any CPU.ActiveCfg = Release|Any CPU
{330D169F-1C9A-41B4-834B-AE363FF85811}.Release|Any CPU.Build.0 = Release|Any CPU {330D169F-1C9A-41B4-834B-AE363FF85811}.Release|Any CPU.Build.0 = Release|Any CPU
{05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}.Release|Any CPU.Build.0 = Release|Any CPU
{25A26C47-210F-4B7F-A48C-71760D0C9475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{25A26C47-210F-4B7F-A48C-71760D0C9475}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25A26C47-210F-4B7F-A48C-71760D0C9475}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25A26C47-210F-4B7F-A48C-71760D0C9475}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="NStratis" Version="3.0.2.23" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" /> <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.2.0" /> <PackageReference Include="xunit" Version="2.2.0" />
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="nStratis" Version="3.0.2.23" /> <ProjectReference Include="..\..\..\StratisBitcoinFullNode\NStratis\NBitcoin\NBitcoin.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -26,8 +26,7 @@ git clone https://github.com/stratisproject/Breeze ...@@ -26,8 +26,7 @@ git clone https://github.com/stratisproject/Breeze
cd Breeze cd Breeze
# Initialize dependencies # Initialize dependencies
git submodule init git submodule update --init --recursive
git submodule update
# Go in Breeze's solution folder # Go in Breeze's solution folder
cd Breeze cd Breeze
......
Subproject commit 01447e3336cd12736d2466fa5d932c550ef549e9 Subproject commit 845f7b76ae524b544de6603b4fe4a94dcde85436
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