Skip to content

Commit

Permalink
Merge pull request #228 from Mrxx99/feature/avalonia11.0.2
Browse files Browse the repository at this point in the history
Updated to avalonia 11.0.2
  • Loading branch information
Takoooooo authored Aug 2, 2023
2 parents eaf7b3b + ceb19df commit 33dc6ac
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Avalonia.Templates.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageType>Template</PackageType>
<PackageVersion>11.0.1</PackageVersion>
<PackageVersion>11.0.2</PackageVersion>
<PackageId>Avalonia.Templates</PackageId>
<Title>Avalonia Templates</Title>
<Description>Templates for creating Avalonia applications and libraries.</Description>
Expand Down
8 changes: 4 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ Available parameters:

*Description*: The target version of Avalonia NuGet packages.

*Options*: **0.10.21**, **11.0.1**
*Options*: **0.10.21**, **11.0.2**

*By default*: 11.0.1
*By default*: 11.0.2

``-cb, --compiled-bindings``

Expand Down Expand Up @@ -99,9 +99,9 @@ Available parameters:

*Description*: The target version of Avalonia NuGet packages.

*Options*: **0.10.21**, **11.0.1**
*Options*: **0.10.21**, **11.0.2**

*By default*: 11.0.1
*By default*: 11.0.2

``-cb, --compiled-bindings``

Expand Down
10 changes: 5 additions & 5 deletions templates/csharp/app-mvvm/.template.config/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,24 @@
"description": "Target 0.10.21"
},
{
"choice": "11.0.1",
"description": "Target 11.0.1 (Latest stable)"
"choice": "11.0.2",
"description": "Target 11.0.2 (Latest stable)"
}
],
"replaces": "AvaloniaVersionTemplateParameter",
"defaultValue": "11.0.1"
"defaultValue": "11.0.2"
},
"AvaloniaStableChosen": {
"type": "computed",
"value": "(AvaloniaVersion == \"11.0.1\")"
"value": "(AvaloniaVersion == \"11.0.2\")"
},
"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.1\")"
"isEnabled": "(AvaloniaVersion == \"11.0.2\")"
},
"RemoveViewLocator": {
"type": "parameter",
Expand Down
10 changes: 5 additions & 5 deletions templates/csharp/app/.template.config/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,24 @@
"description": "Target 0.10.21"
},
{
"choice": "11.0.1",
"description": "Target 11.0.1 (Latest stable)"
"choice": "11.0.2",
"description": "Target 11.0.2 (Latest stable)"
}
],
"replaces": "AvaloniaVersionTemplateParameter",
"defaultValue": "11.0.1"
"defaultValue": "11.0.2"
},
"AvaloniaStableChosen": {
"type": "computed",
"value": "(AvaloniaVersion == \"11.0.1\")"
"value": "(AvaloniaVersion == \"11.0.2\")"
},
"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.1\")"
"isEnabled": "(AvaloniaVersion == \"11.0.2\")"
},
"HostIdentifier": {
"type": "bind",
Expand Down
2 changes: 1 addition & 1 deletion templates/csharp/xplat/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Nullable>enable</Nullable>
<AvaloniaVersion>11.0.1</AvaloniaVersion>
<AvaloniaVersion>11.0.2</AvaloniaVersion>
</PropertyGroup>
</Project>
10 changes: 5 additions & 5 deletions templates/fsharp/app-mvvm/.template.config/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,24 @@
"description": "Target 0.10.21"
},
{
"choice": "11.0.1",
"description": "Target 11.0.1 (Latest stable)"
"choice": "11.0.2",
"description": "Target 11.0.2 (Latest stable)"
}
],
"replaces": "AvaloniaVersionTemplateParameter",
"defaultValue": "11.0.1"
"defaultValue": "11.0.2"
},
"AvaloniaStableChosen": {
"type": "computed",
"value": "(AvaloniaVersion == \"11.0.1\")"
"value": "(AvaloniaVersion == \"11.0.2\")"
},
"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.1\")"
"isEnabled": "(AvaloniaVersion == \"11.0.2\")"
},
"RemoveViewLocator": {
"type": "parameter",
Expand Down
10 changes: 5 additions & 5 deletions templates/fsharp/app/.template.config/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,24 @@
"description": "Target 0.10.21"
},
{
"choice": "11.0.1",
"description": "Target 11.0.1 (Latest stable)"
"choice": "11.0.2",
"description": "Target 11.0.2 (Latest stable)"
}
],
"replaces": "AvaloniaVersionTemplateParameter",
"defaultValue": "11.0.1"
"defaultValue": "11.0.2"
},
"AvaloniaStableChosen": {
"type": "computed",
"value": "(AvaloniaVersion == \"11.0.1\")"
"value": "(AvaloniaVersion == \"11.0.2\")"
},
"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.1\")"
"isEnabled": "(AvaloniaVersion == \"11.0.2\")"
},
"HostIdentifier": {
"type": "bind",
Expand Down
2 changes: 1 addition & 1 deletion templates/fsharp/xplat/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<AvaloniaVersion>11.0.1</AvaloniaVersion>
<AvaloniaVersion>11.0.2</AvaloniaVersion>
</PropertyGroup>
</Project>
8 changes: 4 additions & 4 deletions tests/build-test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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.1" $binlog
Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "11.0.2" $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.1" $binlog
Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "11.0.2" $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
Expand All @@ -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.1" $binlog
Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "11.0.2" $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.1" $binlog
Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "11.0.2" $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
Expand Down

0 comments on commit 33dc6ac

Please sign in to comment.