update blazor sample for .Net Core 3.0.100 release

PDFTron · Sep 26, 2019 · 42a01ef · 42a01ef
1 parent 0632d23
commit 42a01ef
Show file tree

Hide file tree

Showing 953 changed files with 95,888 additions and 95,892 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+bin
+obj
diff --git a/App.razor b/App.razor
@@ -1,7 +1,10 @@
-<CascadingAuthenticationState>
-    <Router AppAssembly="typeof(Startup).Assembly">
-        <NotFoundContent>
+<Router AppAssembly="@typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+    </Found>
+    <NotFound>
+        <LayoutView Layout="@typeof(MainLayout)">
             <p>Sorry, there's nothing at this address.</p>
-        </NotFoundContent>
-    </Router>
-</CascadingAuthenticationState>
+        </LayoutView>
+    </NotFound>
+</Router>
diff --git a/BlazorWebViewerServer.csproj b/BlazorWebViewerServer.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/Data/WeatherForecast.cs b/Data/WeatherForecast.cs
diff --git a/Data/WeatherForecastService.cs b/Data/WeatherForecastService.cs
diff --git a/Pages/Counter.razor b/Pages/Counter.razor
diff --git a/Pages/Error.razor b/Pages/Error.razor
diff --git a/Pages/FetchData.razor b/Pages/FetchData.razor
diff --git a/Pages/Index.razor b/Pages/Index.razor
diff --git a/Pages/WebViewer.razor b/Pages/WebViewer.razor
@@ -5,8 +5,10 @@
 <div id='viewer' style='width: 1024px; height: 600px; margin: 0 auto;'></div>
 
 @code {
-    protected override async void OnAfterRender()
+    protected override async void OnAfterRender(bool firstRender)
     {
-       await JSRuntime.InvokeAsync<object>("webviewerFunctions.initWebViewer");
+      if (firstRender) {
+        await JSRuntime.InvokeAsync<object>("webviewerFunctions.initWebViewer");
+      }
     }
 }
diff --git a/Pages/_Host.cshtml b/Pages/_Host.cshtml
@@ -11,12 +11,11 @@
     <base href="~/" />
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
     <link href="css/site.css" rel="stylesheet" />
-    <script src="WebViewer/lib/webviewer.min.js"></script>
+    <script src="lib/webviewer.min.js"></script>
 </head>
 <body>
     <app>
-        @* Remove the following line of code to disable prerendering *@
-        @(await Html.RenderStaticComponentAsync<App>())
+        @(await Html.RenderComponentAsync<App>(RenderMode.ServerPrerendered))
     </app>
 
     <script src="_framework/blazor.server.js"></script>

diff --git a/Pages/_Imports.razor b/Pages/_Imports.razor
diff --git a/Program.cs b/Program.cs
diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
@@ -3,8 +3,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:42054",
-      "sslPort": 44365
+      "applicationUrl": "http://localhost:4702",
+      "sslPort": 44344
     }
   },
   "profiles": {

diff --git a/Shared/MainLayout.razor b/Shared/MainLayout.razor
diff --git a/Startup.cs b/Startup.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -11,7 +10,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using BlazorWebViewerServer.Data;
-using Microsoft.AspNetCore.ResponseCompression;
+using System.IO;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.FileProviders;
 
@@ -49,37 +48,28 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseHsts();
             }
 
-            app.UseHttpsRedirection();
-
-            app.UseRouting();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapBlazorHub<App>(selector: "app");
-                endpoints.MapFallbackToPage("/_Host");
-            });
-
             var provider = new FileExtensionContentTypeProvider();
-            // Add new MIME type mappings
             provider.Mappings[".res"] = "application/octet-stream";
             provider.Mappings[".pexe"] = "application/x-pnacl";
             provider.Mappings[".nmf"] = "application/octet-stream";
             provider.Mappings[".mem"] = "application/octet-stream";
             provider.Mappings[".wasm"] = "application/wasm";
-
-            app.UseStaticFiles();
-
             app.UseStaticFiles(new StaticFileOptions
             {
                 FileProvider = new PhysicalFileProvider(
                     Path.Combine(Directory.GetCurrentDirectory(), "wwwroot")),
                     ContentTypeProvider = provider
             });
 
-            app.UseDirectoryBrowser(new DirectoryBrowserOptions
+            app.UseHttpsRedirection();
+            app.UseStaticFiles();
+
+            app.UseRouting();
+
+            app.UseEndpoints(endpoints =>
             {
-                FileProvider = new PhysicalFileProvider(
-                    Path.Combine(Directory.GetCurrentDirectory(), "wwwroot"))
+                endpoints.MapBlazorHub();
+                endpoints.MapFallbackToPage("/_Host");
             });
         }
     }

diff --git a/_Imports.razor b/_Imports.razor
@@ -1,7 +1,9 @@
 @using System.Net.Http
 @using Microsoft.AspNetCore.Authorization
+@using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
 @using BlazorWebViewerServer
 @using BlazorWebViewerServer.Shared
