Skip to content

Commit 9e2ce9a

Browse files
committed
Merge branch 'master' into pr70
2 parents 0912fe3 + 9927f7c commit 9e2ce9a

File tree

112 files changed

+1593
-2544
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1593
-2544
lines changed

.gitignore

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/bin
22
/packages
33
/examples/packages
4-
app.config
5-
docs
6-
nuget.exe
7-
AssemblyVersion.cs
4+
test/Geocoding.Tests/settings-override.json
5+
6+
.vs
7+
/artifacts
8+
project.lock.json
89

910
#################
1011
## Visual Studio

.vscode/launch.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": ".NET Core Launch (console)",
6+
"type": "coreclr",
7+
"request": "launch",
8+
"preLaunchTask": "build",
9+
"program": "${workspaceRoot}/bin/Debug/<target-framework>/<project-name.dll>",
10+
"args": [],
11+
"cwd": "${workspaceRoot}",
12+
"externalConsole": false,
13+
"stopAtEntry": false
14+
},
15+
{
16+
"name": ".NET Core Attach",
17+
"type": "coreclr",
18+
"request": "attach",
19+
"processId": "${command.pickProcess}"
20+
}
21+
]
22+
}

.vscode/tasks.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version": "0.1.0",
3+
"command": "dotnet",
4+
"isShellCommand": true,
5+
"args": [],
6+
"tasks": [
7+
{
8+
"taskName": "build",
9+
"args": [
10+
""
11+
],
12+
"isBuildCommand": true,
13+
"problemMatcher": "$msCompile"
14+
}
15+
]
16+
}

AssemblyInfoCommon.cs

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

Core/AsyncGeocoderExtensions.cs

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

Core/Core.csproj

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

Core/IAsyncGeocoder.cs

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

Core/IBatchGeocoder.cs

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

Core/IGeocoder.cs

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

Core/Properties/AssemblyInfo.cs

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

Core/packages.config

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

Geocoding.sln

