2 Commits

Author SHA1 Message Date
Tommy Parnell
f979db92c3 fix running tests 2017-05-22 11:35:33 -07:00
Tommy Parnell
bc6bd7390f updates 2017-05-22 11:31:48 -07:00
10 changed files with 100 additions and 149 deletions

67
Shodan.Net.sln Normal file → Executable file
View File

@@ -1,43 +1,54 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{060AE71C-AE05-4F14-8970-84A1AE49A562}"
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2AA36852-45BA-4974-81F4-D69A222FA76F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{18A95621-2E1B-48F0-9D38-D7B3513F31D3}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
appveyor.yml = appveyor.yml
global.json = global.json
LICENSE.txt = LICENSE.txt
Readme.md = Readme.md
EndProjectSection
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shodan.Net", "src\Shodan.Net\Shodan.Net.csproj", "{02F06523-69A9-42F3-BAA9-37BA60D28B23}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Shodan.Net", "src\Shodan.Net\Shodan.Net.xproj", "{2AC1566F-7C77-499E-B9AE-1F029BD7F7E8}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Shodan.Net.UnitTests", "src\Shodan.Net.UnitTests\Shodan.Net.UnitTests.xproj", "{F83A8130-97B5-4AA2-810C-1D16A88799BD}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shodan.Net.UnitTests", "src\Shodan.Net.UnitTests\Shodan.Net.UnitTests.csproj", "{E54E43E6-A042-45E3-BAD7-0B119190C848}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2AC1566F-7C77-499E-B9AE-1F029BD7F7E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2AC1566F-7C77-499E-B9AE-1F029BD7F7E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2AC1566F-7C77-499E-B9AE-1F029BD7F7E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2AC1566F-7C77-499E-B9AE-1F029BD7F7E8}.Release|Any CPU.Build.0 = Release|Any CPU
{F83A8130-97B5-4AA2-810C-1D16A88799BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F83A8130-97B5-4AA2-810C-1D16A88799BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F83A8130-97B5-4AA2-810C-1D16A88799BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F83A8130-97B5-4AA2-810C-1D16A88799BD}.Release|Any CPU.Build.0 = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{02F06523-69A9-42F3-BAA9-37BA60D28B23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{02F06523-69A9-42F3-BAA9-37BA60D28B23}.Debug|Any CPU.Build.0 = Debug|Any CPU
{02F06523-69A9-42F3-BAA9-37BA60D28B23}.Debug|x64.ActiveCfg = Debug|x64
{02F06523-69A9-42F3-BAA9-37BA60D28B23}.Debug|x64.Build.0 = Debug|x64
{02F06523-69A9-42F3-BAA9-37BA60D28B23}.Debug|x86.ActiveCfg = Debug|x86
{02F06523-69A9-42F3-BAA9-37BA60D28B23}.Debug|x86.Build.0 = Debug|x86
{02F06523-69A9-42F3-BAA9-37BA60D28B23}.Release|Any CPU.ActiveCfg = Release|Any CPU
{02F06523-69A9-42F3-BAA9-37BA60D28B23}.Release|Any CPU.Build.0 = Release|Any CPU
{02F06523-69A9-42F3-BAA9-37BA60D28B23}.Release|x64.ActiveCfg = Release|x64
{02F06523-69A9-42F3-BAA9-37BA60D28B23}.Release|x64.Build.0 = Release|x64
{02F06523-69A9-42F3-BAA9-37BA60D28B23}.Release|x86.ActiveCfg = Release|x86
{02F06523-69A9-42F3-BAA9-37BA60D28B23}.Release|x86.Build.0 = Release|x86
{E54E43E6-A042-45E3-BAD7-0B119190C848}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E54E43E6-A042-45E3-BAD7-0B119190C848}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E54E43E6-A042-45E3-BAD7-0B119190C848}.Debug|x64.ActiveCfg = Debug|x64
{E54E43E6-A042-45E3-BAD7-0B119190C848}.Debug|x64.Build.0 = Debug|x64
{E54E43E6-A042-45E3-BAD7-0B119190C848}.Debug|x86.ActiveCfg = Debug|x86
{E54E43E6-A042-45E3-BAD7-0B119190C848}.Debug|x86.Build.0 = Debug|x86
{E54E43E6-A042-45E3-BAD7-0B119190C848}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E54E43E6-A042-45E3-BAD7-0B119190C848}.Release|Any CPU.Build.0 = Release|Any CPU
{E54E43E6-A042-45E3-BAD7-0B119190C848}.Release|x64.ActiveCfg = Release|x64
{E54E43E6-A042-45E3-BAD7-0B119190C848}.Release|x64.Build.0 = Release|x64
{E54E43E6-A042-45E3-BAD7-0B119190C848}.Release|x86.ActiveCfg = Release|x86
{E54E43E6-A042-45E3-BAD7-0B119190C848}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{2AC1566F-7C77-499E-B9AE-1F029BD7F7E8} = {060AE71C-AE05-4F14-8970-84A1AE49A562}
{F83A8130-97B5-4AA2-810C-1D16A88799BD} = {060AE71C-AE05-4F14-8970-84A1AE49A562}
{02F06523-69A9-42F3-BAA9-37BA60D28B23} = {2AA36852-45BA-4974-81F4-D69A222FA76F}
{E54E43E6-A042-45E3-BAD7-0B119190C848} = {2AA36852-45BA-4974-81F4-D69A222FA76F}
EndGlobalSection
EndGlobal

