Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update various dependencies #737

Merged
merged 37 commits into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
df715c8
Update runner dependencies
Elanis May 2, 2024
0883875
Bump github.com/wailsapp/wails/v2 in /benchmark/01-empty-app/wails
dependabot[bot] May 1, 2024
4e2212b
Bump github.com/wailsapp/wails/v2
dependabot[bot] May 1, 2024
0a761a0
[01-empty-app/] [DotnetMauiVue/] Update npm dependencies
Elanis May 2, 2024
d8589cb
[01-empty-app/] [electron/] Update npm dependencies
Elanis May 2, 2024
38c5976
[01-empty-app/] [nodegui/] Update npm dependencies
Elanis May 2, 2024
a66b2d5
[01-empty-app/] [tauri/] Update npm dependencies
Elanis May 2, 2024
710ff96
[01-empty-app/] [tauri/] Update tauri dependencies
Elanis May 2, 2024
0bb5713
[01-empty-app/] [wails/] Update npm dependencies
Elanis May 2, 2024
276f2d7
[02-empty-app-frameless/] [electron/] Update npm dependencies
Elanis May 2, 2024
68c2ec3
[02-empty-app-frameless/] [nodegui/] Update npm dependencies
Elanis May 2, 2024
9f5c390
[02-empty-app-frameless/] [tauri/] Update npm dependencies
Elanis May 2, 2024
6177ba8
[02-empty-app-frameless/] [tauri/] Update tauri dependencies
Elanis May 2, 2024
808992b
[02-empty-app-frameless/] [wails/] Update npm dependencies
Elanis May 2, 2024
75bf1b8
[01-empty-app/] [DotnetMauiVue/] Fix eslint
Elanis May 2, 2024
6359a23
Update Cargo.toml files to follow Cargo.lock files content
Elanis May 2, 2024
8100b32
Update .NET MAUI example
Elanis May 2, 2024
7b825a8
Update .NET MAUI Vue example
Elanis May 2, 2024
48dd5e3
Flutter upgrade to v3
Elanis May 5, 2024
e9035f3
[01-empty-app/] [DotnetMauiVue/] Update npm dependencies
Elanis May 5, 2024
cf5fac1
[01-empty-app/] [tauri/] Update tauri dependencies
Elanis May 5, 2024
6c86918
[01-empty-app/] [wails/] Update npm dependencies
Elanis May 5, 2024
7c2ac29
Add flutter to dependabot
Elanis May 5, 2024
cde6895
[02-empty-app-frameless/] [tauri/] Update tauri dependencies
Elanis May 5, 2024
3d8540c
[02-empty-app-frameless/] [wails/] Update npm dependencies
Elanis May 5, 2024
10b18b6
Update benchmark for 01-empty-app on ubuntu-latest
Elanis May 5, 2024
819e6ab
Update benchmark for 02-empty-app-frameless on ubuntu-latest
Elanis May 5, 2024
c82451a
Update benchmark for 01-empty-app on windows-latest
Elanis May 5, 2024
17f1842
Update benchmark for 02-empty-app-frameless on windows-latest
Elanis May 5, 2024
3fbb89f
Update benchmark for 01-empty-app on ubuntu-latest
Elanis May 6, 2024
ff0e172
Update benchmark for 02-empty-app-frameless on ubuntu-latest
Elanis May 6, 2024
68920ab
Update benchmark for 01-empty-app on windows-latest
Elanis May 6, 2024
9341a8c
Update benchmark for 02-empty-app-frameless on windows-latest
Elanis May 6, 2024
07ac285
Update benchmark for 01-empty-app on macos-latest
Elanis May 6, 2024
21df092
Update benchmark for 02-empty-app-frameless on macos-latest
Elanis May 6, 2024
6dc62a0
Remove broken result
Elanis May 7, 2024
8673e61
Remove macos x64 results
Elanis May 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ updates:
directory: "benchmark/01-empty-app/electron"
schedule:
interval: monthly
- package-ecosystem: pub
directory: "benchmark/01-empty-app/flutter"
schedule:
interval: monthly
- package-ecosystem: npm
directory: "benchmark/01-empty-app/nodegui"
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/runner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
# Setup the flutter environment.
- uses: subosito/flutter-action@v2
with:
flutter-version: '2.x'
flutter-version: '3.x'

