ivanszabo/SISBusiness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebase Develop

Browse Source
This commit is contained in:
ivanszabo
2021-04-07 11:23:42 +02:00
parent 8a700d7162
commit 11a8d4b6af
67 changed files with 608 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SISBusiness.Win/My Project/Application.Designer.vb
Generated
+1 -1
View File
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
' Runtime Version:4.0.30319.17929
' Runtime Version:4.0.30319.42000
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
SISBusiness.Win/My Project/Resources.Designer.vb
Generated
+2 -2
View File
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
' Runtime Version:4.0.30319.17929
' Runtime Version:4.0.30319.42000
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -22,7 +22,7 @@ Namespace My.Resources
'''<summary>
''' A strongly-typed resource class, for looking up localized strings, etc.
'''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
SISBusiness.Win/My Project/Settings.Designer.vb
Generated
+3 -3
View File
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
' Runtime Version:4.0.30319.17929
' Runtime Version:4.0.30319.42000
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -29,7 +29,7 @@ Namespace My
Private Shared addedHandlerLockObject As New Object
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
If My.Application.SaveMySettingsOnExit Then
My.Settings.Save()
End If
SISBusiness.Win/SISBusiness.Win.vbproj
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -20,7 +20,7 @@
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>4.0</OldToolsVersion>
SISBusiness.Win/app.config
+13 -16
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<configuration>
<configSections>
<section name="DevExpressXpoProfiler" type="DevExpress.Xpo.Logger.ProfilerConfigSection, DevExpress.Data.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" allowLocation="true" allowDefinition="Everywhere" />
<section name="DevExpressXpoProfiler" type="DevExpress.Xpo.Logger.ProfilerConfigSection, DevExpress.Data.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" allowLocation="true" allowDefinition="Everywhere"/>
</configSections>
<appSettings>
<add key="Modules" value="" />
@@ -10,13 +10,12 @@
<add key="Languages" value="en;hu" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
<add key="Uri" value="http://3conline.com:88/api/" />
<add key="GeocodeAPIKey" value="AIzaSyD4RgVEapyYNlAgjemLgtbpOEVC2p2yXY4"/>
<add key="BingMapsKey" value="AkuhLMqiOJ6mqhY8zVPQCLMNFPEP0b4neaExb_eolTgT4Q0hF3098zXBJHMQa1WI"/>
<add key="GeocodeAPIKey" value="AIzaSyD4RgVEapyYNlAgjemLgtbpOEVC2p2yXY4" />
<add key="BingMapsKey" value="AkuhLMqiOJ6mqhY8zVPQCLMNFPEP0b4neaExb_eolTgT4Q0hF3098zXBJHMQa1WI" />
</appSettings>
<connectionStrings>
<!--XPO Profiler MySQL-->
<add name="ConnectionString" connectionString="XpoProvider=MySql;server=localhost;user id=root; password=pcl718; database=3c;persist security info=true;CharSet=utf8;" />
<add name="ConnectionString" connectionString="XpoProvider=MySql;server=localhost;user id=root; password=pcl718; database=3c;persist security info=true;CharSet=utf8;"/>
<!--XPO Profiler MS SQL-->
<!--<add name="ConnectionString" connectionString="User ID=sa; Application Name=FM System; Password=pcl718; Pooling=false; Data Source=SISI5SSD2\SQLEXPRESS; Initial Catalog=FM"/>-->
<!--XPO Profiler Postgre SQL-->
@@ -25,9 +24,9 @@
<system.diagnostics>
<switches>
<!-- Use the one of predefined values: 0-Off, 1-Errors, 2-Warnings, 3-Info, 4-Verbose. The default value is 3. -->
<add name="eXpressAppFramework" value="3" />
<add name="eXpressAppFramework" value="3"/>
<!--<add name="XPO" value="3" />-->
<add name="AllowDebugXtraReportScripts" value="False" />
<add name="AllowDebugXtraReportScripts" value="False"/>
</switches>
</system.diagnostics>
<!--
@@ -38,29 +37,27 @@
<system.serviceModel>
<bindings>
<basicHttpBinding>
<binding name="BasicHttpBinding_MNBArfolyamServiceSoap" />
<binding name="BasicHttpBinding_MNBArfolyamServiceSoap"/>
</basicHttpBinding>
</bindings>
<client>
<endpoint address="http://www.mnb.hu/arfolyamok.asmx" binding="basicHttpBinding"
bindingConfiguration="BasicHttpBinding_MNBArfolyamServiceSoap"
contract="MNBArfolyamService.MNBArfolyamServiceSoap" name="BasicHttpBinding_MNBArfolyamServiceSoap" />
<endpoint address="http://www.mnb.hu/arfolyamok.asmx" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_MNBArfolyamServiceSoap" contract="MNBArfolyamService.MNBArfolyamServiceSoap" name="BasicHttpBinding_MNBArfolyamServiceSoap"/>
</client>
</system.serviceModel>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
</providers>
</roleManager>
</system.web>
<DevExpressXpoProfiler serverType="DevExpress.Xpo.Logger.Transport.LogServer" serverAssembly="DevExpress.Xpo.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" categories="SQL;Session;DataCache" port="52934" />
</configuration>
<DevExpressXpoProfiler serverType="DevExpress.Xpo.Logger.Transport.LogServer" serverAssembly="DevExpress.Xpo.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" categories="SQL;Session;DataCache" port="52934"/>
</configuration>
SISBusiness.Win/packages.config
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Npgsql" version="2.2.7" targetFramework="net40" />
<package id="Npgsql" version="2.2.7" targetFramework="net40" requireReinstallation="true" />
</packages>