From a0ec223b30b36a27e74809f3642a4c1f21a364c4 Mon Sep 17 00:00:00 2001 From: Peter Kurhajec <61538034+PTKu@users.noreply.github.com> Date: Tue, 21 Nov 2023 16:21:28 +0100 Subject: [PATCH 1/2] Update GitVersion.yml bump to v0.17+ --- GitVersion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index b0fa2437..6973ffdf 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,5 +1,5 @@ mode: ContinuousDeployment -next-version: 0.16.0 +next-version: 0.17.0 branches: main: regex: ^master$|^main$ From 596efc277256b986b1232b21f14237445a31e388 Mon Sep 17 00:00:00 2001 From: Peter <61538034+PTKu@users.noreply.github.com> Date: Tue, 21 Nov 2023 16:38:08 +0100 Subject: [PATCH 2/2] asp --- .../templates/axsharpblazor/.config/dotnet-tools.json | 2 +- .../axsharpblazor.app/axsharpblazor.hmi.csproj | 4 ++-- .../axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj | 6 +++--- .../axsharpblazor.twin/axsharpblazor.twin.csproj | 8 ++++---- .../axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj | 6 +++--- .../templates/axsharpconsole/.config/dotnet-tools.json | 2 +- .../axsharpconsole.twin/axsharpconsole.csproj | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/templates/working/templates/axsharpblazor/.config/dotnet-tools.json b/templates/working/templates/axsharpblazor/.config/dotnet-tools.json index 90df7d13..ceb23983 100644 --- a/templates/working/templates/axsharpblazor/.config/dotnet-tools.json +++ b/templates/working/templates/axsharpblazor/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "AXSharp.ixc": { - "version": "0.16.0-move-template-to-separate-dir.168", + "version": "0.17.0-PTKu-patch-2.169", "commands": [ "ixc" ] diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj index b4adffa7..85b57146 100644 --- a/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj +++ b/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj @@ -1,6 +1,6 @@ - net8.0 + net7.0;net8.0 enable enable aspnet-ixsharpblazor-hmi-ee3150da-5237-49bc-b265-f512331ded6c @@ -17,7 +17,7 @@ - + diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj index 927fa7bb..6049b571 100644 --- a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj +++ b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj @@ -1,12 +1,12 @@ - net8.0 + net7.0;net8.0 enable enable - - + + diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj index 8d010fd4..a65053cc 100644 --- a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj +++ b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj @@ -1,13 +1,13 @@ - net8.0 + net7.0;net8.0 enable enable - - - + + + diff --git a/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj index 927fa7bb..6049b571 100644 --- a/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj +++ b/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj @@ -1,12 +1,12 @@ - net8.0 + net7.0;net8.0 enable enable - - + + diff --git a/templates/working/templates/axsharpconsole/.config/dotnet-tools.json b/templates/working/templates/axsharpconsole/.config/dotnet-tools.json index 90df7d13..ceb23983 100644 --- a/templates/working/templates/axsharpconsole/.config/dotnet-tools.json +++ b/templates/working/templates/axsharpconsole/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "AXSharp.ixc": { - "version": "0.16.0-move-template-to-separate-dir.168", + "version": "0.17.0-PTKu-patch-2.169", "commands": [ "ixc" ] diff --git a/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj b/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj index 8d010fd4..a65053cc 100644 --- a/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj +++ b/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj @@ -1,13 +1,13 @@ - net8.0 + net7.0;net8.0 enable enable - - - + + +