diff --git a/OneWare.sln b/OneWare.sln index 3bbf2daf..78f2b166 100644 --- a/OneWare.sln +++ b/OneWare.sln @@ -30,8 +30,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LanguageSupport", "Language EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.SourceControl", "src\OneWare.SourceControl\OneWare.SourceControl.csproj", "{EB5E9D9F-E3E7-4E19-83BF-41EDE282B6B7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.Demo.Browser", "demo\OneWare.Demo.Browser\OneWare.Demo.Browser.csproj", "{4BB8F95D-711C-4BA2-8E7D-A8E2AF37DD2E}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.Demo.Desktop", "demo\OneWare.Demo.Desktop\OneWare.Demo.Desktop.csproj", "{420AB56D-4886-490A-BF50-F0ABBB92AD51}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{26CFC267-21D3-4965-B340-0CEB0138CBE5}" @@ -219,10 +217,6 @@ Global {EB5E9D9F-E3E7-4E19-83BF-41EDE282B6B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {EB5E9D9F-E3E7-4E19-83BF-41EDE282B6B7}.Release|Any CPU.ActiveCfg = Release|Any CPU {EB5E9D9F-E3E7-4E19-83BF-41EDE282B6B7}.Release|Any CPU.Build.0 = Release|Any CPU - {4BB8F95D-711C-4BA2-8E7D-A8E2AF37DD2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BB8F95D-711C-4BA2-8E7D-A8E2AF37DD2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BB8F95D-711C-4BA2-8E7D-A8E2AF37DD2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BB8F95D-711C-4BA2-8E7D-A8E2AF37DD2E}.Release|Any CPU.Build.0 = Release|Any CPU {420AB56D-4886-490A-BF50-F0ABBB92AD51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {420AB56D-4886-490A-BF50-F0ABBB92AD51}.Debug|Any CPU.Build.0 = Debug|Any CPU {420AB56D-4886-490A-BF50-F0ABBB92AD51}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -413,7 +407,6 @@ Global {3223BF61-BDAB-440D-9158-98C248B971A5} = {0761690C-7DA0-4554-9F6B-211088412DCD} {2504C4C6-9F71-4C77-AB0D-FB1281CC8A66} = {EB783E04-C3C8-45F8-B810-24798DAE2450} {FA5D65B7-7396-4FAE-9761-AAD3664011B6} = {4E0B6C8D-B846-4B95-B356-A1B8BDE16B52} - {4BB8F95D-711C-4BA2-8E7D-A8E2AF37DD2E} = {4E0B6C8D-B846-4B95-B356-A1B8BDE16B52} {420AB56D-4886-490A-BF50-F0ABBB92AD51} = {4E0B6C8D-B846-4B95-B356-A1B8BDE16B52} {BABC7A6C-9C36-4544-8B32-561A01F1BDF2} = {614F8A02-432E-46B4-B296-6AC04632A86C} {67A6D0B8-4F0E-48B4-8E10-8A40D7737C62} = {614F8A02-432E-46B4-B296-6AC04632A86C} diff --git a/build/props/Asmichi.ChildProcess.props b/build/props/Asmichi.ChildProcess.props index 1efa1d59..37e3da0f 100644 --- a/build/props/Asmichi.ChildProcess.props +++ b/build/props/Asmichi.ChildProcess.props @@ -1,6 +1,6 @@ - + diff --git a/build/props/Avalonia.Browser.props b/build/props/Avalonia.Browser.props index 0264299f..d08714b7 100644 --- a/build/props/Avalonia.Browser.props +++ b/build/props/Avalonia.Browser.props @@ -1,6 +1,6 @@  - + diff --git a/build/props/Avalonia.Controls.ColorPicker.props b/build/props/Avalonia.Controls.ColorPicker.props index 7619c4d6..f862e234 100644 --- a/build/props/Avalonia.Controls.ColorPicker.props +++ b/build/props/Avalonia.Controls.ColorPicker.props @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/build/props/Avalonia.Controls.DataGrid.props b/build/props/Avalonia.Controls.DataGrid.props index 3826ff24..a675cf2a 100644 --- a/build/props/Avalonia.Controls.DataGrid.props +++ b/build/props/Avalonia.Controls.DataGrid.props @@ -1,6 +1,6 @@  - + diff --git a/build/props/Avalonia.Controls.PanAndZoom.props b/build/props/Avalonia.Controls.PanAndZoom.props index 552fade9..b6dc3727 100644 --- a/build/props/Avalonia.Controls.PanAndZoom.props +++ b/build/props/Avalonia.Controls.PanAndZoom.props @@ -1,6 +1,6 @@ - + diff --git a/build/props/Avalonia.Desktop.props b/build/props/Avalonia.Desktop.props index 945bc539..04cfa6b2 100644 --- a/build/props/Avalonia.Desktop.props +++ b/build/props/Avalonia.Desktop.props @@ -1,6 +1,6 @@ - + diff --git a/build/props/Avalonia.Diagnostics.props b/build/props/Avalonia.Diagnostics.props index 75c81c20..8fee5f38 100644 --- a/build/props/Avalonia.Diagnostics.props +++ b/build/props/Avalonia.Diagnostics.props @@ -1,6 +1,6 @@ - + diff --git a/build/props/Avalonia.Fonts.Inter.props b/build/props/Avalonia.Fonts.Inter.props index 32a65b37..e4660f13 100644 --- a/build/props/Avalonia.Fonts.Inter.props +++ b/build/props/Avalonia.Fonts.Inter.props @@ -1,6 +1,6 @@  - + diff --git a/build/props/Avalonia.ReactiveUI.props b/build/props/Avalonia.ReactiveUI.props index bcb54e4b..c334afb8 100644 --- a/build/props/Avalonia.ReactiveUI.props +++ b/build/props/Avalonia.ReactiveUI.props @@ -1,6 +1,6 @@  - + diff --git a/build/props/Avalonia.Svg.props b/build/props/Avalonia.Svg.props index 76469ea8..9618d191 100644 --- a/build/props/Avalonia.Svg.props +++ b/build/props/Avalonia.Svg.props @@ -1,6 +1,6 @@ - + diff --git a/build/props/Avalonia.Themes.Simple.props b/build/props/Avalonia.Themes.Simple.props index 3de05e98..b6c913af 100644 --- a/build/props/Avalonia.Themes.Simple.props +++ b/build/props/Avalonia.Themes.Simple.props @@ -1,6 +1,6 @@  - + diff --git a/build/props/Avalonia.Xaml.Behaviors.props b/build/props/Avalonia.Xaml.Behaviors.props index 9b8b43bd..6c8273b1 100644 --- a/build/props/Avalonia.Xaml.Behaviors.props +++ b/build/props/Avalonia.Xaml.Behaviors.props @@ -1,6 +1,6 @@ - + diff --git a/build/props/Avalonia.props b/build/props/Avalonia.props index 832faca9..d284d273 100644 --- a/build/props/Avalonia.props +++ b/build/props/Avalonia.props @@ -1,6 +1,6 @@ - + diff --git a/build/props/AvaloniaEdit.TextMate.props b/build/props/AvaloniaEdit.TextMate.props index c1e172b4..3ff10f0d 100644 --- a/build/props/AvaloniaEdit.TextMate.props +++ b/build/props/AvaloniaEdit.TextMate.props @@ -1,6 +1,6 @@  - + diff --git a/build/props/AvaloniaEdit.props b/build/props/AvaloniaEdit.props index 4b3ac053..0ea4a719 100644 --- a/build/props/AvaloniaEdit.props +++ b/build/props/AvaloniaEdit.props @@ -1,6 +1,6 @@  - + diff --git a/build/props/Dock.Avalonia.props b/build/props/Dock.Avalonia.props index f791a9a3..248c05a7 100644 --- a/build/props/Dock.Avalonia.props +++ b/build/props/Dock.Avalonia.props @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/build/props/XUnit.props b/build/props/XUnit.props index a9ca37b0..bf20d5ed 100644 --- a/build/props/XUnit.props +++ b/build/props/XUnit.props @@ -1,14 +1,14 @@ - + - - - - - - + + + + + + \ No newline at end of file diff --git a/demo/OneWare.Demo.Browser/AppBundle/index.html b/demo/OneWare.Demo.Browser/AppBundle/index.html deleted file mode 100644 index 118ae9e6..00000000 --- a/demo/OneWare.Demo.Browser/AppBundle/index.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - OneWare Web IDE - - - - - - - - - - -
-
-
-
- -
-

- Warning! This version is a preview and has some breaking issues! -

-
-
-
-
- - - diff --git a/demo/OneWare.Demo.Browser/AppBundle/main.js b/demo/OneWare.Demo.Browser/AppBundle/main.js deleted file mode 100644 index 0e0ad0f5..00000000 --- a/demo/OneWare.Demo.Browser/AppBundle/main.js +++ /dev/null @@ -1,16 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -import {dotnet} from './dotnet.js' - -const is_browser = typeof window != "undefined"; -if (!is_browser) throw new Error(`Expected to be running in a browser`); - -const dotnetRuntime = await dotnet - .withDiagnosticTracing(false) - .withApplicationArgumentsFromQuery() - .create(); - -const config = dotnetRuntime.getConfig(); - -await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [globalThis.location.href]); \ No newline at end of file diff --git a/demo/OneWare.Demo.Browser/OneWare.Demo.Browser.csproj b/demo/OneWare.Demo.Browser/OneWare.Demo.Browser.csproj deleted file mode 100644 index b5cc5d28..00000000 --- a/demo/OneWare.Demo.Browser/OneWare.Demo.Browser.csproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - net8.0 - browser-wasm - AppBundle\main.js - Exe - true - - true - <_WasmAppIncludeThreadsWorker>true - <_WasmPThreadPoolSize>8 - - - - false - false - full - true - true - - - - - - - - - - - - - - - diff --git a/demo/OneWare.Demo.Browser/Program.cs b/demo/OneWare.Demo.Browser/Program.cs deleted file mode 100644 index 69e87fef..00000000 --- a/demo/OneWare.Demo.Browser/Program.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Diagnostics; -using System.Runtime.Versioning; -using System.Threading.Tasks; -using Avalonia; -using Avalonia.Browser; - -[assembly: SupportedOSPlatform("browser")] - -namespace OneWare.Demo.Browser; - -internal class Program -{ - public static async Task Main(string[] args) - { -#if DEBUG - Trace.Listeners.Add(new ConsoleTraceListener()); -#endif - - await BuildAvaloniaApp() -#if DEBUG - .LogToTrace() -#endif - .StartBrowserAppAsync("out"); - } - - public static AppBuilder BuildAvaloniaApp() - { - return AppBuilder.Configure(); - } -} \ No newline at end of file diff --git a/demo/OneWare.Demo.Browser/Properties/launchSettings.json b/demo/OneWare.Demo.Browser/Properties/launchSettings.json deleted file mode 100644 index bedf615e..00000000 --- a/demo/OneWare.Demo.Browser/Properties/launchSettings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "profiles": { - "OneWare.Demo.Browser": { - "commandName": "Project", - "launchBrowser": true, - "workingDirectory": "$(ProjectDir)", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:5000", - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}" - } - } -} \ No newline at end of file diff --git a/demo/OneWare.Demo.Browser/WebDemoApp.cs b/demo/OneWare.Demo.Browser/WebDemoApp.cs deleted file mode 100644 index 37d148a8..00000000 --- a/demo/OneWare.Demo.Browser/WebDemoApp.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace OneWare.Demo.Browser; - -public class WebDemoApp : DemoApp -{ - protected override string GetDefaultLayoutName => "Web"; -} \ No newline at end of file diff --git a/demo/OneWare.Demo.Browser/runtimeconfig.template.json b/demo/OneWare.Demo.Browser/runtimeconfig.template.json deleted file mode 100644 index c6990ba7..00000000 --- a/demo/OneWare.Demo.Browser/runtimeconfig.template.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "wasmHostProperties": { - "perHostConfig": [ - { - "name": "browser", - "html-path": "index.html", - "Host": "browser" - } - ] - } -} \ No newline at end of file diff --git a/src/OneWare.Core/App.axaml.cs b/src/OneWare.Core/App.axaml.cs index ff94fa07..a995d84d 100644 --- a/src/OneWare.Core/App.axaml.cs +++ b/src/OneWare.Core/App.axaml.cs @@ -332,7 +332,7 @@ public override void OnFrameworkInitializationCompleted() Container.Resolve().GetSettingObservable("Editor_FontSize").Subscribe(x => { - Resources["EditorFontSize"] = x; + Resources["EditorFontSize"] = (double)x; }); _ = LoadContentAsync(); diff --git a/src/OneWare.Core/Services/HttpService.cs b/src/OneWare.Core/Services/HttpService.cs index 3d7f8c91..e4e5111a 100644 --- a/src/OneWare.Core/Services/HttpService.cs +++ b/src/OneWare.Core/Services/HttpService.cs @@ -57,19 +57,20 @@ public async Task DownloadFileAsync(string url, Stream stream, IProgress - diff --git a/src/OneWare.ImageViewer/ViewModels/ImageViewModel.cs b/src/OneWare.ImageViewer/ViewModels/ImageViewModel.cs index 86577ae8..086ebf27 100644 --- a/src/OneWare.ImageViewer/ViewModels/ImageViewModel.cs +++ b/src/OneWare.ImageViewer/ViewModels/ImageViewModel.cs @@ -33,9 +33,7 @@ protected override void UpdateCurrentFile(IFile? oldFile) switch (CurrentFile.Extension.ToLower()) { case ".svg": - var svg = new SvgSource(); - var picture = svg.Load(FullPath); - if (picture is not null) + var svg = new SvgSource(new Uri(FullPath)); Image = new SvgImage { Source = svg diff --git a/src/OneWare.SearchList/Views/SearchListView.axaml b/src/OneWare.SearchList/Views/SearchListView.axaml index 2eceba4f..bb9eb629 100644 --- a/src/OneWare.SearchList/Views/SearchListView.axaml +++ b/src/OneWare.SearchList/Views/SearchListView.axaml @@ -15,8 +15,7 @@ - diff --git a/src/OneWare.SerialMonitor/OneWare.SerialMonitor.csproj b/src/OneWare.SerialMonitor/OneWare.SerialMonitor.csproj index c5d3eeb9..6b50d5fa 100644 --- a/src/OneWare.SerialMonitor/OneWare.SerialMonitor.csproj +++ b/src/OneWare.SerialMonitor/OneWare.SerialMonitor.csproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/OneWare.SourceControl/OneWare.SourceControl.csproj b/src/OneWare.SourceControl/OneWare.SourceControl.csproj index 6f4e57a4..19a7a6c1 100644 --- a/src/OneWare.SourceControl/OneWare.SourceControl.csproj +++ b/src/OneWare.SourceControl/OneWare.SourceControl.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectToolBarView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectToolBarView.axaml index ac4ac034..60bc5b9d 100644 --- a/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectToolBarView.axaml +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectToolBarView.axaml @@ -35,8 +35,9 @@ - + @@ -81,8 +82,9 @@ - + diff --git a/studio/OneWare.Studio.Browser/AppBundle/.htaccess b/studio/OneWare.Studio.Browser/AppBundle/.htaccess deleted file mode 100644 index c7e80b88..00000000 --- a/studio/OneWare.Studio.Browser/AppBundle/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ - - Header set Cross-Origin-Opener-Policy "same-origin" - Header set Cross-Origin-Embedder-Policy "require-corp" - \ No newline at end of file diff --git a/studio/OneWare.Studio.Browser/AppBundle/Logo_SVG-ONE-ware.svg b/studio/OneWare.Studio.Browser/AppBundle/Logo_SVG-ONE-ware.svg deleted file mode 100644 index 078f0ccf..00000000 --- a/studio/OneWare.Studio.Browser/AppBundle/Logo_SVG-ONE-ware.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/studio/OneWare.Studio.Browser/AppBundle/app.css b/studio/OneWare.Studio.Browser/AppBundle/app.css deleted file mode 100644 index 6b179853..00000000 --- a/studio/OneWare.Studio.Browser/AppBundle/app.css +++ /dev/null @@ -1,92 +0,0 @@ -:root { - --sat: env(safe-area-inset-top); - --sar: env(safe-area-inset-right); - --sab: env(safe-area-inset-bottom); - --sal: env(safe-area-inset-left); -} - -/* HTML styles for the splash screen */ - -.highlight { - color: white; - font-size: 2.5rem; - display: block; -} - -.center { - display: flex; - justify-content: center; - align-items: center; - height: 100vh; -} - -.flexRow { - display: flex; - flex-direction: column; - margin: 10px; -} - -#avalonia-splash { - position: relative; - height: 100%; - width: 100%; - color: whitesmoke; - background: black; - background-position: center; - background-size: cover; - background-repeat: no-repeat; -} - -.logo { - width: 30vw; - min-width: 300px; - height: 50%; - margin: auto; -} - -.splash-close { - animation: fadeout 1s linear forwards; -} - -.loader { - width: 48px; - height: 48px; - border: 5px solid #FFF; - border-bottom-color: #009688; - border-radius: 50%; - display: block; - box-sizing: border-box; - margin: auto; - left: 0; - right: 0; - animation: rotation 1s linear infinite; -} - -.warningText { - color: red; - font-weight: bold; - font-size: 1.5rem; - font-family: Arial, Helvetica, sans-serif; - text-align: center; -} - -@keyframes rotation { - 0% { - transform: rotate(0deg); - } - - 100% { - transform: rotate(360deg); - } -} - -@keyframes fadeout { - 0% { - opacity: 100%; - } - - 100% { - opacity: 0; - visibility: collapse; - } -} \ No newline at end of file diff --git a/studio/OneWare.Studio.Browser/AppBundle/favicon.ico b/studio/OneWare.Studio.Browser/AppBundle/favicon.ico deleted file mode 100644 index 8a4fc927..00000000 Binary files a/studio/OneWare.Studio.Browser/AppBundle/favicon.ico and /dev/null differ diff --git a/studio/OneWare.Studio.Browser/OneWare.Studio.Browser.csproj b/studio/OneWare.Studio.Browser/OneWare.Studio.Browser.csproj index 0a0cb49d..218cc4ef 100644 --- a/studio/OneWare.Studio.Browser/OneWare.Studio.Browser.csproj +++ b/studio/OneWare.Studio.Browser/OneWare.Studio.Browser.csproj @@ -6,17 +6,15 @@ $(StudioVersion) - net8.0 - browser-wasm - AppBundle\main.js + net8.0-browser Exe - true true <_WasmAppIncludeThreadsWorker>true <_WasmPThreadPoolSize>8 + + + diff --git a/studio/OneWare.Studio.Browser/Program.cs b/studio/OneWare.Studio.Browser/Program.cs index 6390eea0..439f9ad8 100644 --- a/studio/OneWare.Studio.Browser/Program.cs +++ b/studio/OneWare.Studio.Browser/Program.cs @@ -15,7 +15,7 @@ public static async Task Main(string[] args) #if DEBUG Trace.Listeners.Add(new ConsoleTraceListener()); #endif - + await BuildAvaloniaApp() #if DEBUG .LogToTrace() diff --git a/studio/OneWare.Studio.Browser/Properties/AssemblyInfo.cs b/studio/OneWare.Studio.Browser/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..ff563874 --- /dev/null +++ b/studio/OneWare.Studio.Browser/Properties/AssemblyInfo.cs @@ -0,0 +1 @@ +[assembly:System.Runtime.Versioning.SupportedOSPlatform("browser")] \ No newline at end of file diff --git a/studio/OneWare.Studio.Browser/Properties/launchSettings.json b/studio/OneWare.Studio.Browser/Properties/launchSettings.json index e8b29041..cf18bc78 100644 --- a/studio/OneWare.Studio.Browser/Properties/launchSettings.json +++ b/studio/OneWare.Studio.Browser/Properties/launchSettings.json @@ -3,12 +3,11 @@ "OneWare.Studio.Browser": { "commandName": "Project", "launchBrowser": true, - "workingDirectory": "$(ProjectDir)", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "http://localhost:5000", - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}" + "applicationUrl": "https://localhost:7169;http://localhost:5235", + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", } } -} \ No newline at end of file +} diff --git a/studio/OneWare.Studio.Browser/runtimeconfig.template.json b/studio/OneWare.Studio.Browser/runtimeconfig.template.json index c6990ba7..0d03d038 100644 --- a/studio/OneWare.Studio.Browser/runtimeconfig.template.json +++ b/studio/OneWare.Studio.Browser/runtimeconfig.template.json @@ -3,8 +3,7 @@ "perHostConfig": [ { "name": "browser", - "html-path": "index.html", - "Host": "browser" + "host": "browser" } ] } diff --git a/demo/OneWare.Demo.Browser/AppBundle/.htaccess b/studio/OneWare.Studio.Browser/wwwroot/.htaccess similarity index 100% rename from demo/OneWare.Demo.Browser/AppBundle/.htaccess rename to studio/OneWare.Studio.Browser/wwwroot/.htaccess diff --git a/demo/OneWare.Demo.Browser/AppBundle/Logo_SVG-ONE-ware.svg b/studio/OneWare.Studio.Browser/wwwroot/Logo_SVG-ONE-ware.svg similarity index 100% rename from demo/OneWare.Demo.Browser/AppBundle/Logo_SVG-ONE-ware.svg rename to studio/OneWare.Studio.Browser/wwwroot/Logo_SVG-ONE-ware.svg diff --git a/demo/OneWare.Demo.Browser/AppBundle/app.css b/studio/OneWare.Studio.Browser/wwwroot/app.css similarity index 100% rename from demo/OneWare.Demo.Browser/AppBundle/app.css rename to studio/OneWare.Studio.Browser/wwwroot/app.css diff --git a/demo/OneWare.Demo.Browser/AppBundle/favicon.ico b/studio/OneWare.Studio.Browser/wwwroot/favicon.ico similarity index 100% rename from demo/OneWare.Demo.Browser/AppBundle/favicon.ico rename to studio/OneWare.Studio.Browser/wwwroot/favicon.ico diff --git a/studio/OneWare.Studio.Browser/AppBundle/index.html b/studio/OneWare.Studio.Browser/wwwroot/index.html similarity index 100% rename from studio/OneWare.Studio.Browser/AppBundle/index.html rename to studio/OneWare.Studio.Browser/wwwroot/index.html diff --git a/studio/OneWare.Studio.Browser/AppBundle/main.js b/studio/OneWare.Studio.Browser/wwwroot/main.js similarity index 52% rename from studio/OneWare.Studio.Browser/AppBundle/main.js rename to studio/OneWare.Studio.Browser/wwwroot/main.js index 0e0ad0f5..f4ea6ae1 100644 --- a/studio/OneWare.Studio.Browser/AppBundle/main.js +++ b/studio/OneWare.Studio.Browser/wwwroot/main.js @@ -1,7 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -import {dotnet} from './dotnet.js' +import { dotnet } from './_framework/dotnet.js' const is_browser = typeof window != "undefined"; if (!is_browser) throw new Error(`Expected to be running in a browser`); @@ -13,4 +10,4 @@ const dotnetRuntime = await dotnet const config = dotnetRuntime.getConfig(); -await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [globalThis.location.href]); \ No newline at end of file +await dotnetRuntime.runMain(config.mainAssemblyName, [globalThis.location.href]); \ No newline at end of file