Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Hm

  • Loading branch information...
commit 71740c0546c1abf41fe9a1ae39ac30a088963f83 1 parent d64634a
@markrendle authored
View
15 Simple.Data.Interop.Test/Simple.Data.Interop.Test.csproj
@@ -31,14 +31,17 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Simple.Data, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Simple.Data.Core.0.8.2\lib\net40\Simple.Data.dll</HintPath>
+ <Reference Include="Simple.Data, Version=0.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Core.0.8.6\lib\net40\Simple.Data.dll</HintPath>
</Reference>
- <Reference Include="Simple.Data.Ado, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Simple.Data.Ado.0.8.2\lib\net40\Simple.Data.Ado.dll</HintPath>
+ <Reference Include="Simple.Data.Ado, Version=0.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Ado.0.8.6\lib\net40\Simple.Data.Ado.dll</HintPath>
</Reference>
- <Reference Include="Simple.Data.SqlServer, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Simple.Data.SqlServer.0.8.2\lib\net40\Simple.Data.SqlServer.dll</HintPath>
+ <Reference Include="Simple.Data.SqlServer, Version=0.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.SqlServer.0.8.6\lib\net40\Simple.Data.SqlServer.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
View
6 Simple.Data.Interop.Test/packages.config
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="xunit" version="1.8.0.1545" />
- <package id="Simple.Data.Core" version="0.7.2" />
- <package id="Simple.Data.Ado" version="0.7.2" />
- <package id="Simple.Data.SqlServer" version="0.7.2" />
<package id="Simple.Data.Core" version="0.8.2" />
<package id="Simple.Data.Ado" version="0.8.2" />
<package id="Simple.Data.SqlServer" version="0.8.2" />
+ <package id="Simple.Data.Core" version="0.8.6" />
+ <package id="Simple.Data.Ado" version="0.8.6" />
+ <package id="Simple.Data.SqlServer" version="0.8.6" />
</packages>
View
15 Simple.Data.Interop/Simple.Data.Interop.csproj
@@ -31,14 +31,17 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Simple.Data, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Simple.Data.Core.0.8.2\lib\net40\Simple.Data.dll</HintPath>
+ <Reference Include="Simple.Data, Version=0.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Core.0.8.6\lib\net40\Simple.Data.dll</HintPath>
</Reference>
- <Reference Include="Simple.Data.Ado, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Simple.Data.Ado.0.8.2\lib\net40\Simple.Data.Ado.dll</HintPath>
+ <Reference Include="Simple.Data.Ado, Version=0.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Ado.0.8.6\lib\net40\Simple.Data.Ado.dll</HintPath>
</Reference>
- <Reference Include="Simple.Data.SqlServer, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Simple.Data.SqlServer.0.8.2\lib\net40\Simple.Data.SqlServer.dll</HintPath>
+ <Reference Include="Simple.Data.SqlServer, Version=0.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.SqlServer.0.8.6\lib\net40\Simple.Data.SqlServer.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
View
6 Simple.Data.Interop/packages.config
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Simple.Data.Core" version="0.7.2" />
- <package id="Simple.Data.Ado" version="0.7.2" />
- <package id="Simple.Data.SqlServer" version="0.7.2" />
<package id="Simple.Data.Core" version="0.8.2" />
<package id="Simple.Data.Ado" version="0.8.2" />
<package id="Simple.Data.SqlServer" version="0.8.2" />
+ <package id="Simple.Data.Core" version="0.8.6" />
+ <package id="Simple.Data.Ado" version="0.8.6" />
+ <package id="Simple.Data.SqlServer" version="0.8.6" />
</packages>
View
15 Simple.Data.Pad.Test/Simple.Data.Pad.Test.csproj
@@ -32,14 +32,17 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Simple.Data, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Simple.Data.Core.0.8.2\lib\net40\Simple.Data.dll</HintPath>
+ <Reference Include="Simple.Data, Version=0.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Core.0.8.6\lib\net40\Simple.Data.dll</HintPath>
</Reference>
- <Reference Include="Simple.Data.Ado, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Simple.Data.Ado.0.8.2\lib\net40\Simple.Data.Ado.dll</HintPath>
+ <Reference Include="Simple.Data.Ado, Version=0.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Ado.0.8.6\lib\net40\Simple.Data.Ado.dll</HintPath>
</Reference>
- <Reference Include="Simple.Data.SqlServer, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Simple.Data.SqlServer.0.8.2\lib\net40\Simple.Data.SqlServer.dll</HintPath>
+ <Reference Include="Simple.Data.SqlServer, Version=0.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.SqlServer.0.8.6\lib\net40\Simple.Data.SqlServer.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
View
6 Simple.Data.Pad.Test/packages.config
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="xunit" version="1.8.0.1545" />
- <package id="Simple.Data.Core" version="0.7.2" />
- <package id="Simple.Data.Ado" version="0.7.2" />
- <package id="Simple.Data.SqlServer" version="0.7.2" />
<package id="Simple.Data.Core" version="0.8.2" />
<package id="Simple.Data.Ado" version="0.8.2" />
<package id="Simple.Data.SqlServer" version="0.8.2" />
+ <package id="Simple.Data.Core" version="0.8.6" />
+ <package id="Simple.Data.Ado" version="0.8.6" />
+ <package id="Simple.Data.SqlServer" version="0.8.6" />
</packages>
View
11 Simple.Data.Pad/App.xaml.cs
@@ -12,5 +12,16 @@ namespace Simple.Data.Pad
/// </summary>
public partial class App : Application
{
+ protected override void OnStartup(StartupEventArgs e)
+ {
+ DispatcherUnhandledException += App_DispatcherUnhandledException;
+ base.OnStartup(e);
+ }
+
+ void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
+ {
+ var unhandledExceptionDialog = new UnhandledExceptionDialog(e);
+ unhandledExceptionDialog.ShowDialog();
+ }
}
}
View
2  Simple.Data.Pad/MainViewModel.cs
@@ -252,6 +252,8 @@ private static object FormatResult(object result)
private static object FormatQuery(SimpleQuery simpleQuery)
{
+ bool hasCount = simpleQuery.Clauses.OfType<WithCountClause>().Any();
+
var list = simpleQuery.ToList();
if (list.Count == 0) return "No matching records.";
View
4 Simple.Data.Pad/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]
View
81 Simple.Data.Pad/Simple.Data.Pad.csproj
@@ -14,6 +14,30 @@
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
+ <IsWebBootstrapper>true</IsWebBootstrapper>
+ <PublishUrl>D:\Code\Simple.Data.Pad-ghpages\ClickOnce\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Web</InstallFrom>
+ <UpdateEnabled>true</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <InstallUrl>http://markrendle.github.com/Simple.Data.Pad/ClickOnce/</InstallUrl>
+ <SupportUrl>http://github.com/markrendle/Simple.Data.Pad/issues</SupportUrl>
+ <ProductName>Simple.Data.Pad</ProductName>
+ <PublisherName>Mark Rendle</PublisherName>
+ <SuiteName>Simple.Data</SuiteName>
+ <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
+ <WebPage>index.html</WebPage>
+ <ApplicationRevision>3</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <CreateDesktopShortcut>true</CreateDesktopShortcut>
+ <PublishWizardCompleted>true</PublishWizardCompleted>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -37,15 +61,30 @@
<PropertyGroup>
<ApplicationIcon>Images\Icon.ico</ApplicationIcon>
</PropertyGroup>
+ <PropertyGroup>
+ <ManifestCertificateThumbprint>F5B3DEB900C8412A4AE9D398857DE54EC8F622D4</ManifestCertificateThumbprint>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ManifestKeyFile>Simple.Data.Pad_TemporaryKey.pfx</ManifestKeyFile>
+ </PropertyGroup>
+ <PropertyGroup>
+ <GenerateManifests>true</GenerateManifests>
+ </PropertyGroup>
+ <PropertyGroup>
+ <SignManifests>false</SignManifests>
+ </PropertyGroup>
<ItemGroup>
- <Reference Include="Simple.Data, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Simple.Data.Core.0.8.2\lib\net40\Simple.Data.dll</HintPath>
+ <Reference Include="Simple.Data, Version=0.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Core.0.8.6\lib\net40\Simple.Data.dll</HintPath>
</Reference>
- <Reference Include="Simple.Data.Ado, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Simple.Data.Ado.0.8.2\lib\net40\Simple.Data.Ado.dll</HintPath>
+ <Reference Include="Simple.Data.Ado, Version=0.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Ado.0.8.6\lib\net40\Simple.Data.Ado.dll</HintPath>
</Reference>
- <Reference Include="Simple.Data.SqlServer, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Simple.Data.SqlServer.0.8.2\lib\net40\Simple.Data.SqlServer.dll</HintPath>
+ <Reference Include="Simple.Data.SqlServer, Version=0.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.SqlServer.0.8.6\lib\net40\Simple.Data.SqlServer.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -74,6 +113,9 @@
<Compile Include="ActionTraceListener.cs" />
<Compile Include="MethodInfoToStringConverter.cs" />
<Compile Include="Prettifier.cs" />
+ <Compile Include="UnhandledExceptionDialog.xaml.cs">
+ <DependentUpon>UnhandledExceptionDialog.xaml</DependentUpon>
+ </Compile>
<Compile Include="ViewModelBase.cs" />
<Page Include="DatabaseSelector.xaml">
<SubType>Designer</SubType>
@@ -93,6 +135,10 @@
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
+ <Page Include="UnhandledExceptionDialog.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
@@ -119,6 +165,7 @@
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<AppDesigner Include="Properties\" />
+ <None Include="Simple.Data.Pad_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Simple.Data.Interop\Simple.Data.Interop.csproj">
@@ -132,6 +179,28 @@
<ItemGroup>
<Resource Include="Images\Icon.ico" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+ <Visible>False</Visible>
+ <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
View
6 Simple.Data.Pad/packages.config
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Simple.Data.Core" version="0.7.2" />
- <package id="Simple.Data.Ado" version="0.7.2" />
- <package id="Simple.Data.SqlServer" version="0.7.2" />
<package id="Simple.Data.Core" version="0.8.2" />
<package id="Simple.Data.Ado" version="0.8.2" />
<package id="Simple.Data.SqlServer" version="0.8.2" />
+ <package id="Simple.Data.Core" version="0.8.6" />
+ <package id="Simple.Data.Ado" version="0.8.6" />
+ <package id="Simple.Data.SqlServer" version="0.8.6" />
</packages>
View
BIN  packages/Simple.Data.Ado.0.7.2/lib/net40/Simple.Data.Ado.dll
Binary file not shown
View
BIN  packages/Simple.Data.Core.0.7.2/lib/net40/Simple.Data.dll
Binary file not shown
View
BIN  packages/Simple.Data.SqlServer.0.7.2/lib/net40/Simple.Data.SqlServer.dll
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.