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

This commit is contained in:
2018-07-02 19:42:04 +00:00
parent afe490a7b0
commit a3b64778ed
27 changed files with 129 additions and 55 deletions

View File

@@ -94,6 +94,7 @@
<None Include="..\..\keys\AyaNova.snk">
<Link>AyaNova.snk</Link>
</None>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

View File

@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings />
<connectionStrings />
@@ -18,4 +18,12 @@
<deny users="?" />
</authorization>
</system.web>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<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>
</configuration>

View File

@@ -137,6 +137,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Resources\Script24.png" />
</ItemGroup>
<ItemGroup>

View File

@@ -228,6 +228,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Resource\ImportExportCSV16.png" />
</ItemGroup>
<ItemGroup>

View File

@@ -117,6 +117,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Merger32.png" />
</ItemGroup>
<ItemGroup>

View File

@@ -103,6 +103,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="AyaNova.snk" />
</ItemGroup>
<ItemGroup>

View File

@@ -106,6 +106,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="AyaNova.snk" />
</ItemGroup>
<ItemGroup>

View File

@@ -111,6 +111,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Resources\ExportToExcel16.png" />
</ItemGroup>
<ItemGroup>

View File

@@ -119,6 +119,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Resources\OutlookSchedule.ico" />
</ItemGroup>
<ItemGroup>

View File

@@ -300,6 +300,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Resources\Cancel16.png" />
</ItemGroup>
<ItemGroup>

View File

@@ -369,6 +369,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Resources\Cancel16.png" />
</ItemGroup>
<ItemGroup>

View File

@@ -473,6 +473,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Resources\Cancel16.png" />
</ItemGroup>
<ItemGroup>

View File

@@ -118,6 +118,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Resources\QuickNotification16.png" />
</ItemGroup>
<ItemGroup>

View File

@@ -117,6 +117,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Xtools32.png" />
</ItemGroup>
<ItemGroup>

View File

@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -84,4 +84,13 @@
</setting>
</AyaNovaOL.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<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>
</configuration>

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=DevAyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<!-- Use the TEST embedded Firebird database
<ConnectionType>DataBase</ConnectionType>

View File

@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="devExpress">
@@ -10,7 +10,7 @@
<!-- AyaNova WBI skin selection-->
<appSettings>
<add key="Telerik.Skin" value="Hay" />
<add key ="IE9ForceCompatbilityMode" value="true"/>
<add key="IE9ForceCompatbilityMode" value="true" />
</appSettings>
<system.web>
<compilation debug="true" targetFramework="4.0">
@@ -71,7 +71,7 @@
<add name="RadCompression" type="Telerik.Web.UI.RadCompression" />
<add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
</httpModules>
<httpRuntime requestValidationMode="2.0"/>
<httpRuntime requestValidationMode="2.0" />
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false" />
@@ -106,4 +106,16 @@
<themes enableThemesAssembly="true" />
<errors callbackErrorRedirectUrl="" />
</devExpress>
<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" />
</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>
</configuration>

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>

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>

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

View File

@@ -46,6 +46,7 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<WebGreaseLibPath>..\..\..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -107,6 +108,10 @@
<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>
<Reference Include="BouncyCastle.Crypto">
<HintPath>..\..\..\3rdprtylibs\crypt\BouncyCastle.Crypto.dll</HintPath>
</Reference>
@@ -148,8 +153,13 @@
<Reference Include="Microsoft.VisualBasic">
<Name>Microsoft.VisualBasic</Name>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\3rdprtylibs\json.net.40\Newtonsoft.Json.dll</HintPath>
<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>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Newtonsoft.Json.5.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System">
<Name>System</Name>
@@ -165,9 +175,17 @@
<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">
<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">
<HintPath>..\..\..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs">
@@ -1243,6 +1261,8 @@
<None Include="..\..\..\keys\AyaNova.snk">
<Link>AyaNova.snk</Link>
</None>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="PartByWarehouseInventoryListSchema.xsc">
<DependentUpon>PartByWarehouseInventoryListSchema.xsd</DependentUpon>
</None>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- For more information on how toconfigure your ASP.NET application, please visit
<!-- For more information on how toconfigure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=169433
-->
<configuration>
@@ -13,7 +13,7 @@
</appSettings>
<system.web>
<globalization culture="auto:en-US" />
<httpRuntime requestValidationMode="2.0"/>
<httpRuntime requestValidationMode="2.0" />
<compilation debug="true" targetFramework="4.0" />
<authentication mode="Forms">
<forms loginUrl="~/Account/Login" timeout="2880" />
@@ -36,7 +36,7 @@
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false" />
<modules runAllManagedModulesForAllRequests="true" >
<modules runAllManagedModulesForAllRequests="true">
<!--Following added to support reporting-->
<add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
</modules>

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=DevAyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>
<!-- Use CUSTOMER sql database

View File

@@ -114,6 +114,7 @@
<Reference Include="System.Data.DataSetExtensions" />
<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.Linq" />
<Reference Include="System.Web" />