Merge pull request #249 from AvaloniaUI/prepare-before-11.1

Prepare before 11.1 + 11.0.10
AvaloniaUI · Mar 8, 2024 · d9c1f3c · d9c1f3c
2 parents cb1615c + 72da70a
commit d9c1f3c
Show file tree

Hide file tree

Showing 24 changed files with 61 additions and 59 deletions.
diff --git a/Avalonia.Templates.csproj b/Avalonia.Templates.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <PackageVersion>11.0.9</PackageVersion>
+    <PackageVersion>11.0.10</PackageVersion>
     <PackageId>Avalonia.Templates</PackageId>
     <Title>Avalonia Templates</Title>
     <Description>Templates for creating Avalonia applications and libraries.</Description>

diff --git 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:

diff --git a/readme.md b/readme.md
@@ -58,9 +58,9 @@ Available parameters:
 
 *Description*: The target version of Avalonia NuGet packages.
 
-*Options*: **0.10.21**, **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.21**, **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
@@ -72,28 +72,28 @@
       "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",
-          "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",
       "description": "Defines if CompiledBindings should be enabled by default in the project (only supported in 11.0 version and newer).",
       "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
@@ -48,28 +48,28 @@
       "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",
-          "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",
       "description": "Defines if CompiledBindings should be enabled by default in the project (only supported in 11.0 version and newer).",
       "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/.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/csharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj b/templates/csharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>FrameworkParameter</TargetFramework>
     <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-    <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
-    <OutputType>Exe</OutputType>
+    <WasmMainJSPath>wwwroot\main.js</WasmMainJSPath>
+    <WasmRuntimeAssetsLocation>./_framework</WasmRuntimeAssetsLocation>
   </PropertyGroup>
 
   <ItemGroup>
-    <WasmExtraFilesToDeploy Include="AppBundle\**" />
+    <WasmExtraFilesToDeploy Include="wwwroot\**" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...t/AvaloniaTest.Browser/AppBundle/Logo.svg → ...lat/AvaloniaTest.Browser/wwwroot/Logo.svg b/...t/AvaloniaTest.Browser/AppBundle/Logo.svg → ...lat/AvaloniaTest.Browser/wwwroot/Logo.svg
diff --git a/...at/AvaloniaTest.Browser/AppBundle/app.css → ...plat/AvaloniaTest.Browser/wwwroot/app.css b/...at/AvaloniaTest.Browser/AppBundle/app.css → ...plat/AvaloniaTest.Browser/wwwroot/app.css
diff --git a/...valoniaTest.Browser/AppBundle/favicon.ico → .../AvaloniaTest.Browser/wwwroot/favicon.ico b/...valoniaTest.Browser/AppBundle/favicon.ico → .../AvaloniaTest.Browser/wwwroot/favicon.ico
diff --git a/...AvaloniaTest.Browser/AppBundle/index.html → ...t/AvaloniaTest.Browser/wwwroot/index.html b/...AvaloniaTest.Browser/AppBundle/index.html → ...t/AvaloniaTest.Browser/wwwroot/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <base href="/" />
     <link rel="modulepreload" href="./main.js" />
-    <link rel="modulepreload" href="./dotnet.js" />
-    <link rel="modulepreload" href="./avalonia.js" />
+    <link rel="modulepreload" href="./_framework/dotnet.js" />
+    <link rel="modulepreload" href="./_framework/avalonia.js" />
     <link rel="stylesheet" href="./app.css" />
 </head>
 

diff --git a/...at/AvaloniaTest.Browser/AppBundle/main.js → ...plat/AvaloniaTest.Browser/wwwroot/main.js b/...at/AvaloniaTest.Browser/AppBundle/main.js → ...plat/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/csharp/xplat/Directory.Build.props b/templates/csharp/xplat/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.9</AvaloniaVersion>
+    <AvaloniaVersion>11.0.10</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/templates/fsharp/app-mvvm/.template.config/template.json b/templates/fsharp/app-mvvm/.template.config/template.json
@@ -72,28 +72,28 @@
       "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",
-          "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",
       "description": "Defines if CompiledBindings should be enabled by default in the project (only supported in 11.0 version and newer).",
       "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
@@ -48,28 +48,28 @@
       "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",
-          "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",
       "description": "Defines if CompiledBindings should be enabled by default in the project (only supported in 11.0 version and newer).",
       "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/.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",

diff --git a/templates/fsharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.fsproj b/templates/fsharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.fsproj
@@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>FrameworkParameter</TargetFramework>
     <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-    <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
-    <OutputType>Exe</OutputType>
+    <WasmMainJSPath>wwwroot\main.js</WasmMainJSPath>
+    <WasmRuntimeAssetsLocation>./_framework</WasmRuntimeAssetsLocation>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="Properties\**" />
-    <None Include="AppBundle\**" />
-    <WasmExtraFilesToDeploy Include="AppBundle\**" />
+    <None Include="wwwroot\**" />
+    <WasmExtraFilesToDeploy Include="wwwroot\**" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...t/AvaloniaTest.Browser/AppBundle/Logo.svg → ...lat/AvaloniaTest.Browser/wwwroot/Logo.svg b/...t/AvaloniaTest.Browser/AppBundle/Logo.svg → ...lat/AvaloniaTest.Browser/wwwroot/Logo.svg
diff --git a/...at/AvaloniaTest.Browser/AppBundle/app.css → ...plat/AvaloniaTest.Browser/wwwroot/app.css b/...at/AvaloniaTest.Browser/AppBundle/app.css → ...plat/AvaloniaTest.Browser/wwwroot/app.css
diff --git a/...valoniaTest.Browser/AppBundle/favicon.ico → .../AvaloniaTest.Browser/wwwroot/favicon.ico b/...valoniaTest.Browser/AppBundle/favicon.ico → .../AvaloniaTest.Browser/wwwroot/favicon.ico
diff --git a/...AvaloniaTest.Browser/AppBundle/index.html → ...t/AvaloniaTest.Browser/wwwroot/index.html b/...AvaloniaTest.Browser/AppBundle/index.html → ...t/AvaloniaTest.Browser/wwwroot/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <base href="/" />
     <link rel="modulepreload" href="./main.js" />
-    <link rel="modulepreload" href="./dotnet.js" />
-    <link rel="modulepreload" href="./avalonia.js" />
+    <link rel="modulepreload" href="./_framework/dotnet.js" />
+    <link rel="modulepreload" href="./_framework/avalonia.js" />
     <link rel="stylesheet" href="./app.css" />
 </head>
 

diff --git a/...at/AvaloniaTest.Browser/AppBundle/main.js → ...plat/AvaloniaTest.Browser/wwwroot/main.js b/...at/AvaloniaTest.Browser/AppBundle/main.js → ...plat/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/Directory.Build.props b/templates/fsharp/xplat/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <AvaloniaVersion>11.0.9</AvaloniaVersion>
+    <AvaloniaVersion>11.0.10</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/tests/build-test.ps1 b/tests/build-test.ps1
@@ -97,17 +97,17 @@ $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" "11.0.9" $binlog
+Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "0.10.22" $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
 
 # Build the project only twice with all item templates,once with .net6.0 tfm and once with .net7.0 tfm for C# and F#
 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" "11.0.9" $binlog
+Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "0.10.22" $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
@@ -124,8 +124,8 @@ 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" "11.0.9" $binlog
+Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "0.10.22" $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
 
@@ -134,8 +134,8 @@ 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" "11.0.9" $binlog
+Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "0.10.22" $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