From f443bcc2d1263d6e4d2c79a120d28d6e65d6794d Mon Sep 17 00:00:00 2001
From: PTKu <61538034+PTKu@users.noreply.github.com>
Date: Wed, 15 Jan 2025 11:56:33 +0100
Subject: [PATCH 1/3] adds .net8 due to compatibility issues on an existing
project
---
Directory.Build.props | 2 +-
Directory.Packages.props | 43 +++++++++++++------
cake/Build.csproj | 1 +
cake/BuildContext.cs | 2 +-
.../src/AXSharp.Cs.Compiler/CsProject.cs | 2 +-
.../samples/units/expected/units.csproj | 3 +-
templates/working/AXSharp.templates.csproj | 2 +-
.../axsharpblazor.twin/axsharpblazor.csproj | 2 +-
.../axsharpblazor.twin.csproj | 2 +-
.../axsharpconsole.twin/axsharpconsole.csproj | 2 +-
.../axsharpconsole/axsharpconsole.app.csproj | 2 +-
11 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 4fd88b7c..db27aa7d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
- net9.0
+ net9.0;net8.0
diff --git a/Directory.Packages.props b/Directory.Packages.props
index ca8c75b0..afc2ab46 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -9,31 +9,52 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
-
@@ -55,12 +76,6 @@
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/cake/Build.csproj b/cake/Build.csproj
index 0340c6cc..fbb9bfd2 100644
--- a/cake/Build.csproj
+++ b/cake/Build.csproj
@@ -1,5 +1,6 @@
+ net9.0
Exe
$(MSBuildProjectDirectory)
false
diff --git a/cake/BuildContext.cs b/cake/BuildContext.cs
index 1dff3a68..3db88f1e 100644
--- a/cake/BuildContext.cs
+++ b/cake/BuildContext.cs
@@ -178,7 +178,7 @@ public void PushNugetPackages(string artifactDirectory)
}
}
- public IEnumerable TargetFrameworks { get; } = new List() { "net9.0" };
+ public IEnumerable TargetFrameworks { get; } = new List() { "net9.0", "net8.0" };
public IEnumerable<(string ax, string approject, string solution)> GetTemplateProjects()
{
diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs
index 1da6deb4..e9ac6f96 100644
--- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs
+++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs
@@ -123,7 +123,7 @@ private void EnsureCsProjFile()
var defaultCsProjectWhenNotProvidedByTemplate =
$@"
- net9.0
+ net9.0;net8.0
enable
enable
diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/units.csproj b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/units.csproj
index 370fc45e..d8d4be90 100644
--- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/units.csproj
+++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/units.csproj
@@ -1,6 +1,5 @@
-
- net9.0
+
enable
enable
diff --git a/templates/working/AXSharp.templates.csproj b/templates/working/AXSharp.templates.csproj
index a16aee10..b238b3df 100644
--- a/templates/working/AXSharp.templates.csproj
+++ b/templates/working/AXSharp.templates.csproj
@@ -1,6 +1,6 @@
- net9.0
+ net9.0;net8.0
Template
AXSharp.templates
AXSharp templates
diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj
index 5c3baae3..f6062c0c 100644
--- a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj
+++ b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj
@@ -1,6 +1,6 @@
- net9.0
+ net9.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 3f147862..96dc258d 100644
--- a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj
+++ b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj
@@ -1,6 +1,6 @@
- net9.0
+ net9.0;net8.0
enable
enable
diff --git a/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj b/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj
index 3f147862..96dc258d 100644
--- a/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj
+++ b/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj
@@ -1,6 +1,6 @@
- net9.0
+ net9.0;net8.0
enable
enable
diff --git a/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj b/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj
index 0a515b4a..af7255d7 100644
--- a/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj
+++ b/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj
@@ -1,7 +1,7 @@
Exe
- net9.0
+ net9.0;net8.0
enable
enable
From 5ec09312eef9bdc6e1de27fae0062f1928a68475 Mon Sep 17 00:00:00 2001
From: PTKu <61538034+PTKu@users.noreply.github.com>
Date: Wed, 15 Jan 2025 12:08:09 +0100
Subject: [PATCH 2/3] fixed targed frameworks monikers in templates
---
templates/working/AXSharp.templates.csproj | 2 +-
.../axsharpconsole/axsharpconsole/axsharpconsole.app.csproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/working/AXSharp.templates.csproj b/templates/working/AXSharp.templates.csproj
index b238b3df..19513f9f 100644
--- a/templates/working/AXSharp.templates.csproj
+++ b/templates/working/AXSharp.templates.csproj
@@ -1,6 +1,6 @@
- net9.0;net8.0
+ net9.0;net8.0
Template
AXSharp.templates
AXSharp templates
diff --git a/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj b/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj
index af7255d7..05e31f82 100644
--- a/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj
+++ b/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj
@@ -1,7 +1,7 @@
Exe
- net9.0;net8.0
+ net9.0;net8.0
enable
enable
From e5087745968110e2dba0281f53cf01ec97a0ea8d Mon Sep 17 00:00:00 2001
From: PTKu <61538034+PTKu@users.noreply.github.com>
Date: Wed, 15 Jan 2025 12:10:05 +0100
Subject: [PATCH 3/3] bumps version to 0.22
---
GitVersion.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/GitVersion.yml b/GitVersion.yml
index ac035488..2e9a4a98 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,5 +1,5 @@
mode: ContinuousDeployment
-next-version: 0.21.0
+next-version: 0.22.0
branches:
main:
regex: ^master$|^main$