ASP.NET Core 3.0 support

- Blazor API(s) are fixed to for ASP.NET Core 3.0
- Google Maps final improvments are fixed

.gitignore

@@ -328,3 +328,4 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
+demo/Blazor.GoogleMap.Server/appsettings.Development.json

Blazor.GoogleMap.sln

@@ -3,12 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28902.138
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor.GoogleMap.Server", "demo\Blazor.GoogleMap.Server\Blazor.GoogleMap.Server.csproj", "{9D7D3AA1-A81E-454B-9B17-0B35CDBDCC3C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor.GoogleMap.Client", "demo\Blazor.GoogleMap.Client\Blazor.GoogleMap.Client.csproj", "{8015065B-010D-420B-9539-518D042BA0B4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor.GoogleMap.Shared", "demo\Blazor.GoogleMap.Shared\Blazor.GoogleMap.Shared.csproj", "{5265BA8E-F1A9-436A-9A19-2AC97373E3D2}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{A76C4CD5-7315-48CE-8A01-122B0662BAA5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EB447513-2400-44A6-B2B1-A3E53EBFC999}"
@@ -20,37 +14,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_solutionItems", "_solution
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor.GoogleMap.Server", "demo\Blazor.GoogleMap.Server\Blazor.GoogleMap.Server.csproj", "{72279C45-BCD5-4F61-8E2B-179DED8BE123}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9D7D3AA1-A81E-454B-9B17-0B35CDBDCC3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D7D3AA1-A81E-454B-9B17-0B35CDBDCC3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D7D3AA1-A81E-454B-9B17-0B35CDBDCC3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D7D3AA1-A81E-454B-9B17-0B35CDBDCC3C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8015065B-010D-420B-9539-518D042BA0B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8015065B-010D-420B-9539-518D042BA0B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8015065B-010D-420B-9539-518D042BA0B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8015065B-010D-420B-9539-518D042BA0B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5265BA8E-F1A9-436A-9A19-2AC97373E3D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5265BA8E-F1A9-436A-9A19-2AC97373E3D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5265BA8E-F1A9-436A-9A19-2AC97373E3D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5265BA8E-F1A9-436A-9A19-2AC97373E3D2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8833072A-796E-43D9-840C-346F4C80409E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8833072A-796E-43D9-840C-346F4C80409E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8833072A-796E-43D9-840C-346F4C80409E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8833072A-796E-43D9-840C-346F4C80409E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72279C45-BCD5-4F61-8E2B-179DED8BE123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72279C45-BCD5-4F61-8E2B-179DED8BE123}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72279C45-BCD5-4F61-8E2B-179DED8BE123}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72279C45-BCD5-4F61-8E2B-179DED8BE123}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{9D7D3AA1-A81E-454B-9B17-0B35CDBDCC3C} = {A76C4CD5-7315-48CE-8A01-122B0662BAA5}
-		{8015065B-010D-420B-9539-518D042BA0B4} = {A76C4CD5-7315-48CE-8A01-122B0662BAA5}
-		{5265BA8E-F1A9-436A-9A19-2AC97373E3D2} = {A76C4CD5-7315-48CE-8A01-122B0662BAA5}
 		{8833072A-796E-43D9-840C-346F4C80409E} = {EB447513-2400-44A6-B2B1-A3E53EBFC999}
+		{72279C45-BCD5-4F61-8E2B-179DED8BE123} = {A76C4CD5-7315-48CE-8A01-122B0662BAA5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9FE02341-2660-48BD-A738-C721556C415E}

README.md

@@ -1,23 +1,37 @@
 # Blazor.GoogleMap
-Blazor component for GoogleMap which allows to manipulate with GoogleMap just with C# language and no JS is required.
+Blazor(Server) component for Google Map which allows to mapping features just with C# language and ASP.NET Core 3.0
+
+Blazor Web Assembly is still in preview for ASP.NET Core 3.0 and its' API(s) are still changing a lot. So Blazor.GoogleMap.Client project is removed for now.
 
 ## IMPORTANT!
-This is very very first preview version and API it will increase and also documentation.
+This is just a preview version of the component but ready to use in PROD at your own risj. 
+In future new features will be added. Feel free to send PR(s).
 
 # Instalation
