Skip to content

Commit d389d77

Browse files
mcrossleymcrossley
authored
Merge pull request #7 from mcrossley/main
v1.4.0 - .Net 4.8
2 parents 1980d5f + fce3d27 commit d389d77

6 files changed

Lines changed: 156 additions & 143 deletions

File tree

‎App.config‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<configuration>
3-
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
5-
</startup>
6-
<runtime>
7-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8-
<dependentAssembly>
9-
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
11-
</dependentAssembly>
12-
<dependentAssembly>
13-
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
15-
</dependentAssembly>
16-
<dependentAssembly>
17-
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
18-
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
19-
</dependentAssembly>
20-
<dependentAssembly>
21-
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
22-
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
23-
</dependentAssembly>
24-
</assemblyBinding>
25-
</runtime>
26-
</configuration>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
5+
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
11+
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
15+
</dependentAssembly>
16+
<dependentAssembly>
17+
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
18+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
19+
</dependentAssembly>
20+
<dependentAssembly>
21+
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
22+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
23+
</dependentAssembly>
24+
</assemblyBinding>
25+
</runtime>
26+
</configuration>

‎ExportToMySQL.csproj‎

Lines changed: 105 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,106 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{17129299-1493-4AC5-A15D-4ACCA42F4E07}</ProjectGuid>
8-
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>ExportToMySQL</RootNamespace>
11-
<AssemblyName>ExportToMySQL</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<IsWebBootstrapper>false</IsWebBootstrapper>
15-
<PublishUrl>publish\</PublishUrl>
16-
<Install>true</Install>
17-
<InstallFrom>Disk</InstallFrom>
18-
<UpdateEnabled>false</UpdateEnabled>
19-
<UpdateMode>Foreground</UpdateMode>
20-
<UpdateInterval>7</UpdateInterval>
21-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
22-
<UpdatePeriodically>false</UpdatePeriodically>
23-
<UpdateRequired>false</UpdateRequired>
24-
<MapFileExtensions>true</MapFileExtensions>
25-
<ApplicationRevision>0</ApplicationRevision>
26-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
27-
<UseApplicationTrust>false</UseApplicationTrust>
28-
<BootstrapperEnabled>true</BootstrapperEnabled>
29-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
31-
<PlatformTarget>AnyCPU</PlatformTarget>
32-
<DebugSymbols>true</DebugSymbols>
33-
<DebugType>full</DebugType>
34-
<Optimize>false</Optimize>
35-
<OutputPath>bin\Debug\</OutputPath>
36-
<DefineConstants>DEBUG;TRACE</DefineConstants>
37-
<ErrorReport>prompt</ErrorReport>
38-
<WarningLevel>4</WarningLevel>
39-
</PropertyGroup>
40-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
41-
<PlatformTarget>AnyCPU</PlatformTarget>
42-
<DebugType>none</DebugType>
43-
<Optimize>true</Optimize>
44-
<OutputPath>bin\Release\</OutputPath>
45-
<DefineConstants>TRACE</DefineConstants>
46-
<ErrorReport>prompt</ErrorReport>
47-
<WarningLevel>4</WarningLevel>
48-
</PropertyGroup>
49-
<ItemGroup>
50-
<Reference Include="MySqlConnector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
51-
<HintPath>packages\MySqlConnector.1.3.7\lib\net45\MySqlConnector.dll</HintPath>
52-
</Reference>
53-
<Reference Include="System" />
54-
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
55-
<HintPath>packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll</HintPath>
56-
</Reference>
57-
<Reference Include="System.Core" />
58-
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
59-
<HintPath>packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll</HintPath>
60-
</Reference>
61-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
62-
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
63-
</Reference>
64-
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
65-
<HintPath>packages\System.Threading.Tasks.Extensions.4.5.4\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
66-
</Reference>
67-
<Reference Include="System.Transactions" />
68-
<Reference Include="System.Xml.Linq" />
69-
<Reference Include="System.Data.DataSetExtensions" />
70-
<Reference Include="Microsoft.CSharp" />
71-
<Reference Include="System.Data" />
72-
<Reference Include="System.Xml" />
73-
</ItemGroup>
74-
<ItemGroup>
75-
<Compile Include="IniFile.cs" />
76-
<Compile Include="Program.cs" />
77-
<Compile Include="Properties\AssemblyInfo.cs" />
78-
</ItemGroup>
79-
<ItemGroup>
80-
<None Include="App.config" />
81-
<None Include="packages.config" />
82-
</ItemGroup>
83-
<ItemGroup>
84-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
85-
<Visible>False</Visible>
86-
<ProductName>.NET Framework 3.5 SP1</ProductName>
87-
<Install>false</Install>
88-
</BootstrapperPackage>
89-
</ItemGroup>
90-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
91-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
92-
Other similar extension points exist, see Microsoft.Common.targets.
93-
<Target Name="BeforeBuild">
94-
</Target>
95-
<Target Name="AfterBuild">
96-
</Target>
97-
-->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{17129299-1493-4AC5-A15D-4ACCA42F4E07}</ProjectGuid>
8+
<OutputType>Exe</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>ExportToMySQL</RootNamespace>
11+
<AssemblyName>ExportToMySQL</AssemblyName>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<IsWebBootstrapper>false</IsWebBootstrapper>
15+
<PublishUrl>publish\</PublishUrl>
16+
<Install>true</Install>
17+
<InstallFrom>Disk</InstallFrom>
18+
<UpdateEnabled>false</UpdateEnabled>
19+
<UpdateMode>Foreground</UpdateMode>
20+
<UpdateInterval>7</UpdateInterval>
21+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
22+
<UpdatePeriodically>false</UpdatePeriodically>
23+
<UpdateRequired>false</UpdateRequired>
24+
<MapFileExtensions>true</MapFileExtensions>
25+
<ApplicationRevision>0</ApplicationRevision>
26+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
27+
<UseApplicationTrust>false</UseApplicationTrust>
28+
<BootstrapperEnabled>true</BootstrapperEnabled>
29+
<TargetFrameworkProfile />
30+
</PropertyGroup>
31+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
32+
<PlatformTarget>AnyCPU</PlatformTarget>
33+
<DebugSymbols>true</DebugSymbols>
34+
<DebugType>full</DebugType>
35+
<Optimize>false</Optimize>
36+
<OutputPath>bin\Debug\</OutputPath>
37+
<DefineConstants>DEBUG;TRACE</DefineConstants>
38+
<ErrorReport>prompt</ErrorReport>
39+
<WarningLevel>4</WarningLevel>
40+
</PropertyGroup>
41+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
42+
<PlatformTarget>AnyCPU</PlatformTarget>
43+
<DebugType>none</DebugType>
44+
<Optimize>true</Optimize>
45+
<OutputPath>bin\Release\</OutputPath>
46+
<DefineConstants>TRACE</DefineConstants>
47+
<ErrorReport>prompt</ErrorReport>
48+
<WarningLevel>4</WarningLevel>
49+
</PropertyGroup>
50+
<ItemGroup>
51+
<Reference Include="MySqlConnector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
52+
<HintPath>packages\MySqlConnector.2.0.0\lib\net471\MySqlConnector.dll</HintPath>
53+
</Reference>
54+
<Reference Include="System" />
55+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
56+
<HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
57+
</Reference>
58+
<Reference Include="System.Core" />
59+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
60+
<HintPath>packages\System.Diagnostics.DiagnosticSource.5.0.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
61+
</Reference>
62+
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
63+
<HintPath>packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
64+
</Reference>
65+
<Reference Include="System.Numerics" />
66+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
67+
<HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
68+
</Reference>
69+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
70+
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
71+
</Reference>
72+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
73+
<HintPath>packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
74+
</Reference>
75+
<Reference Include="System.Transactions" />
76+
<Reference Include="System.Xml.Linq" />
77+
<Reference Include="System.Data.DataSetExtensions" />
78+
<Reference Include="Microsoft.CSharp" />
79+
<Reference Include="System.Data" />
80+
<Reference Include="System.Xml" />
81+
</ItemGroup>
82+
<ItemGroup>
83+
<Compile Include="IniFile.cs" />
84+
<Compile Include="Program.cs" />
85+
<Compile Include="Properties\AssemblyInfo.cs" />
86+
</ItemGroup>
87+
<ItemGroup>
88+
<None Include="App.config" />
89+
<None Include="packages.config" />
90+
</ItemGroup>
91+
<ItemGroup>
92+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
93+
<Visible>False</Visible>
94+
<ProductName>.NET Framework 3.5 SP1</ProductName>
95+
<Install>false</Install>
96+
</BootstrapperPackage>
97+
</ItemGroup>
98+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
99+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
100+
Other similar extension points exist, see Microsoft.Common.targets.
101+
<Target Name="BeforeBuild">
102+
</Target>
103+
<Target Name="AfterBuild">
104+
</Target>
105+
-->
98106
</Project>

