UPGRADE TO FRAMEWORK 4.5 because nbitcoin

This commit is contained in:
Rick Falkvinge
2014-10-30 16:13:30 +01:00
parent 058013db20
commit b488545fd2
9 changed files with 45 additions and 15 deletions
+1 -1
View File
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Swarmops.Backend</RootNamespace>
<AssemblyName>Swarmops.Backend</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<ManifestCertificateThumbprint>2280FA0F5C408893812C70CF59D1DEF99F19AAA5</ManifestCertificateThumbprint>
+1 -1
View File
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+1 -1
View File
@@ -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
+1 -1
View File
@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+2 -1
View File
@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -210,6 +210,7 @@
</Compile>
<Compile Include="Security\BCrypt.cs" />
<Compile Include="Security\PgpKey.cs" />
<Compile Include="Special\DummyBitcoin.cs" />
<Compile Include="Special\Sweden\SupportCase.cs" />
<Compile Include="Special\Sweden\SupportCaseDelta.cs" />
<Compile Include="Special\Sweden\SupportDatabase.cs" />
+22
View File
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using NBitcoin;
namespace Swarmops.Logic.Special
{
/// <summary>
/// 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.
/// </summary>
public class DummyBitcoin
{
public static BitcoinAddress Address { get; set; }
public DummyBitcoin()
{
Address = new BitcoinAddress("abcdefgh");
}
}
}
+15 -8
View File
@@ -5,9 +5,17 @@
-->
<configuration>
<!--
For a description of web.config changes for .NET 4.5 see http://go.microsoft.com/fwlink/?LinkId=235367.
The following attributes can be set on the <httpRuntime> tag.
<system.Web>
<httpRuntime targetFramework="4.5" />
</system.Web>
-->
<system.web>
<machineKey configSource="machineKey.config"/>
<compilation debug="true" batch="false" targetFramework="4.0"/>
<compilation debug="true" batch="false" targetFramework="4.5"/>
<customErrors mode="Off"/>
<httpRuntime maxRequestLength="40960" executionTimeout="180"/>
<authentication mode="Forms">
@@ -16,7 +24,7 @@
<authorization>
<deny users="?"/>
</authorization>
<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
<pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID"/>
</system.web>
<system.data>
<DbProviderFactories>
@@ -29,8 +37,7 @@
<add key="aspnet:UseLegacyFormsAuthenticationTicketCompatibility" value="true"/>
</appSettings>
<system.webServer>
<modules runAllManagedModulesForAllRequests="true">
</modules>
<modules runAllManagedModulesForAllRequests="true"/>
<handlers>
<remove name="ChartImage_axd"/>
</handlers>
@@ -43,12 +50,12 @@
<rules>
<rule name="aspxcloak">
<!--Removes the .aspx extension for all pages.-->
<match url="(.*)" />
<match url="(.*)"/>
<conditions logicalGrouping="MatchAll">
<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true"/>
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true"/>
</conditions>
<action type="Rewrite" url="{R:1}.aspx" />
<action type="Rewrite" url="{R:1}.aspx"/>
</rule>
</rules>
</rewrite>
+1 -1
View File
@@ -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\"
+1 -1
View File
@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">