Skip to content

Commit 6917f71

Browse files
tomFlidrtomFlidr
committed
VS2017
1 parent 6346ea5 commit 6917f71

14 files changed

+654
-674
lines changed

‎Databasic.All.nuspec

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata minClientVersion="2.6">
44
<id>Databasic</id>
@@ -21,14 +21,14 @@
2121
<copyright>Copyright © 2017</copyright>
2222
<tags>microsoft sql mssql tsql mysql mariadb postgresql postgres oracle orcl sqlite odbc ole oledb database query command select insert update delete pure sql dml tool utility library</tags>
2323
<dependencies>
24-
<dependency id="Databasic.Core" version="1.2.4.0" />
25-
<dependency id="Databasic.MsSql" version="1.2.4.0" />
26-
<dependency id="Databasic.MySql" version="1.2.4.0" />
27-
<dependency id="Databasic.PostgreSql" version="1.2.4.0" />
28-
<dependency id="Databasic.OracleSql" version="1.2.4.0" />
29-
<dependency id="Databasic.SQLite" version="1.2.4.0" />
30-
<dependency id="Databasic.OdbcSql" version="1.2.4.0" />
31-
<dependency id="Databasic.OleSql" version="1.2.4.0" />
24+
<dependency id="Databasic.Core" version="1.2.5.0" />
25+
<dependency id="Databasic.MsSql" version="1.2.5.0" />
26+
<dependency id="Databasic.MySql" version="1.2.5.0" />
27+
<dependency id="Databasic.PostgreSql" version="1.2.5.0" />
28+
<dependency id="Databasic.OracleSql" version="1.2.5.0" />
29+
<dependency id="Databasic.SQLite" version="1.2.5.0" />
30+
<dependency id="Databasic.OdbcSql" version="1.2.5.0" />
31+
<dependency id="Databasic.OleSql" version="1.2.5.0" />
3232
</dependencies>
3333
<releaseNotes>https://github.com/Databasic-NET/Databasic/releases</releaseNotes>
3434
</metadata>

‎Databasic.All.vbproj

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
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>{928AEB4E-21FD-49D2-AB92-524E3D989991}</ProjectGuid>
7+
<ProjectGuid>{FA13962B-4299-471E-BDF2-7C07B7A6BE99}</ProjectGuid>
88
<OutputType>Library</OutputType>
99
<RootNamespace>Databasic.All</RootNamespace>
1010
<AssemblyName>Databasic.All</AssemblyName>
1111
<FileAlignment>512</FileAlignment>
1212
<MyType>Windows</MyType>
13-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1616
<DebugSymbols>true</DebugSymbols>
@@ -51,7 +51,6 @@
5151
<Import Include="System.Diagnostics" />
5252
<Import Include="System.Linq" />
5353
<Import Include="System.Xml.Linq" />
54-
<Import Include="System.Threading.Tasks" />
5554
</ItemGroup>
5655
<ItemGroup>
5756
<Compile Include="My Project\AssemblyInfo.vb" />
@@ -100,32 +99,20 @@
10099
<None Include="_CreateNewNuGetPackage\DoNotModify\UploadNuGetPackage.ps1" />
101100
<None Include="_CreateNewNuGetPackage\RunMeToUploadNuGetPackage.cmd" />
102101
</ItemGroup>
103-
<ItemGroup>
104-
<None Include="_CreateNewNuGetPackage\DoNotModify\NuGet.exe" />
105-
</ItemGroup>
106102
<ItemGroup>
107103
<ProjectReference Include="..\Databasic\Databasic.vbproj">
108104
<Project>{063224ab-bc4c-49eb-838f-7fb115bd496c}</Project>
109105
<Name>Databasic</Name>
110106
</ProjectReference>
111107
</ItemGroup>
108+
<ItemGroup>
109+
<None Include="_CreateNewNuGetPackage\DoNotModify\NuGet.exe" />
110+
</ItemGroup>
112111
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
113112
<PropertyGroup>
114113
<PostBuildEvent>REM Create a NuGet package for this project and place the .nupkg file in the project's output directory.
115114
REM If you see this in Visual Studio's Error List window, check the Output window's Build tab for the actual error.
116115
ECHO Creating NuGet package in Post-Build event...
117-
PowerShell -NoProfile -ExecutionPolicy Bypass -Command "&amp; '$(ProjectDir)_CreateNewNuGetPackage\DoNotModify\CreateNuGetPackage.ps1' -ProjectFilePath '$(ProjectPath)' -OutputDirectory '$(TargetDir)' -BuildConfiguration '$(ConfigurationName)' -BuildPlatform '$(PlatformName)'"
118-
119-
@set wd=%25cd%25
120-
@cd ../../../Databasic.BuildCommands
121-
@cscript.exe PostBuild.wsf "%25wd%25"
122-
@cd %25wd%25</PostBuildEvent>
116+
PowerShell -NoProfile -ExecutionPolicy Bypass -Command "&amp; '$(ProjectDir)_CreateNewNuGetPackage\DoNotModify\CreateNuGetPackage.ps1' -ProjectFilePath '$(ProjectPath)' -OutputDirectory '$(TargetDir)' -BuildConfiguration '$(ConfigurationName)' -BuildPlatform '$(PlatformName)'"</PostBuildEvent>
123117
</PropertyGroup>
124-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
125-
Other similar extension points exist, see Microsoft.Common.targets.
126-
<Target Name="BeforeBuild">
127-
</Target>
128-
<Target Name="AfterBuild">
129-
</Target>
130-
-->
131118
</Project>

