Move to new lenovo T430 laptop for v7 development commit of changes required

This commit is contained in:
2019-03-22 22:34:11 +00:00
parent 05c700bb9c
commit cf325f74b6
40 changed files with 274 additions and 221 deletions

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -52,6 +52,10 @@
<HintPath>..\..\release\CSLA.Server.DataPortal.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
@@ -207,6 +211,7 @@
<None Include="..\..\keys\AyaNova.snk">
<Link>AyaNova.snk</Link>
</None>
<Content Include="packages.config" />
<None Include="Properties\PublishProfiles\PublishMBI.pubxml" />
</ItemGroup>
<ItemGroup>

View File

@@ -10,10 +10,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt
</PropertyGroup>
<ItemGroup>
<File Include="aya.gif">
<publishTime>07/02/2018 11:40:56</publishTime>
<publishTime>03/14/2019 14:44:18</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>06/14/2017 11:29:54</publishTime>
@@ -28,46 +28,46 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<publishTime>06/14/2017 11:29:55</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>07/02/2018 11:40:02</publishTime>
<publishTime>03/14/2019 14:42:04</publishTime>
</File>
<File Include="bin/ChilkatDotNet4.dll">
<publishTime>07/02/2018 11:40:10</publishTime>
<publishTime>03/14/2019 14:41:56</publishTime>
</File>
<File Include="bin/clients.aspx.cdcab7d2.compiled">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="bin/cmd.aspx.cdcab7d2.compiled">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="bin/config.txt">
<publishTime>02/13/2019 15:50:40</publishTime>
<publishTime>03/14/2019 16:10:07</publishTime>
</File>
<File Include="bin/CSLA.Core.Bindablebase.dll">
<publishTime>09/13/2018 13:53:00</publishTime>
<publishTime>03/18/2019 11:55:42</publishTime>
</File>
<File Include="bin/CSLA.dll">
<publishTime>02/14/2019 11:35:36</publishTime>
<publishTime>03/18/2019 11:55:43</publishTime>
</File>
<File Include="bin/CSLA.Server.DataPortal.dll">
<publishTime>09/13/2018 13:53:02</publishTime>
<publishTime>03/18/2019 11:55:42</publishTime>
</File>
<File Include="bin/default.aspx.cdcab7d2.compiled">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="bin/FirebirdSql.Data.FirebirdClient.dll">
<publishTime>07/02/2018 11:40:09</publishTime>
<publishTime>03/14/2019 14:42:21</publishTime>
</File>
<File Include="bin/GZTW.AyaNova.BLL.dll">
<publishTime>02/15/2019 14:49:52</publishTime>
<publishTime>03/18/2019 11:55:46</publishTime>
</File>
<File Include="bin/GZTW.AyaNovaMBI.dll">
<publishTime>02/15/2019 14:49:53</publishTime>
<publishTime>03/18/2019 11:56:01</publishTime>
</File>
<File Include="bin/GZTW.AyaNovaMBI.Pages.dll">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="bin/GZTW.Data.dll">
<publishTime>02/13/2019 16:35:50</publishTime>
<publishTime>03/18/2019 11:55:42</publishTime>
</File>
<File Include="bin/GZTW.MBI.dll">
<publishTime>06/14/2017 12:04:42</publishTime>
@@ -76,94 +76,97 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<publishTime>06/14/2017 11:32:19</publishTime>
</File>
<File Include="bin/GZTW.Profile.dll">
<publishTime>02/13/2019 16:35:50</publishTime>
<publishTime>03/18/2019 11:55:42</publishTime>
</File>
<File Include="bin/labor.aspx.cdcab7d2.compiled">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="bin/memoedit.aspx.cdcab7d2.compiled">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="bin/memoto.aspx.cdcab7d2.compiled">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>07/02/2018 11:40:10</publishTime>
<publishTime>03/18/2019 11:54:01</publishTime>
</File>
<File Include="bin/ro.aspx.cdcab7d2.compiled">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="bin/sched2labor.aspx.cdcab7d2.compiled">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="bin/schedule.aspx.cdcab7d2.compiled">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="bin/sign.aspx.cdcab7d2.compiled">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="bin/status.aspx.cdcab7d2.compiled">
<publishTime>02/15/2019 14:50:11</publishTime>
<publishTime>03/18/2019 11:56:15</publishTime>
</File>
<File Include="clients.aspx">
<publishTime>02/15/2019 14:50:00</publishTime>
<publishTime>03/18/2019 11:56:07</publishTime>
</File>
<File Include="cmd.aspx">
<publishTime>02/15/2019 14:50:00</publishTime>
<publishTime>03/18/2019 11:56:07</publishTime>
</File>
<File Include="config.txt">
<publishTime>02/13/2019 15:50:40</publishTime>
<publishTime>03/14/2019 16:10:07</publishTime>
</File>
<File Include="default.aspx">
<publishTime>02/15/2019 14:50:00</publishTime>
<publishTime>03/18/2019 11:56:07</publishTime>
</File>
<File Include="jquery-1.4.4.min.js">
<publishTime>07/02/2018 11:40:56</publishTime>
<publishTime>03/14/2019 14:44:19</publishTime>
</File>
<File Include="labor.aspx">
<publishTime>02/15/2019 14:50:00</publishTime>
<publishTime>03/18/2019 11:56:07</publishTime>
</File>
<File Include="mbi.css">
<publishTime>07/02/2018 11:40:55</publishTime>
<publishTime>03/14/2019 14:44:19</publishTime>
</File>
<File Include="memoedit.aspx">
<publishTime>02/15/2019 14:50:00</publishTime>
<publishTime>03/18/2019 11:56:07</publishTime>
</File>
<File Include="memoto.aspx">
<publishTime>02/15/2019 14:50:00</publishTime>
<publishTime>03/18/2019 11:56:07</publishTime>
</File>
<File Include="ok.gif">
<publishTime>07/02/2018 11:40:55</publishTime>
<publishTime>03/14/2019 14:44:19</publishTime>
</File>
<File Include="packages.config">
<publishTime>03/18/2019 11:55:01</publishTime>
</File>
<File Include="password.gif">
<publishTime>07/02/2018 11:40:55</publishTime>
<publishTime>03/14/2019 14:44:19</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>02/15/2019 14:49:54</publishTime>
<publishTime>03/18/2019 11:56:03</publishTime>
</File>
<File Include="ro.aspx">
<publishTime>02/15/2019 14:50:00</publishTime>
<publishTime>03/18/2019 11:56:07</publishTime>
</File>
<File Include="sched2labor.aspx">
<publishTime>02/15/2019 14:50:00</publishTime>
<publishTime>03/18/2019 11:56:07</publishTime>
</File>
<File Include="schedule.aspx">
<publishTime>02/15/2019 14:50:00</publishTime>
<publishTime>03/18/2019 11:56:07</publishTime>
</File>
<File Include="sig.js">
<publishTime>02/13/2019 16:03:57</publishTime>
<publishTime>03/14/2019 14:44:19</publishTime>
</File>
<File Include="sign.aspx">
<publishTime>02/15/2019 14:50:00</publishTime>
<publishTime>03/18/2019 11:56:07</publishTime>
</File>
<File Include="status.aspx">
<publishTime>02/15/2019 14:50:00</publishTime>
<publishTime>03/18/2019 11:56:07</publishTime>
</File>
<File Include="user.gif">
<publishTime>07/02/2018 11:40:56</publishTime>
<publishTime>03/14/2019 14:44:18</publishTime>
</File>
<File Include="Web.config">
<publishTime>02/14/2019 11:05:59</publishTime>
<publishTime>03/18/2019 11:55:01</publishTime>
</File>
</ItemGroup>
</Project>