diff --git a/appsettings.Development.json b/appsettings.Development.json
diff --git a/appsettings.json b/appsettings.json
diff --git a/wwwroot/WebViewer/lib/ui/src/constants/defaultTool.js b/wwwroot/WebViewer/lib/ui/src/constants/defaultTool.js
diff --git a/wwwroot/css/bootstrap/bootstrap.min.css b/wwwroot/css/bootstrap/bootstrap.min.css
diff --git a/wwwroot/css/bootstrap/bootstrap.min.css.map b/wwwroot/css/bootstrap/bootstrap.min.css.map
diff --git a/wwwroot/css/open-iconic/FONT-LICENSE b/wwwroot/css/open-iconic/FONT-LICENSE
diff --git a/wwwroot/css/open-iconic/ICON-LICENSE b/wwwroot/css/open-iconic/ICON-LICENSE
diff --git a/wwwroot/css/open-iconic/README.md b/wwwroot/css/open-iconic/README.md
diff --git a/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css
diff --git a/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/wwwroot/css/open-iconic/font/fonts/open-iconic.eot
diff --git a/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/wwwroot/css/open-iconic/font/fonts/open-iconic.otf
diff --git a/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/wwwroot/css/open-iconic/font/fonts/open-iconic.svg
diff --git a/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf
diff --git a/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/wwwroot/css/open-iconic/font/fonts/open-iconic.woff
diff --git a/wwwroot/css/site.css b/wwwroot/css/site.css
diff --git a/wwwroot/favicon.ico b/wwwroot/favicon.ico
diff --git a/wwwroot/js/webviewerScripts.js b/wwwroot/js/webviewerScripts.js
@@ -2,10 +2,10 @@ window.webviewerFunctions = {
     initWebViewer: function () {
         const viewerElement = document.getElementById('viewer');
         WebViewer({
-            path: 'WebViewer/lib',
+            path: 'lib',
             initialDoc: 'https://pdftron.s3.amazonaws.com/downloads/pl/demo-annotated.pdf', // replace with your own PDF file
         }, viewerElement).then((instance) => {
             // call apis here
         })
     }
-};
+};
diff --git a/wwwroot/WebViewer/lib/core/.htaccess → wwwroot/lib/core/.htaccess b/wwwroot/WebViewer/lib/core/.htaccess → wwwroot/lib/core/.htaccess
@@ -1,27 +1,27 @@
-AddType image/vnd.microsoft.icon .cur
-AddType application/json .json
-AddType text/cache-manifest .appcache
-AddType application/octet-stream .mem
-AddType application/octet-stream .res
-AddType application/x-pnacl .pexe
-AddType application/octet-stream .nmf
-AddType application/wasm .wasm
-
-<IfModule mod_headers.c>
-    <FilesMatch ".*\.(gz)\..*">
-        # Serve correct encoding type.
-        # We make the assumption that gzip is always supported.
-        Header set Content-Encoding gzip
-        # Force proxies to cache gzipped & non-gzipped files separately.
-        Header set Vary Accept-Encoding
-    </FilesMatch>
-
-    <FilesMatch ".*\.(br)\..*">
-        # Serve correct encoding type.
-        # Note that we only serve the brotli file with Content-Encoding: br if the client told us it supports it.
-        SetEnvIf Accept-Encoding ".*br.*" SUPPORT_BROTLI
-        Header set Content-Encoding br env=SUPPORT_BROTLI
-        # Force proxies to cache brotli encoded & non-brotli encoded files separately.
-        Header set Vary Accept-Encoding
-    </FilesMatch>
+AddType image/vnd.microsoft.icon .cur
+AddType application/json .json
+AddType text/cache-manifest .appcache
+AddType application/octet-stream .mem
+AddType application/octet-stream .res
+AddType application/x-pnacl .pexe
+AddType application/octet-stream .nmf
+AddType application/wasm .wasm
+
+<IfModule mod_headers.c>
+    <FilesMatch ".*\.(gz)\..*">
+        # Serve correct encoding type.
+        # We make the assumption that gzip is always supported.
+        Header set Content-Encoding gzip
+        # Force proxies to cache gzipped & non-gzipped files separately.
+        Header set Vary Accept-Encoding
+    </FilesMatch>
+
+    <FilesMatch ".*\.(br)\..*">
+        # Serve correct encoding type.
+        # Note that we only serve the brotli file with Content-Encoding: br if the client told us it supports it.
+        SetEnvIf Accept-Encoding ".*br.*" SUPPORT_BROTLI
+        Header set Content-Encoding br env=SUPPORT_BROTLI
+        # Force proxies to cache brotli encoded & non-brotli encoded files separately.
+        Header set Vary Accept-Encoding
+    </FilesMatch>
 </IfModule>
diff --git a/wwwroot/WebViewer/lib/core/CORSWorker.js → wwwroot/lib/core/CORSWorker.js b/wwwroot/WebViewer/lib/core/CORSWorker.js → wwwroot/lib/core/CORSWorker.js
@@ -1,20 +1,20 @@
-/* eslint-env worker */
-function getWorkerParams(src) {
-  var params = {};
-  var search = decodeURIComponent(src.slice(1));
-  var definitions = search.split('&');
-  definitions.forEach(function(val) {
-    var parts = val.split('=', 2);
-    params[parts[0]] = parts[1];
-  });
-  return params;
-}
-
-var params = getWorkerParams(self.location.hash);
-if (params.path) {
-  self.workerBasePath = params.path;
-  self.pdfWorkerPath = params.path + 'pdf/';
-  self.officeWorkerPath = params.path + 'office/';
-}
-
+/* eslint-env worker */
+function getWorkerParams(src) {
+  var params = {};
+  var search = decodeURIComponent(src.slice(1));
+  var definitions = search.split('&');
+  definitions.forEach(function(val) {
+    var parts = val.split('=', 2);
+    params[parts[0]] = parts[1];
+  });
+  return params;
+}
+
+var params = getWorkerParams(self.location.hash);
+if (params.path) {
+  self.workerBasePath = params.path;
+  self.pdfWorkerPath = params.path + 'pdf/';
+  self.officeWorkerPath = params.path + 'office/';
+}
+
 importScripts(params.file);