diff --git a/Backend/Backend.csproj b/Backend/Backend.csproj index a7dcafe3..9f300a32 100644 --- a/Backend/Backend.csproj +++ b/Backend/Backend.csproj @@ -10,7 +10,7 @@ Properties Swarmops.Backend Swarmops.Backend - v4.0 + v4.5 512 false 2280FA0F5C408893812C70CF59D1DEF99F19AAA5 diff --git a/Backend/app.config b/Backend/app.config index cb2586be..b7a7ef16 100644 --- a/Backend/app.config +++ b/Backend/app.config @@ -1,3 +1,3 @@ - + diff --git a/External Dependencies/rebuild-all.cmd b/External Dependencies/rebuild-all.cmd index 4dcce4cb..8b63bb3e 100644 --- a/External Dependencies/rebuild-all.cmd +++ b/External Dependencies/rebuild-all.cmd @@ -5,7 +5,7 @@ git submodule update git submodule foreach git checkout master git submodule foreach git pull -msbuild /p:Configuration=Release /t:Clean;Build NBitcoin\NBitcoin\NBitcoin.csproj > nul +msbuild /p:Configuration=Release;TargetFrameworkVersion=v4.5 /t:Clean;Build NBitcoin\NBitcoin\NBitcoin.csproj if exist bin erase /s /q bin > nul if not exist bin mkdir bin diff --git a/Interface/Interface.csproj b/Interface/Interface.csproj index 0a5abb37..4730d67c 100644 --- a/Interface/Interface.csproj +++ b/Interface/Interface.csproj @@ -15,7 +15,7 @@ 3.5 - v4.0 + v4.5 diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj index 20bd456a..00570158 100644 --- a/Logic/Logic.csproj +++ b/Logic/Logic.csproj @@ -15,7 +15,7 @@ 3.5 - v4.0 + v4.5 @@ -210,6 +210,7 @@ + diff --git a/Logic/Special/DummyBitcoin.cs b/Logic/Special/DummyBitcoin.cs new file mode 100644 index 00000000..0e16cd0b --- /dev/null +++ b/Logic/Special/DummyBitcoin.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using NBitcoin; + +namespace Swarmops.Logic.Special +{ + /// + /// The point of this class is to reference NBitcoin, so its assembly and dependencies get copied to the output dir, + /// as the Site can't reference assemblies directly. + /// + public class DummyBitcoin + { + public static BitcoinAddress Address { get; set; } + + public DummyBitcoin() + { + Address = new BitcoinAddress("abcdefgh"); + } + } +} diff --git a/Site5/web.config b/Site5/web.config index 6da03a63..a5ff2d8b 100644 --- a/Site5/web.config +++ b/Site5/web.config @@ -5,9 +5,17 @@ --> + - + @@ -16,7 +24,7 @@ - + @@ -29,8 +37,7 @@ - - + @@ -43,12 +50,12 @@ - + - - + + - + diff --git a/Swarmops.sln b/Swarmops.sln index 0eb7b634..6b265e07 100644 --- a/Swarmops.sln +++ b/Swarmops.sln @@ -16,7 +16,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend", "Backend\Backend. EndProject Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Site5", "Site5\", "{367F36EA-AE1C-4E15-BAF9-BA75B18B3807}" ProjectSection(WebsiteProperties) = preProject - TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5" ProjectReferences = "{3A5B5F19-51A5-48CE-A82E-97D5C189E5CB}|Swarmops.Database.dll;{6608C2E6-F841-4CD1-8AB2-28DC3B1DDDD1}|Swarmops.Basic.dll;{13E59551-34AC-43DC-9A03-EF5E4721DC61}|Swarmops.Logic.dll;{BA24FAF7-D518-49E8-952A-45595682877E}|Swarmops.Interface.dll;{C540570C-20E0-4979-84EB-8833810DDDF6}|Swarmops.Utility.dll;" Debug.AspNetCompiler.VirtualPath = "/Site5-Deployment" Debug.AspNetCompiler.PhysicalPath = "Site5\" diff --git a/Utility/Utility.csproj b/Utility/Utility.csproj index cccb9eb5..b289cf05 100644 --- a/Utility/Utility.csproj +++ b/Utility/Utility.csproj @@ -15,7 +15,7 @@ 3.5 - v4.0 + v4.5