‎My Project/Application.Designer.vb

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

‎My Project/AssemblyInfo.vb

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,34 @@
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

99
' Review the values of the assembly attributes
1010

1111
<Assembly: AssemblyTitle("Databasic.All")>
12-
<Assembly: AssemblyDescription("Databasic - C#/VB.NET database utility
13-
- focusing on queries primarily based on pure SQL commands, no linq transations
14-
- arranging data into primitive types, typed active record classes, collections and more
15-
- allowing to run any nonselect queries
16-
This package contains references to all database provider libraries (dll).
17-
You can use this package as you wish, but if you want to use
18-
only a specific database type, install package like:
19-
- Databasic&#60;DatabaseType&#62;")>
20-
<Assembly: AssemblyCompany("Tom Flidr")>
21-
<Assembly: AssemblyProduct("Databasic.All")>
12+
<Assembly: AssemblyDescription("")>
13+
<Assembly: AssemblyCompany("")>
14+
<Assembly: AssemblyProduct("Databasic.All")>
2215
<Assembly: AssemblyCopyright("Copyright © 2017")>
23-
<Assembly: AssemblyTrademark("Tom Flidr")>
16+
<Assembly: AssemblyTrademark("")>
2417

2518
<Assembly: ComVisible(False)>
2619

2720
'The following GUID is for the ID of the typelib if this project is exposed to COM
28-
<Assembly: Guid("b0bbc94e-6604-4e57-8d72-753653c80577")>
21+
<Assembly: Guid("c7950d2f-9138-4f9c-ab0f-f4271750c78e")>
2922

3023
' Version information for an assembly consists of the following four values:
3124
'
32-
' Major Version
33-
' Minor Version
34-
' Build Number
35-
' Revision
25+
' Major Version
26+
' Minor Version
27+
' Build Number
28+
' Revision
3629
'
37-
' You can specify all the values or you can default the Build and Revision Numbers
30+
' You can specify all the values or you can default the Build and Revision Numbers
3831
' by using the '*' as shown below:
39-
' <Assembly: AssemblyVersion("1.0.*")>
32+
' <Assembly: AssemblyVersion("1.0.*")>
4033

41-
<Assembly: AssemblyVersion("1.2.5.0")>
42-
<Assembly: AssemblyFileVersion("1.2.5.0")>
34+
<Assembly: AssemblyVersion("1.0.0.0")>
35+
<Assembly: AssemblyFileVersion("1.0.0.0")>

‎My Project/Resources.Designer.vb

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

0 commit comments

Comments
 (0)