Preview8 support

galvesribeiro · galvesribeiro · commit 3e5d82d94dbb · 2019-08-16T08:27:01.000-03:00
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -7,7 +7,7 @@ steps:
   - task: DotNetCoreInstaller@0
     inputs:
       packageType: 'sdk'
-      version: 3.0.100-preview7-012821
+      version: 3.0.100-preview8-013656
   - task: Npm@1
     inputs:
       command: 'install'
diff --git a/.vsts-release.yml b/.vsts-release.yml
@@ -7,7 +7,7 @@ steps:
   - task: DotNetCoreInstaller@0
     inputs:
       packageType: 'sdk'
-      version: 3.0.100-preview7-012821
+      version: 3.0.100-preview8-013656
 
   - task: Npm@1
     inputs:
diff --git a/src/Blazor.Extensions.Canvas/BECanvas.razor b/src/Blazor.Extensions.Canvas/BECanvas.razor
@@ -1,3 +1,3 @@
 @inherits BECanvasComponent
 
-<canvas id="@Id" width="@Width" height="@Height" @ref="_canvasRef" @onclick="OnClick"></canvas>
+<canvas id="@Id" width="@Width" height="@Height" @ref="_canvasRef" @ref:suppressField @onclick="OnClick"></canvas>
diff --git a/src/Blazor.Extensions.Canvas/BECanvasComponent.cs b/src/Blazor.Extensions.Canvas/BECanvasComponent.cs
@@ -7,20 +7,20 @@ namespace Blazor.Extensions
     public class BECanvasComponent : ComponentBase
     {
         [Parameter]
-        protected long Height { get; set; }
+        public long Height { get; set; }
 
         [Parameter]
-        protected long Width { get; set; }
+        public long Width { get; set; }
 
         protected readonly string Id = Guid.NewGuid().ToString();
-        protected ElementRef _canvasRef;
+        protected ElementReference _canvasRef;
 
-        internal ElementRef CanvasReference => this._canvasRef;
+        internal ElementReference CanvasReference => this._canvasRef;
 
         [Inject]
         internal IJSRuntime JSRuntime { get; set; }
 
         [Parameter]
-        protected Action<UIMouseEventArgs> OnClick { get; set; }
+        public Action<UIMouseEventArgs> OnClick { get; set; }
     }
 }
diff --git a/src/Blazor.Extensions.Canvas/Blazor.Extensions.Canvas.csproj b/src/Blazor.Extensions.Canvas/Blazor.Extensions.Canvas.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview7.19365.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0-preview8.19405.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Blazor.Extensions.Canvas/Canvas2D/Canvas2DContext.cs b/src/Blazor.Extensions.Canvas/Canvas2D/Canvas2DContext.cs
diff --git a/src/Blazor.Extensions.Canvas/RenderingContext.cs b/src/Blazor.Extensions.Canvas/RenderingContext.cs
@@ -25,7 +25,7 @@ public abstract class RenderingContext : IDisposable
         private bool _batching;
         private bool _initialized;
 