-[![NuGet Pre Release](https://img.shields.io/badge/nuget-0.0.2--preview-orange.svg)](https://www.nuget.org/packages/BlazorMap)
+Soon
 
 # Setup
+Just add ``AddGoogleMaps`` service extension to default service collection of the application. Also don't forget to check other options.
+
 ```cs
 public void ConfigureServices(IServiceCollection services)
 {
     services.AddGoogleMaps(options =>
     {
-	options.ApiKey = "Your Google Maps Api Key";
+		options.ApiKey = "Your Google Maps Api Key";
     });
 }
 ```
 
+Also don't forget to add following .js files into _Host.cshtml file as below
+
+```html
+    <script src="_framework/blazor.server.js"></script>
+
+    <script src="~/GoogleMapInterop.js"></script>
+    <script src="~/GoogleMapMarkerInterop.js"></script>
+```
+
 # Features
 * Add marker to the map
 * Add OnClick, OnDoubleClick event listeners on the map and marker
@@ -37,10 +51,11 @@ If you add marker into map whit filled property **AssociatedInfoWindowId**, afte
 @page "/map"
 @inject MarkerCollectionFactory MarkerCollectionFactory;
 @inject InfoWindow  InfoWindow;
+@inject IJSRuntime JsRuntime;
 
 <h1>Google Map</h1>
 
-<GoogleMap OnClick="@MapOnClick" OnDoubleClick="@MapOnDoubleClick"></GoogleMap>
+<GoogleMap OnClick="(args)=>MapOnClick(args)" OnDoubleClick="(args)=>MapOnDoubleClick(args)"></GoogleMap>
 <GoogleMapInfoWindow Id="infoWindow">
     <div>
         <h4>Infowindow 1</h4>
@@ -50,7 +65,7 @@ If you add marker into map whit filled property **AssociatedInfoWindowId**, afte
         }
 
 
-        <button onclick="@RemoveMarker">Remove marker</button>
+        <button @onclick="()=>RemoveMarker()">Remove marker</button>
     </div>
 </GoogleMapInfoWindow>
 
@@ -63,7 +78,7 @@ If you add marker into map whit filled property **AssociatedInfoWindowId**, afte
         }
 
 
-        <button onclick="@RemoveMarker">Remove marker</button>
+         <button @onclick="()=>RemoveMarker()">Remove marker</button>
     </div>
 </GoogleMapInfoWindow>
 
@@ -72,9 +87,9 @@ If you add marker into map whit filled property **AssociatedInfoWindowId**, afte
     IMarkerCollection markers;
     Marker selectedMarker;
 
-    protected override void OnInit()
+    protected async override Task OnInitializedAsync()
     {
-        base.OnInit();
+        await base.OnInitializedAsync();
         markers = MarkerCollectionFactory.Create();
     }
 

demo/Blazor.GoogleMap.Server/App.razor

@@ -0,0 +1,10 @@
+<Router AppAssembly="@typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+    </Found>
+    <NotFound>
+        <LayoutView Layout="@typeof(MainLayout)">
+            <p>Sorry, there's nothing at this address.</p>
+        </LayoutView>
+    </NotFound>
+</Router>

demo/Blazor.GoogleMap.Server/Blazor.GoogleMap.Server.csproj

@@ -1,22 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <RestoreAdditionalProjectSources>
-      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-      https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
-    </RestoreAdditionalProjectSources>
-    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview5-19227-01" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview5-19227-01" />
+    <Content Remove="wwwroot\GoogleMapInterop.js" />
+    <Content Remove="wwwroot\GoogleMapMarkerInterop.js" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Blazor.GoogleMap.Client\Blazor.GoogleMap.Client.csproj" />
-    <ProjectReference Include="..\Blazor.GoogleMap.Shared\Blazor.GoogleMap.Shared.csproj" />
+    <EmbeddedResource Include="wwwroot\GoogleMapInterop.js">
+      <LogicalName>blazor:js:%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="wwwroot\GoogleMapMarkerInterop.js">
+      <LogicalName>blazor:js:%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Blazor.GoogleMap\Blazor.GoogleMap.csproj" />
   </ItemGroup>
 
 </Project>