rename avalonia.web to avalonia.browser
This commit is contained in:
Dan Walmsley
+5
-5
@@ -210,9 +210,9 @@ coc-settings.json
|
||||
.ccls-cache
|
||||
.ccls
|
||||
*.map
|
||||
src/Web/Avalonia.Web.Blazor/wwwroot/*.js
|
||||
src/Web/Avalonia.Web.Blazor/Interop/Typescript/*.js
|
||||
src/Browser/Avalonia.Browser.Blazor/wwwroot/*.js
|
||||
src/Browser/Avalonia.Browser.Blazor/Interop/Typescript/*.js
|
||||
node_modules
|
||||
src/Web/Avalonia.Web.Blazor/webapp/package-lock.json
|
||||
src/Web/Avalonia.Web.Blazor/wwwroot
|
||||
src/Web/Avalonia.Web/wwwroot
|
||||
src/Browser/Avalonia.Browser.Blazor/webapp/package-lock.json
|
||||
src/Browser/Avalonia.Browser.Blazor/wwwroot
|
||||
src/Browser/Avalonia.Browser/wwwroot
|
||||
|
||||
+27
-27
@@ -198,9 +198,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTestApp", "sampl
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.IntegrationTests.Appium", "tests\Avalonia.IntegrationTests.Appium\Avalonia.IntegrationTests.Appium.csproj", "{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Web.Blazor", "src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.csproj", "{25831348-EB2A-483E-9576-E8F6528674A5}"
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Browser", "Browser", "{86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsInteropTest", "samples\interop\WindowsInteropTest\WindowsInteropTest.csproj", "{26A98DA1-D89D-4A95-8152-349F404DA2E2}"
|
||||
EndProject
|
||||
@@ -216,8 +214,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport.Te
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevGenerators", "src\tools\DevGenerators\DevGenerators.csproj", "{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Web", "src\Web\Avalonia.Web\Avalonia.Web.csproj", "{76D39FF6-6B4F-46C4-93CD-E6FC4665739E}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MobileSandbox", "samples\MobileSandbox\MobileSandbox.csproj", "{3B8519C1-2F51-4F12-A348-120AB91D4532}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MobileSandbox.Android", "samples\MobileSandbox.Android\MobileSandbox.Android.csproj", "{C90FE60B-B01E-4F35-91D6-379D6966030F}"
|
||||
@@ -226,9 +222,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MobileSandbox.iOS", "sample
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MobileSandbox.Desktop", "samples\MobileSandbox.Desktop\MobileSandbox.Desktop.csproj", "{62D392C9-81CF-487F-92E8-598B2AF3FDCE}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Blazor.Web", "samples\ControlCatalog.Blazor.Web\ControlCatalog.Blazor.Web.csproj", "{6A710364-AE6D-40BD-968B-024311527AC2}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Browser", "src\Browser\Avalonia.Browser\Avalonia.Browser.csproj", "{4A39637C-9338-4925-A4DB-D072E292EC78}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Web", "samples\ControlCatalog.Web\ControlCatalog.Web.csproj", "{8B3E8405-DE18-4048-A459-9CA4AC3319A2}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Browser.Blazor", "src\Browser\Avalonia.Browser.Blazor\Avalonia.Browser.Blazor.csproj", "{47F8530C-F19B-4B1A-B4D6-EB231522AE5D}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.Browser", "samples\ControlCatalog.Browser\ControlCatalog.Browser.csproj", "{15B93A4C-1B46-43F6-B534-7B25B6E99932}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.Browser.Blazor", "samples\ControlCatalog.Browser.Blazor\ControlCatalog.Browser.Blazor.csproj", "{90B08091-9BBD-4362-B712-E9F2CC62B218}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
@@ -480,10 +480,6 @@ Global
|
||||
{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{25831348-EB2A-483E-9576-E8F6528674A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{25831348-EB2A-483E-9576-E8F6528674A5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
@@ -512,10 +508,6 @@ Global
|
||||
{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{76D39FF6-6B4F-46C4-93CD-E6FC4665739E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{76D39FF6-6B4F-46C4-93CD-E6FC4665739E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{76D39FF6-6B4F-46C4-93CD-E6FC4665739E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{76D39FF6-6B4F-46C4-93CD-E6FC4665739E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{3B8519C1-2F51-4F12-A348-120AB91D4532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{3B8519C1-2F51-4F12-A348-120AB91D4532}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{3B8519C1-2F51-4F12-A348-120AB91D4532}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
@@ -533,14 +525,22 @@ Global
|
||||
{62D392C9-81CF-487F-92E8-598B2AF3FDCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{62D392C9-81CF-487F-92E8-598B2AF3FDCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{62D392C9-81CF-487F-92E8-598B2AF3FDCE}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{6A710364-AE6D-40BD-968B-024311527AC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{6A710364-AE6D-40BD-968B-024311527AC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6A710364-AE6D-40BD-968B-024311527AC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{6A710364-AE6D-40BD-968B-024311527AC2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{8B3E8405-DE18-4048-A459-9CA4AC3319A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8B3E8405-DE18-4048-A459-9CA4AC3319A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8B3E8405-DE18-4048-A459-9CA4AC3319A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8B3E8405-DE18-4048-A459-9CA4AC3319A2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{4A39637C-9338-4925-A4DB-D072E292EC78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4A39637C-9338-4925-A4DB-D072E292EC78}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4A39637C-9338-4925-A4DB-D072E292EC78}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4A39637C-9338-4925-A4DB-D072E292EC78}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{47F8530C-F19B-4B1A-B4D6-EB231522AE5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{47F8530C-F19B-4B1A-B4D6-EB231522AE5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{47F8530C-F19B-4B1A-B4D6-EB231522AE5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{47F8530C-F19B-4B1A-B4D6-EB231522AE5D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{15B93A4C-1B46-43F6-B534-7B25B6E99932}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{15B93A4C-1B46-43F6-B534-7B25B6E99932}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{15B93A4C-1B46-43F6-B534-7B25B6E99932}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{15B93A4C-1B46-43F6-B534-7B25B6E99932}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{90B08091-9BBD-4362-B712-E9F2CC62B218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{90B08091-9BBD-4362-B712-E9F2CC62B218}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{90B08091-9BBD-4362-B712-E9F2CC62B218}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{90B08091-9BBD-4362-B712-E9F2CC62B218}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -591,20 +591,20 @@ Global
|
||||
{BC594FD5-4AF2-409E-A1E6-04123F54D7C5} = {9B9E3891-2366-4253-A952-D08BCEB71098}
|
||||
{676D6BFD-029D-4E43-BFC7-3892265CE251} = {9B9E3891-2366-4253-A952-D08BCEB71098}
|
||||
{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
|
||||
{25831348-EB2A-483E-9576-E8F6528674A5} = {86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}
|
||||
{26A98DA1-D89D-4A95-8152-349F404DA2E2} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
|
||||
{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270} = {9B9E3891-2366-4253-A952-D08BCEB71098}
|
||||
{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
|
||||
{2B390431-288C-435C-BB6B-A374033BD8D1} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
|
||||
{EABE2161-989B-42BF-BD8D-1E34B20C21F1} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
|
||||
{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
|
||||
{76D39FF6-6B4F-46C4-93CD-E6FC4665739E} = {86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}
|
||||
{3B8519C1-2F51-4F12-A348-120AB91D4532} = {9B9E3891-2366-4253-A952-D08BCEB71098}
|
||||
{C90FE60B-B01E-4F35-91D6-379D6966030F} = {9B9E3891-2366-4253-A952-D08BCEB71098}
|
||||
{FED9A71D-00D7-4F40-A9E4-1229EEA28EEB} = {9B9E3891-2366-4253-A952-D08BCEB71098}
|
||||
{62D392C9-81CF-487F-92E8-598B2AF3FDCE} = {9B9E3891-2366-4253-A952-D08BCEB71098}
|
||||
{6A710364-AE6D-40BD-968B-024311527AC2} = {9B9E3891-2366-4253-A952-D08BCEB71098}
|
||||
{8B3E8405-DE18-4048-A459-9CA4AC3319A2} = {9B9E3891-2366-4253-A952-D08BCEB71098}
|
||||
{4A39637C-9338-4925-A4DB-D072E292EC78} = {86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}
|
||||
{47F8530C-F19B-4B1A-B4D6-EB231522AE5D} = {86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}
|
||||
{15B93A4C-1B46-43F6-B534-7B25B6E99932} = {9B9E3891-2366-4253-A952-D08BCEB71098}
|
||||
{90B08091-9BBD-4362-B712-E9F2CC62B218} = {9B9E3891-2366-4253-A952-D08BCEB71098}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
using Avalonia;
|
||||
using Avalonia.Web.Blazor;
|
||||
using Avalonia.Browser.Blazor;
|
||||
|
||||
namespace ControlCatalog.Blazor.Web;
|
||||
namespace ControlCatalog.Browser.Blazor;
|
||||
|
||||
public partial class App
|
||||
{
|
||||
+3
-3
@@ -15,15 +15,15 @@
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
|
||||
<ProjectReference Include="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.csproj" />
|
||||
<ProjectReference Include="..\..\src\Browser\Avalonia.Browser.Blazor\Avalonia.Browser.Blazor.csproj" />
|
||||
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="..\..\build\ReferenceCoreLibraries.props" />
|
||||
<Import Project="..\..\build\BuildTargets.targets" />
|
||||
|
||||
<Import Project="..\..\src\Web\Avalonia.Web\Avalonia.Web.props" />
|
||||
<Import Project="..\..\src\Web\Avalonia.Web\Avalonia.Web.targets" />
|
||||
<Import Project="..\..\src\Browser\Avalonia.Browser\Avalonia.Browser.props" />
|
||||
<Import Project="..\..\src\Browser\Avalonia.Browser\Avalonia.Browser.targets" />
|
||||
|
||||
</Project>
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
@page "/"
|
||||
|
||||
@using Avalonia.Web.Blazor
|
||||
@using Avalonia.Browser.Blazor
|
||||
|
||||
<AvaloniaView />
|
||||
+1
-1
@@ -3,7 +3,7 @@ using System.Net.Http;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ControlCatalog.Blazor.Web;
|
||||
using ControlCatalog.Browser.Blazor;
|
||||
|
||||
public class Program
|
||||
{
|
||||
+1
-1
@@ -6,5 +6,5 @@
|
||||
@using Microsoft.AspNetCore.Components.Web.Virtualization
|
||||
@using Microsoft.AspNetCore.Components.WebAssembly.Http
|
||||
@using Microsoft.JSInterop
|
||||
@using ControlCatalog.Blazor.Web.Shared
|
||||
@using ControlCatalog.Browser.Blazor.Shared
|
||||
@using SkiaSharp
|
||||
|
Before Width: | Height: | Size: 172 KiB After Width: | Height: | Size: 172 KiB |
+3
-3
@@ -26,7 +26,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
|
||||
<ProjectReference Include="..\..\src\Web\Avalonia.Web\Avalonia.Web.csproj" />
|
||||
<ProjectReference Include="..\..\src\Browser\Avalonia.Browser\Avalonia.Browser.csproj" />
|
||||
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
@@ -39,6 +39,6 @@
|
||||
<WasmExtraFilesToDeploy Include="app.css" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="..\..\src\Web\Avalonia.Web\Avalonia.Web.props" />
|
||||
<Import Project="..\..\src\Web\Avalonia.Web\Avalonia.Web.targets" />
|
||||
<Import Project="..\..\src\Browser\Avalonia.Browser\Avalonia.Browser.props" />
|
||||
<Import Project="..\..\src\Browser\Avalonia.Browser\Avalonia.Browser.targets" />
|
||||
</Project>
|
||||
+2
-2
@@ -1,11 +1,11 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
using Avalonia.Platform;
|
||||
using Avalonia.Web;
|
||||
using Avalonia.Browser;
|
||||
|
||||
using ControlCatalog.Pages;
|
||||
|
||||
namespace ControlCatalog.Web;
|
||||
namespace ControlCatalog.Browser;
|
||||
|
||||
public class EmbedSampleWeb : INativeDemoControl
|
||||
{
|
||||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
@@ -1,8 +1,8 @@
|
||||
using System.Runtime.Versioning;
|
||||
using Avalonia;
|
||||
using Avalonia.Web;
|
||||
using Avalonia.Browser;
|
||||
using ControlCatalog;
|
||||
using ControlCatalog.Web;
|
||||
using ControlCatalog.Browser;
|
||||
|
||||
[assembly:SupportedOSPlatform("browser")]
|
||||
|
||||
|
Before Width: | Height: | Size: 172 KiB After Width: | Height: | Size: 172 KiB |
@@ -40,7 +40,6 @@
|
||||
<InternalsVisibleTo Include="Avalonia.Skia.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
|
||||
<InternalsVisibleTo Include="Avalonia.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
|
||||
<InternalsVisibleTo Include="Avalonia.Win32, PublicKey=$(AvaloniaPublicKey)" />
|
||||
<InternalsVisibleTo Include="Avalonia.Web.Blazor, PublicKey=$(AvaloniaPublicKey)" />
|
||||
<InternalsVisibleTo Include="Avalonia.Dialogs, PublicKey=$(AvaloniaPublicKey)" />
|
||||
<InternalsVisibleTo Include="Avalonia.Diagnostics, PublicKey=$(AvaloniaPublicKey)" />
|
||||
<InternalsVisibleTo Include="DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
|
||||
|
||||
@@ -29,6 +29,6 @@ using Avalonia.Metadata;
|
||||
[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
|
||||
[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
|
||||
[assembly: InternalsVisibleTo("Avalonia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
|
||||
[assembly: InternalsVisibleTo("Avalonia.Web.Blazor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
|
||||
[assembly: InternalsVisibleTo("Avalonia.Web, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
|
||||
[assembly: InternalsVisibleTo("Avalonia.Browser.Blazor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
|
||||
[assembly: InternalsVisibleTo("Avalonia.Browser, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
|
||||
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
|
||||
|
||||
+4
-4
@@ -2,7 +2,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<PackageId>Avalonia.Web.Blazor</PackageId>
|
||||
<PackageId>Avalonia.Browser.Blazor</PackageId>
|
||||
<ResolveStaticWebAssetsInputsDependsOn>_IncludeGeneratedAvaloniaStaticFiles;$(ResolveStaticWebAssetsInputsDependsOn)</ResolveStaticWebAssetsInputsDependsOn>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -17,12 +17,12 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Avalonia.Web\Avalonia.Web.csproj" />
|
||||
<ProjectReference Include="..\Avalonia.Browser\Avalonia.Browser.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="_IncludeGeneratedAvaloniaStaticFiles">
|
||||
<ItemGroup>
|
||||
<_AvaloniaWebAssets Include="$(MSBuildThisFileDirectory)../Avalonia.Web/wwwroot/**/*.*" />
|
||||
<_AvaloniaWebAssets Include="$(MSBuildThisFileDirectory)../Avalonia.Browser/wwwroot/**/*.*" />
|
||||
</ItemGroup>
|
||||
<DefineStaticWebAssets SourceId="$(PackageId)"
|
||||
SourceType="Computed"
|
||||
@@ -30,7 +30,7 @@
|
||||
AssetRole="Primary"
|
||||
CopyToOutputDirectory="PreserveNewest"
|
||||
CopyToPublishDirectory="PreserveNewest"
|
||||
ContentRoot="$(MSBuildThisFileDirectory)../Avalonia.Web/wwwroot/"
|
||||
ContentRoot="$(MSBuildThisFileDirectory)../Avalonia.Browser/wwwroot/"
|
||||
BasePath="_content\$(PackageId)"
|
||||
CandidateAssets="@(_AvaloniaWebAssets)"
|
||||
RelativePathFilter="**.js">
|
||||
+6
-5
@@ -2,17 +2,18 @@ using System.Runtime.InteropServices.JavaScript;
|
||||
using System.Runtime.Versioning;
|
||||
using System.Threading.Tasks;
|
||||
using System;
|
||||
using Avalonia.Browser.Interop;
|
||||
using Avalonia.Controls.ApplicationLifetimes;
|
||||
using Microsoft.AspNetCore.Components;
|
||||
using Microsoft.AspNetCore.Components.Rendering;
|
||||
using BrowserView = Avalonia.Web.AvaloniaView;
|
||||
using BrowserView = Avalonia.Browser.AvaloniaView;
|
||||
|
||||
namespace Avalonia.Web.Blazor;
|
||||
namespace Avalonia.Browser.Blazor;
|
||||
|
||||
[SupportedOSPlatform("browser")]
|
||||
public class AvaloniaView : ComponentBase
|
||||
{
|
||||
private BrowserView? _browserView;
|
||||
private Browser.AvaloniaView? _browserView;
|
||||
private readonly string _containerId;
|
||||
|
||||
public AvaloniaView()
|
||||
@@ -32,9 +33,9 @@ public class AvaloniaView : ComponentBase
|
||||
{
|
||||
if (OperatingSystem.IsBrowser())
|
||||
{
|
||||
await Avalonia.Web.Interop.AvaloniaModule.ImportMain();
|
||||
await AvaloniaModule.ImportMain();
|
||||
|
||||
_browserView = new BrowserView(_containerId);
|
||||
_browserView = new Browser.AvaloniaView(_containerId);
|
||||
if (Application.Current?.ApplicationLifetime is ISingleViewApplicationLifetime lifetime)
|
||||
{
|
||||
_browserView.Content = lifetime.MainView;
|
||||
+2
-2
@@ -3,7 +3,7 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.ApplicationLifetimes;
|
||||
|
||||
namespace Avalonia.Web.Blazor;
|
||||
namespace Avalonia.Browser.Blazor;
|
||||
|
||||
[SupportedOSPlatform("browser")]
|
||||
public static class WebAppBuilder
|
||||
@@ -21,7 +21,7 @@ public static class WebAppBuilder
|
||||
.UseBrowser()
|
||||
.With(new BrowserPlatformOptions
|
||||
{
|
||||
FrameworkAssetPathResolver = new(filePath => $"/_content/Avalonia.Web.Blazor/{filePath}")
|
||||
FrameworkAssetPathResolver = new(filePath => $"/_content/Avalonia.Browser.Blazor/{filePath}")
|
||||
});
|
||||
}
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@
|
||||
</Target>
|
||||
|
||||
<ItemGroup Label="InternalsVisibleTo">
|
||||
<InternalsVisibleTo Include="Avalonia.Web.Blazor, PublicKey=$(AvaloniaPublicKey)" />
|
||||
<InternalsVisibleTo Include="Avalonia.Browser.Blazor, PublicKey=$(AvaloniaPublicKey)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -2,7 +2,8 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
|
||||
using Avalonia.Browser.Interop;
|
||||
using Avalonia.Browser.Skia;
|
||||
using Avalonia.Collections.Pooled;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.Embedding;
|
||||
@@ -12,12 +13,9 @@ using Avalonia.Input.Raw;
|
||||
using Avalonia.Input.TextInput;
|
||||
using Avalonia.Rendering.Composition;
|
||||
using Avalonia.Threading;
|
||||
using Avalonia.Web.Interop;
|
||||
using Avalonia.Web.Skia;
|
||||
|
||||
using SkiaSharp;
|
||||
|
||||
namespace Avalonia.Web
|
||||
namespace Avalonia.Browser
|
||||
{
|
||||
[System.Runtime.Versioning.SupportedOSPlatform("browser")] // gets rid of callsite warnings
|
||||
public partial class AvaloniaView : ITextInputMethodImpl
|
||||
+2
-3
@@ -1,12 +1,11 @@
|
||||
using System;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
|
||||
using Avalonia.Browser.Interop;
|
||||
using Avalonia.Controls.Platform;
|
||||
using Avalonia.Platform;
|
||||
using Avalonia.Web.Interop;
|
||||
|
||||
namespace Avalonia.Web
|
||||
namespace Avalonia.Browser
|
||||
{
|
||||
internal class BrowserNativeControlHost : INativeControlHostImpl
|
||||
{
|
||||
+2
-2
@@ -2,10 +2,10 @@ using System;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
using System.Text.RegularExpressions;
|
||||
using Avalonia.Browser.Interop;
|
||||
using Avalonia.Platform;
|
||||
using Avalonia.Web.Interop;
|
||||
|
||||
namespace Avalonia.Web;
|
||||
namespace Avalonia.Browser;
|
||||
|
||||
internal class BrowserRuntimePlatform : StandardRuntimePlatform
|
||||
{
|
||||
+2
-2
@@ -1,11 +1,11 @@
|
||||
using System;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.ApplicationLifetimes;
|
||||
using Avalonia.Web.Skia;
|
||||
using System.Runtime.Versioning;
|
||||
using Avalonia.Browser.Skia;
|
||||
using Avalonia.Platform;
|
||||
|
||||
namespace Avalonia.Web;
|
||||
namespace Avalonia.Browser;
|
||||
|
||||
[SupportedOSPlatform("browser")]
|
||||
public class BrowserSingleViewLifetime : ISingleViewApplicationLifetime
|
||||
+3
-3
@@ -2,6 +2,8 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using Avalonia.Browser.Skia;
|
||||
using Avalonia.Browser.Storage;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.Platform;
|
||||
using Avalonia.Input;
|
||||
@@ -11,10 +13,8 @@ using Avalonia.Platform;
|
||||
using Avalonia.Platform.Storage;
|
||||
using Avalonia.Rendering;
|
||||
using Avalonia.Rendering.Composition;
|
||||
using Avalonia.Web.Skia;
|
||||
using Avalonia.Web.Storage;
|
||||
|
||||
namespace Avalonia.Web
|
||||
namespace Avalonia.Browser
|
||||
{
|
||||
[System.Runtime.Versioning.SupportedOSPlatform("browser")] // gets rid of callsite warnings
|
||||
internal class BrowserTopLevelImpl : ITopLevelImplWithTextInputMethod, ITopLevelImplWithNativeControlHost, ITopLevelImplWithStorageProvider
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia.Browser.Interop;
|
||||
using Avalonia.Input;
|
||||
using Avalonia.Input.Platform;
|
||||
using Avalonia.Web.Interop;
|
||||
|
||||
namespace Avalonia.Web
|
||||
namespace Avalonia.Browser
|
||||
{
|
||||
internal class ClipboardImpl : IClipboard
|
||||
{
|
||||
@@ -3,7 +3,7 @@ using System.IO;
|
||||
using Avalonia.Input;
|
||||
using Avalonia.Platform;
|
||||
|
||||
namespace Avalonia.Web
|
||||
namespace Avalonia.Browser
|
||||
{
|
||||
internal class CssCursor : ICursorImpl
|
||||
{
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Avalonia.Web.Interop;
|
||||
namespace Avalonia.Browser.Interop;
|
||||
|
||||
internal static partial class AvaloniaModule
|
||||
{
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
|
||||
namespace Avalonia.Web.Interop;
|
||||
namespace Avalonia.Browser.Interop;
|
||||
|
||||
internal record GLInfo(int ContextId, uint FboId, int Stencils, int Samples, int Depth);
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
|
||||
namespace Avalonia.Web.Interop;
|
||||
namespace Avalonia.Browser.Interop;
|
||||
|
||||
internal static partial class DomHelper
|
||||
{
|
||||
+1
-1
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Avalonia.Web.Interop;
|
||||
namespace Avalonia.Browser.Interop;
|
||||
|
||||
internal static partial class InputHelper
|
||||
{
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
|
||||
namespace Avalonia.Web.Interop;
|
||||
namespace Avalonia.Browser.Interop;
|
||||
|
||||
internal static partial class NativeControlHostHelper
|
||||
{
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Avalonia.Web.Interop;
|
||||
namespace Avalonia.Browser.Interop;
|
||||
|
||||
internal static partial class StorageHelper
|
||||
{
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Avalonia.Web.Interop;
|
||||
namespace Avalonia.Browser.Interop;
|
||||
|
||||
/// <summary>
|
||||
/// Set of FileSystemWritableFileStream and Blob methods.
|
||||
+1
-1
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices.JavaScript;
|
||||
|
||||
using Avalonia.Controls.Platform;
|
||||
|
||||
namespace Avalonia.Web;
|
||||
namespace Avalonia.Browser;
|
||||
|
||||
public class JSObjectControlHandle : INativeControlHostDestroyableControlHandle
|
||||
{
|
||||
@@ -2,7 +2,7 @@ using System.Collections.Generic;
|
||||
|
||||
using Avalonia.Input;
|
||||
|
||||
namespace Avalonia.Web
|
||||
namespace Avalonia.Browser
|
||||
{
|
||||
internal static class Keycodes
|
||||
{
|
||||
+1
-1
@@ -2,7 +2,7 @@ using System;
|
||||
using System.Diagnostics;
|
||||
using Avalonia.Rendering;
|
||||
|
||||
namespace Avalonia.Web
|
||||
namespace Avalonia.Browser
|
||||
{
|
||||
internal class ManualTriggerRenderTimer : IRenderTimer
|
||||
{
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
using Avalonia.Skia;
|
||||
|
||||
namespace Avalonia.Web.Skia
|
||||
namespace Avalonia.Browser.Skia
|
||||
{
|
||||
public class BrowserSkiaGpu : ISkiaGpu
|
||||
{
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
using Avalonia.Skia;
|
||||
using SkiaSharp;
|
||||
|
||||
namespace Avalonia.Web.Skia
|
||||
namespace Avalonia.Browser.Skia
|
||||
{
|
||||
internal class BrowserSkiaGpuRenderSession : ISkiaGpuRenderSession
|
||||
{
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
using Avalonia.Skia;
|
||||
using SkiaSharp;
|
||||
|
||||
namespace Avalonia.Web.Skia
|
||||
namespace Avalonia.Browser.Skia
|
||||
{
|
||||
internal class BrowserSkiaGpuRenderTarget : ISkiaGpuRenderTarget
|
||||
{
|
||||
+1
-1
@@ -5,7 +5,7 @@ using Avalonia.Platform;
|
||||
using Avalonia.Skia;
|
||||
using SkiaSharp;
|
||||
|
||||
namespace Avalonia.Web.Skia
|
||||
namespace Avalonia.Browser.Skia
|
||||
{
|
||||
internal class BrowserSkiaRasterSurface : IBrowserSkiaSurface, IFramebufferPlatformSurface, IDisposable
|
||||
{
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
using Avalonia.Web.Interop;
|
||||
using Avalonia.Browser.Interop;
|
||||
using SkiaSharp;
|
||||
|
||||
namespace Avalonia.Web.Skia
|
||||
namespace Avalonia.Browser.Skia
|
||||
{
|
||||
internal class BrowserSkiaSurface : IBrowserSkiaSurface
|
||||
{
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
namespace Avalonia.Web.Skia
|
||||
namespace Avalonia.Browser.Skia
|
||||
{
|
||||
internal interface IBrowserSkiaSurface
|
||||
{
|
||||
+2
-3
@@ -3,10 +3,9 @@ using System.IO;
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia.Browser.Interop;
|
||||
|
||||
using Avalonia.Web.Interop;
|
||||
|
||||
namespace Avalonia.Web.Storage;
|
||||
namespace Avalonia.Browser.Storage;
|
||||
|
||||
[System.Runtime.Versioning.SupportedOSPlatform("browser")]
|
||||
internal class BlobReadableStream : Stream
|
||||
+2
-3
@@ -6,11 +6,10 @@ using System.Linq;
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
using System.Runtime.Versioning;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using Avalonia.Browser.Interop;
|
||||
using Avalonia.Platform.Storage;
|
||||
using Avalonia.Web.Interop;
|
||||
|
||||
namespace Avalonia.Web.Storage;
|
||||
namespace Avalonia.Browser.Storage;
|
||||
|
||||
internal record FilePickerAcceptType(string Description, IReadOnlyDictionary<string, IReadOnlyList<string>> Accept);
|
||||
|
||||
+2
-3
@@ -3,10 +3,9 @@ using System.IO;
|
||||
using System.Runtime.InteropServices.JavaScript;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia.Browser.Interop;
|
||||
|
||||
using Avalonia.Web.Interop;
|
||||
|
||||
namespace Avalonia.Web.Storage;
|
||||
namespace Avalonia.Browser.Storage;
|
||||
|
||||
[System.Runtime.Versioning.SupportedOSPlatform("browser")]
|
||||
// Loose wrapper implementaion of a stream on top of FileAPI FileSystemWritableFileStream
|
||||
+1
-1
@@ -4,7 +4,7 @@ using Avalonia.Media;
|
||||
using Avalonia.Platform;
|
||||
using Avalonia.Rendering.SceneGraph;
|
||||
|
||||
namespace Avalonia.Web
|
||||
namespace Avalonia.Browser
|
||||
{
|
||||
internal class WebEmbeddableControlRoot : EmbeddableControlRoot
|
||||
{
|
||||
@@ -4,7 +4,7 @@ using Avalonia.Platform;
|
||||
|
||||
#nullable enable
|
||||
|
||||
namespace Avalonia.Web
|
||||
namespace Avalonia.Browser
|
||||
{
|
||||
internal class IconLoaderStub : IPlatformIconLoader
|
||||
{
|
||||
+1
-1
@@ -6,7 +6,7 @@ using Avalonia.Platform;
|
||||
using Avalonia.Rendering;
|
||||
using Avalonia.Threading;
|
||||
|
||||
namespace Avalonia.Web
|
||||
namespace Avalonia.Browser
|
||||
{
|
||||
internal class BrowserWindowingPlatform : IWindowingPlatform, IPlatformThreadingInterface
|
||||
{
|
||||
+5496
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "avalonia.web",
|
||||
"name": "avalonia.browser",
|
||||
"scripts": {
|
||||
"typecheck": "npx tsc -noEmit",
|
||||
"eslint": "npx eslint . --fix",
|
||||
-2234
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user