Skip to content

Commit 7d35f98

Browse files
tomFlidrtomFlidr
committed
VS2017
1 parent 515297a commit 7d35f98

File tree

12 files changed

+580
-588
lines changed

12 files changed

+580
-588
lines changed

‎Databasic.MsSql.vbproj

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{147B4C21-ACCE-445C-B4B6-7FA2C497EFC9}</ProjectGuid>
7+
<ProjectGuid>{75F0A240-4970-4139-92D9-1F827E137F9D}</ProjectGuid>
88
<OutputType>Library</OutputType>
99
<RootNamespace>Databasic.MsSql</RootNamespace>
1010
<AssemblyName>Databasic.MsSql</AssemblyName>
@@ -44,8 +44,8 @@
4444
</PropertyGroup>
4545
<ItemGroup>
4646
<Reference Include="System" />
47-
<Reference Include="System.Core" />
4847
<Reference Include="System.Data" />
48+
<Reference Include="System.Core" />
4949
</ItemGroup>
5050
<ItemGroup>
5151
<Import Include="Microsoft.VisualBasic" />
@@ -59,7 +59,6 @@
5959
</ItemGroup>
6060
<ItemGroup>
6161
<Compile Include="Connection.vb" />
62-
<Compile Include="SqlError.vb" />
6362
<Compile Include="My Project\AssemblyInfo.vb" />
6463
<Compile Include="My Project\Application.Designer.vb">
6564
<AutoGen>True</AutoGen>
@@ -76,6 +75,7 @@
7675
<DesignTimeSharedInput>True</DesignTimeSharedInput>
7776
</Compile>
7877
<Compile Include="ProviderResource.vb" />
78+
<Compile Include="SqlError.vb" />
7979
<Compile Include="Statement.vb" />
8080
<Compile Include="Transaction.vb" />
8181
</ItemGroup>
@@ -109,15 +109,15 @@
109109
<None Include="_CreateNewNuGetPackage\DoNotModify\UploadNuGetPackage.ps1" />
110110
<None Include="_CreateNewNuGetPackage\RunMeToUploadNuGetPackage.cmd" />
111111
</ItemGroup>
112+
<ItemGroup>
113+
<None Include="_CreateNewNuGetPackage\DoNotModify\NuGet.exe" />
114+
</ItemGroup>
112115
<ItemGroup>
113116
<ProjectReference Include="..\Databasic\Databasic.vbproj">
114117
<Project>{063224ab-bc4c-49eb-838f-7fb115bd496c}</Project>
115118
<Name>Databasic</Name>
116119
</ProjectReference>
117120
</ItemGroup>
118-
<ItemGroup>
119-
<None Include="_CreateNewNuGetPackage\DoNotModify\NuGet.exe" />
120-
</ItemGroup>
121121
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
122122
<PropertyGroup>
123123
<PostBuildEvent>REM Create a NuGet package for this project and place the .nupkg file in the project's output directory.
@@ -130,11 +130,4 @@ PowerShell -NoProfile -ExecutionPolicy Bypass -Command "&amp; '$(ProjectDir)_Cre
130130
@cscript.exe PostBuild.wsf "%25wd%25"
131131
@cd %25wd%25</PostBuildEvent>
132132
</PropertyGroup>
133-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
134-
Other similar extension points exist, see Microsoft.Common.targets.
135-
<Target Name="BeforeBuild">
136-
</Target>
137-
<Target Name="AfterBuild">
138-
</Target>
139-
-->
140133
</Project>

‎My Project/AssemblyInfo.vb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Imports System.Reflection
33
Imports System.Runtime.InteropServices
44

5-
' General Information about an assembly is controlled through the following
5+
' General Information about an assembly is controlled through the following
66
' set of attributes. Change these attribute values to modify the information
77
' associated with an assembly.
88

@@ -21,18 +21,18 @@ Imports System.Runtime.InteropServices
2121
<Assembly: ComVisible(False)>
2222

2323
'The following GUID is for the ID of the typelib if this project is exposed to COM
24-
<Assembly: Guid("d7594b0e-a7ac-4a77-a22c-af8d73894446")>
24+
<Assembly: Guid("d9536bf9-e3bf-4e5c-883f-24c965c6bc87")>
2525

2626
' Version information for an assembly consists of the following four values:
2727
'
28-
' Major Version
29-
' Minor Version
30-
' Build Number
31-
' Revision
28+
' Major Version
29+
' Minor Version
30+
' Build Number
31+
' Revision
3232
'
33-
' You can specify all the values or you can default the Build and Revision Numbers
33+
' You can specify all the values or you can default the Build and Revision Numbers
3434
' by using the '*' as shown below:
35-
' <Assembly: AssemblyVersion("1.0.*")>
35+
' <Assembly: AssemblyVersion("1.0.*")>
3636

