Skip to content

Commit 7584f8d

Browse files
bordoleybordoley
committed
misc cleanups.
1 parent bd43835 commit 7584f8d

5 files changed

Lines changed: 41 additions & 43 deletions

File tree

‎SQLitePCL.pretty.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLitePCL.pretty.Orm", "SQL
1616
EndProject
1717
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLitePCL.pretty.tests.Android", "SQLitePCL.pretty.tests.Android\SQLitePCL.pretty.tests.Android.csproj", "{A3278FF6-0B65-482E-AE3E-7AEF33C4F25C}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLitePCL.pretty.Tests", "SQLitePCL.pretty.Tests\SQLitePCL.pretty.Tests.csproj", "{3C8B2558-E287-4031-8597-14480A15ED0E}"
19+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLitePCL.pretty.tests", "SQLitePCL.pretty.tests\SQLitePCL.pretty.tests.csproj", "{3C8B2558-E287-4031-8597-14480A15ED0E}"
2020
EndProject
2121
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLitePCL.pretty.tests.iOS", "SQLitePCL.pretty.tests.iOS\SQLitePCL.pretty.tests.iOS.csproj", "{641DDEDB-D0E6-47B9-A96E-5567B8D79244}"
2222
EndProject

‎SQLitePCL.pretty.tests/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Information about this assembly is defined by the following attributes.
55
// Change them to the values specific to your project.
66

7-
[assembly: AssemblyTitle("SQLitePCL.pretty.Tests")]
7+
[assembly: AssemblyTitle("SQLitePCL.pretty.tests")]
88
[assembly: AssemblyDescription("")]
99
[assembly: AssemblyConfiguration("")]
1010
[assembly: AssemblyCompany("")]
@@ -13,15 +13,4 @@
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515

16-
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
17-
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
18-
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
19-
20-
[assembly: AssemblyVersion("1.0.*")]
21-
22-
// The following attributes are used to specify the signing key for the assembly,
23-
// if desired. See the Mono documentation for more information about signing.
24-
25-
//[assembly: AssemblyDelaySign(false)]
26-
//[assembly: AssemblyKeyFile("")]
2716

‎SQLitePCL.pretty.tests/SQLitePCL.pretty.Tests.csproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
77
<ProjectGuid>{3C8B2558-E287-4031-8597-14480A15ED0E}</ProjectGuid>
88
<OutputType>Library</OutputType>
9-
<RootNamespace>SQLitePCL.pretty.Tests</RootNamespace>
9+
<RootNamespace>SQLitePCL.pretty.tests</RootNamespace>
1010
<AssemblyName>SQLitePCL.pretty.tests</AssemblyName>
1111
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
@@ -31,24 +31,24 @@
3131
</PropertyGroup>
3232
<ItemGroup>
3333
<Compile Include="Properties\AssemblyInfo.cs" />
34-
<Compile Include="columninfotests.cs" />
35-
<Compile Include="databaseconnectiontests.cs" />
36-
<Compile Include="implementationtests.cs" />
37-
<Compile Include="prettytests.cs" />
38-
<Compile Include="resultset.cs" />
39-
<Compile Include="sqlite3tests.cs" />
34+
<Compile Include="ColumnInfoTests.cs" />
35+
<Compile Include="DatabaseConnectionTests.cs" />
36+
<Compile Include="ImplementationTests.cs" />
37+
<Compile Include="prettyTests.cs" />
38+
<Compile Include="ResultSet.cs" />
39+
<Compile Include="SQLite3Tests.cs" />
4040
<Compile Include="SQLiteValueTests.cs" />
41-
<Compile Include="sqliteversiontests.cs" />
42-
<Compile Include="tablecolumnmetadatatests.cs" />
43-
<Compile Include="OrmTests\querytests.cs" />
44-
<Compile Include="OrmTests\querytests.joins.cs" />
41+
<Compile Include="SQLiteVersionTests.cs" />
42+
<Compile Include="TableColumnMetadataTests.cs" />
43+
<Compile Include="OrmTests\QueryTests.cs" />
44+
<Compile Include="OrmTests\QueryTests.Joins.cs" />
4545
<Compile Include="OrmTests\TableMappingTest.Async.cs" />
4646
<Compile Include="OrmTests\TableMappingTests.Create.cs" />
47-
<Compile Include="OrmTests\tablemappingtests.sync.cs" />
48-
<Compile Include="AsyncTests\asyncblobstreamtests.cs" />
47+
<Compile Include="OrmTests\TableMappingTests.sync.cs" />
48+
<Compile Include="AsyncTests\AsyncBlobStreamTests.cs" />
4949
<Compile Include="AsyncTests\AsyncDatabaseConnectionTests.cs" />
50-
<Compile Include="AsyncTests\asyncstatementtests.cs" />
51-
<Compile Include="AsyncTests\resultset.cs" />
50+
<Compile Include="AsyncTests\AsyncStatementTests.cs" />
51+
<Compile Include="AsyncTests\ResultSet.cs" />
5252
</ItemGroup>
5353
<ItemGroup>
5454
<Reference Include="System.Reactive.Core">

