Skip to content

Commit 5aa0006

Browse files
galvesribeirogalvesribeiro
authored
Preview7 (#30)
* preview7 updates * fix serverside * CI fix
1 parent 10edbae commit 5aa0006

File tree

9 files changed

+170
-169
lines changed

9 files changed

+170
-169
lines changed

‎.vsts-ci.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
queue: 'Hosted VS2017'
2-
3-
variables:
4-
buildConfiguration: 'Release'
5-
6-
steps:
7-
- task: DotNetCoreInstaller@0
8-
inputs:
9-
packageType: 'sdk'
10-
version: '3.0.100-preview4-011223'
11-
- task: Npm@1
12-
inputs:
13-
command: 'install'
14-
workingDir: src/Blazor.Extensions.Canvas.JS
15-
- task: DotNetCoreCLI@2
16-
inputs:
17-
command: 'build'
18-
projects: '**/*.csproj'
19-
arguments: '--configuration $(buildConfiguration)'
20-
21-
- task: DotNetCoreCLI@2
22-
inputs:
23-
command: pack
24-
packagesToPack: 'src/Blazor.Extensions.Canvas/*.csproj'
25-
configuration: '$(buildConfiguration)'
26-
versioningScheme: byPrereleaseNumber
27-
majorVersion: '0'
28-
minorVersion: '1'
1+
queue: 'Hosted VS2017'
2+
3+
variables:
4+
buildConfiguration: 'Release'
5+
6+
steps:
7+
- task: DotNetCoreInstaller@0
8+
inputs:
9+
packageType: 'sdk'
10+
version: 3.0.100-preview7-012821
11+
- task: Npm@1
12+
inputs:
13+
command: 'install'
14+
workingDir: src/Blazor.Extensions.Canvas.JS
15+
- task: DotNetCoreCLI@2
16+
inputs:
17+
command: 'build'
18+
projects: '**/*.csproj'
19+
arguments: '--configuration $(buildConfiguration)'
20+
21+
- task: DotNetCoreCLI@2
22+
inputs:
23+
command: pack
24+
packagesToPack: 'src/Blazor.Extensions.Canvas/*.csproj'
25+
configuration: '$(buildConfiguration)'
26+
versioningScheme: byPrereleaseNumber
27+
majorVersion: '0'
28+
minorVersion: '1'
2929
patchVersion: '0'

‎.vsts-release.yml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
queue: 'Hosted VS2017'
2-
3-
variables:
4-
buildConfiguration: 'Release'
5-
6-
steps:
7-
- task: DotNetCoreInstaller@0
8-
inputs:
9-
packageType: 'sdk'
10-
version: '3.0.100-preview4-011223'
11-
12-
- task: Npm@1
13-
inputs:
14-
command: 'install'
15-
workingDir: src/Blazor.Extensions.Canvas.JS
16-
17-
- task: DotNetCoreCLI@2
18-
inputs:
19-
command: 'build'
20-
projects: '**/*.csproj'
21-
arguments: '--configuration $(buildConfiguration)'
22-
23-
- task: DotNetCoreCLI@2
24-
inputs:
25-
command: pack
26-
packagesToPack: 'src/Blazor.Extensions.Canvas/*.csproj'
27-
packDirectory: '$(build.artifactStagingDirectory)'
28-
configuration: '$(buildConfiguration)'
29-
versioningScheme: byEnvVar
30-
versionEnvVar: Version
31-
32-
- task: NuGetCommand@2
33-
inputs:
34-
command: push
35-
packagesToPush: '$(build.ArtifactStagingDirectory)/**/*.nupkg;!$(build.ArtifactStagingDirectory)/**/*.symbols.nupkg'
36-
publishFeedCredentials: 'BlazorExtensions'
37-
nuGetFeedType: external
38-
versioningScheme: byEnvVar
1+
queue: 'Hosted VS2017'
2+
3+
variables:
4+
buildConfiguration: 'Release'
5+
6+
steps:
7+
- task: DotNetCoreInstaller@0
8+
inputs:
9+
packageType: 'sdk'
10+
version: 3.0.100-preview7-012821
11+
12+
- task: Npm@1
13+
inputs:
14+
command: 'install'
15+
workingDir: src/Blazor.Extensions.Canvas.JS
16+
17+
- task: DotNetCoreCLI@2
18+
inputs:
19+
command: 'build'
20+
projects: '**/*.csproj'
21+
arguments: '--configuration $(buildConfiguration)'
22+
23+
- task: DotNetCoreCLI@2
24+
inputs:
25+
command: pack
26+
packagesToPack: 'src/Blazor.Extensions.Canvas/*.csproj'
27+
packDirectory: '$(build.artifactStagingDirectory)'
28+
configuration: '$(buildConfiguration)'
29+
versioningScheme: byEnvVar
30+
versionEnvVar: Version
31+
32+
- task: NuGetCommand@2
33+
inputs:
34+
command: push
35+
packagesToPush: '$(build.ArtifactStagingDirectory)/**/*.nupkg;!$(build.ArtifactStagingDirectory)/**/*.symbols.nupkg'
36+
publishFeedCredentials: 'BlazorExtensions'
37+
nuGetFeedType: external
38+
versioningScheme: byEnvVar
3939
versionEnvVar: Version

‎src/Blazor.Extensions.Canvas/BECanvas.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
@inherits BECanvasComponent
2-
3-
<canvas id="@Id" width="@Width" height="@Height" ref="_canvasRef"></canvas>
1+
@inherits BECanvasComponent
2+
3+
<canvas id="@Id" width="@Width" height="@Height" @ref="_canvasRef"></canvas>

‎src/Blazor.Extensions.Canvas/Blazor.Extensions.Canvas.csproj‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
3-
<PropertyGroup>
4-
<Title>Blazor Extensions Canvas</Title>
5-
<Description>HTML5 Canvas API implementation for ASP.NET Core Blazor.</Description>
6-
</PropertyGroup>
7-
8-
<PropertyGroup>
9-
<OutputType>Library</OutputType>
10-
<BlazorLinkOnBuild>false</BlazorLinkOnBuild>
11-
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeP2POutput</TargetsForTfmSpecificBuildOutput>
12-
</PropertyGroup>
13-
14-
<PropertyGroup>
15-
<LangVersion>Preview</LangVersion>
16-
<RazorLangVersion>3.0</RazorLangVersion>
17-
</PropertyGroup>
18-
19-
<ItemGroup>
20-
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
21-
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
22-
</ItemGroup>
23-
24-
<ItemGroup>
25-
<ProjectReference Include="..\Blazor.Extensions.Canvas.JS\Blazor.Extensions.Canvas.JS.csproj" PrivateAssets="All" />
26-
</ItemGroup>
27-
28-
<Target Name="IncludeP2POutput">
29-
<ItemGroup>
30-
<BuildOutputInPackage Include="$(OutputPath)Blazor.Extensions.Canvas.JS.dll" />
31-
</ItemGroup>
32-
</Target>
33-
34-
<ItemGroup>
35-
<Content Update="**\*.razor">
36-
<Pack>false</Pack>
37-
</Content>
38-
</ItemGroup>
39-
40-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk.Razor">
2+
3+
<PropertyGroup>
4+
<Title>Blazor Extensions Canvas</Title>
5+
<Description>HTML5 Canvas API implementation for ASP.NET Core Blazor.</Description>
6+
</PropertyGroup>
7+
8+
<PropertyGroup>
9+
<OutputType>Library</OutputType>
10+
<BlazorLinkOnBuild>false</BlazorLinkOnBuild>
11+
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeP2POutput</TargetsForTfmSpecificBuildOutput>
12+
</PropertyGroup>
13+
14+
<PropertyGroup>
15+
<LangVersion>7.3</LangVersion>
16+
<RazorLangVersion>3.0</RazorLangVersion>
17+
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
18+
</PropertyGroup>
19+
20+
<ItemGroup>
21+
<PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview7.19365.7" />
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<ProjectReference Include="..\Blazor.Extensions.Canvas.JS\Blazor.Extensions.Canvas.JS.csproj" PrivateAssets="All" />
26+
</ItemGroup>
27+
28+
<Target Name="IncludeP2POutput">
29+
<ItemGroup>
30+
<BuildOutputInPackage Include="$(OutputPath)Blazor.Extensions.Canvas.JS.dll" />
31+
</ItemGroup>
32+
</Target>
33+
34+
<ItemGroup>
35+
<Content Update="**\*.razor">
36+
<Pack>false</Pack>
37+
</Content>
38+
</ItemGroup>
39+
40+
</Project>

‎test/Blazor.Extensions.Canvas.Test.ClientSide/Blazor.Extensions.Canvas.Test.ClientSide.csproj‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<LangVersion>7.3</LangVersion>
6-
<RazorLangVersion>3.0</RazorLangVersion>
7-
</PropertyGroup>
8-
9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
11-
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
12-
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
13-
</ItemGroup>
14-
15-
<ItemGroup>
16-
<ProjectReference Include="..\..\src\Blazor.Extensions.Canvas.JS\Blazor.Extensions.Canvas.JS.csproj" />
17-
<ProjectReference Include="..\..\src\Blazor.Extensions.Canvas\Blazor.Extensions.Canvas.csproj" />
18-
</ItemGroup>
19-
20-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<OutputType>Exe</OutputType>
6+
<LangVersion>7.3</LangVersion>
7+
<RazorLangVersion>3.0</RazorLangVersion>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview7.19365.7" />
12+
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview7.19365.7" PrivateAssets="all" />
13+
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview7.19365.7" PrivateAssets="all" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<ProjectReference Include="..\..\src\Blazor.Extensions.Canvas.JS\Blazor.Extensions.Canvas.JS.csproj" />
18+
<ProjectReference Include="..\..\src\Blazor.Extensions.Canvas\Blazor.Extensions.Canvas.csproj" />
19+
</ItemGroup>
20+
21+
</Project>

‎test/Blazor.Extensions.Canvas.Test.ClientSide/Pages/Index.razor‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
@page "/"
2-
@inherits IndexComponent
3-
4-
<h1>Canvas demo!!!</h1>
5-
6-
<a href="/webgl">View WebGL page</a><br>
7-
8-
Welcome to your new app.
9-
10-
<BECanvas Width="300" Height="400" ref="_canvasReference"></BECanvas>
1+
@page "/"
2+
@inherits IndexComponent
3+
4+
<h1>Canvas demo!!!</h1>
5+
6+
<a href="/webgl">View WebGL page</a><br>
7+
8+
Welcome to your new app.
9+
10+
<BECanvas Width="300" Height="400" @ref="_canvasReference"></BECanvas>

‎test/Blazor.Extensions.Canvas.Test.ClientSide/Pages/WebGL.razor‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
@page "/webgl"
2-
@inherits WebGLComponent
3-
4-
<h1>Canvas demo!!!</h1>
5-
6-
<a href="/">View Canvas2d page</a><br>
7-
8-
Welcome to your new app.
9-
10-
<BECanvas Width="800" Height="600" ref="_canvasReference"></BECanvas>
1+
@page "/webgl"
2+
@inherits WebGLComponent
3+
4+
<h1>Canvas demo!!!</h1>
5+
6+
<a href="/">View Canvas2d page</a><br>
7+
8+
Welcome to your new app.
9+
10+
<BECanvas Width="800" Height="600" @ref="_canvasReference"></BECanvas>

‎test/Blazor.Extensions.Canvas.Test.ServerSide/Pages/Index.razor‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
@page "/"
2-
@inherits IndexComponent
3-
4-
<h1>Canvas demo!!!</h1>
5-
6-
<a href="/webgl">View WebGL page</a><br>
7-
8-
Welcome to your new app.
9-
10-
<BECanvas Width="300" Height="400" ref="_canvasReference"></BECanvas>
1+
@page "/"
2+
@inherits IndexComponent
3+
4+
<h1>Canvas demo!!!</h1>
5+
6+
<a href="/webgl">View WebGL page</a><br>
7+
8+
Welcome to your new app.
9+
10+
<BECanvas Width="300" Height="400" @ref="_canvasReference"></BECanvas>

‎test/Blazor.Extensions.Canvas.Test.ServerSide/Pages/WebGL.razor‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
@page "/webgl"
2-
@inherits WebGLComponent
3-
4-
<h1>Canvas demo!!!</h1>
5-
6-
<a href="/">View Canvas2d page</a><br>
7-
8-
Welcome to your new app.
9-
10-
<BECanvas Width="800" Height="600" ref="_canvasReference"></BECanvas>
1+
@page "/webgl"
2+
@inherits WebGLComponent
3+
4+
<h1>Canvas demo!!!</h1>
5+
6+
<a href="/">View Canvas2d page</a><br>
7+
8+
Welcome to your new app.
9+
10+
<BECanvas Width="800" Height="600" @ref="_canvasReference"></BECanvas>

0 commit comments

Comments
 (0)