diff options
author | emkael <emkael@tlen.pl> | 2018-10-13 10:47:08 +0200 |
---|---|---|
committer | emkael <emkael@tlen.pl> | 2018-10-13 10:47:08 +0200 |
commit | 51d31a9451c6ecdda114dd0c4a0a556bebedc19a (patch) | |
tree | ed334abcfc2fd020ee0d5413f07c7347f4d684ad | |
parent | 74202e8d091886e703af302dff8ee59560d1f85a (diff) |
Migrating to .NET 2.0
-rw-r--r-- | kurier/Form1.resx | 8 | ||||
-rw-r--r-- | kurier/MysqlSettings.resx | 6 | ||||
-rw-r--r-- | kurier/Properties/Resources.Designer.cs | 2 | ||||
-rw-r--r-- | kurier/Properties/Resources.resx | 12 | ||||
-rw-r--r-- | kurier/app.config | 10 | ||||
-rw-r--r-- | kurier/kurier.csproj | 11 |
6 files changed, 25 insertions, 24 deletions
diff --git a/kurier/Form1.resx b/kurier/Form1.resx index 9b2fff7..f41cdd1 100644 --- a/kurier/Form1.resx +++ b/kurier/Form1.resx @@ -112,15 +112,15 @@ <value>2.0</value> </resheader> <resheader name="reader"> - <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> - <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAA diff --git a/kurier/MysqlSettings.resx b/kurier/MysqlSettings.resx index 14a4aab..c473cfa 100644 --- a/kurier/MysqlSettings.resx +++ b/kurier/MysqlSettings.resx @@ -112,12 +112,12 @@ <value>2.0</value> </resheader> <resheader name="reader"> - <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> - <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAA diff --git a/kurier/Properties/Resources.Designer.cs b/kurier/Properties/Resources.Designer.cs index fec3012..285ff7a 100644 --- a/kurier/Properties/Resources.Designer.cs +++ b/kurier/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace kurier.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/kurier/Properties/Resources.resx b/kurier/Properties/Resources.resx index 98193e3..f3d303b 100644 --- a/kurier/Properties/Resources.resx +++ b/kurier/Properties/Resources.resx @@ -112,19 +112,19 @@ <value>2.0</value> </resheader> <resheader name="reader"> - <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> - <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Resources\save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="settings" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Resources\settings.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\305_Close_32x32_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Resources\305_Close_32x32_72.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root>
\ No newline at end of file diff --git a/kurier/app.config b/kurier/app.config index ffe99a0..ec3337f 100644 --- a/kurier/app.config +++ b/kurier/app.config @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0"?> <configuration> <configSections> - <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > - <section name="kurier.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> + <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <section name="kurier.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/> </sectionGroup> </configSections> <userSettings> @@ -17,11 +17,11 @@ <value>root</value> </setting> <setting name="PASS" serializeAs="String"> - <value /> + <value/> </setting> <setting name="CONFIGURED" serializeAs="String"> <value>False</value> </setting> </kurier.Properties.Settings> </userSettings> -</configuration>
\ No newline at end of file +<startup><supportedRuntime version="v2.0.50727"/></startup></configuration> diff --git a/kurier/kurier.csproj b/kurier/kurier.csproj index b955ee2..02fde5e 100644 --- a/kurier/kurier.csproj +++ b/kurier/kurier.csproj @@ -10,8 +10,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>kurier</RootNamespace> <AssemblyName>kurier</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <TargetFrameworkProfile>Client</TargetFrameworkProfile> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + <TargetFrameworkProfile> + </TargetFrameworkProfile> <FileAlignment>512</FileAlignment> <PublishUrl>publish\</PublishUrl> <Install>true</Install> @@ -49,9 +50,9 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="MySql.Data, Version=6.9.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" /> - <Reference Include="System"> - <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\Profile\Client\System.dll</HintPath> + <Reference Include="MySql.Data, Version=6.9.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\res\MySql.Data.dll</HintPath> </Reference> <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data" /> |