Skip to content

Commit 6f805c7

Browse files
csharpfritzcsharpfritz
committed
WIP - Updating ListView component to mimic initial properties of the ListView control
1 parent fa2392d commit 6f805c7

39 files changed

Lines changed: 1422 additions & 51 deletions

‎samples/BeforeWebForms/BeforeWebForms.csproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@
178178
<Compile Include="Global.asax.cs">
179179
<DependentUpon>Global.asax</DependentUpon>
180180
</Compile>
181-
<Compile Include="Models\Widget.cs" />
182181
<Compile Include="Properties\AssemblyInfo.cs" />
183182
<Compile Include="Site.Master.cs">
184183
<DependentUpon>Site.Master</DependentUpon>
@@ -216,6 +215,12 @@
216215
<DependentUpon>Web.config</DependentUpon>
217216
</None>
218217
</ItemGroup>
218+
<ItemGroup>
219+
<ProjectReference Include="..\..\src\SharedSampleObjects\SharedSampleObjects.csproj">
220+
<Project>{824d4f8a-e27f-4760-a185-b99380a863f2}</Project>
221+
<Name>SharedSampleObjects</Name>
222+
</ProjectReference>
223+
</ItemGroup>
219224
<PropertyGroup>
220225
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
221226
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -246,7 +251,9 @@
246251
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
247252
</PropertyGroup>
248253
<Error Condition="!Exists('..\..\src\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
254+
<Error Condition="!Exists('..\..\src\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
249255
</Target>
256+
<Import Project="..\..\src\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\src\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
250257
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
251258
Other similar extension points exist, see Microsoft.Common.targets.
252259
<Target Name="BeforeBuild">

‎samples/BeforeWebForms/ControlSamples/ListView/Default.aspx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<p>Here is a simple listview bound to a collection of widgets.</p>
88

9-
<asp:ListView ID="simpleListView" runat="server" ItemType="BeforeWebForms.Models.Widget">
9+
<asp:ListView ID="simpleListView" runat="server" ItemType="SharedSampleObjects.Models.Widget">
1010
<LayoutTemplate>
1111
<table>
1212
<thead>

‎samples/BeforeWebForms/ControlSamples/ListView/Default.aspx.cs‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using BeforeWebForms.Models;
1+
using SharedSampleObjects.Models;
22
using System;
33
using System.Collections.Generic;
44
using System.Linq;
@@ -14,14 +14,7 @@ public partial class Default : System.Web.UI.Page
1414
protected void Page_Load(object sender, EventArgs e)
1515
{
1616

17-
var widgets = new Widget[]
18-
{
19-
new Widget { Id=1, Name="First Widget", Price=7.99M, LastUpdate=DateTime.Today.AddHours(6)},
20-
new Widget { Id=2, Name="Second Widget", Price=13.99M, LastUpdate=DateTime.Today.AddHours(7)},
21-
new Widget { Id=3, Name="Third Widget", Price=100.99M, LastUpdate=DateTime.Today.AddHours(14)},
22-
23-
};
24-
simpleListView.DataSource = widgets;
17+
simpleListView.DataSource = Widget.SimpleWidgetList;
2518
simpleListView.DataBind();
2619

2720
}

‎samples/BeforeWebForms/Default.aspx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<li>DetailsView </li>
2222
<li>FormView </li>
2323
<li>GridView </li>
24-
<li><a href="~/ControlSamples/ListView">ListView</a></li>
24+
<li><a href="/ControlSamples/ListView">ListView</a></li>
2525
<li>Repeater </li>
2626

2727
</ul>
@@ -35,7 +35,7 @@
3535
<li>CustomValidator </li>
3636
<li>RangeValidator </li>
3737
<li>RegularExpressionValidator(?) </li>
38-
<li>RequiredFieldValidator < /li>
38+
<li>RequiredFieldValidator </li>
3939
<li>ValidationSummary </li>
4040

4141
</ul>

‎samples/BeforeWebForms/Models/Widget.cs‎

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

