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/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$ 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..19513f9f 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..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 + net9.0;net8.0 enable enable