diff --git a/cake/Build.csproj b/cake/Build.csproj index 1d2b495d..d7d6396d 100644 --- a/cake/Build.csproj +++ b/cake/Build.csproj @@ -1,7 +1,7 @@  Exe - net7.0 + net8.0 $(MSBuildProjectDirectory) false diff --git a/cake/BuildContext.cs b/cake/BuildContext.cs index 30468fd6..b8d656b7 100644 --- a/cake/BuildContext.cs +++ b/cake/BuildContext.cs @@ -83,7 +83,7 @@ public BuildContext(ICakeContext context, BuildParameters buildParameters) DotNetRunSettings = new DotNetRunSettings() { Verbosity = buildParameters.Verbosity, - Framework = "net7.0", + Framework = "net8.0", Configuration = buildParameters.Configuration, NoBuild = true, NoRestore = true, @@ -167,7 +167,7 @@ public void PushNugetPackages(string artifactDirectory) } } - public IEnumerable TargetFrameworks { get; } = new List() { "net6.0", "net7.0" }; + public IEnumerable TargetFrameworks { get; } = new List() { "net7.0", "net8.0" }; public IEnumerable<(string ax, string approject, string solution)> GetTemplateProjects() { @@ -189,6 +189,9 @@ public void PushNugetPackages(string artifactDirectory) private static void DeleteDirectory(string target_dir) { + if (!Directory.Exists(target_dir)) + return; + string[] files = Directory.GetFiles(target_dir); string[] dirs = Directory.GetDirectories(target_dir); @@ -209,7 +212,7 @@ private static void DeleteDirectory(string target_dir) public void CleaUpAllBinsAndObjs() { foreach (var directory in Directory.EnumerateDirectories(this.ScrDir, "*.*", SearchOption.AllDirectories).Select(p => new DirectoryInfo(p)) - .Where(p => p.Name == "bin" || p.Name == "obj")) + .Where(p => (p.Name == "bin" || p.Name == "obj") && !string.IsNullOrEmpty(p.LinkTarget))) { DeleteDirectory(directory.FullName); } diff --git a/cake/Program.cs b/cake/Program.cs index ed2d2b57..390620c9 100644 --- a/cake/Program.cs +++ b/cake/Program.cs @@ -96,7 +96,7 @@ private static void ProvisionProjectWideTools(BuildContext context) context.ProcessRunner.Start(Helpers.GetApaxCommand(), new Cake.Core.IO.ProcessSettings() { - Arguments = $" install -c", + Arguments = $" install -r -c", WorkingDirectory = Path.Combine(context.ScrDir, "apax"), RedirectStandardOutput = false, RedirectStandardError = false, diff --git a/src/AXSharp.abstractions/src/AXSharp.Abstractions/AXSharp.Abstractions.csproj b/src/AXSharp.abstractions/src/AXSharp.Abstractions/AXSharp.Abstractions.csproj index 46cd64d6..0b2d7f2e 100644 --- a/src/AXSharp.abstractions/src/AXSharp.Abstractions/AXSharp.Abstractions.csproj +++ b/src/AXSharp.abstractions/src/AXSharp.Abstractions/AXSharp.Abstractions.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0 + true @@ -42,13 +42,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/AXSharp.Presentation.Blazor.Controls.csproj b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/AXSharp.Presentation.Blazor.Controls.csproj index 2d57c37c..4df77933 100644 --- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/AXSharp.Presentation.Blazor.Controls.csproj +++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/AXSharp.Presentation.Blazor.Controls.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + true @@ -81,12 +81,8 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor/AXSharp.Presentation.Blazor.csproj b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor/AXSharp.Presentation.Blazor.csproj index f7144b01..eef6f790 100644 --- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor/AXSharp.Presentation.Blazor.csproj +++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor/AXSharp.Presentation.Blazor.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + true true @@ -59,13 +59,9 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/AXSharp.RenderableContent.Tests.csproj b/src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/AXSharp.RenderableContent.Tests.csproj index 66dbeb34..7af1c768 100644 --- a/src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/AXSharp.RenderableContent.Tests.csproj +++ b/src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/AXSharp.RenderableContent.Tests.csproj @@ -1,20 +1,20 @@ - net6.0;net7.0 + false - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/AXSharp.blazor/tests/sandbox/ComponentsExamples/ComponentsExamples.csproj b/src/AXSharp.blazor/tests/sandbox/ComponentsExamples/ComponentsExamples.csproj index 74e194bb..fa906434 100644 --- a/src/AXSharp.blazor/tests/sandbox/ComponentsExamples/ComponentsExamples.csproj +++ b/src/AXSharp.blazor/tests/sandbox/ComponentsExamples/ComponentsExamples.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + false false @@ -12,7 +12,7 @@ - + diff --git a/src/AXSharp.blazor/tests/sandbox/IxBlazor.App/IxBlazor.App.csproj b/src/AXSharp.blazor/tests/sandbox/IxBlazor.App/IxBlazor.App.csproj index 0258cbfb..37ff149b 100644 --- a/src/AXSharp.blazor/tests/sandbox/IxBlazor.App/IxBlazor.App.csproj +++ b/src/AXSharp.blazor/tests/sandbox/IxBlazor.App/IxBlazor.App.csproj @@ -1,7 +1,7 @@  - net6.0 + false false diff --git a/src/AXSharp.blazor/tests/sandbox/ax-blazor-example/ix/ax_blazor_example.csproj b/src/AXSharp.blazor/tests/sandbox/ax-blazor-example/ix/ax_blazor_example.csproj index c207b16a..c7b60974 100644 --- a/src/AXSharp.blazor/tests/sandbox/ax-blazor-example/ix/ax_blazor_example.csproj +++ b/src/AXSharp.blazor/tests/sandbox/ax-blazor-example/ix/ax_blazor_example.csproj @@ -1,6 +1,6 @@ - net6.0 + enable enable diff --git a/src/AXSharp.compiler/src/AXSharp.Compiler.Abstractions/AXSharp.Compiler.Abstractions.csproj b/src/AXSharp.compiler/src/AXSharp.Compiler.Abstractions/AXSharp.Compiler.Abstractions.csproj index 3d5aad53..d4cd510a 100644 --- a/src/AXSharp.compiler/src/AXSharp.Compiler.Abstractions/AXSharp.Compiler.Abstractions.csproj +++ b/src/AXSharp.compiler/src/AXSharp.Compiler.Abstractions/AXSharp.Compiler.Abstractions.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + enable enable @@ -53,11 +53,5 @@ \ True - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + diff --git a/src/AXSharp.compiler/src/AXSharp.Compiler/AXSharp.Compiler.csproj b/src/AXSharp.compiler/src/AXSharp.Compiler/AXSharp.Compiler.csproj index eab4b505..8897c2b4 100644 --- a/src/AXSharp.compiler/src/AXSharp.Compiler/AXSharp.Compiler.csproj +++ b/src/AXSharp.compiler/src/AXSharp.Compiler/AXSharp.Compiler.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + enable enable @@ -61,18 +61,14 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + + + + + + + diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/AXSharp.Compiler.Cs.csproj b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/AXSharp.Compiler.Cs.csproj index d1e13ae2..0b366c4b 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/AXSharp.Compiler.Cs.csproj +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/AXSharp.Compiler.Cs.csproj @@ -1,7 +1,7 @@  - net6.0 + enable enable @@ -57,14 +57,10 @@ Always - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Cs/csproj-template.xml b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Cs/csproj-template.xml index 4dd492e8..a7d4535d 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Cs/csproj-template.xml +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Cs/csproj-template.xml @@ -1,6 +1,6 @@  - net6.0 + enable enable diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs index ce96b167..bdb04de1 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs @@ -112,7 +112,7 @@ private void EnsureCsProjFile() var defaultCsProjectWhenNotProvidedByTemplate = $@" - net7.0 + net8.0 enable enable diff --git a/src/AXSharp.compiler/src/ixc/AXSharp.ixc.csproj b/src/AXSharp.compiler/src/ixc/AXSharp.ixc.csproj index 2661041e..66935014 100644 --- a/src/AXSharp.compiler/src/ixc/AXSharp.ixc.csproj +++ b/src/AXSharp.compiler/src/ixc/AXSharp.ixc.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net7.0 + enable enable true @@ -76,11 +76,7 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/AXSharp.compiler/src/ixd/AXSharp.ixd.csproj b/src/AXSharp.compiler/src/ixd/AXSharp.ixd.csproj index aadfaaa9..9e64ebab 100644 --- a/src/AXSharp.compiler/src/ixd/AXSharp.ixd.csproj +++ b/src/AXSharp.compiler/src/ixd/AXSharp.ixd.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net7.0 + AXSharp.ixc_doc enable enable @@ -47,14 +47,10 @@ - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + + + diff --git a/src/AXSharp.compiler/src/ixr/AXSharp - Backup.ixr.csproj b/src/AXSharp.compiler/src/ixr/AXSharp - Backup.ixr.csproj index d3e4db60..08738fa8 100644 --- a/src/AXSharp.compiler/src/ixr/AXSharp - Backup.ixr.csproj +++ b/src/AXSharp.compiler/src/ixr/AXSharp - Backup.ixr.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net7.0 + AXSharp.ixr enable enable diff --git a/src/AXSharp.compiler/src/ixr/AXSharp.ixr.csproj b/src/AXSharp.compiler/src/ixr/AXSharp.ixr.csproj index 1c542481..15547222 100644 --- a/src/AXSharp.compiler/src/ixr/AXSharp.ixr.csproj +++ b/src/AXSharp.compiler/src/ixr/AXSharp.ixr.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net7.0 + AXSharp.ixr enable enable @@ -53,15 +53,11 @@ - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + + + + diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/AXSharp.Compiler.CsTests.csproj b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/AXSharp.Compiler.CsTests.csproj index 8e3db225..b5e09d89 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/AXSharp.Compiler.CsTests.csproj +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/AXSharp.Compiler.CsTests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + enable enable @@ -391,14 +391,14 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/AXSharp.compiler/tests/AXSharp.CompilerTests/AXSharp.CompilerTests.csproj b/src/AXSharp.compiler/tests/AXSharp.CompilerTests/AXSharp.CompilerTests.csproj index b2606d5b..3769ac00 100644 --- a/src/AXSharp.compiler/tests/AXSharp.CompilerTests/AXSharp.CompilerTests.csproj +++ b/src/AXSharp.compiler/tests/AXSharp.CompilerTests/AXSharp.CompilerTests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + enable enable false @@ -25,15 +25,15 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/AXSharp.compiler/tests/AXSharp.ixc.Tests/AXSharp.ixc.Tests.csproj b/src/AXSharp.compiler/tests/AXSharp.ixc.Tests/AXSharp.ixc.Tests.csproj index 87192a57..833dc83d 100644 --- a/src/AXSharp.compiler/tests/AXSharp.ixc.Tests/AXSharp.ixc.Tests.csproj +++ b/src/AXSharp.compiler/tests/AXSharp.ixc.Tests/AXSharp.ixc.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + enable enable @@ -17,13 +17,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/AXSharp.compiler/tests/AXSharp.ixr.Tests/AXSharp.ixr.Tests.csproj b/src/AXSharp.compiler/tests/AXSharp.ixr.Tests/AXSharp.ixr.Tests.csproj index 769e95c1..f0d731a3 100644 --- a/src/AXSharp.compiler/tests/AXSharp.ixr.Tests/AXSharp.ixr.Tests.csproj +++ b/src/AXSharp.compiler/tests/AXSharp.ixr.Tests/AXSharp.ixr.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + enable enable @@ -10,13 +10,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/AXSharp.compiler/tests/integration/actual/app/ix/app.csproj b/src/AXSharp.compiler/tests/integration/actual/app/ix/app.csproj index e6dce49f..a72622f6 100644 --- a/src/AXSharp.compiler/tests/integration/actual/app/ix/app.csproj +++ b/src/AXSharp.compiler/tests/integration/actual/app/ix/app.csproj @@ -1,6 +1,6 @@  - net6.0 + enable enable diff --git a/src/AXSharp.compiler/tests/integration/actual/lib1/ix/lib1.csproj b/src/AXSharp.compiler/tests/integration/actual/lib1/ix/lib1.csproj index fad938d1..2c7f2067 100644 --- a/src/AXSharp.compiler/tests/integration/actual/lib1/ix/lib1.csproj +++ b/src/AXSharp.compiler/tests/integration/actual/lib1/ix/lib1.csproj @@ -1,6 +1,6 @@  - net6.0 + enable enable false diff --git a/src/AXSharp.compiler/tests/integration/actual/lib2/ix/lib2.csproj b/src/AXSharp.compiler/tests/integration/actual/lib2/ix/lib2.csproj index 9cd0183b..188db4d4 100644 --- a/src/AXSharp.compiler/tests/integration/actual/lib2/ix/lib2.csproj +++ b/src/AXSharp.compiler/tests/integration/actual/lib2/ix/lib2.csproj @@ -1,6 +1,6 @@  - net6.0 + enable enable false diff --git a/src/AXSharp.compiler/tests/integration/expected/app/ix/app.csproj b/src/AXSharp.compiler/tests/integration/expected/app/ix/app.csproj index e6dce49f..a72622f6 100644 --- a/src/AXSharp.compiler/tests/integration/expected/app/ix/app.csproj +++ b/src/AXSharp.compiler/tests/integration/expected/app/ix/app.csproj @@ -1,6 +1,6 @@  - net6.0 + enable enable diff --git a/src/AXSharp.compiler/tests/integration/expected/lib1/ix/lib1.csproj b/src/AXSharp.compiler/tests/integration/expected/lib1/ix/lib1.csproj index fad938d1..2c7f2067 100644 --- a/src/AXSharp.compiler/tests/integration/expected/lib1/ix/lib1.csproj +++ b/src/AXSharp.compiler/tests/integration/expected/lib1/ix/lib1.csproj @@ -1,6 +1,6 @@  - net6.0 + enable enable false diff --git a/src/AXSharp.compiler/tests/integration/expected/lib2/ix/lib2.csproj b/src/AXSharp.compiler/tests/integration/expected/lib2/ix/lib2.csproj index 9cd0183b..188db4d4 100644 --- a/src/AXSharp.compiler/tests/integration/expected/lib2/ix/lib2.csproj +++ b/src/AXSharp.compiler/tests/integration/expected/lib2/ix/lib2.csproj @@ -1,6 +1,6 @@  - net6.0 + enable enable false diff --git a/src/AXSharp.connectors/src/AXSharp.Connector.S71500.WebAPI/AXSharp.Connector.S71500.WebAPI.csproj b/src/AXSharp.connectors/src/AXSharp.Connector.S71500.WebAPI/AXSharp.Connector.S71500.WebAPI.csproj index 128d558c..fadf38bb 100644 --- a/src/AXSharp.connectors/src/AXSharp.Connector.S71500.WebAPI/AXSharp.Connector.S71500.WebAPI.csproj +++ b/src/AXSharp.connectors/src/AXSharp.Connector.S71500.WebAPI/AXSharp.Connector.S71500.WebAPI.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + enable enable @@ -48,16 +48,12 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + diff --git a/src/AXSharp.connectors/src/AXSharp.Connector/AXSharp.Connector.csproj b/src/AXSharp.connectors/src/AXSharp.Connector/AXSharp.Connector.csproj index cf65bf27..ee63cd51 100644 --- a/src/AXSharp.connectors/src/AXSharp.Connector/AXSharp.Connector.csproj +++ b/src/AXSharp.connectors/src/AXSharp.Connector/AXSharp.Connector.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + true @@ -72,16 +72,12 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + diff --git a/src/AXSharp.connectors/src/AXSharp.TIA.Connector/AXSharp.TIA2AXSharp.csproj b/src/AXSharp.connectors/src/AXSharp.TIA.Connector/AXSharp.TIA2AXSharp.csproj index d51fc351..feda2b1d 100644 --- a/src/AXSharp.connectors/src/AXSharp.TIA.Connector/AXSharp.TIA2AXSharp.csproj +++ b/src/AXSharp.connectors/src/AXSharp.TIA.Connector/AXSharp.TIA2AXSharp.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + enable enable @@ -34,13 +34,7 @@ - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + diff --git a/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/AXSharp.Connector.S71500.WebAPITests.csproj b/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/AXSharp.Connector.S71500.WebAPITests.csproj index 1f39d3f0..8ae3ead2 100644 --- a/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/AXSharp.Connector.S71500.WebAPITests.csproj +++ b/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/AXSharp.Connector.S71500.WebAPITests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + false false @@ -20,14 +20,14 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/AXSharp.connectors/tests/AXSharp.ConnectorLegacyTests/AXSharp.ConnectorLegacyTests.csproj b/src/AXSharp.connectors/tests/AXSharp.ConnectorLegacyTests/AXSharp.ConnectorLegacyTests.csproj index 3481d764..3924eab1 100644 --- a/src/AXSharp.connectors/tests/AXSharp.ConnectorLegacyTests/AXSharp.ConnectorLegacyTests.csproj +++ b/src/AXSharp.connectors/tests/AXSharp.ConnectorLegacyTests/AXSharp.ConnectorLegacyTests.csproj @@ -1,16 +1,16 @@  - net6.0;net7.0 + false false - - - + + + diff --git a/src/AXSharp.connectors/tests/AXSharp.ConnectorTests/AXSharp.ConnectorTests/AXSharp.ConnectorTests.csproj b/src/AXSharp.connectors/tests/AXSharp.ConnectorTests/AXSharp.ConnectorTests/AXSharp.ConnectorTests.csproj index 07a0fd80..7839c199 100644 --- a/src/AXSharp.connectors/tests/AXSharp.ConnectorTests/AXSharp.ConnectorTests/AXSharp.ConnectorTests.csproj +++ b/src/AXSharp.connectors/tests/AXSharp.ConnectorTests/AXSharp.ConnectorTests/AXSharp.ConnectorTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + enable enable @@ -25,18 +25,18 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/AXSharp.connectors/tests/AXSharp.TIA.ConnectorTests/AXSharp.TIA2AXSharpTests_L3.csproj b/src/AXSharp.connectors/tests/AXSharp.TIA.ConnectorTests/AXSharp.TIA2AXSharpTests_L3.csproj index 5092a7e6..ae16c8c5 100644 --- a/src/AXSharp.connectors/tests/AXSharp.TIA.ConnectorTests/AXSharp.TIA2AXSharpTests_L3.csproj +++ b/src/AXSharp.connectors/tests/AXSharp.TIA.ConnectorTests/AXSharp.TIA2AXSharpTests_L3.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + enable enable @@ -10,12 +10,12 @@ - - - - - - + + + + + + diff --git a/src/AXSharp.connectors/tests/ax-test-project/ix/ax_test_project.csproj b/src/AXSharp.connectors/tests/ax-test-project/ix/ax_test_project.csproj index 5f25f454..e3a3f43c 100644 --- a/src/AXSharp.connectors/tests/ax-test-project/ix/ax_test_project.csproj +++ b/src/AXSharp.connectors/tests/ax-test-project/ix/ax_test_project.csproj @@ -1,6 +1,6 @@  - net6.0 + enable enable diff --git a/src/AXSharp.connectors/tests/exploring/Webserver.Api.Exploratory/Webserver.Api.Exploratory.csproj b/src/AXSharp.connectors/tests/exploring/Webserver.Api.Exploratory/Webserver.Api.Exploratory.csproj index 9e2a4920..0a68d826 100644 --- a/src/AXSharp.connectors/tests/exploring/Webserver.Api.Exploratory/Webserver.Api.Exploratory.csproj +++ b/src/AXSharp.connectors/tests/exploring/Webserver.Api.Exploratory/Webserver.Api.Exploratory.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + enable enable diff --git a/src/AXSharp.connectors/tests/exploring/exploratory.consoleapp/exploratory.consoleapp.csproj b/src/AXSharp.connectors/tests/exploring/exploratory.consoleapp/exploratory.consoleapp.csproj index b6c2ac17..b0afc3a5 100644 --- a/src/AXSharp.connectors/tests/exploring/exploratory.consoleapp/exploratory.consoleapp.csproj +++ b/src/AXSharp.connectors/tests/exploring/exploratory.consoleapp/exploratory.consoleapp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + enable enable diff --git a/src/AXSharp.examples/hello.world.console/hello.world.console.plc/ix/hello.world.console.plc.csproj b/src/AXSharp.examples/hello.world.console/hello.world.console.plc/ix/hello.world.console.plc.csproj index f9bb2177..856383f1 100644 --- a/src/AXSharp.examples/hello.world.console/hello.world.console.plc/ix/hello.world.console.plc.csproj +++ b/src/AXSharp.examples/hello.world.console/hello.world.console.plc/ix/hello.world.console.plc.csproj @@ -1,6 +1,6 @@  - net6.0 + enable enable diff --git a/src/AXSharp.examples/hello.world.console/hello.world.console.plc/ix/hello_world_console_plc.csproj b/src/AXSharp.examples/hello.world.console/hello.world.console.plc/ix/hello_world_console_plc.csproj index 70fda89d..be7194f0 100644 --- a/src/AXSharp.examples/hello.world.console/hello.world.console.plc/ix/hello_world_console_plc.csproj +++ b/src/AXSharp.examples/hello.world.console/hello.world.console.plc/ix/hello_world_console_plc.csproj @@ -1,6 +1,6 @@ - net6.0 + enable enable diff --git a/src/AXSharp.examples/hello.world.console/hello.world.console/hello.world.console.csproj b/src/AXSharp.examples/hello.world.console/hello.world.console/hello.world.console.csproj index 716330f3..8dbc472f 100644 --- a/src/AXSharp.examples/hello.world.console/hello.world.console/hello.world.console.csproj +++ b/src/AXSharp.examples/hello.world.console/hello.world.console/hello.world.console.csproj @@ -2,13 +2,13 @@ Exe - net7.0 + enable enable - + diff --git a/src/AXSharp.templates/working/AXSharp.templates.csproj b/src/AXSharp.templates/working/AXSharp.templates.csproj index 19784dca..855daf23 100644 --- a/src/AXSharp.templates/working/AXSharp.templates.csproj +++ b/src/AXSharp.templates/working/AXSharp.templates.csproj @@ -8,7 +8,7 @@ AXSharp project templates. simatic-ax;axsharp;templates - net6.0;net7.0 + true false @@ -35,13 +35,5 @@ True \ - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - + \ No newline at end of file diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj b/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj index b78fc4b8..977705c7 100644 --- a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj +++ b/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj @@ -1,6 +1,6 @@ - net7.0 + enable enable aspnet-ixsharpblazor-hmi-ee3150da-5237-49bc-b265-f512331ded6c diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj b/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj index d85b6eec..26f1cd7c 100644 --- a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj +++ b/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj @@ -1,6 +1,6 @@ - net6.0 + enable enable diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj b/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj index 963952b1..0ede0c67 100644 --- a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj +++ b/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + enable enable diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj b/src/AXSharp.templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj index d85b6eec..26f1cd7c 100644 --- a/src/AXSharp.templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj +++ b/src/AXSharp.templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj @@ -1,6 +1,6 @@ - net6.0 + enable enable diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj b/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj index 963952b1..0ede0c67 100644 --- a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj +++ b/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + enable enable diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj b/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj index 8f6d6f4d..1625976a 100644 --- a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj +++ b/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj @@ -1,7 +1,7 @@ Exe - net6.0;net7.0 + enable enable diff --git a/src/AXSharp.tools/src/AXSharp.LocalizablesToResx/AXSharp.LocalizablesToResx.csproj b/src/AXSharp.tools/src/AXSharp.LocalizablesToResx/AXSharp.LocalizablesToResx.csproj index 71cf455c..d5b1efbd 100644 --- a/src/AXSharp.tools/src/AXSharp.LocalizablesToResx/AXSharp.LocalizablesToResx.csproj +++ b/src/AXSharp.tools/src/AXSharp.LocalizablesToResx/AXSharp.LocalizablesToResx.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net7.0 + enable enable @@ -34,12 +34,8 @@ - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + diff --git a/src/AXSharp.tools/src/AXSharp.TIA2AX.Tranformer/AXSharp.TIA2AX.Transformer.csproj b/src/AXSharp.tools/src/AXSharp.TIA2AX.Tranformer/AXSharp.TIA2AX.Transformer.csproj index ec0611ff..a3eedcf8 100644 --- a/src/AXSharp.tools/src/AXSharp.TIA2AX.Tranformer/AXSharp.TIA2AX.Transformer.csproj +++ b/src/AXSharp.tools/src/AXSharp.TIA2AX.Tranformer/AXSharp.TIA2AX.Transformer.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net7.0 + enable enable @@ -46,10 +46,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/AXSharp.tools/src/AXSharp.TIA2AX.TranformerTests/AXSharp.TIA2AX.TransformerTests.csproj b/src/AXSharp.tools/src/AXSharp.TIA2AX.TranformerTests/AXSharp.TIA2AX.TransformerTests.csproj index cb2ef458..6490cad7 100644 --- a/src/AXSharp.tools/src/AXSharp.TIA2AX.TranformerTests/AXSharp.TIA2AX.TransformerTests.csproj +++ b/src/AXSharp.tools/src/AXSharp.TIA2AX.TranformerTests/AXSharp.TIA2AX.TransformerTests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + enable enable @@ -10,12 +10,12 @@ - - - - - - + + + + + + diff --git a/src/AXSharp.tools/src/AXSharp.TIA2AXTool/AXSharp.TIA2AXTool.csproj b/src/AXSharp.tools/src/AXSharp.TIA2AXTool/AXSharp.TIA2AXTool.csproj index 1145adb3..c50dcc15 100644 --- a/src/AXSharp.tools/src/AXSharp.TIA2AXTool/AXSharp.TIA2AXTool.csproj +++ b/src/AXSharp.tools/src/AXSharp.TIA2AXTool/AXSharp.TIA2AXTool.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net7.0 + enable enable @@ -34,11 +34,7 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/AXSharp.tools/src/AXSharp.nuget.update/AXSharp.nuget.update.csproj b/src/AXSharp.tools/src/AXSharp.nuget.update/AXSharp.nuget.update.csproj index 3a142e8f..000c3499 100644 --- a/src/AXSharp.tools/src/AXSharp.nuget.update/AXSharp.nuget.update.csproj +++ b/src/AXSharp.tools/src/AXSharp.nuget.update/AXSharp.nuget.update.csproj @@ -8,7 +8,7 @@ - - + + diff --git a/src/AXSharp.tools/tests/AXSharp.LocalizablesToResx.Tests/AXSharp.LocalizablesToResx.Tests.csproj b/src/AXSharp.tools/tests/AXSharp.LocalizablesToResx.Tests/AXSharp.LocalizablesToResx.Tests.csproj index effb21a0..9aa5eb64 100644 --- a/src/AXSharp.tools/tests/AXSharp.LocalizablesToResx.Tests/AXSharp.LocalizablesToResx.Tests.csproj +++ b/src/AXSharp.tools/tests/AXSharp.LocalizablesToResx.Tests/AXSharp.LocalizablesToResx.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + enable enable @@ -10,13 +10,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/AXSharp.tools/tests/AXSharp.TIA2AX.TranformerTests/AXSharp.TIA2AX.TranformerTests.csproj b/src/AXSharp.tools/tests/AXSharp.TIA2AX.TranformerTests/AXSharp.TIA2AX.TranformerTests.csproj index ed22915e..cd7fdeb4 100644 --- a/src/AXSharp.tools/tests/AXSharp.TIA2AX.TranformerTests/AXSharp.TIA2AX.TranformerTests.csproj +++ b/src/AXSharp.tools/tests/AXSharp.TIA2AX.TranformerTests/AXSharp.TIA2AX.TranformerTests.csproj @@ -1,7 +1,7 @@ - net6.0 + enable enable @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/AXSharp.nuget.update.Tests.csproj b/src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/AXSharp.nuget.update.Tests.csproj index 65624491..cad42588 100644 --- a/src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/AXSharp.nuget.update.Tests.csproj +++ b/src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/AXSharp.nuget.update.Tests.csproj @@ -7,17 +7,17 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/samples/IxTwin.csproj b/src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/samples/IxTwin.csproj index ae51204d..c2e1dc1d 100644 --- a/src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/samples/IxTwin.csproj +++ b/src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/samples/IxTwin.csproj @@ -1,6 +1,5 @@  - net6.0;net7.0 enable enable false diff --git a/src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/samples/expected/IxTwin.csproj b/src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/samples/expected/IxTwin.csproj index 6bc6d889..51865e00 100644 --- a/src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/samples/expected/IxTwin.csproj +++ b/src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/samples/expected/IxTwin.csproj @@ -1,6 +1,5 @@  - net6.0;net7.0 enable enable false diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 00000000..aabf5692 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,8 @@ + + + net7.0;net8.0 + + + \ No newline at end of file diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props new file mode 100644 index 00000000..9cd7f190 --- /dev/null +++ b/src/Directory.Packages.props @@ -0,0 +1,87 @@ + + + true + false + true + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/global.json b/src/global.json index 45ebf8dd..062f5fef 100644 --- a/src/global.json +++ b/src/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.402" + "version": "8.0.100" } } \ No newline at end of file diff --git a/src/sanbox/integration/ix-integration-blazor/ix-integration-blazor.csproj b/src/sanbox/integration/ix-integration-blazor/ix-integration-blazor.csproj index c9cc7cf4..ce7d4df6 100644 --- a/src/sanbox/integration/ix-integration-blazor/ix-integration-blazor.csproj +++ b/src/sanbox/integration/ix-integration-blazor/ix-integration-blazor.csproj @@ -1,14 +1,14 @@  - net7.0 + enable enable ix_integration_blazor - + diff --git a/src/sanbox/integration/ix-integration-library/ix-integration-library.csproj b/src/sanbox/integration/ix-integration-library/ix-integration-library.csproj index 04e320af..7bb7a2a9 100644 --- a/src/sanbox/integration/ix-integration-library/ix-integration-library.csproj +++ b/src/sanbox/integration/ix-integration-library/ix-integration-library.csproj @@ -1,7 +1,7 @@  - net7.0 + enable enable ix_integration_library @@ -13,7 +13,7 @@ - + diff --git a/src/sanbox/integration/ix-integration-plc/ix/ix_integration_plc.csproj b/src/sanbox/integration/ix-integration-plc/ix/ix_integration_plc.csproj index 270bf29a..59fd4aa5 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/ix_integration_plc.csproj +++ b/src/sanbox/integration/ix-integration-plc/ix/ix_integration_plc.csproj @@ -1,6 +1,6 @@  - net6.0 + enable enable diff --git a/src/sanbox/probes/ax-blazor-1/ix-blaxor-app/ix-blaxor-app.csproj b/src/sanbox/probes/ax-blazor-1/ix-blaxor-app/ix-blaxor-app.csproj index 59310669..bc6bf938 100644 --- a/src/sanbox/probes/ax-blazor-1/ix-blaxor-app/ix-blaxor-app.csproj +++ b/src/sanbox/probes/ax-blazor-1/ix-blaxor-app/ix-blaxor-app.csproj @@ -1,7 +1,7 @@ - net6.0 + enable enable service-worker-assets.js diff --git a/src/sanbox/probes/ax-blazor-1/ix-blaxor/ix-blaxor.csproj b/src/sanbox/probes/ax-blazor-1/ix-blaxor/ix-blaxor.csproj index 7e9d806f..8318b233 100644 --- a/src/sanbox/probes/ax-blazor-1/ix-blaxor/ix-blaxor.csproj +++ b/src/sanbox/probes/ax-blazor-1/ix-blaxor/ix-blaxor.csproj @@ -5,7 +5,7 @@ - net6.0 + enable enable ix_blaxor diff --git a/src/sanbox/probes/ax-blazor-1/ix/ax-blazor-1.csproj b/src/sanbox/probes/ax-blazor-1/ix/ax-blazor-1.csproj index c0e4e929..7255cf9d 100644 --- a/src/sanbox/probes/ax-blazor-1/ix/ax-blazor-1.csproj +++ b/src/sanbox/probes/ax-blazor-1/ix/ax-blazor-1.csproj @@ -1,6 +1,6 @@  - net6.0 + enable enable diff --git a/src/tests.integrations/integrated/src/ax/ix/integrated.csproj b/src/tests.integrations/integrated/src/ax/ix/integrated.csproj index f51847a8..1d3ebf7a 100644 --- a/src/tests.integrations/integrated/src/ax/ix/integrated.csproj +++ b/src/tests.integrations/integrated/src/ax/ix/integrated.csproj @@ -1,6 +1,6 @@ - net6.0 + enable enable diff --git a/src/tests.integrations/integrated/src/integrated.app/integrated.hmi.csproj b/src/tests.integrations/integrated/src/integrated.app/integrated.hmi.csproj index e7b52014..4344f28f 100644 --- a/src/tests.integrations/integrated/src/integrated.app/integrated.hmi.csproj +++ b/src/tests.integrations/integrated/src/integrated.app/integrated.hmi.csproj @@ -1,7 +1,7 @@  - net7.0 + enable enable aspnet-integrated-hmi-ee3150da-5237-49bc-b265-f512331ded6c @@ -21,11 +21,11 @@ - - - - - + + + + + diff --git a/src/tests.integrations/integrated/src/integrated.twin/integrated.csproj b/src/tests.integrations/integrated/src/integrated.twin/integrated.csproj index 487d32ae..f0cae048 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/integrated.csproj +++ b/src/tests.integrations/integrated/src/integrated.twin/integrated.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0 + enable enable diff --git a/src/tests.integrations/integrated/tests/integrated.tests/integrated.tests.csproj b/src/tests.integrations/integrated/tests/integrated.tests/integrated.tests.csproj index 5ed4a31d..fe494eb8 100644 --- a/src/tests.integrations/integrated/tests/integrated.tests/integrated.tests.csproj +++ b/src/tests.integrations/integrated/tests/integrated.tests/integrated.tests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + enable enable @@ -13,13 +13,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all