Skip to content

Commit

Permalink
Merge branch 'master' into pr70
Browse files Browse the repository at this point in the history
  • Loading branch information
chadly committed Jun 13, 2017
2 parents 0912fe3 + 9927f7c commit 9e2ce9a
Show file tree
Hide file tree
Showing 112 changed files with 1,593 additions and 2,544 deletions.
9 changes: 5 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/bin
/packages
/examples/packages
app.config
docs
nuget.exe
AssemblyVersion.cs
test/Geocoding.Tests/settings-override.json

.vs
/artifacts
project.lock.json

#################
## Visual Studio
Expand Down
22 changes: 22 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceRoot}/bin/Debug/<target-framework>/<project-name.dll>",
"args": [],
"cwd": "${workspaceRoot}",
"externalConsole": false,
"stopAtEntry": false
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command.pickProcess}"
}
]
}
16 changes: 16 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": "0.1.0",
"command": "dotnet",
"isShellCommand": true,
"args": [],
"tasks": [
{
"taskName": "build",
"args": [
""
],
"isBuildCommand": true,
"problemMatcher": "$msCompile"
}
]
}
7 changes: 0 additions & 7 deletions AssemblyInfoCommon.cs

This file was deleted.

26 changes: 0 additions & 26 deletions Core/AsyncGeocoderExtensions.cs

This file was deleted.

119 changes: 0 additions & 119 deletions Core/Core.csproj

This file was deleted.

17 changes: 0 additions & 17 deletions Core/IAsyncGeocoder.cs

This file was deleted.

13 changes: 0 additions & 13 deletions Core/IBatchGeocoder.cs

This file was deleted.

14 changes: 0 additions & 14 deletions Core/IGeocoder.cs

This file was deleted.

3 changes: 0 additions & 3 deletions Core/Properties/AssemblyInfo.cs

This file was deleted.

4 changes: 0 additions & 4 deletions Core/packages.config

This file was deleted.

