admin/ayanova7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes to make a clean build after moving to new svn server

Browse Source
This commit is contained in:
John Cardinal
2018-07-02 19:42:04 +00:00
parent afe490a7b0
commit a3b64778ed
27 changed files with 129 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/WinFormApp/AyaNova.csproj
View File

@@ -156,10 +156,12 @@
<Reference Include="DevExpress.Charts.v10.2.Core, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.Charts.v10.2.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.Data.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.Data.v10.2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.Data.v10.2.Compact, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -168,62 +170,77 @@
<Reference Include="DevExpress.PivotGrid.v10.2.Core, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.PivotGrid.v10.2.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.RichEdit.v10.2.Core, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.RichEdit.v10.2.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.Utils.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.Utils.v10.2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraBars.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraBars.v10.2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraCharts.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraCharts.v10.2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraEditors.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraEditors.v10.2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraNavBar.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraNavBar.v10.2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraPivotGrid.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraPivotGrid.v10.2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraPrinting.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraPrinting.v10.2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraReports.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraReports.v10.2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraReports.v10.2.Extensions, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraReports.v10.2.Extensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraRichEdit.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraRichEdit.v10.2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraScheduler.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraScheduler.v10.2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraScheduler.v10.2.Core, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraScheduler.v10.2.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraScheduler.v10.2.Reporting.Extensions, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraScheduler.v10.2.Reporting.Extensions.dll</HintPath>
<Private>True</Private>
</Reference>
<ProjectReference Include="..\AyaNova.PlugIn\AyaNova.PlugIn.csproj">
<Project>{674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}</Project>
@@ -260,7 +277,7 @@
<Reference Include="log4net">
<Name>log4net</Name>
<HintPath>..\..\3rdprtylibs\log4net\log4net.dll</HintPath>
<Private>False</Private>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualBasic">
<Name>Microsoft.VisualBasic</Name>

10
source/WinFormApp/app.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
@@ -8,8 +8,12 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
</assemblyBinding>
</runtime>

10
source/WinFormApp/config.txt
View File

@@ -1,11 +1,11 @@
<?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=DevAyaNova;User Id=sa; Password = abraxis;</DataBaseConnectionString>
-->
<DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password = abraxis;</DataBaseConnectionString>
<!-- Customer restored MSSQL DB
<ConnectionType>DataBase</ConnectionType>
@@ -13,11 +13,11 @@
<DataBaseConnectionString>Server=7DEVTEST-PC\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