View File

@@ -3,13 +3,11 @@
<appSettings />
<connectionStrings />
<system.web>
<compilation debug="true" targetFramework="4.0">
</compilation>
<compilation debug="true" targetFramework="4.0"></compilation>
<xhtmlConformance mode="Strict" />
<httpRuntime useFullyQualifiedRedirectUrl="true" />
<identity impersonate="false" />
<pages enableViewState="false" enableEventValidation="false" controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
</pages>
<pages enableViewState="false" enableEventValidation="false" controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"></pages>
<sessionState cookieless="true" />
<authentication mode="Forms">
<forms loginUrl="default.aspx" protection="All" timeout="30" name=".ASPXAUTH" path="/" requireSSL="false" slidingExpiration="true" defaultUrl="default.aspx" cookieless="UseDeviceProfile" enableCrossAppRedirects="false" />
@@ -28,6 +26,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>

View File

@@ -5,13 +5,13 @@
<!-- VIRTUAL Use the test sql database -->
<ConnectionType>DataBase</ConnectionType>
<DataBaseType>MSSQL</DataBaseType>
<DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<DataBaseConnectionString>Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<!-- Use CUSTOMER sql database
<ConnectionType>DataBase</ConnectionType>
<DataBaseType>MSSQL</DataBaseType>
<DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<DataBaseConnectionString>Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
-->

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -95,6 +95,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

