diff --git a/Backend/Backend.csproj b/Backend/Backend.csproj
index 438ebafb..fcbcae74 100644
--- a/Backend/Backend.csproj
+++ b/Backend/Backend.csproj
@@ -10,7 +10,7 @@
Properties
Swarmops.Backend
Swarmops.Backend
- v3.5
+ v4.5
512
false
2280FA0F5C408893812C70CF59D1DEF99F19AAA5
@@ -45,6 +45,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -53,6 +54,7 @@
TRACE
prompt
4
+ false
diff --git a/Backend/app.config b/Backend/app.config
index 8494f728..b7a7ef16 100644
--- a/Backend/app.config
+++ b/Backend/app.config
@@ -1,3 +1,3 @@
-
+
diff --git a/Basic/Basic.csproj b/Basic/Basic.csproj
index 36ce6e32..b70c419a 100644
--- a/Basic/Basic.csproj
+++ b/Basic/Basic.csproj
@@ -15,7 +15,7 @@
3.5
- v3.5
+ v4.5
@@ -30,6 +30,7 @@
prompt
Library
Swarmops.Basic
+ false
../Site/bin/
@@ -43,6 +44,7 @@
prompt
Library
Swarmops.Basic
+ false
diff --git a/Basic/Properties/Settings.Designer.cs b/Basic/Properties/Settings.Designer.cs
index 0fb0fd3e..5f839afb 100644
--- a/Basic/Properties/Settings.Designer.cs
+++ b/Basic/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.296
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@ namespace Swarmops.Basic.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Basic/app.config b/Basic/app.config
index 9483dfed..f180140e 100644
--- a/Basic/app.config
+++ b/Basic/app.config
@@ -2,4 +2,4 @@
-
+
diff --git a/Console/Console.csproj b/Console/Console.csproj
index eab07f9f..20c8b2f2 100644
--- a/Console/Console.csproj
+++ b/Console/Console.csproj
@@ -17,7 +17,7 @@
3.5
- v3.5
+ v4.5
@@ -33,6 +33,7 @@
Exe
Swarmops.Console
./App.ico
+ false
./bin/
@@ -47,6 +48,7 @@
Exe
Swarmops.Console
./App.ico
+ false
Swarmops.BotConsole
diff --git a/Console/app.config b/Console/app.config
index 8494f728..b7a7ef16 100644
--- a/Console/app.config
+++ b/Console/app.config
@@ -1,3 +1,3 @@
-
+
diff --git a/Database/Database.csproj b/Database/Database.csproj
index b855d9c5..78df93ba 100644
--- a/Database/Database.csproj
+++ b/Database/Database.csproj
@@ -15,7 +15,7 @@
3.5
- v3.5
+ v4.5
@@ -30,6 +30,7 @@
prompt
Library
Swarmops.Database
+ false
../Site/bin/
@@ -43,6 +44,7 @@
prompt
Library
Swarmops.Database
+ false
diff --git a/Database/app.config b/Database/app.config
index 33e50b7e..4c133a0a 100644
--- a/Database/app.config
+++ b/Database/app.config
@@ -1,23 +1,23 @@
-
-
+
+
-
-
+
+
-
+
-
+
-
+
diff --git a/Interface/Interface.csproj b/Interface/Interface.csproj
index 5ee3f5e7..eaf4b3d1 100644
--- a/Interface/Interface.csproj
+++ b/Interface/Interface.csproj
@@ -15,7 +15,7 @@
3.5
- v3.5
+ v4.5
@@ -30,6 +30,7 @@
prompt
Library
Swarmops.Interface
+ false
../Site/bin/
@@ -43,6 +44,7 @@
prompt
Library
Swarmops.Interface
+ false
diff --git a/Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.Designer.cs b/Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.Designer.cs
index a16d5d7c..bac65cad 100644
--- a/Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.Designer.cs
+++ b/Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.1022
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
diff --git a/Logic/App_GlobalResources/Logic.Financial.FinancialTransactionTagSetTypesStock.Designer.cs b/Logic/App_GlobalResources/Logic.Financial.FinancialTransactionTagSetTypesStock.Designer.cs
index b3622cef..24a6a79c 100644
--- a/Logic/App_GlobalResources/Logic.Financial.FinancialTransactionTagSetTypesStock.Designer.cs
+++ b/Logic/App_GlobalResources/Logic.Financial.FinancialTransactionTagSetTypesStock.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.1008
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
diff --git a/Logic/App_GlobalResources/Logic.Swarm.DashboardTodos.Designer.cs b/Logic/App_GlobalResources/Logic.Swarm.DashboardTodos.Designer.cs
index 2e2d021e..d65084e1 100644
--- a/Logic/App_GlobalResources/Logic.Swarm.DashboardTodos.Designer.cs
+++ b/Logic/App_GlobalResources/Logic.Swarm.DashboardTodos.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.1008
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
diff --git a/Logic/App_GlobalResources/Logic.Test.Designer.cs b/Logic/App_GlobalResources/Logic.Test.Designer.cs
index be03186b..90245801 100644
--- a/Logic/App_GlobalResources/Logic.Test.Designer.cs
+++ b/Logic/App_GlobalResources/Logic.Test.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.1008
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj
index fa2fc0b4..9a13318d 100644
--- a/Logic/Logic.csproj
+++ b/Logic/Logic.csproj
@@ -15,7 +15,7 @@
3.5
- v3.5
+ v4.5
@@ -30,6 +30,7 @@
prompt
Library
Swarmops.Logic
+ false
../Site/bin/
@@ -43,6 +44,7 @@
prompt
Library
Swarmops.Logic
+ false
diff --git a/Logic/Security/App_LocalResources/Authentication.Designer.cs b/Logic/Security/App_LocalResources/Authentication.Designer.cs
index cfbbad6b..c3ac3f77 100644
--- a/Logic/Security/App_LocalResources/Authentication.Designer.cs
+++ b/Logic/Security/App_LocalResources/Authentication.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.296
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
diff --git a/Site5/App_Code/PageV5Base.cs b/Site5/App_Code/PageV5Base.cs
index 82d11daa..5e7b211a 100644
--- a/Site5/App_Code/PageV5Base.cs
+++ b/Site5/App_Code/PageV5Base.cs
@@ -195,6 +195,10 @@ public class PageV5Base : System.Web.UI.Page
return result;
}
+ ///
+ /// This is used to identify special cases for pilot installations. Because of the privacy implications, it
+ /// should not be used at all from general availability onwards, except for those pilot installations.
+ ///
protected string InstallationId
{
get { return Persistence.Key["SwarmopsInstallationId"]; }
diff --git a/Site5/App_GlobalResources/Menu5.resx b/Site5/App_GlobalResources/Menu5.resx
index bbe95d3f..960bd9d4 100644
--- a/Site5/App_GlobalResources/Menu5.resx
+++ b/Site5/App_GlobalResources/Menu5.resx
@@ -177,8 +177,11 @@
List
+
+ Cash Requests
+
- Expense Claims, Cash Requests
+ Expense Claims
Inbound Invoices
diff --git a/Site5/Master-v5.master b/Site5/Master-v5.master
index c01c6c79..ef7664cb 100644
--- a/Site5/Master-v5.master
+++ b/Site5/Master-v5.master
@@ -13,6 +13,7 @@
+
diff --git a/Site5/web.config b/Site5/web.config
index b4023d36..6f11d157 100644
--- a/Site5/web.config
+++ b/Site5/web.config
@@ -5,52 +5,26 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -58,26 +32,16 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
@@ -85,29 +49,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Swarmops.sln b/Swarmops.sln
index d7d72725..e9bbe3c6 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%3Dv3.5"
+ 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/BotCode/App_LocalResources/EventProcessor.Designer.cs b/Utility/BotCode/App_LocalResources/EventProcessor.Designer.cs
index 2fa48e28..ab183664 100644
--- a/Utility/BotCode/App_LocalResources/EventProcessor.Designer.cs
+++ b/Utility/BotCode/App_LocalResources/EventProcessor.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.296
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
diff --git a/Utility/Utility.csproj b/Utility/Utility.csproj
index 4ff1691b..fa10100a 100644
--- a/Utility/Utility.csproj
+++ b/Utility/Utility.csproj
@@ -15,7 +15,7 @@
3.5
- v3.5
+ v4.5
@@ -30,6 +30,7 @@
prompt
Library
Swarmops.Utility
+ false
../Site/bin/
@@ -43,6 +44,7 @@
prompt
Library
Swarmops.Utility
+ false