-        public ElementRef Canvas { get; }
+        public ElementReference Canvas { get; }
 
         internal RenderingContext(BECanvasComponent reference, string contextName, object parameters = null)
         {
diff --git a/test/Blazor.Extensions.Canvas.Test.ClientSide/Blazor.Extensions.Canvas.Test.ClientSide.csproj b/test/Blazor.Extensions.Canvas.Test.ClientSide/Blazor.Extensions.Canvas.Test.ClientSide.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview7.19365.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview7.19365.7" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview7.19365.7" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview8.19405.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview8.19405.7" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview8.19405.7" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Blazor.Extensions.Canvas.Test.ClientSide/Pages/Index.razor b/test/Blazor.Extensions.Canvas.Test.ClientSide/Pages/Index.razor
@@ -7,4 +7,4 @@
 
 Welcome to your new app.
 
-<BECanvas Width="300" Height="400" @ref="_canvasReference"></BECanvas>
+<BECanvas Width="300" Height="400" @ref="_canvasReference" @ref:suppressField></BECanvas>
diff --git a/test/Blazor.Extensions.Canvas.Test.ClientSide/Pages/WebGL.razor b/test/Blazor.Extensions.Canvas.Test.ClientSide/Pages/WebGL.razor
@@ -7,4 +7,4 @@
 
 Welcome to your new app.
 
-<BECanvas Width="800" Height="600" @ref="_canvasReference"></BECanvas>
+<BECanvas Width="800" Height="600" @ref="_canvasReference" @ref:suppressField></BECanvas>
diff --git a/test/Blazor.Extensions.Canvas.Test.ClientSide/_Imports.razor b/test/Blazor.Extensions.Canvas.Test.ClientSide/_Imports.razor
@@ -1,8 +1,7 @@
-@using System.Net.Http
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Layouts
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.JSInterop
-@using Blazor.Extensions.Canvas.Test.ClientSide
-@using Blazor.Extensions.Canvas.Test.ClientSide.Shared
-@using Blazor.Extensions.Canvas
+@using System.Net.Http
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.JSInterop
+@using Blazor.Extensions.Canvas.Test.ClientSide
+@using Blazor.Extensions.Canvas.Test.ClientSide.Shared
+@using Blazor.Extensions.Canvas
diff --git a/test/Blazor.Extensions.Canvas.Test.ServerSide/Pages/Index.razor b/test/Blazor.Extensions.Canvas.Test.ServerSide/Pages/Index.razor
@@ -7,4 +7,4 @@
 
 Welcome to your new app.
 
-<BECanvas Width="300" Height="400" @ref="_canvasReference"></BECanvas>
+<BECanvas Width="300" Height="400" @ref="_canvasReference" @ref:suppressField></BECanvas>
diff --git a/test/Blazor.Extensions.Canvas.Test.ServerSide/Pages/WebGL.razor b/test/Blazor.Extensions.Canvas.Test.ServerSide/Pages/WebGL.razor
@@ -7,4 +7,4 @@
 
 Welcome to your new app.
 
-<BECanvas Width="800" Height="600" @ref="_canvasReference"></BECanvas>
+<BECanvas Width="800" Height="600" @ref="_canvasReference" @ref:suppressField></BECanvas>
diff --git a/test/Blazor.Extensions.Canvas.Test.ServerSide/_Imports.razor b/test/Blazor.Extensions.Canvas.Test.ServerSide/_Imports.razor
@@ -1,8 +1,7 @@
-@using System.Net.Http
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Layouts
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.JSInterop
-@using Blazor.Extensions.Canvas.Test.ServerSide
-@using Blazor.Extensions.Canvas.Test.ServerSide.Shared
-@using Blazor.Extensions.Canvas
+@using System.Net.Http
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.JSInterop
+@using Blazor.Extensions.Canvas.Test.ServerSide
+@using Blazor.Extensions.Canvas.Test.ServerSide.Shared
+@using Blazor.Extensions.Canvas

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`@inherits BECanvasComponent`
`2`	`2`
`3`		`-<canvas id="@Id" width="@Width" height="@Height" @ref="_canvasRef" @onclick="OnClick"></canvas>`
	`3`	`+<canvas id="@Id" width="@Width" height="@Height" @ref="_canvasRef" @ref:suppressField @onclick="OnClick"></canvas>`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public abstract class RenderingContext : IDisposable`
`25`	`25`	`private bool _batching;`
`26`	`26`	`private bool _initialized;`
`27`	`27`
`28`		`- public ElementRef Canvas { get; }`
	`28`	`+ public ElementReference Canvas { get; }`
`29`	`29`
`30`	`30`	`internal RenderingContext(BECanvasComponent reference, string contextName, object parameters = null)`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,4 @@`
`7`	`7`
`8`	`8`	`Welcome to your new app.`
`9`	`9`
`10`		`-<BECanvas Width="300" Height="400" @ref="_canvasReference"></BECanvas>`
	`10`	`+<BECanvas Width="300" Height="400" @ref="_canvasReference" @ref:suppressField></BECanvas>`