3737
<Assembly: AssemblyVersion("1.2.5.0")>
3838
<Assembly: AssemblyFileVersion("1.2.5.0")>

‎My Project/Resources.Designer.vb

Lines changed: 11 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎My Project/Resources.resx

Lines changed: 102 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,117 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
33
<!--
4-
Microsoft ResX Schema
5-
6-
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
11-
associated with the data types.
12-
13-
Example:
14-
15-
... ado.net/XML headers & schema ...
16-
<resheader name="resmimetype">text/microsoft-resx</resheader>
17-
<resheader name="version">2.0</resheader>
18-
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19-
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20-
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21-
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22-
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23-
<value>[base64 mime encoded serialized .NET Framework object]</value>
24-
</data>
25-
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26-
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27-
<comment>This is a comment</comment>
28-
</data>
29-
30-
There are any number of "resheader" rows that contain simple
31-
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
37-
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
41-
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
45-
read any of the formats listed below.
46-
47-
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
49-
: System.Serialization.Formatters.Binary.BinaryFormatter
50-
: and then encoded with base64 encoding.
51-
52-
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
54-
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55-
: and then encoded with base64 encoding.
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
5656
57-
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
59-
: using a System.ComponentModel.TypeConverter
60-
: and then encoded with base64 encoding.
61-
-->
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
6262
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63-
<xsd:element name="root" msdata:IsDataSet="true">
64-
<xsd:complexType>
65-
<xsd:choice maxOccurs="unbounded">
66-
<xsd:element name="metadata">
67-
<xsd:complexType>
68-
<xsd:sequence>
69-
<xsd:element name="value" type="xsd:string" minOccurs="0" />
70-
</xsd:sequence>
71-
<xsd:attribute name="name" type="xsd:string" />
72-
<xsd:attribute name="type" type="xsd:string" />
73-
<xsd:attribute name="mimetype" type="xsd:string" />
74-
</xsd:complexType>
75-
</xsd:element>
76-
<xsd:element name="assembly">
77-
<xsd:complexType>
78-
<xsd:attribute name="alias" type="xsd:string" />
79-
<xsd:attribute name="name" type="xsd:string" />
80-
</xsd:complexType>
81-
</xsd:element>
82-
<xsd:element name="data">
83-
<xsd:complexType>
84-
<xsd:sequence>
85-
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
86-
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
87-
</xsd:sequence>
88-
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
89-
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
90-
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
91-
</xsd:complexType>
92-
</xsd:element>
93-
<xsd:element name="resheader">
94-
<xsd:complexType>
95-
<xsd:sequence>
96-
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
97-
</xsd:sequence>
98-
<xsd:attribute name="name" type="xsd:string" use="required" />
99-
</xsd:complexType>
100-
</xsd:element>
101-
</xsd:choice>
102-
</xsd:complexType>
103-
</xsd:element>
63+
<xsd:element name="root" msdata:IsDataSet="true">
64+
<xsd:complexType>
65+
<xsd:choice maxOccurs="unbounded">
66+
<xsd:element name="metadata">
67+
<xsd:complexType>
68+
<xsd:sequence>
69+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
70+
</xsd:sequence>
71+
<xsd:attribute name="name" type="xsd:string" />
72+
<xsd:attribute name="type" type="xsd:string" />
73+
<xsd:attribute name="mimetype" type="xsd:string" />
74+
</xsd:complexType>
75+
</xsd:element>
76+
<xsd:element name="assembly">
77+
<xsd:complexType>
78+
<xsd:attribute name="alias" type="xsd:string" />
79+
<xsd:attribute name="name" type="xsd:string" />
80+
</xsd:complexType>
81+
</xsd:element>
82+
<xsd:element name="data">
83+
<xsd:complexType>
84+
<xsd:sequence>
85+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
86+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
87+
</xsd:sequence>
88+
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
89+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
90+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
91+
</xsd:complexType>
92+
</xsd:element>
93+
<xsd:element name="resheader">
94+
<xsd:complexType>
95+
<xsd:sequence>
96+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
97+
</xsd:sequence>
98+
<xsd:attribute name="name" type="xsd:string" use="required" />
99+
</xsd:complexType>
100+
</xsd:element>
101+
</xsd:choice>
102+
</xsd:complexType>
103+
</xsd:element>
104104
</xsd:schema>
105105
<resheader name="resmimetype">
106-
<value>text/microsoft-resx</value>
106+
<value>text/microsoft-resx</value>
107107
</resheader>
108108
<resheader name="version">
109-
<value>2.0</value>
109+
<value>2.0</value>
110110
</resheader>
111111
<resheader name="reader">
112-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
112+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
113113
</resheader>
114114
<resheader name="writer">
115-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
</root>

0 commit comments

Comments
 (0)