Binary file not shown.

View File

@@ -5,7 +5,7 @@
<!-- VIRTUAL Use the test sql database -->
<ConnectionType>DataBase</ConnectionType>
<DataBaseType>MSSQL</DataBaseType>
<DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<DataBaseConnectionString>Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<!-- Use the TEST embedded Firebird database
<ConnectionType>DataBase</ConnectionType>

View File

@@ -120,6 +120,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -20,8 +20,10 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<SourceWebPhysicalPath>$(MSBuildThisFileDirectory)</SourceWebPhysicalPath>
<SourceWebVirtualPath>/WBI</SourceWebVirtualPath>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SourceWebProject>http://localhost/AyaNovaWBI</SourceWebProject>
<SourceWebMetabasePath>/LM/W3SVC/1/ROOT/AyaNovaWBI</SourceWebMetabasePath>
<SourceWebProject>
</SourceWebProject>
<SourceWebMetabasePath>
</SourceWebMetabasePath>
</PropertyGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

View File

@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
</startup>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
@@ -15,8 +13,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>

View File

@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<!-- Development test MSSQL DB -->
<!-- Development test MSSQL DB
<ConnectionType>DataBase</ConnectionType>
<DataBaseType>MSSQL</DataBaseType>
<DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password = abraxis;</DataBaseConnectionString>
<DataBaseConnectionString>Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password = abraxis;</DataBaseConnectionString>
-->
<!-- Customer restored MSSQL DB
<ConnectionType>DataBase</ConnectionType>
<DataBaseType>MSSQL</DataBaseType>
<DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova-XXXXX;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<DataBaseConnectionString>Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova-XXXXX;User Id=sa; Password=abraxis;</DataBaseConnectionString>
-->
<!-- TEST embedded Firebird database
<!-- TEST embedded Firebird database -->
<ConnectionType>DataBase</ConnectionType>
<DataBaseType>FireBird</DataBaseType>
<DataBaseConnectionString>ServerType=1;DataBase=C:\data\AyaNova\database\AYANOVA.fdb;Dialect=3;</DataBaseConnectionString>
-->
<!-- DataPortal
<ConnectionType>DataPortal</ConnectionType>

View File

@@ -108,9 +108,8 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
<Private>True</Private>
<Reference Include="Antlr3.Runtime">
<HintPath>..\..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="BouncyCastle.Crypto">
<HintPath>..\..\..\3rdprtylibs\crypt\BouncyCastle.Crypto.dll</HintPath>
@@ -154,12 +153,12 @@
<Name>Microsoft.VisualBasic</Name>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\3rdprtylibs\json.net.40\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System">
<Name>System</Name>
@@ -175,16 +174,14 @@
<Reference Include="System.Security">
<Name>System.Security</Name>
</Reference>
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="System.Web.Optimization">
<HintPath>..\..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml">
<Name>System.XML</Name>
</Reference>
<Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="WebGrease">
<HintPath>..\..\..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>

View File

@@ -10,6 +10,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -30,7 +30,7 @@
</namespaces>
</pages>
<!--Httpmodules key added to support reporting -->
<httpModules>
<httpModules>
<add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
</httpModules>
</system.web>
@@ -68,6 +68,10 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -5,13 +5,13 @@
<!-- VIRTUAL Use the test sql database -->
<ConnectionType>DataBase</ConnectionType>
<DataBaseType>MSSQL</DataBaseType>
<DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<DataBaseConnectionString>Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<!-- Use CUSTOMER sql database
<ConnectionType>DataBase</ConnectionType>
<DataBaseType>MSSQL</DataBaseType>
<DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<DataBaseConnectionString>Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
-->

View File

@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr" version="3.4.1.9004" targetFramework="net40" />
<package id="Antlr" version="3.5.0.2" targetFramework="net40" />
<package id="jQuery" version="1.9.1" targetFramework="net40" />
<package id="jQuery" version="1.6.4" targetFramework="net40" />
<package id="jQuery.UI.Combined" version="1.11.1" targetFramework="net40" />
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net40" />
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="Modernizr" version="2.5.3" targetFramework="net40" />
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net40" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
<package id="WebGrease" version="1.5.2" targetFramework="net40" />
</packages>

View File

@@ -55,7 +55,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr3.Runtime">
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
<HintPath>..\..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="DevExpress.Data.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -98,9 +98,8 @@
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -112,10 +111,34 @@
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Optimization">
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
@@ -130,30 +153,6 @@
<Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="WebGrease">
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
</Reference>