88 changes: 37 additions & 51 deletions Geocoding.sln
Original file line number Diff line number Diff line change
@@ -1,75 +1,61 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
# Visual Studio 15
VisualStudioVersion = 15.0.26430.6
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{891021E5-7521-4F93-9946-B7B630DF3192}"
ProjectSection(SolutionItems) = preProject
common.targets = common.targets
LICENSE.md = LICENSE.md
README.md = README.md
teamcity.targets = teamcity.targets
test.targets = test.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core Framework", "Core Framework", "{2104CCA2-94D4-4C56-9A5E-FAF9D9538817}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{654812CF-D009-4420-B9EC-D07B030926A1}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "APIs", "APIs", "{F742864D-9400-4CE2-957A-DBD0A0237277}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{BB5F66AC-286B-4BA5-86EC-6DED28426132}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geocoding.Core", "src\Geocoding.Core\Geocoding.Core.csproj", "{8F490709-2265-4AAF-BAE7-A18FE054320F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "APIs", "APIs", "{F742864D-9400-4CE2-957A-DBD0A0237277}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geocoding.Google", "src\Geocoding.Google\Geocoding.Google.csproj", "{CA6983AD-C1B2-4524-93FF-2281C657B037}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google", "Google\Google.csproj", "{2E608F4E-29F7-4AC3-922F-23D971312CAE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geocoding.MapQuest", "src\Geocoding.MapQuest\Geocoding.MapQuest.csproj", "{B46F0315-6CE4-414A-BDDA-186090F5062C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yahoo", "Yahoo\Yahoo.csproj", "{B2863E87-3983-46EF-8B3E-37A4475ECA13}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geocoding.Microsoft", "src\Geocoding.Microsoft\Geocoding.Microsoft.csproj", "{27F58640-D424-40F5-945E-42BF8BC872A0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft", "Microsoft\Microsoft.csproj", "{74BCB608-4674-452F-A50C-7EE61AC47EAF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geocoding.Yahoo", "src\Geocoding.Yahoo\Geocoding.Yahoo.csproj", "{9773C7DA-DD1A-490D-B4D8-CEA18804AD1E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapQuest", "MapQuest\MapQuest.csproj", "{B37FC059-5E9E-4893-994A-64D835D2A54F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geocoding.Tests", "test\Geocoding.Tests\Geocoding.Tests.csproj", "{B87FBD8D-1E79-49F0-B06D-B4B15C1BA9C4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{654812CF-D009-4420-B9EC-D07B030926A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{654812CF-D009-4420-B9EC-D07B030926A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{654812CF-D009-4420-B9EC-D07B030926A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{654812CF-D009-4420-B9EC-D07B030926A1}.Release|Any CPU.Build.0 = Release|Any CPU
{BB5F66AC-286B-4BA5-86EC-6DED28426132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BB5F66AC-286B-4BA5-86EC-6DED28426132}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BB5F66AC-286B-4BA5-86EC-6DED28426132}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BB5F66AC-286B-4BA5-86EC-6DED28426132}.Release|Any CPU.Build.0 = Release|Any CPU
{2E608F4E-29F7-4AC3-922F-23D971312CAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2E608F4E-29F7-4AC3-922F-23D971312CAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E608F4E-29F7-4AC3-922F-23D971312CAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E608F4E-29F7-4AC3-922F-23D971312CAE}.Release|Any CPU.Build.0 = Release|Any CPU
{B2863E87-3983-46EF-8B3E-37A4475ECA13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B2863E87-3983-46EF-8B3E-37A4475ECA13}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B2863E87-3983-46EF-8B3E-37A4475ECA13}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B2863E87-3983-46EF-8B3E-37A4475ECA13}.Release|Any CPU.Build.0 = Release|Any CPU
{74BCB608-4674-452F-A50C-7EE61AC47EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74BCB608-4674-452F-A50C-7EE61AC47EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74BCB608-4674-452F-A50C-7EE61AC47EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74BCB608-4674-452F-A50C-7EE61AC47EAF}.Release|Any CPU.Build.0 = Release|Any CPU
{B37FC059-5E9E-4893-994A-64D835D2A54F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B37FC059-5E9E-4893-994A-64D835D2A54F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B37FC059-5E9E-4893-994A-64D835D2A54F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B37FC059-5E9E-4893-994A-64D835D2A54F}.Release|Any CPU.Build.0 = Release|Any CPU
{8F490709-2265-4AAF-BAE7-A18FE054320F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8F490709-2265-4AAF-BAE7-A18FE054320F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8F490709-2265-4AAF-BAE7-A18FE054320F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8F490709-2265-4AAF-BAE7-A18FE054320F}.Release|Any CPU.Build.0 = Release|Any CPU
{CA6983AD-C1B2-4524-93FF-2281C657B037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CA6983AD-C1B2-4524-93FF-2281C657B037}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CA6983AD-C1B2-4524-93FF-2281C657B037}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CA6983AD-C1B2-4524-93FF-2281C657B037}.Release|Any CPU.Build.0 = Release|Any CPU
{B46F0315-6CE4-414A-BDDA-186090F5062C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B46F0315-6CE4-414A-BDDA-186090F5062C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B46F0315-6CE4-414A-BDDA-186090F5062C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B46F0315-6CE4-414A-BDDA-186090F5062C}.Release|Any CPU.Build.0 = Release|Any CPU
{27F58640-D424-40F5-945E-42BF8BC872A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{27F58640-D424-40F5-945E-42BF8BC872A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{27F58640-D424-40F5-945E-42BF8BC872A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{27F58640-D424-40F5-945E-42BF8BC872A0}.Release|Any CPU.Build.0 = Release|Any CPU
{9773C7DA-DD1A-490D-B4D8-CEA18804AD1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9773C7DA-DD1A-490D-B4D8-CEA18804AD1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9773C7DA-DD1A-490D-B4D8-CEA18804AD1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9773C7DA-DD1A-490D-B4D8-CEA18804AD1E}.Release|Any CPU.Build.0 = Release|Any CPU
{B87FBD8D-1E79-49F0-B06D-B4B15C1BA9C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B87FBD8D-1E79-49F0-B06D-B4B15C1BA9C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B87FBD8D-1E79-49F0-B06D-B4B15C1BA9C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B87FBD8D-1E79-49F0-B06D-B4B15C1BA9C4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{654812CF-D009-4420-B9EC-D07B030926A1} = {2104CCA2-94D4-4C56-9A5E-FAF9D9538817}
{BB5F66AC-286B-4BA5-86EC-6DED28426132} = {2104CCA2-94D4-4C56-9A5E-FAF9D9538817}
{F742864D-9400-4CE2-957A-DBD0A0237277} = {2104CCA2-94D4-4C56-9A5E-FAF9D9538817}
{2E608F4E-29F7-4AC3-922F-23D971312CAE} = {F742864D-9400-4CE2-957A-DBD0A0237277}
{B2863E87-3983-46EF-8B3E-37A4475ECA13} = {F742864D-9400-4CE2-957A-DBD0A0237277}
{74BCB608-4674-452F-A50C-7EE61AC47EAF} = {F742864D-9400-4CE2-957A-DBD0A0237277}
{B37FC059-5E9E-4893-994A-64D835D2A54F} = {F742864D-9400-4CE2-957A-DBD0A0237277}
{CA6983AD-C1B2-4524-93FF-2281C657B037} = {F742864D-9400-4CE2-957A-DBD0A0237277}
{B46F0315-6CE4-414A-BDDA-186090F5062C} = {F742864D-9400-4CE2-957A-DBD0A0237277}
{27F58640-D424-40F5-945E-42BF8BC872A0} = {F742864D-9400-4CE2-957A-DBD0A0237277}
{9773C7DA-DD1A-490D-B4D8-CEA18804AD1E} = {F742864D-9400-4CE2-957A-DBD0A0237277}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Tests\Tests.csproj
Expand Down
Loading

0 comments on commit 9e2ce9a

Please sign in to comment.