# Setup the go environment
- uses: actions/setup-go@v5
Expand Down
98 changes: 52 additions & 46 deletions README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<!--<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>-->
<TargetFramework Condition="$([MSBuild]::IsOSPlatform('OSX'))">net6.0-maccatalyst</TargetFramework>
<TargetFramework Condition="$([MSBuild]::IsOSPlatform('windows'))">net6.0-windows10.0.19041.0</TargetFramework>
<TargetFramework Condition="$([MSBuild]::IsOSPlatform('OSX'))">net8.0-maccatalyst</TargetFramework>
<TargetFramework Condition="$([MSBuild]::IsOSPlatform('windows'))">net8.0-windows10.0.19041.0</TargetFramework>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
<OutputType>Exe</OutputType>
Expand Down Expand Up @@ -49,4 +49,8 @@
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.Maui.Controls" Version="8.0.21" />
<PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.21" />
</ItemGroup>
</Project>
12 changes: 11 additions & 1 deletion benchmark/01-empty-app/DotnetMauiVue/DotnetMauiVue.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetMauiVue", "DotnetMauiVue\DotnetMauiVue.csproj", "{EA473A51-9359-47E9-83DA-BE0773F6B8C1}"
# Visual Studio Version 17
VisualStudioVersion = 17.9.34622.214
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetMauiVue", "DotnetMauiVue\DotnetMauiVue.csproj", "{EA473A51-9359-47E9-83DA-BE0773F6B8C1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -10,7 +13,14 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EA473A51-9359-47E9-83DA-BE0773F6B8C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EA473A51-9359-47E9-83DA-BE0773F6B8C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EA473A51-9359-47E9-83DA-BE0773F6B8C1}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{EA473A51-9359-47E9-83DA-BE0773F6B8C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EA473A51-9359-47E9-83DA-BE0773F6B8C1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {EF50097D-6728-437C-91B1-7E357165BECB}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -1,56 +1,63 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
<OutputType>Exe</OutputType>
<RootNamespace>DotnetMauiVue</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<EnableDefaultCssItems>false</EnableDefaultCssItems>

<!-- Display name -->
<ApplicationTitle>DotnetMauiVue</ApplicationTitle>

<!-- App Identifier -->
<ApplicationId>com.companyname.dotnetmauivue</ApplicationId>
<ApplicationIdGuid>5EBE64A3-BA9A-412C-94F2-B5DEC5A7EE9C</ApplicationIdGuid>

<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>

<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />

<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />

<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />

<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />

<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
</ItemGroup>

<PropertyGroup>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Android'))">net8.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('OSX'))">net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
<OutputType>Exe</OutputType>
<RootNamespace>DotnetMauiVue</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<EnableDefaultCssItems>false</EnableDefaultCssItems>

<!-- Display name -->
<ApplicationTitle>DotnetMauiVue</ApplicationTitle>

<!-- App Identifier -->
<ApplicationId>com.companyname.dotnetmauivue</ApplicationId>
<ApplicationIdGuid>5EBE64A3-BA9A-412C-94F2-B5DEC5A7EE9C</ApplicationIdGuid>

<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>

<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />

<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />

<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />

<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />

<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<Folder Include="Components\" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,34 @@
@code {

[JSInvokable]
public static Task<string> GetFoo()
{
public static Task<string> GetFoo() {
return Task.FromResult("this is foo call C# method from js");
}

[JSInvokable]
public static Task<int> Add(AddInput addInput)
{
public static Task<int> Add(AddInput addInput) {
return Task.FromResult(addInput.a + addInput.b);
}

public async void Post(object o, EventArgs a)
{
public async void Post(object o, EventArgs a) {
await JSRuntime.InvokeAsync<string>("postBar", "this is bar call js method from C#");
}

protected override async Task OnAfterRenderAsync(bool firstRender)
{
protected override async Task OnAfterRenderAsync(bool firstRender) {
((App.Current as App).MainPage as MainPage).OnPostBar += this.Post;
try
{
if (firstRender)
{
try {
if (firstRender) {
await JSRuntime.InvokeAsync<IJSObjectReference>("import", "./assets/index.js", new { crossorigin = "anonymous" });
}


}
catch (Exception ex)
{
} catch (Exception ex) {
Console.WriteLine(ex);
}

}

public void Dispose()
{
public void Dispose() {
(Application.Current.MainPage as MainPage).OnPostBar -= this.Post;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using Microsoft.AspNetCore.Components;

namespace DotnetMauiVue;

public partial class Home : ComponentBase {
public Home() {
}
}
15 changes: 8 additions & 7 deletions benchmark/01-empty-app/DotnetMauiVue/DotnetMauiVue/MainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:DotnetMauiVue"
x:Class="DotnetMauiVue.MainPage"
BackgroundColor="{DynamicResource PageBackgroundColor}">
BackgroundColor="{DynamicResource PageBackgroundColor}"
>
<Grid>
<BlazorWebView x:Name="blazorWebView" HostPage="wwwroot/index.html">
<BlazorWebView.RootComponents>
<RootComponent Selector="#blazorapp" ComponentType="{x:Type local:Main}" />
</BlazorWebView.RootComponents>
</BlazorWebView>
<Button Text="Post Bar To WebView" HorizontalOptions="Center" VerticalOptions="End" HeightRequest="40" Clicked="PostBar_Clicked"></Button>
<BlazorWebView x:Name="blazorWebView" HostPage="wwwroot/index.html">
<BlazorWebView.RootComponents>
<RootComponent Selector="#blazorapp" ComponentType="{x:Type local:Home}" />
</BlazorWebView.RootComponents>
</BlazorWebView>
<Button Text="Post Bar To WebView" HorizontalOptions="Center" VerticalOptions="End" HeightRequest="40" Clicked="PostBar_Clicked"></Button>
</Grid>
</ContentPage>
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
namespace DotnetMauiVue;

public partial class MainPage : ContentPage
{
public partial class MainPage : ContentPage {
public event EventHandler<EventArgs> OnPostBar;
int count = 0;
public MainPage()
{

public MainPage() {
InitializeComponent();
}
private async void PostBar_Clicked(object sender, EventArgs args)
{
private void PostBar_Clicked(object sender, EventArgs args) {
OnPostBar?.Invoke(this, args);
}
}
Loading
Loading