From a5216256c145989d42c42521e2528ccb094e8f5e Mon Sep 17 00:00:00 2001 From: Daniil Pavliuchyk Date: Fri, 1 Dec 2023 16:19:15 +0200 Subject: [PATCH 1/7] Update templates to support NET8 --- azure-pipelines.yml | 2 +- .../csharp/app-mvvm/.template.config/template.json | 10 +++++----- templates/csharp/app/.template.config/template.json | 10 +++++----- .../csharp/xplat/.template.config/template.json | 6 +++--- .../fsharp/app-mvvm/.template.config/template.json | 10 +++++----- templates/fsharp/app/.template.config/template.json | 10 +++++----- .../fsharp/xplat/.template.config/template.json | 6 +++--- tests/build-test.ps1 | 12 ++++++------ 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 450264b0..c262fa6f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,7 +5,7 @@ steps: displayName: 'Use .NET SDK' inputs: packageType: 'sdk' - version: 7.0.302 + version: 8.0.100 - task: DotNetCoreCLI@2 displayName: 'Pack Templates' inputs: diff --git a/templates/csharp/app-mvvm/.template.config/template.json b/templates/csharp/app-mvvm/.template.config/template.json index 9948edcc..7f7d8312 100644 --- a/templates/csharp/app-mvvm/.template.config/template.json +++ b/templates/csharp/app-mvvm/.template.config/template.json @@ -20,17 +20,17 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ - { - "choice": "net6.0", - "description": "Target net6.0" - }, { "choice": "net7.0", "description": "Target net7.0" + }, + { + "choice": "net8.0", + "description": "Target net8.0" } ], "replaces": "FrameworkParameter", - "defaultValue": "net6.0" + "defaultValue": "net8.0" }, "skipRestore": { "type": "parameter", diff --git a/templates/csharp/app/.template.config/template.json b/templates/csharp/app/.template.config/template.json index bd79926c..74ab159e 100644 --- a/templates/csharp/app/.template.config/template.json +++ b/templates/csharp/app/.template.config/template.json @@ -20,17 +20,17 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ - { - "choice": "net6.0", - "description": "Target net6.0" - }, { "choice": "net7.0", "description": "Target net7.0" + }, + { + "choice": "net8.0", + "description": "Target net8.0" } ], "replaces": "FrameworkParameter", - "defaultValue": "net6.0" + "defaultValue": "net8.0" }, "skipRestore": { "type": "parameter", diff --git a/templates/csharp/xplat/.template.config/template.json b/templates/csharp/xplat/.template.config/template.json index e7766347..0fdbe074 100644 --- a/templates/csharp/xplat/.template.config/template.json +++ b/templates/csharp/xplat/.template.config/template.json @@ -21,12 +21,12 @@ "datatype": "choice", "choices": [ { - "choice": "net7.0", - "description": "Target net7.0" + "choice": "net8.0", + "description": "Target net8.0" } ], "replaces": "FrameworkParameter", - "defaultValue": "net7.0" + "defaultValue": "net8.0" }, "UseCompiledBindings": { "type": "parameter", diff --git a/templates/fsharp/app-mvvm/.template.config/template.json b/templates/fsharp/app-mvvm/.template.config/template.json index bb59d7d5..a8689d9e 100644 --- a/templates/fsharp/app-mvvm/.template.config/template.json +++ b/templates/fsharp/app-mvvm/.template.config/template.json @@ -20,17 +20,17 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ - { - "choice": "net6.0", - "description": "Target net6.0" - }, { "choice": "net7.0", "description": "Target net7.0" + }, + { + "choice": "net8.0", + "description": "Target net8.0" } ], "replaces": "FrameworkParameter", - "defaultValue": "net6.0" + "defaultValue": "net8.0" }, "skipRestore": { "type": "parameter", diff --git a/templates/fsharp/app/.template.config/template.json b/templates/fsharp/app/.template.config/template.json index e423641d..6377a3bc 100644 --- a/templates/fsharp/app/.template.config/template.json +++ b/templates/fsharp/app/.template.config/template.json @@ -20,17 +20,17 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ - { - "choice": "net6.0", - "description": "Target net6.0" - }, { "choice": "net7.0", "description": "Target net7.0" + }, + { + "choice": "net8.0", + "description": "Target net8.0" } ], "replaces": "FrameworkParameter", - "defaultValue": "net6.0" + "defaultValue": "net8.0" }, "skipRestore": { "type": "parameter", diff --git a/templates/fsharp/xplat/.template.config/template.json b/templates/fsharp/xplat/.template.config/template.json index fc3df43d..88605264 100644 --- a/templates/fsharp/xplat/.template.config/template.json +++ b/templates/fsharp/xplat/.template.config/template.json @@ -21,12 +21,12 @@ "datatype": "choice", "choices": [ { - "choice": "net7.0", - "description": "Target net7.0" + "choice": "net8.0", + "description": "Target net8.0" } ], "replaces": "FrameworkParameter", - "defaultValue": "net7.0" + "defaultValue": "net8.0" }, "UseCompiledBindings": { "type": "parameter", diff --git a/tests/build-test.ps1 b/tests/build-test.ps1 index c8556aec..887972c1 100644 --- a/tests/build-test.ps1 +++ b/tests/build-test.ps1 @@ -94,16 +94,16 @@ if (Test-Path "output") { $binlog = [IO.Path]::GetFullPath([IO.Path]::Combine($pwd, "..", "binlog", "test.binlog")) -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.5" $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.5" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "m" "ReactiveUI" $binlog @@ -113,21 +113,21 @@ Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "cb" "false" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "rvl" "true" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "rvl" "false" $binlog -Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "f" "net7.0" $binlog +Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "f" "net8.0" $binlog Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "cb" "true" $binlog Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "cb" "false" $binlog Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "rvl" "true" $binlog 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.5" $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 +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.5" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "m" "ReactiveUI" $binlog @@ -137,7 +137,7 @@ Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "cb" "false" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "rvl" "true" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "rvl" "false" $binlog -Create-And-Build "avalonia.xplat" "AvaloniaXplat" "F#" "f" "net7.0" $binlog +Create-And-Build "avalonia.xplat" "AvaloniaXplat" "F#" "f" "net8.0" $binlog Create-And-Build "avalonia.xplat" "AvaloniaXplat" "F#" "cb" "true" $binlog Create-And-Build "avalonia.xplat" "AvaloniaXplat" "F#" "cb" "false" $binlog Create-And-Build "avalonia.xplat" "AvaloniaXplat" "F#" "rvl" "true" $binlog From 4d3a7b3f57f51e6daa023380c1075f373eca3c6a Mon Sep 17 00:00:00 2001 From: Daniil Pavliuchyk Date: Mon, 4 Dec 2023 12:14:29 +0200 Subject: [PATCH 2/7] Return .net6 choice for app and mvvm templates --- 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 ++++ 4 files changed, 16 insertions(+) diff --git a/templates/csharp/app-mvvm/.template.config/template.json b/templates/csharp/app-mvvm/.template.config/template.json index 7f7d8312..f3f4ce4b 100644 --- a/templates/csharp/app-mvvm/.template.config/template.json +++ b/templates/csharp/app-mvvm/.template.config/template.json @@ -20,6 +20,10 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ + { + "choice": "net6.0", + "description": "Target net6.0" + }, { "choice": "net7.0", "description": "Target net7.0" diff --git a/templates/csharp/app/.template.config/template.json b/templates/csharp/app/.template.config/template.json index 74ab159e..5cf42c3a 100644 --- a/templates/csharp/app/.template.config/template.json +++ b/templates/csharp/app/.template.config/template.json @@ -20,6 +20,10 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ + { + "choice": "net6.0", + "description": "Target net6.0" + }, { "choice": "net7.0", "description": "Target net7.0" diff --git a/templates/fsharp/app-mvvm/.template.config/template.json b/templates/fsharp/app-mvvm/.template.config/template.json index a8689d9e..e78bf4c5 100644 --- a/templates/fsharp/app-mvvm/.template.config/template.json +++ b/templates/fsharp/app-mvvm/.template.config/template.json @@ -20,6 +20,10 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ + { + "choice": "net6.0", + "description": "Target net6.0" + }, { "choice": "net7.0", "description": "Target net7.0" diff --git a/templates/fsharp/app/.template.config/template.json b/templates/fsharp/app/.template.config/template.json index 6377a3bc..ce363277 100644 --- a/templates/fsharp/app/.template.config/template.json +++ b/templates/fsharp/app/.template.config/template.json @@ -20,6 +20,10 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ + { + "choice": "net6.0", + "description": "Target net6.0" + }, { "choice": "net7.0", "description": "Target net7.0" From b00d03ac1916490d4548f77a4a481edc3b4e9952 Mon Sep 17 00:00:00 2001 From: Daniil Pavliuchyk Date: Mon, 4 Dec 2023 12:23:42 +0200 Subject: [PATCH 3/7] add .net6 to tests --- tests/build-test.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/build-test.ps1 b/tests/build-test.ps1 index 887972c1..b8d27c7b 100644 --- a/tests/build-test.ps1 +++ b/tests/build-test.ps1 @@ -94,6 +94,7 @@ if (Test-Path "output") { $binlog = [IO.Path]::GetFullPath([IO.Path]::Combine($pwd, "..", "binlog", "test.binlog")) +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 @@ -102,6 +103,7 @@ 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 @@ -119,6 +121,7 @@ Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "cb" "false" $binlog Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "rvl" "true" $binlog 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 @@ -126,6 +129,7 @@ Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "11.0.5" $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 Test-Template "avalonia.mvvm" "AvaloniaMvvm" "F#" "f" "net8.0" $binlog Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "0.10.21" $binlog From 587b56440f522371bb35982c92d9d12d68bcf4fc Mon Sep 17 00:00:00 2001 From: Daniil Pavliuchyk Date: Wed, 6 Dec 2023 14:53:56 +0200 Subject: [PATCH 4/7] Update templates to 11.0.6 --- Avalonia.Templates.csproj | 2 +- readme.md | 18 +++++++++--------- .../app-mvvm/.template.config/template.json | 10 +++++----- .../csharp/app/.template.config/template.json | 10 +++++----- templates/csharp/xplat/Directory.Build.props | 2 +- .../app-mvvm/.template.config/template.json | 10 +++++----- .../fsharp/app/.template.config/template.json | 10 +++++----- templates/fsharp/xplat/Directory.Build.props | 2 +- tests/build-test.ps1 | 8 ++++---- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Avalonia.Templates.csproj b/Avalonia.Templates.csproj index 546bbf6e..15b53de9 100644 --- a/Avalonia.Templates.csproj +++ b/Avalonia.Templates.csproj @@ -2,7 +2,7 @@ Template - 11.0.5 + 11.0.6 Avalonia.Templates Avalonia Templates Templates for creating Avalonia applications and libraries. diff --git a/readme.md b/readme.md index 9821a244..c2a92a5b 100644 --- a/readme.md +++ b/readme.md @@ -6,7 +6,7 @@ For more information about `dotnet new` templates see [here](https://blogs.msdn. ## Installing the templates -Run from a command line (`.NET 7`): +Run from a command line (`.NET 7+`): ```powershell dotnet new install Avalonia.Templates @@ -50,17 +50,17 @@ Available parameters: *Description*: The target framework for the project. -*Options*: **net6.0**, **net7.0** +*Options*: **net6.0**, **net7.0**, **net8.0** -*By default*: net6.0 +*By default*: net8.0 ``-av, --avalonia-version`` *Description*: The target version of Avalonia NuGet packages. -*Options*: **0.10.21**, **11.0.5** +*Options*: **0.10.21**, **11.0.6** -*By default*: 11.0.5 +*By default*: 11.0.6 ``-cb, --compiled-bindings`` @@ -91,17 +91,17 @@ Available parameters: *Description*: The target framework for the project. -*Options*: **net6.0**, **net7.0** +*Options*: **net6.0**, **net7.0**, **net8.0** -*By default*: net6.0 +*By default*: net8.0 ``-av, --avalonia-version`` *Description*: The target version of Avalonia NuGet packages. -*Options*: **0.10.21**, **11.0.5** +*Options*: **0.10.21**, **11.0.6** -*By default*: 11.0.5 +*By default*: 11.0.6 ``-cb, --compiled-bindings`` diff --git a/templates/csharp/app-mvvm/.template.config/template.json b/templates/csharp/app-mvvm/.template.config/template.json index f3f4ce4b..980286dd 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.21" }, { - "choice": "11.0.5", - "description": "Target 11.0.5 (Latest stable)" + "choice": "11.0.6", + "description": "Target 11.0.6 (Latest stable)" } ], "replaces": "AvaloniaVersionTemplateParameter", - "defaultValue": "11.0.5" + "defaultValue": "11.0.6" }, "AvaloniaStableChosen": { "type": "computed", - "value": "(AvaloniaVersion == \"11.0.5\")" + "value": "(AvaloniaVersion == \"11.0.6\")" }, "UseCompiledBindings": { "type": "parameter", @@ -93,7 +93,7 @@ "datatype": "bool", "displayName": "Use compiled Bindings", "defaultValue": "true", - "isEnabled": "(AvaloniaVersion == \"11.0.5\")" + "isEnabled": "(AvaloniaVersion == \"11.0.6\")" }, "RemoveViewLocator": { "type": "parameter", diff --git a/templates/csharp/app/.template.config/template.json b/templates/csharp/app/.template.config/template.json index 5cf42c3a..1e0ab6ff 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.21" }, { - "choice": "11.0.5", - "description": "Target 11.0.5 (Latest stable)" + "choice": "11.0.6", + "description": "Target 11.0.6 (Latest stable)" } ], "replaces": "AvaloniaVersionTemplateParameter", - "defaultValue": "11.0.5" + "defaultValue": "11.0.6" }, "AvaloniaStableChosen": { "type": "computed", - "value": "(AvaloniaVersion == \"11.0.5\")" + "value": "(AvaloniaVersion == \"11.0.6\")" }, "UseCompiledBindings": { "type": "parameter", @@ -69,7 +69,7 @@ "datatype": "bool", "displayName": "Use compiled Bindings", "defaultValue": "true", - "isEnabled": "(AvaloniaVersion == \"11.0.5\")" + "isEnabled": "(AvaloniaVersion == \"11.0.6\")" }, "HostIdentifier": { "type": "bind", diff --git a/templates/csharp/xplat/Directory.Build.props b/templates/csharp/xplat/Directory.Build.props index 28f59c38..b7d1f090 100644 --- a/templates/csharp/xplat/Directory.Build.props +++ b/templates/csharp/xplat/Directory.Build.props @@ -1,6 +1,6 @@ enable - 11.0.5 + 11.0.6 diff --git a/templates/fsharp/app-mvvm/.template.config/template.json b/templates/fsharp/app-mvvm/.template.config/template.json index e78bf4c5..c33312c4 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.21" }, { - "choice": "11.0.5", - "description": "Target 11.0.5 (Latest stable)" + "choice": "11.0.6", + "description": "Target 11.0.6 (Latest stable)" } ], "replaces": "AvaloniaVersionTemplateParameter", - "defaultValue": "11.0.5" + "defaultValue": "11.0.6" }, "AvaloniaStableChosen": { "type": "computed", - "value": "(AvaloniaVersion == \"11.0.5\")" + "value": "(AvaloniaVersion == \"11.0.6\")" }, "UseCompiledBindings": { "type": "parameter", @@ -93,7 +93,7 @@ "datatype": "bool", "displayName": "Use compiled Bindings", "defaultValue": "true", - "isEnabled": "(AvaloniaVersion == \"11.0.5\")" + "isEnabled": "(AvaloniaVersion == \"11.0.6\")" }, "RemoveViewLocator": { "type": "parameter", diff --git a/templates/fsharp/app/.template.config/template.json b/templates/fsharp/app/.template.config/template.json index ce363277..3fbf6f57 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.21" }, { - "choice": "11.0.5", - "description": "Target 11.0.5 (Latest stable)" + "choice": "11.0.6", + "description": "Target 11.0.6 (Latest stable)" } ], "replaces": "AvaloniaVersionTemplateParameter", - "defaultValue": "11.0.5" + "defaultValue": "11.0.6" }, "AvaloniaStableChosen": { "type": "computed", - "value": "(AvaloniaVersion == \"11.0.5\")" + "value": "(AvaloniaVersion == \"11.0.6\")" }, "UseCompiledBindings": { "type": "parameter", @@ -69,7 +69,7 @@ "datatype": "bool", "displayName": "Use compiled Bindings", "defaultValue": "true", - "isEnabled": "(AvaloniaVersion == \"11.0.5\")" + "isEnabled": "(AvaloniaVersion == \"11.0.6\")" }, "HostIdentifier": { "type": "bind", diff --git a/templates/fsharp/xplat/Directory.Build.props b/templates/fsharp/xplat/Directory.Build.props index 70b81ac9..9b65e5ec 100644 --- a/templates/fsharp/xplat/Directory.Build.props +++ b/templates/fsharp/xplat/Directory.Build.props @@ -1,5 +1,5 @@ - 11.0.5 + 11.0.6 diff --git a/tests/build-test.ps1 b/tests/build-test.ps1 index b8d27c7b..43057460 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.21" $binlog -Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "11.0.5" $binlog +Create-And-Build "avalonia.app" "AvaloniaApp" "C#" "av" "11.0.6" $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.21" $binlog -Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "11.0.5" $binlog +Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "av" "11.0.6" $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.21" $binlog -Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "11.0.5" $binlog +Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "11.0.6" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "cb" "true" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "cb" "false" $binlog @@ -133,7 +133,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.21" $binlog -Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "11.0.5" $binlog +Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "F#" "av" "11.0.6" $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 38c117afe2b179e35401c2253d8144a8c9ba72c9 Mon Sep 17 00:00:00 2001 From: Daniil Pavliuchyk Date: Wed, 6 Dec 2023 15:51:09 +0200 Subject: [PATCH 5/7] Remove build folders after building --- tests/build-test.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/build-test.ps1 b/tests/build-test.ps1 index 43057460..bbe89bd9 100644 --- a/tests/build-test.ps1 +++ b/tests/build-test.ps1 @@ -64,6 +64,7 @@ function Test-Template { # Build Exec { dotnet build $outDir/$lang/$folderName -bl:$bl } + Remove-Item -Recurse $outDir/$lang/$folderName } function Create-And-Build { @@ -86,6 +87,7 @@ function Create-And-Build { # Build Exec { dotnet build output/$lang/$folderName -bl:$bl } + Remove-Item -Recurse $outDir/$lang/$folderName } if (Test-Path "output") { From ad2bdcd29b50f945a26cdbe0ea1a9e334a3d7819 Mon Sep 17 00:00:00 2001 From: Daniil Pavliuchyk Date: Wed, 6 Dec 2023 16:03:43 +0200 Subject: [PATCH 6/7] fix --- tests/build-test.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/build-test.ps1 b/tests/build-test.ps1 index bbe89bd9..b84abf38 100644 --- a/tests/build-test.ps1 +++ b/tests/build-test.ps1 @@ -87,7 +87,7 @@ function Create-And-Build { # Build Exec { dotnet build output/$lang/$folderName -bl:$bl } - Remove-Item -Recurse $outDir/$lang/$folderName + Remove-Item -Recurse output/$lang/$folderName } if (Test-Path "output") { From 5707c0554d3c0fe1879ee58b4e02c6778b39c6bb Mon Sep 17 00:00:00 2001 From: Daniil Pavliuchyk Date: Wed, 6 Dec 2023 16:14:31 +0200 Subject: [PATCH 7/7] Try --- tests/build-test.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/build-test.ps1 b/tests/build-test.ps1 index b84abf38..166801f0 100644 --- a/tests/build-test.ps1 +++ b/tests/build-test.ps1 @@ -64,7 +64,6 @@ function Test-Template { # Build Exec { dotnet build $outDir/$lang/$folderName -bl:$bl } - Remove-Item -Recurse $outDir/$lang/$folderName } function Create-And-Build { @@ -87,7 +86,6 @@ function Create-And-Build { # Build Exec { dotnet build output/$lang/$folderName -bl:$bl } - Remove-Item -Recurse output/$lang/$folderName } if (Test-Path "output") { @@ -131,6 +129,8 @@ Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "av" "11.0.6" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "cb" "true" $binlog Create-And-Build "avalonia.app" "AvaloniaApp" "F#" "cb" "false" $binlog +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