Skip to content
This repository was archived by the owner on Jan 8, 2025. It is now read-only.

Commit d98555e

Browse files
authored
Merge pull request #2 from openimis/v1.2.0
V1.2.0
2 parents d7bb423 + 680c951 commit d98555e

File tree

23 files changed

+164
-117
lines changed

23 files changed

+164
-117
lines changed

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,3 +263,14 @@ __pycache__/
263263
/IMIS/Web.Debug.config
264264
/IMIS/Web.Release.config
265265
/IMIS/Web.config
266+
267+
**/Extracts/
268+
**/Archive/
269+
**/FromPhone/
270+
**/Images/Submitted/
271+
**/Images/Updated/
272+
**/Workspace/
273+
!dummy.dmd
274+
275+
276+

IMIS.sln

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,49 +16,71 @@ EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1818
Debug|Any CPU = Debug|Any CPU
19+
Debug|x64 = Debug|x64
1920
Debug|x86 = Debug|x86
2021
Release|Any CPU = Release|Any CPU
22+
Release|x64 = Release|x64
2123
Release|x86 = Release|x86
2224
EndGlobalSection
2325
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2426
{E0D2FF4A-A742-4A05-BF65-BA4BD4C2EB14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2527
{E0D2FF4A-A742-4A05-BF65-BA4BD4C2EB14}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{E0D2FF4A-A742-4A05-BF65-BA4BD4C2EB14}.Debug|x64.ActiveCfg = Debug|x64
29+
{E0D2FF4A-A742-4A05-BF65-BA4BD4C2EB14}.Debug|x64.Build.0 = Debug|x64
2630
{E0D2FF4A-A742-4A05-BF65-BA4BD4C2EB14}.Debug|x86.ActiveCfg = Debug|x86
2731
{E0D2FF4A-A742-4A05-BF65-BA4BD4C2EB14}.Debug|x86.Build.0 = Debug|x86
2832
{E0D2FF4A-A742-4A05-BF65-BA4BD4C2EB14}.Release|Any CPU.ActiveCfg = Release|Any CPU
2933
{E0D2FF4A-A742-4A05-BF65-BA4BD4C2EB14}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{E0D2FF4A-A742-4A05-BF65-BA4BD4C2EB14}.Release|x64.ActiveCfg = Release|x64
35+
{E0D2FF4A-A742-4A05-BF65-BA4BD4C2EB14}.Release|x64.Build.0 = Release|x64
3036
{E0D2FF4A-A742-4A05-BF65-BA4BD4C2EB14}.Release|x86.ActiveCfg = Release|x86
3137
{E0D2FF4A-A742-4A05-BF65-BA4BD4C2EB14}.Release|x86.Build.0 = Release|x86
3238
{9B6B33F6-7629-4EB7-9548-2D3F48963643}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3339
{9B6B33F6-7629-4EB7-9548-2D3F48963643}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{9B6B33F6-7629-4EB7-9548-2D3F48963643}.Debug|x64.ActiveCfg = Debug|x64
41+
{9B6B33F6-7629-4EB7-9548-2D3F48963643}.Debug|x64.Build.0 = Debug|x64
3442
{9B6B33F6-7629-4EB7-9548-2D3F48963643}.Debug|x86.ActiveCfg = Debug|x86
3543
{9B6B33F6-7629-4EB7-9548-2D3F48963643}.Debug|x86.Build.0 = Debug|x86
3644
{9B6B33F6-7629-4EB7-9548-2D3F48963643}.Release|Any CPU.ActiveCfg = Release|Any CPU
3745
{9B6B33F6-7629-4EB7-9548-2D3F48963643}.Release|Any CPU.Build.0 = Release|Any CPU
46+
{9B6B33F6-7629-4EB7-9548-2D3F48963643}.Release|x64.ActiveCfg = Release|x64
47+
{9B6B33F6-7629-4EB7-9548-2D3F48963643}.Release|x64.Build.0 = Release|x64
3848
{9B6B33F6-7629-4EB7-9548-2D3F48963643}.Release|x86.ActiveCfg = Release|x86
3949
{9B6B33F6-7629-4EB7-9548-2D3F48963643}.Release|x86.Build.0 = Release|x86
4050
{53D67C82-CF46-4BB2-8319-3FD91FA92737}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4151
{53D67C82-CF46-4BB2-8319-3FD91FA92737}.Debug|Any CPU.Build.0 = Debug|Any CPU
52+
{53D67C82-CF46-4BB2-8319-3FD91FA92737}.Debug|x64.ActiveCfg = Debug|x64
53+
{53D67C82-CF46-4BB2-8319-3FD91FA92737}.Debug|x64.Build.0 = Debug|x64
4254
{53D67C82-CF46-4BB2-8319-3FD91FA92737}.Debug|x86.ActiveCfg = Debug|x86
4355
{53D67C82-CF46-4BB2-8319-3FD91FA92737}.Debug|x86.Build.0 = Debug|x86
4456
{53D67C82-CF46-4BB2-8319-3FD91FA92737}.Release|Any CPU.ActiveCfg = Release|Any CPU
4557
{53D67C82-CF46-4BB2-8319-3FD91FA92737}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{53D67C82-CF46-4BB2-8319-3FD91FA92737}.Release|x64.ActiveCfg = Release|x64
59+
{53D67C82-CF46-4BB2-8319-3FD91FA92737}.Release|x64.Build.0 = Release|x64
4660
{53D67C82-CF46-4BB2-8319-3FD91FA92737}.Release|x86.ActiveCfg = Release|x86
4761
{53D67C82-CF46-4BB2-8319-3FD91FA92737}.Release|x86.Build.0 = Release|x86
4862
{4FA70042-5378-4AE5-BC4F-C55F6A4A4807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4963
{4FA70042-5378-4AE5-BC4F-C55F6A4A4807}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{4FA70042-5378-4AE5-BC4F-C55F6A4A4807}.Debug|x64.ActiveCfg = Debug|x64
65+
{4FA70042-5378-4AE5-BC4F-C55F6A4A4807}.Debug|x64.Build.0 = Debug|x64
5066
{4FA70042-5378-4AE5-BC4F-C55F6A4A4807}.Debug|x86.ActiveCfg = Debug|x86
5167
{4FA70042-5378-4AE5-BC4F-C55F6A4A4807}.Debug|x86.Build.0 = Debug|x86
5268
{4FA70042-5378-4AE5-BC4F-C55F6A4A4807}.Release|Any CPU.ActiveCfg = Release|Any CPU
5369
{4FA70042-5378-4AE5-BC4F-C55F6A4A4807}.Release|Any CPU.Build.0 = Release|Any CPU
70+
{4FA70042-5378-4AE5-BC4F-C55F6A4A4807}.Release|x64.ActiveCfg = Release|x64
71+
{4FA70042-5378-4AE5-BC4F-C55F6A4A4807}.Release|x64.Build.0 = Release|x64
5472
{4FA70042-5378-4AE5-BC4F-C55F6A4A4807}.Release|x86.ActiveCfg = Release|x86
5573
{4FA70042-5378-4AE5-BC4F-C55F6A4A4807}.Release|x86.Build.0 = Release|x86
5674
{A57FC2FD-3B24-4F9E-9514-CF370E411401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5775
{A57FC2FD-3B24-4F9E-9514-CF370E411401}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
{A57FC2FD-3B24-4F9E-9514-CF370E411401}.Debug|x64.ActiveCfg = Debug|x64
77+
{A57FC2FD-3B24-4F9E-9514-CF370E411401}.Debug|x64.Build.0 = Debug|x64
5878
{A57FC2FD-3B24-4F9E-9514-CF370E411401}.Debug|x86.ActiveCfg = Debug|x86
5979
{A57FC2FD-3B24-4F9E-9514-CF370E411401}.Debug|x86.Build.0 = Debug|x86
6080
{A57FC2FD-3B24-4F9E-9514-CF370E411401}.Release|Any CPU.ActiveCfg = Release|Any CPU
6181
{A57FC2FD-3B24-4F9E-9514-CF370E411401}.Release|Any CPU.Build.0 = Release|Any CPU
82+
{A57FC2FD-3B24-4F9E-9514-CF370E411401}.Release|x64.ActiveCfg = Release|x64
83+
{A57FC2FD-3B24-4F9E-9514-CF370E411401}.Release|x64.Build.0 = Release|x64
6284
{A57FC2FD-3B24-4F9E-9514-CF370E411401}.Release|x86.ActiveCfg = Release|x86
6385
{A57FC2FD-3B24-4F9E-9514-CF370E411401}.Release|x86.Build.0 = Release|x86
6486
EndGlobalSection

IMIS/Archive/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

IMIS/Extracts/Export/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

IMIS/Extracts/Export/Log/dummy.dmd

Whitespace-only changes.

IMIS/Extracts/OffLine/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

IMIS/Extracts/Phone/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

IMIS/IMIS.vbproj

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<OutputType>Library</OutputType>
1414
<RootNamespace>IMIS</RootNamespace>
1515
<AssemblyName>IMIS</AssemblyName>
16-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1717
<MyType>Custom</MyType>
1818
<UseIISExpress>true</UseIISExpress>
1919
<IISExpressSSLPort />
@@ -78,6 +78,9 @@
7878
<Reference Include="System" />
7979
<Reference Include="System.Data" />
8080
<Reference Include="System.Data.Entity" />
81+
<Reference Include="System.Data.SQLite, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
82+
<HintPath>..\packages\System.Data.SQLite.Core.1.0.109.1\lib\net46\System.Data.SQLite.dll</HintPath>
83+
</Reference>
8184
<Reference Include="System.Drawing" />
8285
<Reference Include="System.Core" />
8386
<Reference Include="System.Data.DataSetExtensions" />
@@ -231,6 +234,10 @@
231234
<Content Include="IMISDataSet.xsc">
232235
<DependentUpon>IMISDataSet.xsd</DependentUpon>
233236
</Content>
237+
<Content Include="Extracts\Export\Log\dummy.dmd" />
238+
<Content Include="Images\Submitted\dummy.dmd" />
239+
<Content Include="Images\Updated\dummy.dmd" />
240+
<Content Include="x64\SQLite.Interop.dll" />
234241
<None Include="IMISDataSet.xsd">
235242
<Generator>MSDataSetGenerator</Generator>
236243
<LastGenOutput>IMISDataSet.Designer.vb</LastGenOutput>
@@ -240,7 +247,9 @@
240247
<DependentUpon>IMISDataSet.xsd</DependentUpon>
241248
</Content>
242249
<None Include="My Project\PublishProfiles\IMIS.pubxml" />
243-
<None Include="packages.config" />
250+
<None Include="packages.config">
251+
<SubType>Designer</SubType>
252+
</None>
244253
<None Include="Web References\IMISService\imisservices.disco" />
245254
<Content Include="Web.config">
246255
<SubType>Designer</SubType>
@@ -803,11 +812,7 @@
803812
<DependentUpon>Web.config</DependentUpon>
804813
</None>
805814
</ItemGroup>
806-
<ItemGroup>
807-
<Folder Include="Extracts\Export\Log\" />
808-
<Folder Include="Images\Submitted\" />
809-
<Folder Include="Images\Updated\" />
810-
</ItemGroup>
815+
<ItemGroup />
811816
<ItemGroup>
812817
<WCFMetadata Include="Service References\" />
813818
</ItemGroup>
@@ -874,9 +879,30 @@
874879
<PlatformTarget>x86</PlatformTarget>
875880
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
876881
</PropertyGroup>
882+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
883+
<DebugSymbols>true</DebugSymbols>
884+
<DefineDebug>true</DefineDebug>
885+
<DefineTrace>true</DefineTrace>
886+
<OutputPath>bin\</OutputPath>
887+
<DocumentationFile>IMIS.xml</DocumentationFile>
888+
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
889+
<DebugType>full</DebugType>
890+
<PlatformTarget>x64</PlatformTarget>
891+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
892+
</PropertyGroup>
893+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
894+
<DefineTrace>true</DefineTrace>
895+
<OutputPath>bin\</OutputPath>
896+
<DocumentationFile>IMIS.xml</DocumentationFile>
897+
<Optimize>true</Optimize>
898+
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
899+
<DebugType>pdbonly</DebugType>
900+
<PlatformTarget>x64</PlatformTarget>
901+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
902+
</PropertyGroup>
877903
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
878-
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
879-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
904+
<!-- <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
905+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />-->
880906
<ProjectExtensions>
881907
<VisualStudio>
882908
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -908,4 +934,11 @@
908934
</Target>
909935
<Target Name="AfterBuild">
910936
</Target>
937+
<Import Project="..\packages\System.Data.SQLite.Core.1.0.109.1\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.109.1\build\net46\System.Data.SQLite.Core.targets')" />
938+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
939+
<PropertyGroup>
940+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
941+
</PropertyGroup>
942+
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.109.1\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.109.1\build\net46\System.Data.SQLite.Core.targets'))" />
943+
</Target>
911944
</Project>

IMIS/Images/Submitted/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

IMIS/Images/Submitted/dummy.dmd

Whitespace-only changes.

0 commit comments

Comments
 (0)