View File

@@ -1,13 +1,10 @@
version: 1.0.{build}
configuration: Release
image: Visual Studio 2017
before_build:
- ps: >-
(new-object net.webclient).DownloadFile('https://download.microsoft.com/download/4/6/1/46116DFF-29F9-4FF8-94BF-F9BE05BE263B/packages/DotNetCore.1.0.0.RC2-SDK.Preview1-x64.exe','core.exe')
core.exe /install /quiet /norestart
dotnet restore
build:
verbosity: minimal
test_script:
- cmd: dotnet test .\src\Shodan.Net.UnitTests\
- cmd: dotnet test .\src\Shodan.Net.UnitTests\Shodan.Net.UnitTests.csproj

View File

@@ -1,6 +0,0 @@
{
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-preview1-002702"
}
}

View File

@@ -0,0 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework>
<AssemblyName>Shodan.Net.UnitTests</AssemblyName>
<PackageId>Shodan.Net.UnitTests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../Shodan.Net/Shodan.Net.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>
</Project>

View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>f83a8130-97b5-4aa2-810c-1d16a88799bd</ProjectGuid>
<RootNamespace>Shodan.Net.UnitTests</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

View File

@@ -1,26 +0,0 @@
{
"version": "1.0.0-*",
"testRunner": "xunit",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-build10015",
"Shodan.Net": "1.0.0-*",
"Newtonsoft.Json": "8.0.3"
},
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-3002702"
}
},
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
}
}

View File

@@ -10,9 +10,6 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Shodan.Net")]
[assembly: AssemblyTrademark("")]
// Setting ComVisible to false makes the types in this assembly not visible

View File

@@ -0,0 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<VersionPrefix>0.3.0</VersionPrefix>
<Authors>Tommy Parnell</Authors>
<TargetFrameworks>netstandard1.5</TargetFrameworks>
<AssemblyName>Shodan.Net</AssemblyName>
<PackageId>Shodan.Net</PackageId>
<PackageTags>shodan.io</PackageTags>
<PackageProjectUrl>https://github.com/TerribleDev/Shodan.Net</PackageProjectUrl>
<PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/TerribleDev/Shodan.Net.git</RepositoryUrl>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Net.Http" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>

View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>2ac1566f-7c77-499e-b9ae-1f029bd7f7e8</ProjectGuid>
<RootNamespace>Shodan.Net</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

View File

@@ -1,38 +0,0 @@
{
"version": "0.3.0",
"authors": [ "Tommy Parnell" ],
"dependencies": {
"Newtonsoft.Json": "8.0.3"
},
"frameworks": {
"netstandard1.5": {
"imports": "dnxcore50",
"dependencies": {
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"NETStandard.Library": "1.5.0-rc2-24027"
}
},
"net45": {
"frameworkAssemblies": {
"System.Runtime.Serialization": "4.0.0.0",
"System.Net.Http": "4.0.0.0"
}
}
},
"buildOptions": {
"xmlDoc": false
},
"packOptions": {
"owners": [ "Tommy Parnell" ],
"summary": "Wrapper over the shodan.io api",
"projectUrl": "https://github.com/tparnell8/Shodan.Net",
"licenseUrl": "https://opensource.org/licenses/MIT",
"repository": {
"type": "git",
"url": "https://github.com/tparnell8/Shodan.Net.git"
},
"tags": [ "shodan.io" ]
}
}