Merge pull request #212 from AvaloniaUI/update-to-avalonia-11

Update to Avalonia 11
AvaloniaUI · Jul 5, 2023 · d6189e0 · d6189e0
2 parents 0bf318f + 467b4ca
commit d6189e0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/Avalonia.Templates.csproj b/Avalonia.Templates.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <PackageVersion>0.10.24</PackageVersion>
+    <PackageVersion>0.10.25</PackageVersion>
     <PackageId>Avalonia.Templates</PackageId>
     <Title>Avalonia Templates</Title>
     <Description>Templates for creating Avalonia applications and libraries.</Description>

diff --git a/templates/csharp/app-mvvm/.template.config/template.json b/templates/csharp/app-mvvm/.template.config/template.json
@@ -72,12 +72,12 @@
           "description": "Target 0.10.21 (Latest stable)."
         },
         {
-          "choice": "11.0.0-rc2.2",
-          "description": "Target 11.0.0-rc2.2"
+          "choice": "11.0.0",
+          "description": "Target 11.0.0"
         }
       ],
       "replaces": "AvaloniaVersionTemplateParameter",
-      "defaultValue": "0.10.21"
+      "defaultValue": "11.0.0"
     },
     "AvaloniaStableChosen": {
       "type": "computed",

diff --git a/templates/csharp/app/.template.config/template.json b/templates/csharp/app/.template.config/template.json
@@ -48,12 +48,12 @@
           "description": "Target 0.10.21 (Latest stable)."
         },
         {
-          "choice": "11.0.0-rc2.2",
-          "description": "Target 11.0.0-rc2.2"
+          "choice": "11.0.0",
+          "description": "Target 11.0.0"
         }
       ],
       "replaces": "AvaloniaVersionTemplateParameter",
-      "defaultValue": "0.10.21"
+      "defaultValue": "11.0.0"
     },
     "AvaloniaStableChosen": {
       "type": "computed",

diff --git a/templates/fsharp/app-mvvm/.template.config/template.json b/templates/fsharp/app-mvvm/.template.config/template.json
@@ -72,12 +72,12 @@
           "description": "Target 0.10.21 (Latest stable)."
         },
         {
-          "choice": "11.0.0-rc2.2",
-          "description": "Target 11.0.0-rc2.2"
+          "choice": "11.0.0",
+          "description": "Target 11.0.0"
         }
       ],
       "replaces": "AvaloniaVersionTemplateParameter",
-      "defaultValue": "0.10.21"
+      "defaultValue": "11.0.0"
     },
     "AvaloniaStableChosen": {
       "type": "computed",

diff --git a/templates/fsharp/app/.template.config/template.json b/templates/fsharp/app/.template.config/template.json
@@ -48,12 +48,12 @@
           "description": "Target 0.10.21 (Latest stable)."
         },
         {
-          "choice": "11.0.0-rc2.2",
-          "description": "Target 11.0.0-rc2.2"
+          "choice": "11.0.0",
+          "description": "Target 11.0.0"
         }
       ],
       "replaces": "AvaloniaVersionTemplateParameter",
-      "defaultValue": "0.10.21"
+      "defaultValue": "11.0.0"
     },
     "AvaloniaStableChosen": {
       "type": "computed",

diff --git a/tests/build-test.ps1 b/tests/build-test.ps1
@@ -97,15 +97,15 @@ $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#" "av" "0.10.21" $binlog
-Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "11.0.0-rc2.2" $binlog
+Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "11.0.0" $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
 Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "0.10.21" $binlog
-Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "11.0.0-rc2.2" $binlog
+Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "11.0.0" $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
@@ -122,14 +122,14 @@ 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#" "av" "0.10.21" $binlog
-Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "11.0.0-rc2.2" $binlog
+Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "11.0.0" $binlog
 Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "cb" "true" $binlog
 Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "cb" "false" $binlog
 
 Test-Template "avalonia.mvvm" "AvaloniaMvvm" "F#" "f" "net6.0" $binlog
 Test-Template "avalonia.mvvm" "AvaloniaMvvm" "F#" "f" "net7.0" $binlog
 Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "0.10.21" $binlog
-Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "11.0.0-rc2.2" $binlog
+Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "11.0.0" $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