Lines changed: 37 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,61 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26430.6
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{891021E5-7521-4F93-9946-B7B630DF3192}"
7-
ProjectSection(SolutionItems) = preProject
8-
common.targets = common.targets
9-
LICENSE.md = LICENSE.md
10-
README.md = README.md
11-
teamcity.targets = teamcity.targets
12-
test.targets = test.targets
13-
EndProjectSection
14-
EndProject
15-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core Framework", "Core Framework", "{2104CCA2-94D4-4C56-9A5E-FAF9D9538817}"
16-
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{654812CF-D009-4420-B9EC-D07B030926A1}"
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "APIs", "APIs", "{F742864D-9400-4CE2-957A-DBD0A0237277}"
187
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{BB5F66AC-286B-4BA5-86EC-6DED28426132}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geocoding.Core", "src\Geocoding.Core\Geocoding.Core.csproj", "{8F490709-2265-4AAF-BAE7-A18FE054320F}"
209
EndProject
21-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "APIs", "APIs", "{F742864D-9400-4CE2-957A-DBD0A0237277}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geocoding.Google", "src\Geocoding.Google\Geocoding.Google.csproj", "{CA6983AD-C1B2-4524-93FF-2281C657B037}"
2211
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google", "Google\Google.csproj", "{2E608F4E-29F7-4AC3-922F-23D971312CAE}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geocoding.MapQuest", "src\Geocoding.MapQuest\Geocoding.MapQuest.csproj", "{B46F0315-6CE4-414A-BDDA-186090F5062C}"
2413
EndProject
25-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yahoo", "Yahoo\Yahoo.csproj", "{B2863E87-3983-46EF-8B3E-37A4475ECA13}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geocoding.Microsoft", "src\Geocoding.Microsoft\Geocoding.Microsoft.csproj", "{27F58640-D424-40F5-945E-42BF8BC872A0}"
2615
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft", "Microsoft\Microsoft.csproj", "{74BCB608-4674-452F-A50C-7EE61AC47EAF}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geocoding.Yahoo", "src\Geocoding.Yahoo\Geocoding.Yahoo.csproj", "{9773C7DA-DD1A-490D-B4D8-CEA18804AD1E}"
2817
EndProject
29-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapQuest", "MapQuest\MapQuest.csproj", "{B37FC059-5E9E-4893-994A-64D835D2A54F}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geocoding.Tests", "test\Geocoding.Tests\Geocoding.Tests.csproj", "{B87FBD8D-1E79-49F0-B06D-B4B15C1BA9C4}"
3019
EndProject
3120
Global
3221
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3322
Debug|Any CPU = Debug|Any CPU
3423
Release|Any CPU = Release|Any CPU
3524
EndGlobalSection
3625
GlobalSection(ProjectConfigurationPlatforms) = postSolution
37-
{654812CF-D009-4420-B9EC-D07B030926A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{654812CF-D009-4420-B9EC-D07B030926A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{654812CF-D009-4420-B9EC-D07B030926A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{654812CF-D009-4420-B9EC-D07B030926A1}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{BB5F66AC-286B-4BA5-86EC-6DED28426132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{BB5F66AC-286B-4BA5-86EC-6DED28426132}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{BB5F66AC-286B-4BA5-86EC-6DED28426132}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{BB5F66AC-286B-4BA5-86EC-6DED28426132}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{2E608F4E-29F7-4AC3-922F-23D971312CAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46-
{2E608F4E-29F7-4AC3-922F-23D971312CAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
47-
{2E608F4E-29F7-4AC3-922F-23D971312CAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{2E608F4E-29F7-4AC3-922F-23D971312CAE}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{B2863E87-3983-46EF-8B3E-37A4475ECA13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{B2863E87-3983-46EF-8B3E-37A4475ECA13}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{B2863E87-3983-46EF-8B3E-37A4475ECA13}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{B2863E87-3983-46EF-8B3E-37A4475ECA13}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{74BCB608-4674-452F-A50C-7EE61AC47EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{74BCB608-4674-452F-A50C-7EE61AC47EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{74BCB608-4674-452F-A50C-7EE61AC47EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{74BCB608-4674-452F-A50C-7EE61AC47EAF}.Release|Any CPU.Build.0 = Release|Any CPU
57-
{B37FC059-5E9E-4893-994A-64D835D2A54F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58-
{B37FC059-5E9E-4893-994A-64D835D2A54F}.Debug|Any CPU.Build.0 = Debug|Any CPU
59-
{B37FC059-5E9E-4893-994A-64D835D2A54F}.Release|Any CPU.ActiveCfg = Release|Any CPU
60-
{B37FC059-5E9E-4893-994A-64D835D2A54F}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{8F490709-2265-4AAF-BAE7-A18FE054320F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{8F490709-2265-4AAF-BAE7-A18FE054320F}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{8F490709-2265-4AAF-BAE7-A18FE054320F}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{8F490709-2265-4AAF-BAE7-A18FE054320F}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{CA6983AD-C1B2-4524-93FF-2281C657B037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{CA6983AD-C1B2-4524-93FF-2281C657B037}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{CA6983AD-C1B2-4524-93FF-2281C657B037}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{CA6983AD-C1B2-4524-93FF-2281C657B037}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{B46F0315-6CE4-414A-BDDA-186090F5062C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{B46F0315-6CE4-414A-BDDA-186090F5062C}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{B46F0315-6CE4-414A-BDDA-186090F5062C}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{B46F0315-6CE4-414A-BDDA-186090F5062C}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{27F58640-D424-40F5-945E-42BF8BC872A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{27F58640-D424-40F5-945E-42BF8BC872A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{27F58640-D424-40F5-945E-42BF8BC872A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{27F58640-D424-40F5-945E-42BF8BC872A0}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{9773C7DA-DD1A-490D-B4D8-CEA18804AD1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{9773C7DA-DD1A-490D-B4D8-CEA18804AD1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{9773C7DA-DD1A-490D-B4D8-CEA18804AD1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
45+
{9773C7DA-DD1A-490D-B4D8-CEA18804AD1E}.Release|Any CPU.Build.0 = Release|Any CPU
46+
{B87FBD8D-1E79-49F0-B06D-B4B15C1BA9C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{B87FBD8D-1E79-49F0-B06D-B4B15C1BA9C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{B87FBD8D-1E79-49F0-B06D-B4B15C1BA9C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{B87FBD8D-1E79-49F0-B06D-B4B15C1BA9C4}.Release|Any CPU.Build.0 = Release|Any CPU
6150
EndGlobalSection
6251
GlobalSection(SolutionProperties) = preSolution
6352
HideSolutionNode = FALSE
6453
EndGlobalSection
6554
GlobalSection(NestedProjects) = preSolution
66-
{654812CF-D009-4420-B9EC-D07B030926A1} = {2104CCA2-94D4-4C56-9A5E-FAF9D9538817}
67-
{BB5F66AC-286B-4BA5-86EC-6DED28426132} = {2104CCA2-94D4-4C56-9A5E-FAF9D9538817}
68-
{F742864D-9400-4CE2-957A-DBD0A0237277} = {2104CCA2-94D4-4C56-9A5E-FAF9D9538817}
69-
{2E608F4E-29F7-4AC3-922F-23D971312CAE} = {F742864D-9400-4CE2-957A-DBD0A0237277}
70-
{B2863E87-3983-46EF-8B3E-37A4475ECA13} = {F742864D-9400-4CE2-957A-DBD0A0237277}
71-
{74BCB608-4674-452F-A50C-7EE61AC47EAF} = {F742864D-9400-4CE2-957A-DBD0A0237277}
72-
{B37FC059-5E9E-4893-994A-64D835D2A54F} = {F742864D-9400-4CE2-957A-DBD0A0237277}
55+
{CA6983AD-C1B2-4524-93FF-2281C657B037} = {F742864D-9400-4CE2-957A-DBD0A0237277}
56+
{B46F0315-6CE4-414A-BDDA-186090F5062C} = {F742864D-9400-4CE2-957A-DBD0A0237277}
57+
{27F58640-D424-40F5-945E-42BF8BC872A0} = {F742864D-9400-4CE2-957A-DBD0A0237277}
58+
{9773C7DA-DD1A-490D-B4D8-CEA18804AD1E} = {F742864D-9400-4CE2-957A-DBD0A0237277}
7359
EndGlobalSection
7460
GlobalSection(MonoDevelopProperties) = preSolution
7561
StartupItem = Tests\Tests.csproj

0 commit comments

Comments
 (0)