Skip to content

Commit

Permalink
Merge pull request #86 from eiximenis/update-3.2.0
Browse files Browse the repository at this point in the history
Update 3.2.0 (GA of WebAssembly)
  • Loading branch information
attilah authored Feb 17, 2021
2 parents 84eccf1 + 775aaac commit 4ede4c2
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.100-preview1-014459
dotnet-version: 3.1.301
- name: Build
run: dotnet build --configuration Release
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.100-preview1-014459
dotnet-version: 3.1.301
- name: Build
run: dotnet build --configuration Release
- name: Pack
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Both Canvas 2D and WebGL are supported.

Both Blazor Server Apps and Blazor WebAssembly Apps are supported.

**NOTE** Currently targets the v3.0.0-preview8 version of Blazor.
**NOTE** Currently targets the v3.1.5 of Blazor with 3.2.0 of WebAssembly

# Installation

Expand Down
3 changes: 2 additions & 1 deletion src/Blazor.Extensions.Canvas/Blazor.Extensions.Canvas.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
<LangVersion>7.3</LangVersion>
<RazorLangVersion>3.0</RazorLangVersion>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0-preview1.19508.20" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.5" />
</ItemGroup>

<ItemGroup>
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<OutputType>Exe</OutputType>
<TargetFramework>netstandard2.1</TargetFramework>
<LangVersion>7.3</LangVersion>
<RazorLangVersion>3.0</RazorLangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview1.19508.20" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview1.19508.20" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview1.19508.20" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0" PrivateAssets="all" />

</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 6 additions & 7 deletions test/Blazor.Extensions.Canvas.Test.ClientSide/Program.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
using Microsoft.AspNetCore.Blazor.Hosting;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using System.Threading.Tasks;

namespace Blazor.Extensions.Canvas.Test.ClientSide
{
public class Program
{
static void Main(string[] args)
public static async Task Main(string[] args)
{
CreateHostBuilder(args).Build().Run();
var builder = WebAssemblyHostBuilder.CreateDefault(args);
builder.RootComponents.Add<App>("app");
await builder.Build().RunAsync();
}

public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) =>
BlazorWebAssemblyHost.CreateDefaultBuilder()
.UseBlazorStartup<Startup>();
}
}
17 changes: 0 additions & 17 deletions test/Blazor.Extensions.Canvas.Test.ClientSide/Startup.cs

This file was deleted.

0 comments on commit 4ede4c2

Please sign in to comment.