Skip to content

Commit 1756bed

Browse files
csharpfritzcsharpfritz
authored
Merge pull request #81 from FritzAndFriends/v0.5.0
V0.5.0
2 parents 408f80b + d2b7158 commit 1756bed

File tree

175 files changed

+3717
-605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+3717
-605
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
*.user
99
*.userosscache
1010
*.sln.docstates
11+
*.ncrunchproject
12+
*.ncrunchsolution
1113

1214
# User-specific files (MonoDevelop/Xamarin Studio)
1315
*.userprefs

‎src/BlazorMeetsWebForms.sln‎ renamed to ‎BlazorMeetsWebForms.sln‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,40 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.29521.150
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWebFormsComponents", "BlazorWebFormsComponents\BlazorWebFormsComponents.csproj", "{7E35A14A-C0EF-4705-B892-F1704ECC6B31}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWebFormsComponents", "src\BlazorWebFormsComponents\BlazorWebFormsComponents.csproj", "{7E35A14A-C0EF-4705-B892-F1704ECC6B31}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{240E45D9-B9FF-42E8-B0C1-332861E02DBF}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeforeWebForms", "..\samples\BeforeWebForms\BeforeWebForms.csproj", "{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeforeWebForms", "samples\BeforeWebForms\BeforeWebForms.csproj", "{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}"
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{FD758025-7F6D-4EE8-9837-98C0E0BFCB6B}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWebFormsComponents.Test", "BlazorWebFormsComponents.Test\BlazorWebFormsComponents.Test.csproj", "{70EC4DF2-FE9B-49F4-B385-040E45BC7764}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWebFormsComponents.Test", "src\BlazorWebFormsComponents.Test\BlazorWebFormsComponents.Test.csproj", "{70EC4DF2-FE9B-49F4-B385-040E45BC7764}"
1515
EndProject
1616
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Version", "Version", "{CF13A094-3FCB-470C-8450-1E1B4B05400D}"
1717
ProjectSection(SolutionItems) = preProject
18-
..\Directory.Build.props = ..\Directory.Build.props
19-
..\version.json = ..\version.json
18+
Directory.Build.props = Directory.Build.props
19+
version.json = version.json
2020
EndProjectSection
2121
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedSampleObjects", "..\samples\SharedSampleObjects\SharedSampleObjects.csproj", "{6C602B37-5FC9-43FF-A3D8-C92B42D62F0D}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedSampleObjects", "samples\SharedSampleObjects\SharedSampleObjects.csproj", "{6C602B37-5FC9-43FF-A3D8-C92B42D62F0D}"
2323
EndProject
24-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AfterBlazorClientSide", "..\samples\AfterBlazorClientSide\AfterBlazorClientSide.csproj", "{7218D3E2-38BD-429D-9D84-15E688BDC4A1}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AfterBlazorClientSide", "samples\AfterBlazorClientSide\AfterBlazorClientSide.csproj", "{7218D3E2-38BD-429D-9D84-15E688BDC4A1}"
2525
EndProject
26-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AfterBlazorServerSide", "..\samples\AfterBlazorServerSide\AfterBlazorServerSide.csproj", "{1669CD22-5CCE-4D96-A02B-31D81B5EFB2B}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AfterBlazorServerSide", "samples\AfterBlazorServerSide\AfterBlazorServerSide.csproj", "{1669CD22-5CCE-4D96-A02B-31D81B5EFB2B}"
27+
EndProject
28+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionInfo", "SolutionInfo", "{230A010B-4503-4DBA-8F60-8EF13CA0A4DF}"
29+
ProjectSection(SolutionItems) = preProject
30+
.editorconfig = .editorconfig
31+
CODE-OF-CONDUCT.md = CODE-OF-CONDUCT.md
32+
CONTRIBUTING.md = CONTRIBUTING.md
33+
Directory.Build.props = Directory.Build.props
34+
global.json = global.json
35+
LICENSE = LICENSE
36+
nuget.config = nuget.config
37+
README.md = README.md
38+
version.json = version.json
39+
EndProjectSection
2740
EndProject
2841
Global
2942
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,9 @@
66
<PrivateAssets>all</PrivateAssets>
77
</PackageReference>
88
</ItemGroup>
9+
10+
<PropertyGroup>
11+
<BlazorWebAssemblyVersion>3.2.0-preview1.20073.1</BlazorWebAssemblyVersion>
12+
</PropertyGroup>
13+
914
</Project>

‎README.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
A collection of Blazor components that emulate the web forms components of the same name
44

5-
[![Build status](https://dev.azure.com/FritzAndFriends/BlazorWebFormsComponents/_apis/build/status/BlazorWebFormsComponents-.NET%20Standard-CI)](https://dev.azure.com/FritzAndFriends/BlazorWebFormsComponents/_build/latest?definitionId=14)
5+
[![Build status](https://dev.azure.com/FritzAndFriends/BlazorWebFormsComponents/_apis/build/status/BlazorWebFormsComponents-.NET%20Standard-CI)](https://dev.azure.com/FritzAndFriends/BlazorWebFormsComponents/_build/latest?definitionId=14) [![Join the chat at https://gitter.im/BlazorWebFormsComponents/community](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/BlazorWebFormsComponents/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
66

77
[![Nuget](https://img.shields.io/nuget/v/Fritz.BlazorWebFormsComponents?color=violet)](https://www.nuget.org/packages/Fritz.BlazorWebFormsComponents/) [![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/Fritz.BlazorWebFormsComponents)](https://www.nuget.org/packages/Fritz.BlazorWebFormsComponents/)
88

@@ -14,6 +14,8 @@ This is not for everyone, not everyone needs to migrate their application. They
1414

1515
[Strategies for your migration and steps ahead](docs/Migration/README.md) are available as part of this repository.
1616

17+
Portions of the [original .NET Framework](https://github.com/microsoft/referencesource) are contributed to this project under their MIT license.
18+
1719
## Blazor Components for Controls
1820

1921
There are a significant number of controls in ASP.NET Web Forms, and we will focus on creating components in the following order:
@@ -47,3 +49,11 @@ There are a significant number of controls in ASP.NET Web Forms, and we will foc
4749
- PasswordRecovery
4850

4951
We will NOT be converting any DataSource objects, Wizard components, skins or themes. Once this first collection of 23 controls is written, we can consider additional features like modern tag formatting.
52+
53+
## Compiling the project
54+
55+
There are three different types of .NET projects in this repository: .NET Framework, .NET Core, and .NET Standard. The sample projects are in the `/samples` folder, while the unit test project is next to the component library in the `/src` folder. From the root of the repository, you should be able to execute:
56+
57+
`dotnet restore` to restore packages
58+
59+
`dotnet run --project samples/AfterBlazorServerSide` to start the Blazor Server-Side samples

‎docs/TreeView.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ The TreeView component is meant to emulate the asp:TreeView control in markup an
1111
- TreeNode expand and collapse events
1212
- TreeNode checkbox checked / unchecked events
1313
- XmlDocument databinding
14+
- SiteMap databinding as an XmlDocument
15+
- Databinding events
1416

1517
##### [Back to top](#treeview)
1618

‎nuget.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<config>
4+
<add key="repositoryPath" value="src\packages" />
5+
</config>
6+
</configuration>

‎samples/AfterBlazorClientSide/AfterBlazorClientSide.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview4.19579.2" />
20-
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
21-
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview4.19579.2" />
22-
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
19+
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="$(BlazorWebAssemblyVersion)" />
20+
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(BlazorWebAssemblyVersion)" PrivateAssets="all" />
21+
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="$(BlazorWebAssemblyVersion)" />
22+
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="$(BlazorWebAssemblyVersion)" PrivateAssets="all" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎samples/AfterBlazorClientSide/Pages/Index.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
that our Blazor components render appropriately.
99
</p>
1010

11-
<ComponentList></ComponentList>
11+
<ComponentList></ComponentList>

‎samples/AfterBlazorClientSide/Program.cs‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
11
using Microsoft.AspNetCore.Blazor.Hosting;
2+
using Microsoft.AspNetCore.Components.Authorization;
3+
using Microsoft.Extensions.DependencyInjection;
4+
using System.Threading.Tasks;
25

36
namespace AfterBlazorClientSide
47
{
58
public class Program
69
{
7-
public static void Main(string[] args)
10+
public static async Task Main(string[] args)
811
{
9-
CreateHostBuilder(args).Build().Run();
12+
13+
var builder = WebAssemblyHostBuilder.CreateDefault(args);
14+
builder.RootComponents.Add<App>("app");
15+
16+
builder.Services.AddScoped<AuthenticationStateProvider, StaticAuthStateProvider>();
17+
18+
await builder.Build().RunAsync();
19+
1020
}
1121

12-
public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) =>
13-
BlazorWebAssemblyHost.CreateDefaultBuilder()
14-
.UseBlazorStartup<Startup>();
1522
}
23+
24+
public static class Startup
25+
{
26+
27+
public static string ApplicationName => "Blazor WebAssembly";
28+
29+
}
30+
1631
}

‎samples/AfterBlazorClientSide/Startup.cs‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)