Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
Breeze
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DeStream-public
Breeze
Commits
4b13ab87
Commit
4b13ab87
authored
May 29, 2017
by
Jeremy Bokobza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved the Json Errors to a newly created project called Breeze.Common
parent
75c97b79
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
41 additions
and
6 deletions
+41
-6
Breeze.sln
Breeze/Breeze.sln
+7
-0
ControllersTests.cs
Breeze/src/Breeze.Api.Tests/ControllersTests.cs
+1
-1
Breeze.Common.csproj
Breeze/src/Breeze.Common/Breeze.Common.csproj
+19
-0
ErrorHelpers.cs
Breeze/src/Breeze.Common/JsonErrors/ErrorHelpers.cs
+1
-1
ErrorResponse.cs
Breeze/src/Breeze.Common/JsonErrors/ErrorResponse.cs
+1
-1
ErrorResult.cs
Breeze/src/Breeze.Common/JsonErrors/ErrorResult.cs
+2
-2
Breeze.TumbleBit.Client.csproj
...rc/Breeze.TumbleBit.Client/Breeze.TumbleBit.Client.csproj
+4
-0
Breeze.Wallet.csproj
Breeze/src/Breeze.Wallet/Breeze.Wallet.csproj
+5
-0
WalletController.cs
Breeze/src/Breeze.Wallet/Controllers/WalletController.cs
+1
-1
No files found.
Breeze/Breeze.sln
View file @
4b13ab87
...
...
@@ -21,6 +21,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Breeze.Daemon", "src\Breeze
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Breeze.TumbleBit.Client", "src\Breeze.TumbleBit.Client\Breeze.TumbleBit.Client.csproj", "{2490DD1A-6C14-47F2-A9C6-56761A52E2D9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Breeze.Common", "src\Breeze.Common\Breeze.Common.csproj", "{C726817D-9E2F-4DDC-90A4-B6895CF5309B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
...
...
@@ -47,6 +49,10 @@ Global
{2490DD1A-6C14-47F2-A9C6-56761A52E2D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2490DD1A-6C14-47F2-A9C6-56761A52E2D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2490DD1A-6C14-47F2-A9C6-56761A52E2D9}.Release|Any CPU.Build.0 = Release|Any CPU
{C726817D-9E2F-4DDC-90A4-B6895CF5309B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C726817D-9E2F-4DDC-90A4-B6895CF5309B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C726817D-9E2F-4DDC-90A4-B6895CF5309B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C726817D-9E2F-4DDC-90A4-B6895CF5309B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
...
...
@@ -57,5 +63,6 @@ Global
{D16CD478-9D1E-4C69-91AD-43539E94A215} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{1B598E33-667F-496D-BC0D-88276E8E7632} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{2490DD1A-6C14-47F2-A9C6-56761A52E2D9} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{C726817D-9E2F-4DDC-90A4-B6895CF5309B} = {807563C4-7259-434D-B604-A14C3DCF8E30}
EndGlobalSection
EndGlobal
Breeze/src/Breeze.Api.Tests/ControllersTests.cs
View file @
4b13ab87
...
...
@@ -6,7 +6,7 @@ using Xunit;
using
Moq
;
using
Breeze.Wallet
;
using
Breeze.Wallet.Controllers
;
using
Breeze.
Wallet.
Errors
;
using
Breeze.
Common.Json
Errors
;
using
Breeze.Wallet.Helpers
;
using
Breeze.Wallet.Models
;
using
NBitcoin
;
...
...
Breeze/src/Breeze.Common/Breeze.Common.csproj
0 → 100644
View file @
4b13ab87
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="1.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Mvc.Core">
<HintPath>C:\Users\Jeremy\.nuget\packages\microsoft.aspnetcore.mvc.core\1.1.2\lib\netstandard1.6\Microsoft.AspNetCore.Mvc.Core.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
\ No newline at end of file
Breeze/src/Breeze.
Wallet/
Errors/ErrorHelpers.cs
→
Breeze/src/Breeze.
Common/Json
Errors/ErrorHelpers.cs
View file @
4b13ab87
using
System.Collections.Generic
;
using
System.Net
;
namespace
Breeze.
Wallet.
Errors
namespace
Breeze.
Common.Json
Errors
{
public
static
class
ErrorHelpers
{
...
...
Breeze/src/Breeze.
Wallet/
Errors/ErrorResponse.cs
→
Breeze/src/Breeze.
Common/Json
Errors/ErrorResponse.cs
View file @
4b13ab87
using
System.Collections.Generic
;
using
Newtonsoft.Json
;
namespace
Breeze.
Wallet.
Errors
namespace
Breeze.
Common.Json
Errors
{
public
class
ErrorResponse
{
...
...
Breeze/src/Breeze.
Wallet/
Errors/ErrorResult.cs
→
Breeze/src/Breeze.
Common/Json
Errors/ErrorResult.cs
View file @
4b13ab87
...
...
@@ -2,11 +2,11 @@
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
using
Breeze.
Wallet.
Errors
;
using
Breeze.
Common.Json
Errors
;
using
Microsoft.AspNetCore.Http
;
using
Microsoft.AspNetCore.Mvc
;
namespace
Breeze.
Wallet.
Errors
namespace
Breeze.
Common.Json
Errors
{
public
class
ErrorResult
:
ObjectResult
{
...
...
Breeze/src/Breeze.TumbleBit.Client/Breeze.TumbleBit.Client.csproj
View file @
4b13ab87
...
...
@@ -16,4 +16,8 @@
<PackageReference Include="Serilog.Extensions.Logging.File" Version="1.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Breeze.Common\Breeze.Common.csproj" />
</ItemGroup>
</Project>
\ No newline at end of file
Breeze/src/Breeze.Wallet/Breeze.Wallet.csproj
View file @
4b13ab87
...
...
@@ -16,10 +16,15 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="1.0.3" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="1.0.1" />
<PackageReference Include="System.ValueTuple" Version="4.3.1" />
<PackageReference Include="Stratis.Bitcoin" Version="1.0.1.8-alpha" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Breeze.Common\Breeze.Common.csproj" />
</ItemGroup>
</Project>
Breeze/src/Breeze.Wallet/Controllers/WalletController.cs
View file @
4b13ab87
...
...
@@ -4,7 +4,7 @@ using System.IO;
using
System.Linq
;
using
System.Net
;
using
System.Security
;
using
Breeze.
Wallet.
Errors
;
using
Breeze.
Common.Json
Errors
;
using
Microsoft.AspNetCore.Mvc
;
using
Breeze.Wallet.Models
;
using
NBitcoin
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment