From 113069ebd92d08c469f575a70a4cbb44e069507e Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 8 Mar 2024 14:00:58 -0800 Subject: [PATCH 1/7] Update 0.10.21 to 0.10.22 --- readme.md | 4 ++-- templates/csharp/app-mvvm/.template.config/template.json | 4 ++-- templates/csharp/app/.template.config/template.json | 4 ++-- templates/fsharp/app-mvvm/.template.config/template.json | 4 ++-- templates/fsharp/app/.template.config/template.json | 4 ++-- tests/build-test.ps1 | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/readme.md b/readme.md index 30c687ba..a4e8c74e 100644 --- a/readme.md +++ b/readme.md @@ -58,7 +58,7 @@ Available parameters: *Description*: The target version of Avalonia NuGet packages. -*Options*: **0.10.21**, **11.0.9** +*Options*: **0.10.22**, **11.0.9** *By default*: 11.0.9 @@ -99,7 +99,7 @@ Available parameters: *Description*: The target version of Avalonia NuGet packages. -*Options*: **0.10.21**, **11.0.9** +*Options*: **0.10.22**, **11.0.9** *By default*: 11.0.9 diff --git a/templates/csharp/app-mvvm/.template.config/template.json b/templates/csharp/app-mvvm/.template.config/template.json index d4e1a233..b068077f 100644 --- a/templates/csharp/app-mvvm/.template.config/template.json +++ b/templates/csharp/app-mvvm/.template.config/template.json @@ -72,8 +72,8 @@ "datatype": "choice", "choices": [ { - "choice": "0.10.21", - "description": "Target 0.10.21" + "choice": "0.10.22", + "description": "Target 0.10.22" }, { "choice": "11.0.9", diff --git a/templates/csharp/app/.template.config/template.json b/templates/csharp/app/.template.config/template.json index b03cd460..91331624 100644 --- a/templates/csharp/app/.template.config/template.json +++ b/templates/csharp/app/.template.config/template.json @@ -48,8 +48,8 @@ "datatype": "choice", "choices": [ { - "choice": "0.10.21", - "description": "Target 0.10.21" + "choice": "0.10.22", + "description": "Target 0.10.22" }, { "choice": "11.0.9", diff --git a/templates/fsharp/app-mvvm/.template.config/template.json b/templates/fsharp/app-mvvm/.template.config/template.json index cf41067e..3b4a247b 100644 --- a/templates/fsharp/app-mvvm/.template.config/template.json +++ b/templates/fsharp/app-mvvm/.template.config/template.json @@ -72,8 +72,8 @@ "datatype": "choice", "choices": [ { - "choice": "0.10.21", - "description": "Target 0.10.21" + "choice": "0.10.22", + "description": "Target 0.10.22" }, { "choice": "11.0.9", diff --git a/templates/fsharp/app/.template.config/template.json b/templates/fsharp/app/.template.config/template.json index d538ac74..1741cb31 100644 --- a/templates/fsharp/app/.template.config/template.json +++ b/templates/fsharp/app/.template.config/template.json @@ -48,8 +48,8 @@ "datatype": "choice", "choices": [ { - "choice": "0.10.21", - "description": "Target 0.10.21" + "choice": "0.10.22", + "description": "Target 0.10.22" }, { "choice": "11.0.9", diff --git a/tests/build-test.ps1 b/tests/build-test.ps1 index b3a20a4a..2f5ff403 100644 --- a/tests/build-test.ps1 +++ b/tests/build-test.ps1 @@ -97,7 +97,7 @@ $binlog = [IO.Path]::GetFullPath([IO.Path]::Combine($pwd, "..", "binlog", "test. Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "f" "net6.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "f" "net7.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "f" "net8.0" $binlog -Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "0.10.21" $binlog +Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "0.10.22" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "11.0.9" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "cb" "true" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "cb" "false" $binlog @@ -106,7 +106,7 @@ Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "cb" "false" $binlog Test-Template "avalonia.mvvm" "AvaloniaMvvm" "C#" "f" "net6.0" $binlog Test-Template "avalonia.mvvm" "AvaloniaMvvm" "C#" "f" "net7.0" $binlog Test-Template "avalonia.mvvm" "AvaloniaMvvm" "C#" "f" "net8.0" $binlog -Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "0.10.21" $binlog +Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "0.10.22" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "11.0.9" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "m" "ReactiveUI" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "m" "CommunityToolkit" $binlog @@ -124,7 +124,7 @@ Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "rvl" "false" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "f" "net6.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "f" "net7.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "f" "net8.0" $binlog -Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "0.10.21" $binlog +Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "0.10.22" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "11.0.9" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "cb" "true" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "cb" "false" $binlog @@ -134,7 +134,7 @@ Remove-Item -Recurse "output/C#" Test-Template "avalonia.mvvm" "AvaloniaMvvm" "F#" "f" "net6.0" $binlog Test-Template "avalonia.mvvm" "AvaloniaMvvm" "F#" "f" "net7.0" $binlog Test-Template "avalonia.mvvm" "AvaloniaMvvm" "F#" "f" "net8.0" $binlog -Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "0.10.21" $binlog +Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "0.10.22" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "11.0.9" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "m" "ReactiveUI" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "m" "CommunityToolkit" $binlog From d2d323451bd51160b65a836845f44b40499c20fa Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 8 Mar 2024 14:01:48 -0800 Subject: [PATCH 2/7] Update 11.0.9 to 11.0.10 --- readme.md | 8 ++++---- .../csharp/app-mvvm/.template.config/template.json | 10 +++++----- templates/csharp/app/.template.config/template.json | 10 +++++----- templates/csharp/xplat/Directory.Build.props | 2 +- .../fsharp/app-mvvm/.template.config/template.json | 10 +++++----- templates/fsharp/app/.template.config/template.json | 10 +++++----- templates/fsharp/xplat/Directory.Build.props | 2 +- tests/build-test.ps1 | 8 ++++---- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/readme.md b/readme.md index a4e8c74e..9ff7bd57 100644 --- a/readme.md +++ b/readme.md @@ -58,9 +58,9 @@ Available parameters: *Description*: The target version of Avalonia NuGet packages. -*Options*: **0.10.22**, **11.0.9** +*Options*: **0.10.22**, **11.0.10** -*By default*: 11.0.9 +*By default*: 11.0.10 ``-cb, --compiled-bindings`` @@ -99,9 +99,9 @@ Available parameters: *Description*: The target version of Avalonia NuGet packages. -*Options*: **0.10.22**, **11.0.9** +*Options*: **0.10.22**, **11.0.10** -*By default*: 11.0.9 +*By default*: 11.0.10 ``-cb, --compiled-bindings`` diff --git a/templates/csharp/app-mvvm/.template.config/template.json b/templates/csharp/app-mvvm/.template.config/template.json index b068077f..ba0aef63 100644 --- a/templates/csharp/app-mvvm/.template.config/template.json +++ b/templates/csharp/app-mvvm/.template.config/template.json @@ -76,16 +76,16 @@ "description": "Target 0.10.22" }, { - "choice": "11.0.9", - "description": "Target 11.0.9 (Latest stable)" + "choice": "11.0.10", + "description": "Target 11.0.10 (Latest stable)" } ], "replaces": "AvaloniaVersionTemplateParameter", - "defaultValue": "11.0.9" + "defaultValue": "11.0.10" }, "AvaloniaStableChosen": { "type": "computed", - "value": "(AvaloniaVersion == \"11.0.9\")" + "value": "(AvaloniaVersion == \"11.0.10\")" }, "UseCompiledBindings": { "type": "parameter", @@ -93,7 +93,7 @@ "datatype": "bool", "displayName": "Use compiled Bindings", "defaultValue": "true", - "isEnabled": "(AvaloniaVersion == \"11.0.9\")" + "isEnabled": "(AvaloniaVersion == \"11.0.10\")" }, "RemoveViewLocator": { "type": "parameter", diff --git a/templates/csharp/app/.template.config/template.json b/templates/csharp/app/.template.config/template.json index 91331624..cec2644a 100644 --- a/templates/csharp/app/.template.config/template.json +++ b/templates/csharp/app/.template.config/template.json @@ -52,16 +52,16 @@ "description": "Target 0.10.22" }, { - "choice": "11.0.9", - "description": "Target 11.0.9 (Latest stable)" + "choice": "11.0.10", + "description": "Target 11.0.10 (Latest stable)" } ], "replaces": "AvaloniaVersionTemplateParameter", - "defaultValue": "11.0.9" + "defaultValue": "11.0.10" }, "AvaloniaStableChosen": { "type": "computed", - "value": "(AvaloniaVersion == \"11.0.9\")" + "value": "(AvaloniaVersion == \"11.0.10\")" }, "UseCompiledBindings": { "type": "parameter", @@ -69,7 +69,7 @@ "datatype": "bool", "displayName": "Use compiled Bindings", "defaultValue": "true", - "isEnabled": "(AvaloniaVersion == \"11.0.9\")" + "isEnabled": "(AvaloniaVersion == \"11.0.10\")" }, "HostIdentifier": { "type": "bind", diff --git a/templates/csharp/xplat/Directory.Build.props b/templates/csharp/xplat/Directory.Build.props index c950d6ac..3a820543 100644 --- a/templates/csharp/xplat/Directory.Build.props +++ b/templates/csharp/xplat/Directory.Build.props @@ -1,6 +1,6 @@ enable - 11.0.9 + 11.0.10 diff --git a/templates/fsharp/app-mvvm/.template.config/template.json b/templates/fsharp/app-mvvm/.template.config/template.json index 3b4a247b..8116ce4c 100644 --- a/templates/fsharp/app-mvvm/.template.config/template.json +++ b/templates/fsharp/app-mvvm/.template.config/template.json @@ -76,16 +76,16 @@ "description": "Target 0.10.22" }, { - "choice": "11.0.9", - "description": "Target 11.0.9 (Latest stable)" + "choice": "11.0.10", + "description": "Target 11.0.10 (Latest stable)" } ], "replaces": "AvaloniaVersionTemplateParameter", - "defaultValue": "11.0.9" + "defaultValue": "11.0.10" }, "AvaloniaStableChosen": { "type": "computed", - "value": "(AvaloniaVersion == \"11.0.9\")" + "value": "(AvaloniaVersion == \"11.0.10\")" }, "UseCompiledBindings": { "type": "parameter", @@ -93,7 +93,7 @@ "datatype": "bool", "displayName": "Use compiled Bindings", "defaultValue": "true", - "isEnabled": "(AvaloniaVersion == \"11.0.9\")" + "isEnabled": "(AvaloniaVersion == \"11.0.10\")" }, "RemoveViewLocator": { "type": "parameter", diff --git a/templates/fsharp/app/.template.config/template.json b/templates/fsharp/app/.template.config/template.json index 1741cb31..ab9daa21 100644 --- a/templates/fsharp/app/.template.config/template.json +++ b/templates/fsharp/app/.template.config/template.json @@ -52,16 +52,16 @@ "description": "Target 0.10.22" }, { - "choice": "11.0.9", - "description": "Target 11.0.9 (Latest stable)" + "choice": "11.0.10", + "description": "Target 11.0.10 (Latest stable)" } ], "replaces": "AvaloniaVersionTemplateParameter", - "defaultValue": "11.0.9" + "defaultValue": "11.0.10" }, "AvaloniaStableChosen": { "type": "computed", - "value": "(AvaloniaVersion == \"11.0.9\")" + "value": "(AvaloniaVersion == \"11.0.10\")" }, "UseCompiledBindings": { "type": "parameter", @@ -69,7 +69,7 @@ "datatype": "bool", "displayName": "Use compiled Bindings", "defaultValue": "true", - "isEnabled": "(AvaloniaVersion == \"11.0.9\")" + "isEnabled": "(AvaloniaVersion == \"11.0.10\")" }, "HostIdentifier": { "type": "bind", diff --git a/templates/fsharp/xplat/Directory.Build.props b/templates/fsharp/xplat/Directory.Build.props index b5a8ca24..5f86bb8f 100644 --- a/templates/fsharp/xplat/Directory.Build.props +++ b/templates/fsharp/xplat/Directory.Build.props @@ -1,5 +1,5 @@ - 11.0.9 + 11.0.10 diff --git a/tests/build-test.ps1 b/tests/build-test.ps1 index 2f5ff403..f0f17208 100644 --- a/tests/build-test.ps1 +++ b/tests/build-test.ps1 @@ -98,7 +98,7 @@ Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "f" "net6.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "f" "net7.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "f" "net8.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "0.10.22" $binlog -Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "11.0.9" $binlog +Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "11.0.10" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "cb" "true" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "cb" "false" $binlog @@ -107,7 +107,7 @@ Test-Template "avalonia.mvvm" "AvaloniaMvvm" "C#" "f" "net6.0" $binlog Test-Template "avalonia.mvvm" "AvaloniaMvvm" "C#" "f" "net7.0" $binlog Test-Template "avalonia.mvvm" "AvaloniaMvvm" "C#" "f" "net8.0" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "0.10.22" $binlog -Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "11.0.9" $binlog +Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "11.0.10" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "m" "ReactiveUI" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "m" "CommunityToolkit" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "cb" "true" $binlog @@ -125,7 +125,7 @@ Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "f" "net6.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "f" "net7.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "f" "net8.0" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "0.10.22" $binlog -Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "11.0.9" $binlog +Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "11.0.10" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "cb" "true" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "cb" "false" $binlog @@ -135,7 +135,7 @@ Test-Template "avalonia.mvvm" "AvaloniaMvvm" "F#" "f" "net6.0" $binlog Test-Template "avalonia.mvvm" "AvaloniaMvvm" "F#" "f" "net7.0" $binlog Test-Template "avalonia.mvvm" "AvaloniaMvvm" "F#" "f" "net8.0" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "0.10.22" $binlog -Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "11.0.9" $binlog +Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "11.0.10" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "m" "ReactiveUI" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "m" "CommunityToolkit" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "cb" "true" $binlog From b25af94b9d58480ba66df99cdb3c50e0b51f1a32 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 8 Mar 2024 14:03:18 -0800 Subject: [PATCH 3/7] Change Web tag to Browser --- templates/csharp/xplat/.template.config/template.json | 2 +- templates/fsharp/xplat/.template.config/template.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/csharp/xplat/.template.config/template.json b/templates/csharp/xplat/.template.config/template.json index 0fdbe074..af2670ea 100644 --- a/templates/csharp/xplat/.template.config/template.json +++ b/templates/csharp/xplat/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "AvaloniaUI", - "classifications": [ "Desktop", "Xaml", "Avalonia", "Web", "Mobile" ], + "classifications": [ "Desktop", "Xaml", "Avalonia", "Browser", "Mobile" ], "description": "A cross-platform Avalonia UI Application using the MVVM pattern targeting Desktop, Mobile and Browser with WebAssembly", "groupidentity": "Avalonia.App.CrossPlatform", "identity": "Avalonia.App.CrossPlatform", diff --git a/templates/fsharp/xplat/.template.config/template.json b/templates/fsharp/xplat/.template.config/template.json index 88605264..4969b881 100644 --- a/templates/fsharp/xplat/.template.config/template.json +++ b/templates/fsharp/xplat/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "AvaloniaUI", - "classifications": [ "Desktop", "Xaml", "Avalonia", "Web", "Mobile" ], + "classifications": [ "Desktop", "Xaml", "Avalonia", "Browser", "Mobile" ], "description": "A cross-platform Avalonia UI Application using the MVVM pattern targeting Desktop, Mobile and Browser with WebAssembly", "name": "Avalonia Cross Platform Application", "identity": "Avalonia.App.CrossPlatform.FSharp", From 9a13bb986d86c2c8ed5a58f7b540a89dd66158ca Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 8 Mar 2024 14:05:27 -0800 Subject: [PATCH 4/7] Make 11.0 browser templates more compatible with 11.1 templates --- .../AvaloniaTest.Browser.csproj | 3 ++- .../{AppBundle => wwwroot}/Logo.svg | 0 .../{AppBundle => wwwroot}/app.css | 0 .../{AppBundle => wwwroot}/favicon.ico | Bin .../{AppBundle => wwwroot}/index.html | 4 ++-- .../{AppBundle => wwwroot}/main.js | 2 +- .../AvaloniaTest.Browser.fsproj | 5 +++-- .../{AppBundle => wwwroot}/Logo.svg | 0 .../{AppBundle => wwwroot}/app.css | 0 .../{AppBundle => wwwroot}/favicon.ico | Bin .../{AppBundle => wwwroot}/index.html | 4 ++-- .../{AppBundle => wwwroot}/main.js | 2 +- 12 files changed, 11 insertions(+), 9 deletions(-) rename templates/csharp/xplat/AvaloniaTest.Browser/{AppBundle => wwwroot}/Logo.svg (100%) rename templates/csharp/xplat/AvaloniaTest.Browser/{AppBundle => wwwroot}/app.css (100%) rename templates/csharp/xplat/AvaloniaTest.Browser/{AppBundle => wwwroot}/favicon.ico (100%) rename templates/csharp/xplat/AvaloniaTest.Browser/{AppBundle => wwwroot}/index.html (86%) rename templates/csharp/xplat/AvaloniaTest.Browser/{AppBundle => wwwroot}/main.js (87%) rename templates/fsharp/xplat/AvaloniaTest.Browser/{AppBundle => wwwroot}/Logo.svg (100%) rename templates/fsharp/xplat/AvaloniaTest.Browser/{AppBundle => wwwroot}/app.css (100%) rename templates/fsharp/xplat/AvaloniaTest.Browser/{AppBundle => wwwroot}/favicon.ico (100%) rename templates/fsharp/xplat/AvaloniaTest.Browser/{AppBundle => wwwroot}/index.html (86%) rename templates/fsharp/xplat/AvaloniaTest.Browser/{AppBundle => wwwroot}/main.js (87%) diff --git a/templates/csharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj b/templates/csharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj index 8a584771..6d80366c 100644 --- a/templates/csharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj +++ b/templates/csharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj @@ -4,10 +4,11 @@ browser-wasm AppBundle\main.js Exe + ./_framework - + diff --git a/templates/csharp/xplat/AvaloniaTest.Browser/AppBundle/Logo.svg b/templates/csharp/xplat/AvaloniaTest.Browser/wwwroot/Logo.svg similarity index 100% rename from templates/csharp/xplat/AvaloniaTest.Browser/AppBundle/Logo.svg rename to templates/csharp/xplat/AvaloniaTest.Browser/wwwroot/Logo.svg diff --git a/templates/csharp/xplat/AvaloniaTest.Browser/AppBundle/app.css b/templates/csharp/xplat/AvaloniaTest.Browser/wwwroot/app.css similarity index 100% rename from templates/csharp/xplat/AvaloniaTest.Browser/AppBundle/app.css rename to templates/csharp/xplat/AvaloniaTest.Browser/wwwroot/app.css diff --git a/templates/csharp/xplat/AvaloniaTest.Browser/AppBundle/favicon.ico b/templates/csharp/xplat/AvaloniaTest.Browser/wwwroot/favicon.ico similarity index 100% rename from templates/csharp/xplat/AvaloniaTest.Browser/AppBundle/favicon.ico rename to templates/csharp/xplat/AvaloniaTest.Browser/wwwroot/favicon.ico diff --git a/templates/csharp/xplat/AvaloniaTest.Browser/AppBundle/index.html b/templates/csharp/xplat/AvaloniaTest.Browser/wwwroot/index.html similarity index 86% rename from templates/csharp/xplat/AvaloniaTest.Browser/AppBundle/index.html rename to templates/csharp/xplat/AvaloniaTest.Browser/wwwroot/index.html index e83cc389..585436d6 100644 --- a/templates/csharp/xplat/AvaloniaTest.Browser/AppBundle/index.html +++ b/templates/csharp/xplat/AvaloniaTest.Browser/wwwroot/index.html @@ -7,8 +7,8 @@ - - + + diff --git a/templates/csharp/xplat/AvaloniaTest.Browser/AppBundle/main.js b/templates/csharp/xplat/AvaloniaTest.Browser/wwwroot/main.js similarity index 87% rename from templates/csharp/xplat/AvaloniaTest.Browser/AppBundle/main.js rename to templates/csharp/xplat/AvaloniaTest.Browser/wwwroot/main.js index 3df7852d..a9de29f0 100644 --- a/templates/csharp/xplat/AvaloniaTest.Browser/AppBundle/main.js +++ b/templates/csharp/xplat/AvaloniaTest.Browser/wwwroot/main.js @@ -1,4 +1,4 @@ -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`); diff --git a/templates/fsharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.fsproj b/templates/fsharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.fsproj index 8cd494c2..16f77ee5 100644 --- a/templates/fsharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.fsproj +++ b/templates/fsharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.fsproj @@ -4,12 +4,13 @@ browser-wasm AppBundle\main.js Exe + ./_framework - - + + diff --git a/templates/fsharp/xplat/AvaloniaTest.Browser/AppBundle/Logo.svg b/templates/fsharp/xplat/AvaloniaTest.Browser/wwwroot/Logo.svg similarity index 100% rename from templates/fsharp/xplat/AvaloniaTest.Browser/AppBundle/Logo.svg rename to templates/fsharp/xplat/AvaloniaTest.Browser/wwwroot/Logo.svg diff --git a/templates/fsharp/xplat/AvaloniaTest.Browser/AppBundle/app.css b/templates/fsharp/xplat/AvaloniaTest.Browser/wwwroot/app.css similarity index 100% rename from templates/fsharp/xplat/AvaloniaTest.Browser/AppBundle/app.css rename to templates/fsharp/xplat/AvaloniaTest.Browser/wwwroot/app.css diff --git a/templates/fsharp/xplat/AvaloniaTest.Browser/AppBundle/favicon.ico b/templates/fsharp/xplat/AvaloniaTest.Browser/wwwroot/favicon.ico similarity index 100% rename from templates/fsharp/xplat/AvaloniaTest.Browser/AppBundle/favicon.ico rename to templates/fsharp/xplat/AvaloniaTest.Browser/wwwroot/favicon.ico diff --git a/templates/fsharp/xplat/AvaloniaTest.Browser/AppBundle/index.html b/templates/fsharp/xplat/AvaloniaTest.Browser/wwwroot/index.html similarity index 86% rename from templates/fsharp/xplat/AvaloniaTest.Browser/AppBundle/index.html rename to templates/fsharp/xplat/AvaloniaTest.Browser/wwwroot/index.html index e83cc389..585436d6 100644 --- a/templates/fsharp/xplat/AvaloniaTest.Browser/AppBundle/index.html +++ b/templates/fsharp/xplat/AvaloniaTest.Browser/wwwroot/index.html @@ -7,8 +7,8 @@ - - + + diff --git a/templates/fsharp/xplat/AvaloniaTest.Browser/AppBundle/main.js b/templates/fsharp/xplat/AvaloniaTest.Browser/wwwroot/main.js similarity index 87% rename from templates/fsharp/xplat/AvaloniaTest.Browser/AppBundle/main.js rename to templates/fsharp/xplat/AvaloniaTest.Browser/wwwroot/main.js index 3df7852d..a9de29f0 100644 --- a/templates/fsharp/xplat/AvaloniaTest.Browser/AppBundle/main.js +++ b/templates/fsharp/xplat/AvaloniaTest.Browser/wwwroot/main.js @@ -1,4 +1,4 @@ -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`); From 160f835d24ebfd1d0bb8d31e53a980e2c5cfe2a7 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 8 Mar 2024 14:05:38 -0800 Subject: [PATCH 5/7] Bump version --- Avalonia.Templates.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Avalonia.Templates.csproj b/Avalonia.Templates.csproj index fe74e307..2b6a8772 100644 --- a/Avalonia.Templates.csproj +++ b/Avalonia.Templates.csproj @@ -2,7 +2,7 @@ Template - 11.0.9 + 11.0.10 Avalonia.Templates Avalonia Templates Templates for creating Avalonia applications and libraries. From 8c46a1ca76407fe2f44cfd8c9a530f493ff51fa4 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 8 Mar 2024 14:07:11 -0800 Subject: [PATCH 6/7] Remove wasm-experimental workload --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c262fa6f..25603f1b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ steps: - task: CmdLine@2 displayName: 'Install workload' inputs: - script: 'dotnet workload install android ios wasm-tools wasm-experimental' + script: 'dotnet workload install android ios wasm-tools' - task: PowerShell@2 displayName: 'Run Tests' inputs: From 72da70abf39a392a2f220155b5ff7b4a8cf3266b Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 8 Mar 2024 14:17:21 -0800 Subject: [PATCH 7/7] Fix browser template --- .../xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj | 4 ++-- .../xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.fsproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/csharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj b/templates/csharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj index 6d80366c..dd96f0d5 100644 --- a/templates/csharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj +++ b/templates/csharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj @@ -1,9 +1,9 @@  + Exe FrameworkParameter browser-wasm - AppBundle\main.js - Exe + wwwroot\main.js ./_framework diff --git a/templates/fsharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.fsproj b/templates/fsharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.fsproj index 16f77ee5..0b9097ad 100644 --- a/templates/fsharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.fsproj +++ b/templates/fsharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.fsproj @@ -1,9 +1,9 @@  + Exe FrameworkParameter browser-wasm - AppBundle\main.js - Exe + wwwroot\main.js ./_framework