‎SQLitePCL.pretty.tests/SQLitePCL.pretty.tests.x86.csproj‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
34
<Import Project="..\packages\xunit.core.2.1.0-beta1-build2945\build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.1.0-beta1-build2945\build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,7 +9,7 @@
89
<OutputType>Library</OutputType>
910
<RootNamespace>SQLitePCL.pretty.tests.x86</RootNamespace>
1011
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<NuGetPackageImportStamp>63f1c1ac</NuGetPackageImportStamp>
12+
<NuGetPackageImportStamp>4e4e7804</NuGetPackageImportStamp>
1213
<AssemblyName>SQLitePCL.pretty.tests</AssemblyName>
1314
</PropertyGroup>
1415
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -48,24 +49,25 @@
4849
<WarningLevel>4</WarningLevel>
4950
</PropertyGroup>
5051
<ItemGroup>
51-
<Compile Include="columninfotests.cs" />
52-
<Compile Include="databaseconnectiontests.cs" />
53-
<Compile Include="implementationtests.cs" />
54-
<Compile Include="prettytests.cs" />
55-
<Compile Include="resultset.cs" />
56-
<Compile Include="sqlite3tests.cs" />
52+
<Compile Include="Properties\AssemblyInfo.cs" />
53+
<Compile Include="ColumnInfoTests.cs" />
54+
<Compile Include="DatabaseConnectionTests.cs" />
55+
<Compile Include="ImplementationTests.cs" />
56+
<Compile Include="prettyTests.cs" />
57+
<Compile Include="ResultSet.cs" />
58+
<Compile Include="SQLite3Tests.cs" />
5759
<Compile Include="SQLiteValueTests.cs" />
58-
<Compile Include="sqliteversiontests.cs" />
59-
<Compile Include="tablecolumnmetadatatests.cs" />
60-
<Compile Include="OrmTests\querytests.cs" />
61-
<Compile Include="OrmTests\querytests.joins.cs" />
60+
<Compile Include="SQLiteVersionTests.cs" />
61+
<Compile Include="TableColumnMetadataTests.cs" />
62+
<Compile Include="OrmTests\QueryTests.cs" />
63+
<Compile Include="OrmTests\QueryTests.Joins.cs" />
6264
<Compile Include="OrmTests\TableMappingTest.Async.cs" />
6365
<Compile Include="OrmTests\TableMappingTests.Create.cs" />
64-
<Compile Include="OrmTests\tablemappingtests.sync.cs" />
65-
<Compile Include="AsyncTests\asyncblobstreamtests.cs" />
66+
<Compile Include="OrmTests\TableMappingTests.sync.cs" />
67+
<Compile Include="AsyncTests\AsyncBlobStreamTests.cs" />
6668
<Compile Include="AsyncTests\AsyncDatabaseConnectionTests.cs" />
67-
<Compile Include="AsyncTests\asyncstatementtests.cs" />
68-
<Compile Include="AsyncTests\resultset.cs" />
69+
<Compile Include="AsyncTests\AsyncStatementTests.cs" />
70+
<Compile Include="AsyncTests\ResultSet.cs" />
6971
</ItemGroup>
7072
<ItemGroup>
7173
<Reference Include="System" />
@@ -117,4 +119,10 @@
117119
<ItemGroup>
118120
<None Include="packages.config" />
119121
</ItemGroup>
122+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
123+
<PropertyGroup>
124+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
125+
</PropertyGroup>
126+
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
127+
</Target>
120128
</Project>

‎SQLitePCL.pretty.tests/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
<package id="xunit.extensibility.execution" version="2.0.0" targetFramework="MonoAndroid50" />
1515
<package id="xunit.runner.devices" version="1.0.0" targetFramework="MonoAndroid50" />
1616
<package id="xunit.runner.utility" version="2.0.0" targetFramework="MonoAndroid50" />
17+
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
1718
</packages>

0 commit comments

Comments
 (0)