Skip to content
This repository has been archived by the owner on Dec 17, 2021. It is now read-only.

Commit

Permalink
Merge pull request #189 from Daddoon/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Daddoon authored Mar 27, 2020
2 parents 7bc9953 + 3798915 commit 43e42b5
Show file tree
Hide file tree
Showing 1,419 changed files with 49,903 additions and 558 deletions.
2 changes: 1 addition & 1 deletion BlazorMobile.sln
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorMobile.Sample.AppPack
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorMobile.InteropBlazorApp.AnotherApp", "src\BlazorMobile.InteropBlazorApp.AnotherApp\BlazorMobile.InteropBlazorApp.AnotherApp.csproj", "{F68DAC97-2CC9-46FA-A7F5-BD71BBB271A2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorMobile.InteropApp.DummyRCL", "src\BlazorMobile.InteropApp.DummyRCL\BlazorMobile.InteropApp.DummyRCL.csproj", "{9C93F9E4-99B6-405D-8E94-CFD4BD3C620C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorMobile.InteropApp.DummyRCL", "src\BlazorMobile.InteropApp.DummyRCL\BlazorMobile.InteropApp.DummyRCL.csproj", "{9C93F9E4-99B6-405D-8E94-CFD4BD3C620C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
38 changes: 37 additions & 1 deletion MIGRATION.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

# Migration

- [BlazorMobile 3.2.3-preview2.20160.5 to 3.2.4-preview2.20160.5](#blazormobile-323-preview2201605-to-324-preview2201605)
- [BlazorMobile 3.2.2-preview1.20073.1 to 3.2.3-preview2.20160.5](#blazormobile-322-preview1200731-to-323-preview2201605)
- [BlazorMobile 3.2.0-preview1.20073.1 to 3.2.2-preview1.20073.1](#blazormobile-320-preview1200731-to-322-preview1200731)
- [BlazorMobile 3.1.0-preview3.19555.2 to 3.2.0-preview1.20073.1](#blazormobile-310-preview3195552-to-320-preview1200731)
Expand Down Expand Up @@ -1187,4 +1188,39 @@ dotnet new -i BlazorMobile.Templates::3.2.3-preview2.20160.5

- Update your Blazor WebAssembly project to **3.2.0-preview2.20160.5**. See this [Microsoft migration guide to Blazor WebAssembly 3.2.0 Preview 2](https://devblogs.microsoft.com/aspnet/blazor-webassembly-3-2-0-preview-2-release-now-available/)

- Update all your BlazorMobile.* NuGet packages to **3.2.3-preview2.20160.5**.
- Update all your BlazorMobile.* NuGet packages to **3.2.3-preview2.20160.5**.

### BlazorMobile 3.2.3-preview2.20160.5 to 3.2.4-preview2.20160.5

#### Release note:

- Add **select** tag behavior support missing on Android
- Add **input** type **file** behavior support missing on Android

#### Migration guide:

- Update your installed BlazorMobile.Templates to this version by calling:

```console
dotnet new -i BlazorMobile.Templates::3.2.4-preview2.20160.5
```

- Update all your BlazorMobile.* NuGet packages to **3.2.4-preview2.20160.5**.

- In your **MainActivity.cs** file in your Android project, make your **MainActivity** class inheriting from **BlazorMobileFormsAppCompatActivity** instead of **FormsAppCompatActivity**.

Before:

```csharp
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
{
```

After:

```csharp
public class MainActivity : global::BlazorMobile.Droid.Platform.BlazorMobileFormsAppCompatActivity
{
```

- If you have your own overrides on **OnActivityResult** or **OnCreate** on your **MainActivity** class, be sure to not forget to call the base implementation.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ The main differences / advantages of BlazorMobile are:
First install the template model with the following command from a command prompt:

```console
dotnet new -i BlazorMobile.Templates::3.2.3-preview2.20160.5
dotnet new -i BlazorMobile.Templates::3.2.4-preview2.20160.5
```

Then go the folder where you want your project to be created, and from a command prompt type the following command, and of course replace **MyProjectName** to your desired project name:
Expand Down
8 changes: 8 additions & 0 deletions src/BlazorMobile.Android/BlazorMobile.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,18 @@
<ItemGroup>
<Compile Include="Components\BlazorGeckoView.cs" />
<Compile Include="Handler\BlazorContentDelegate.cs" />
<Compile Include="Handler\BlazorGeckoViewPromptDelegate.cs" />
<Compile Include="Handler\BlazorProgressDelegate.cs" />
<Compile Include="Handler\BlazorNavigationDelegate.cs" />
<Compile Include="Helper\FileCachingHelper.cs" />
<Compile Include="Helper\KeyboardUtil.cs" />
<Compile Include="Helper\RequestPermissionsHelper.cs" />
<Compile Include="Helper\WebExtensionHelper.cs" />
<Compile Include="Interop\WebViewService.cs" />
<Compile Include="Platform\BlazorMobileFormsAppCompatActivity.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Renderer\BlazorGeckoViewRenderer.cs" />
<Compile Include="Resources\Resource.Designer.cs" />
<Compile Include="Services\ApplicationStoreService.cs" />
<Compile Include="Services\BlazorWebViewService.cs" />
</ItemGroup>
Expand All @@ -77,6 +82,9 @@
<Name>BlazorMobile</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\intent_listview_row.xml" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.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.
Expand Down
Loading

0 comments on commit 43e42b5

Please sign in to comment.