downgraded web forms to 4.7.2

Andrew Jank · Andrew Jank · commit da61cc050ae8 · 2024-01-16T17:18:42.000-05:00
added hello world component to blazor to replicate other sample
diff --git a/samples/WebFormsToBlazorWithSession/BlazorSessionCore/AxdContraint.cs b/samples/WebFormsToBlazorWithSession/BlazorSessionCore/AxdContraint.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
 
-namespace BlazorSessionCore.Components
+namespace BlazorSessionCore
 {
     internal sealed class AxdContraint : IRouteConstraint
     {
diff --git a/samples/WebFormsToBlazorWithSession/BlazorSessionCore/BlazorSessionCore.csproj b/samples/WebFormsToBlazorWithSession/BlazorSessionCore/BlazorSessionCore.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
   
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.CustomElements" Version="8.0.0" />
     <PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
   </ItemGroup>
   
diff --git a/samples/WebFormsToBlazorWithSession/BlazorSessionCore/HelloWorld.razor b/samples/WebFormsToBlazorWithSession/BlazorSessionCore/HelloWorld.razor
@@ -0,0 +1,8 @@
+<h3>HelloWorld from ASP.NET Core</h3>
+
+Current path: @Path
+
+@code {
+    [Parameter]
+    public string Path { get; set; } = "no-route";
+}
diff --git a/samples/WebFormsToBlazorWithSession/BlazorSessionCore/Program.cs b/samples/WebFormsToBlazorWithSession/BlazorSessionCore/Program.cs
@@ -1,4 +1,6 @@
+using BlazorSessionCore;
 using BlazorSessionCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -22,7 +24,7 @@
 
 // Add services to the container.
 builder.Services.AddRazorComponents()
-    .AddInteractiveServerComponents();
+    .AddInteractiveServerComponents(options => options.RootComponents.RegisterCustomElement<HelloWorld>("hello-world"));
 
 var app = builder.Build();
 
@@ -46,6 +48,7 @@
 
 app.MapForwarder("/Scripts/{**catch-all}", app.Configuration["ProxyTo"]).Add(static builder => ((RouteEndpointBuilder)builder).Order = int.MaxValue);
 app.MapForwarder("/Content/{**catch-all}", app.Configuration["ProxyTo"]).Add(static builder => ((RouteEndpointBuilder)builder).Order = int.MaxValue);
+app.MapForwarder("/bundles/{**catch-all}", app.Configuration["ProxyTo"]).Add(static builder => ((RouteEndpointBuilder)builder).Order = int.MaxValue);
 app.MapForwarder("/About", app.Configuration["ProxyTo"]).Add(static builder => ((RouteEndpointBuilder)builder).Order = int.MaxValue);
 app.MapForwarder("/Contact", app.Configuration["ProxyTo"]).Add(static builder => ((RouteEndpointBuilder)builder).Order = int.MaxValue);
 app.MapForwarder("/{route:isAxdFile}", app.Configuration["ProxyTo"]).Add(static builder => ((RouteEndpointBuilder)builder).Order = int.MaxValue);
diff --git a/samples/WebFormsToBlazorWithSession/WebFormsSessionFramework/Global.asax.cs b/samples/WebFormsToBlazorWithSession/WebFormsSessionFramework/Global.asax.cs
@@ -18,6 +18,7 @@ void Application_Start(object sender, EventArgs e)
             RouteConfig.RegisterRoutes(RouteTable.Routes);
             BundleConfig.RegisterBundles(BundleTable.Bundles);
             SystemWebAdapterConfiguration.AddSystemWebAdapters(this)
+                .AddProxySupport(options => options.UseForwardedHeaders = true)
                 .AddJsonSessionSerializer(options =>
                 {
                     options.RegisterKey<string>("test-value");
diff --git a/samples/WebFormsToBlazorWithSession/WebFormsSessionFramework/Site.Master b/samples/WebFormsToBlazorWithSession/WebFormsSessionFramework/Site.Master
@@ -1,4 +1,4 @@
-﻿<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="WebFormsSessionFramework.SiteMaster" %>
+<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="WebFormsSessionFramework.SiteMaster" %>
 
 <!DOCTYPE html>
 
@@ -7,6 +7,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title><%: Page.Title %> - My ASP.NET Application</title>
+    <base href="/" />
 
     <asp:PlaceHolder runat="server">
         <%: Scripts.Render("~/bundles/modernizr") %>
@@ -54,6 +55,7 @@
             </div>
         </nav>
         <div class="container body-content">
+            <hello-world path="<%: Context.Request.Path %>"></hello-world>
             <asp:ContentPlaceHolder ID="MainContent" runat="server">
             </asp:ContentPlaceHolder>
             <hr />
@@ -64,6 +66,8 @@
     </form>
     <asp:PlaceHolder runat="server">
         <%: Scripts.Render("~/Scripts/bootstrap.js") %>
-    </asp:PlaceHolder>
+    </asp:PlaceHolder>=
+
+    <script src="_framework/blazor.server.js"></script>
 </body>
 </html>
diff --git a/samples/WebFormsToBlazorWithSession/WebFormsSessionFramework/Site.Master.designer.cs b/samples/WebFormsToBlazorWithSession/WebFormsSessionFramework/Site.Master.designer.cs
diff --git a/samples/WebFormsToBlazorWithSession/WebFormsSessionFramework/Web.config b/samples/WebFormsToBlazorWithSession/WebFormsSessionFramework/Web.config
@@ -17,7 +17,7 @@
     <add key="RemoteAppApiKey" value="2874B6C1-AB0F-4108-898A-4B4B85EF4972"/>
   </appSettings>
   <system.web>
-    <compilation debug="true" targetFramework="4.8"/>
+    <compilation debug="true" targetFramework="4.7.2"/>
     <httpRuntime targetFramework="4.7.2"/>
     <pages>
       <namespaces>
@@ -68,4 +68,4 @@
       <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
     </handlers>
   </system.webServer>
-</configuration>
+</configuration>
diff --git a/samples/WebFormsToBlazorWithSession/WebFormsSessionFramework/WebFormsSessionFramework.csproj b/samples/WebFormsToBlazorWithSession/WebFormsSessionFramework/WebFormsSessionFramework.csproj
@@ -14,7 +14,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WebFormsSessionFramework</RootNamespace>
     <AssemblyName>WebFormsSessionFramework</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort>44397</IISExpressSSLPort>
@@ -49,8 +49,10 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
@@ -77,6 +79,7 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="WebGrease">
       <Private>True</Private>
       <HintPath>..\..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Globalization;`
`2`	`2`	`using System.Text.RegularExpressions;`
`3`	`3`
`4`		`-namespace BlazorSessionCore.Components`
	`4`	`+namespace BlazorSessionCore`
`5`	`5`	`{`
`6`	`6`	`internal sealed class AxdContraint : IRouteConstraint`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ void Application_Start(object sender, EventArgs e)`
`18`	`18`	`RouteConfig.RegisterRoutes(RouteTable.Routes);`
`19`	`19`	`BundleConfig.RegisterBundles(BundleTable.Bundles);`
`20`	`20`	`SystemWebAdapterConfiguration.AddSystemWebAdapters(this)`
	`21`	`+ .AddProxySupport(options => options.UseForwardedHeaders = true)`
`21`	`22`	`.AddJsonSessionSerializer(options =>`
`22`	`23`	`{`
`23`	`24`	`options.RegisterKey<string>("test-value");`