‎samples/BeforeWebForms/Web.config‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,42 @@
55
-->
66
<configuration>
77
<system.web>
8-
<compilation debug="true" targetFramework="4.8"/>
9-
<httpRuntime targetFramework="4.8"/>
8+
<compilation debug="true" targetFramework="4.8">
9+
<assemblies>
10+
<add assembly="netstandard, Version=2.0.3.0, Culture=neutral,
11+
PublicKeyToken=cc7b13ffcd2ddd51"/>
12+
</assemblies>
13+
</compilation>
14+
<httpRuntime targetFramework="4.8" />
1015
<pages>
1116
<namespaces>
12-
<add namespace="System.Web.Optimization"/>
17+
<add namespace="System.Web.Optimization" />
1318
</namespaces>
1419
<controls>
15-
<add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt"/>
20+
<add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt" />
1621
</controls>
1722
</pages>
1823
</system.web>
1924
<runtime>
2025
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
2126
<dependentAssembly>
22-
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f"/>
23-
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
27+
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" />
28+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
2429
</dependentAssembly>
2530
<dependentAssembly>
26-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
27-
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
31+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
32+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
2833
</dependentAssembly>
2934
<dependentAssembly>
30-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
31-
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
35+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
36+
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
3237
</dependentAssembly>
3338
</assemblyBinding>
3439
</runtime>
3540
<system.codedom>
3641
<compilers>
37-
<compiler language="c#;cs;csharp" extension=".cs"
38-
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
39-
warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
40-
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
41-
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
42-
warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
42+
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
43+
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
4344
</compilers>
4445
</system.codedom>
4546
</configuration>

‎samples/BeforeWebForms/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net48" />
1313
<package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.1.3" targetFramework="net48" />
1414
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
15+
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net48" />
1516
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
1617
<package id="Modernizr" version="2.8.3" targetFramework="net48" />
18+
<package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
1719
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net48" />
1820
<package id="WebGrease" version="1.6.0" targetFramework="net48" />
1921
</packages>

‎src/AfterBlazorServerSide/AfterBlazorServerSide.csproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<ProjectReference Include="..\BlazorWebFormsComponents\BlazorWebFormsComponents.csproj" />
9+
<ProjectReference Include="..\SharedSampleObjects\SharedSampleObjects.csproj" />
10+
</ItemGroup>
11+
12+
</Project>

‎src/AfterBlazorServerSide/App.razor‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Router AppAssembly="@typeof(Program).Assembly">
2+
<Found Context="routeData">
3+
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
4+
</Found>
5+
<NotFound>
6+
<LayoutView Layout="@typeof(MainLayout)">
7+
<p>Sorry, there's nothing at this address.</p>
8+
</LayoutView>
9+
</NotFound>
10+
</Router>

‎src/AfterBlazorServerSide/Pages/ControlSamples/ListView/Index.razor‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
@page "/ControlSamples/ListView"
2+
3+
<h2>ListView Component homepage</h2>
4+
5+
<p>Here is a simple listview bound to a collection of widgets.</p>
6+
7+
<ListView ID="simpleListView"
8+
runat="server"
9+
ItemType="SharedSampleObjects.Models.Widget"
10+
Items="Widget.SimpleWidgetList">
11+
<LayoutTemplate>
12+
<table>
13+
<thead>
14+
<tr>
15+
<td>Id</td>
16+
<td>Name</td>
17+
<td>Price</td>
18+
<td>Last Update</td>
19+
</tr>
20+
</thead>
21+
<tbody>
22+
<tr runat="server" id="itemPlaceHolder"></tr>
23+
</tbody>
24+
</table>
25+
</LayoutTemplate>
26+
<ItemTemplate Context="Item">
27+
<tr>
28+
<td>@Item.Id</td>
29+
<td>@Item.Name</td>
30+
<td>@Item.Price.ToString("c")</td>
31+
<td>@Item.LastUpdate.ToString("d")</td>
32+
</tr>
33+
</ItemTemplate>
34+
</ListView>
35+
36+
@code {
37+
38+
override void OnInitialized()
39+
{
40+
41+
42+
43+
base.OnInitialized();
44+
}
45+
46+
}
47+

0 commit comments

Comments
 (0)