‎Program.cs‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ namespace ExportToMySQL
1111
{
1212
internal class Program
1313
{
14-
private static string MySqlHost;
15-
private static int MySqlPort;
16-
private static string MySqlUser;
17-
private static string MySqlPass;
18-
private static string MySqlDatabase;
1914
private static string MySqlMonthlyTable;
2015
private static string MySqlDayfileTable;
2116

@@ -47,14 +42,18 @@ private static void Main(string[] args)
4742

4843
IniFile ini = new IniFile("Cumulus.ini");
4944

50-
MySqlHost = ini.GetValue("MySQL", "Host", "127.0.0.1");
51-
MySqlPort = ini.GetValue("MySQL", "Port", 3306);
52-
MySqlUser = ini.GetValue("MySQL", "User", "");
53-
MySqlPass = ini.GetValue("MySQL", "Pass", "");
54-
MySqlDatabase = ini.GetValue("MySQL", "Database", "database");
5545
MySqlMonthlyTable = ini.GetValue("MySQL", "MonthlyTable", "Monthly");
5646
MySqlDayfileTable = ini.GetValue("MySQL", "DayfileTable", "Dayfile");
5747

48+
MySqlConnectionStringBuilder ConnString = new MySqlConnectionStringBuilder()
49+
{
50+
Server = ini.GetValue("MySQL", "Host", "127.0.0.1"),
51+
Port = (uint)ini.GetValue("MySQL", "Port", 3306),
52+
UserID = ini.GetValue("MySQL", "User", ""),
53+
Password = ini.GetValue("MySQL", "Pass", ""),
54+
Database = ini.GetValue("MySQL", "Database", "database")
55+
};
56+
5857
if (File.Exists("strings.ini"))
5958
{
6059
IniFile iniStrs = new IniFile("strings.ini");
@@ -78,7 +77,7 @@ private static void Main(string[] args)
7877

7978
try
8079
{
81-
mySqlConn = new MySqlConnection($"server={MySqlHost};port={MySqlPort};user={MySqlUser};password={MySqlPass};database={MySqlDatabase}");
80+
mySqlConn = new MySqlConnection(ConnString.ToString());
8281
}
8382
catch (Exception ex)
8483
{

‎Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.3.1.0")]
36-
[assembly: AssemblyFileVersion("1.3.1.0")]
35+
[assembly: AssemblyVersion("1.4.0.0")]
36+
[assembly: AssemblyFileVersion("1.4.0.0")]

‎Updates.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
ver 1.4.0
2+
—————————
3+
- Updated to .Net Framework 4.8 to match Cumulus MX v3.14.0+
4+
15
ver 1.3.1
26
—————————
37
- Fix: Bug that prevented December being imported when performing an import of all files

‎packages.config‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="MySqlConnector" version="1.3.7" targetFramework="net45" />
4-
<package id="System.Buffers" version="4.5.1" targetFramework="net45" />
5-
<package id="System.Memory" version="4.5.4" targetFramework="net45" />
6-
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net45" />
7-
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net45" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="MySqlConnector" version="2.0.0" targetFramework="net48" />
4+
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
5+
<package id="System.Diagnostics.DiagnosticSource" version="5.0.1" targetFramework="net48" />
6+
<package id="System.Memory" version="4.5.4" targetFramework="net48" />
7+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
8+
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
9+
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
810
</packages>

0 commit comments

Comments
 (0)