From 79f999e1b34ca45bdcc4acd34f6811b2c0b3fe9e Mon Sep 17 00:00:00 2001 From: max-ieremenko Date: Sun, 12 Nov 2023 14:57:21 +0100 Subject: [PATCH 1/4] .sln target .net8.0 --- Sources/Directory.Build.props | 1 + ...lDatabase.Adapter.AssemblyScripts.Test.csproj | 2 +- .../SqlDatabase.Adapter.MsSql.Test.csproj | 2 +- .../SqlDatabase.Adapter.MySql.Test.csproj | 2 +- .../SqlDatabase.Adapter.PgSql.Test.csproj | 2 +- ...atabase.Adapter.PowerShellScripts.Test.csproj | 2 +- .../InstallationSeeker.cs | 4 +++- .../SqlDatabase.Adapter.PowerShellScripts.csproj | 4 ++-- .../SqlDatabase.Adapter.Sql.Test.csproj | 2 +- .../SqlDatabase.Configuration.Test.csproj | 2 +- .../SqlDatabase.FileSystem.Test.csproj | 2 +- .../SqlDatabase.Sequence.Test.csproj | 2 +- Sources/SqlDatabase.Test/SqlDatabase.Test.csproj | 2 +- .../Configuration/InvalidCommandLineException.cs | 16 +--------------- Sources/SqlDatabase/SqlDatabase.csproj | 4 ++-- Sources/global.json | 4 ++-- 16 files changed, 21 insertions(+), 32 deletions(-) diff --git a/Sources/Directory.Build.props b/Sources/Directory.Build.props index 43bcdf3e..72014747 100644 --- a/Sources/Directory.Build.props +++ b/Sources/Directory.Build.props @@ -13,6 +13,7 @@ false en false + true diff --git a/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/SqlDatabase.Adapter.AssemblyScripts.Test.csproj b/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/SqlDatabase.Adapter.AssemblyScripts.Test.csproj index cf359b4f..a2ca550f 100644 --- a/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/SqlDatabase.Adapter.AssemblyScripts.Test.csproj +++ b/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/SqlDatabase.Adapter.AssemblyScripts.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0 + net472;net6.0;net7.0;net8.0 SqlDatabase.Adapter.AssemblyScripts NU1702 diff --git a/Sources/SqlDatabase.Adapter.MsSql.Test/SqlDatabase.Adapter.MsSql.Test.csproj b/Sources/SqlDatabase.Adapter.MsSql.Test/SqlDatabase.Adapter.MsSql.Test.csproj index 3e29faab..184b29ef 100644 --- a/Sources/SqlDatabase.Adapter.MsSql.Test/SqlDatabase.Adapter.MsSql.Test.csproj +++ b/Sources/SqlDatabase.Adapter.MsSql.Test/SqlDatabase.Adapter.MsSql.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0 + net472;net6.0;net7.0;net8.0 SqlDatabase.Adapter.MsSql diff --git a/Sources/SqlDatabase.Adapter.MySql.Test/SqlDatabase.Adapter.MySql.Test.csproj b/Sources/SqlDatabase.Adapter.MySql.Test/SqlDatabase.Adapter.MySql.Test.csproj index a4a11e6a..7ef1c4cf 100644 --- a/Sources/SqlDatabase.Adapter.MySql.Test/SqlDatabase.Adapter.MySql.Test.csproj +++ b/Sources/SqlDatabase.Adapter.MySql.Test/SqlDatabase.Adapter.MySql.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0 + net472;net6.0;net7.0;net8.0 SqlDatabase.Adapter.MySql diff --git a/Sources/SqlDatabase.Adapter.PgSql.Test/SqlDatabase.Adapter.PgSql.Test.csproj b/Sources/SqlDatabase.Adapter.PgSql.Test/SqlDatabase.Adapter.PgSql.Test.csproj index eef24fc4..797873bc 100644 --- a/Sources/SqlDatabase.Adapter.PgSql.Test/SqlDatabase.Adapter.PgSql.Test.csproj +++ b/Sources/SqlDatabase.Adapter.PgSql.Test/SqlDatabase.Adapter.PgSql.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0 + net472;net6.0;net7.0;net8.0 SqlDatabase.Adapter.PgSql diff --git a/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/SqlDatabase.Adapter.PowerShellScripts.Test.csproj b/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/SqlDatabase.Adapter.PowerShellScripts.Test.csproj index ba34a726..2106e043 100644 --- a/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/SqlDatabase.Adapter.PowerShellScripts.Test.csproj +++ b/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/SqlDatabase.Adapter.PowerShellScripts.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0 + net472;net6.0;net7.0;net8.0 SqlDatabase.Adapter.PowerShellScripts diff --git a/Sources/SqlDatabase.Adapter.PowerShellScripts/InstallationSeeker.cs b/Sources/SqlDatabase.Adapter.PowerShellScripts/InstallationSeeker.cs index 93b820dd..989409f3 100644 --- a/Sources/SqlDatabase.Adapter.PowerShellScripts/InstallationSeeker.cs +++ b/Sources/SqlDatabase.Adapter.PowerShellScripts/InstallationSeeker.cs @@ -131,7 +131,9 @@ private static string GetDefaultInstallationRoot() private static bool IsCompatibleVersion(Version version) { -#if NET7_0 +#if NET8_0 + return version < new Version("7.5"); +#elif NET7_0 return version < new Version("7.4"); #elif NET6_0 return version < new Version("7.3"); diff --git a/Sources/SqlDatabase.Adapter.PowerShellScripts/SqlDatabase.Adapter.PowerShellScripts.csproj b/Sources/SqlDatabase.Adapter.PowerShellScripts/SqlDatabase.Adapter.PowerShellScripts.csproj index 2b82949b..d7b2f9c1 100644 --- a/Sources/SqlDatabase.Adapter.PowerShellScripts/SqlDatabase.Adapter.PowerShellScripts.csproj +++ b/Sources/SqlDatabase.Adapter.PowerShellScripts/SqlDatabase.Adapter.PowerShellScripts.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0;netstandard2.0 + net472;net6.0;net7.0;net8.0;netstandard2.0 @@ -12,7 +12,7 @@ - + diff --git a/Sources/SqlDatabase.Adapter.Sql.Test/SqlDatabase.Adapter.Sql.Test.csproj b/Sources/SqlDatabase.Adapter.Sql.Test/SqlDatabase.Adapter.Sql.Test.csproj index 9e0ab78a..67641488 100644 --- a/Sources/SqlDatabase.Adapter.Sql.Test/SqlDatabase.Adapter.Sql.Test.csproj +++ b/Sources/SqlDatabase.Adapter.Sql.Test/SqlDatabase.Adapter.Sql.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0 + net472;net6.0;net7.0;net8.0 SqlDatabase.Adapter.Sql diff --git a/Sources/SqlDatabase.Configuration.Test/SqlDatabase.Configuration.Test.csproj b/Sources/SqlDatabase.Configuration.Test/SqlDatabase.Configuration.Test.csproj index e7ee05b5..ea917321 100644 --- a/Sources/SqlDatabase.Configuration.Test/SqlDatabase.Configuration.Test.csproj +++ b/Sources/SqlDatabase.Configuration.Test/SqlDatabase.Configuration.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0 + net472;net6.0;net7.0;net8.0 SqlDatabase.Configuration diff --git a/Sources/SqlDatabase.FileSystem.Test/SqlDatabase.FileSystem.Test.csproj b/Sources/SqlDatabase.FileSystem.Test/SqlDatabase.FileSystem.Test.csproj index f0fef585..ce4bdfe7 100644 --- a/Sources/SqlDatabase.FileSystem.Test/SqlDatabase.FileSystem.Test.csproj +++ b/Sources/SqlDatabase.FileSystem.Test/SqlDatabase.FileSystem.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0 + net472;net6.0;net7.0;net8.0 SqlDatabase.FileSystem diff --git a/Sources/SqlDatabase.Sequence.Test/SqlDatabase.Sequence.Test.csproj b/Sources/SqlDatabase.Sequence.Test/SqlDatabase.Sequence.Test.csproj index 23c7f020..2fcaebb2 100644 --- a/Sources/SqlDatabase.Sequence.Test/SqlDatabase.Sequence.Test.csproj +++ b/Sources/SqlDatabase.Sequence.Test/SqlDatabase.Sequence.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0 + net472;net6.0;net7.0;net8.0 SqlDatabase.Sequence diff --git a/Sources/SqlDatabase.Test/SqlDatabase.Test.csproj b/Sources/SqlDatabase.Test/SqlDatabase.Test.csproj index b189f178..ae5cb1e9 100644 --- a/Sources/SqlDatabase.Test/SqlDatabase.Test.csproj +++ b/Sources/SqlDatabase.Test/SqlDatabase.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0 + net472;net6.0;net7.0;net8.0 SqlDatabase diff --git a/Sources/SqlDatabase/Configuration/InvalidCommandLineException.cs b/Sources/SqlDatabase/Configuration/InvalidCommandLineException.cs index 2375c2b5..253ff89a 100644 --- a/Sources/SqlDatabase/Configuration/InvalidCommandLineException.cs +++ b/Sources/SqlDatabase/Configuration/InvalidCommandLineException.cs @@ -3,8 +3,7 @@ namespace SqlDatabase.Configuration; -[Serializable] -public class InvalidCommandLineException : SystemException +public sealed class InvalidCommandLineException : SystemException { public InvalidCommandLineException() { @@ -32,18 +31,5 @@ public InvalidCommandLineException(string argument, string message, Exception in Argument = argument; } - protected InvalidCommandLineException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - Argument = info.GetString(nameof(Argument)); - } - public string? Argument { get; } - - public override void GetObjectData(SerializationInfo info, StreamingContext context) - { - base.GetObjectData(info, context); - - info.AddValue(nameof(Argument), Argument); - } } \ No newline at end of file diff --git a/Sources/SqlDatabase/SqlDatabase.csproj b/Sources/SqlDatabase/SqlDatabase.csproj index ec37d066..9a434fc5 100644 --- a/Sources/SqlDatabase/SqlDatabase.csproj +++ b/Sources/SqlDatabase/SqlDatabase.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0;netstandard2.0 - net6.0;net7.0 + net472;net6.0;net7.0;net8.0;netstandard2.0 + net6.0;net7.0;net8.0 Exe diff --git a/Sources/global.json b/Sources/global.json index 2ff089f7..5815c394 100644 --- a/Sources/global.json +++ b/Sources/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "7.0.100", - "allowPrerelease": false, + "version": "8.0.100-rc.2.23502.2", + "allowPrerelease": true, "rollForward": "latestFeature" } } \ No newline at end of file From 8eaeb388e9221c0d9f2b6b6bdc730b8ecbb6ee9a Mon Sep 17 00:00:00 2001 From: max-ieremenko Date: Sun, 12 Nov 2023 14:58:04 +0100 Subject: [PATCH 2/4] tpl target .net8.0 --- .../packages/nuget.org/dapper.strongname/2.1.15/index.json | 3 ++- .../packages/nuget.org/dapper.strongname/2.1.15/readme.md | 2 +- .../nuget.org/microsoft.codecoverage/17.7.2/index.json | 3 ++- .../packages/nuget.org/microsoft.codecoverage/17.7.2/readme.md | 2 +- .../nuget.org/microsoft.net.test.sdk/17.7.2/index.json | 3 ++- .../packages/nuget.org/microsoft.net.test.sdk/17.7.2/readme.md | 2 +- .../microsoft.testplatform.objectmodel/17.7.2/index.json | 3 ++- .../microsoft.testplatform.objectmodel/17.7.2/readme.md | 2 +- .../microsoft.testplatform.testhost/17.7.2/index.json | 3 ++- .../nuget.org/microsoft.testplatform.testhost/17.7.2/readme.md | 2 +- .../nuget.org/microsoft.win32.registry/4.7.0/index.json | 1 + .../nuget.org/microsoft.win32.registry/4.7.0/readme.md | 2 +- .../nuget.org/microsoft.wsman.runtime/7.2.0/index.json | 1 + .../packages/nuget.org/microsoft.wsman.runtime/7.2.0/readme.md | 2 +- .../nuget.org/microsoft.wsman.runtime/7.3.0/index.json | 1 + .../packages/nuget.org/microsoft.wsman.runtime/7.3.0/readme.md | 2 +- .../packages/nuget.org/netstandard.library/2.0.3/index.json | 1 + .../packages/nuget.org/netstandard.library/2.0.3/readme.md | 2 +- .../packages/nuget.org/newtonsoft.json/13.0.1/index.json | 3 ++- .../packages/nuget.org/newtonsoft.json/13.0.1/readme.md | 2 +- .../packages/nuget.org/newtonsoft.json/13.0.3/index.json | 3 ++- .../packages/nuget.org/newtonsoft.json/13.0.3/readme.md | 2 +- .../packages/nuget.org/nuget.frameworks/6.5.0/index.json | 3 ++- .../packages/nuget.org/nuget.frameworks/6.5.0/readme.md | 2 +- .../packages/nuget.org/nunit/3.14.0/index.json | 3 ++- .../packages/nuget.org/nunit/3.14.0/readme.md | 2 +- .../packages/nuget.org/nunit3testadapter/4.5.0/index.json | 3 ++- .../packages/nuget.org/nunit3testadapter/4.5.0/readme.md | 2 +- .../nuget.org/powershellstandard.library/5.1.0/index.json | 1 + .../nuget.org/powershellstandard.library/5.1.0/readme.md | 2 +- .../nuget.org/stylecop.analyzers.unstable/1.2.0.507/index.json | 1 + .../nuget.org/stylecop.analyzers.unstable/1.2.0.507/readme.md | 2 +- .../packages/nuget.org/system.data.sqlclient/4.8.5/index.json | 1 + .../packages/nuget.org/system.data.sqlclient/4.8.5/readme.md | 2 +- .../nuget.org/system.reflection.metadata/1.6.0/index.json | 3 ++- .../nuget.org/system.reflection.metadata/1.6.0/readme.md | 2 +- .../nuget.org/system.security.accesscontrol/4.7.0/index.json | 1 + .../nuget.org/system.security.accesscontrol/4.7.0/readme.md | 2 +- .../system.security.principal.windows/4.7.0/index.json | 1 + .../system.security.principal.windows/4.7.0/readme.md | 2 +- 40 files changed, 51 insertions(+), 31 deletions(-) diff --git a/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.15/index.json b/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.15/index.json index 3b3cf0a3..dfadd243 100644 --- a/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.15/index.json +++ b/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.15/index.json @@ -11,7 +11,8 @@ "TargetFrameworks": [ "net472", "net6.0", - "net7.0" + "net7.0", + "net8.0" ] } ], diff --git a/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.15/readme.md b/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.15/readme.md index e0382b14..ea8883fd 100644 --- a/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.15/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.15/readme.md @@ -3,7 +3,7 @@ Dapper.StrongName [2.1.15](https://www.nuget.org/packages/Dapper.StrongName/2.1. Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net7.0 +Target frameworks: net472, net6.0, net7.0, net8.0 License: [Apache-2.0](../../../../licenses/apache-2.0) diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.7.2/index.json b/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.7.2/index.json index 3bcd358e..d4d492c6 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.7.2/index.json +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.7.2/index.json @@ -11,7 +11,8 @@ "TargetFrameworks": [ "net472", "net6.0", - "net7.0" + "net7.0", + "net8.0" ] } ], diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.7.2/readme.md b/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.7.2/readme.md index b5c3f475..615d9061 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.7.2/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.7.2/readme.md @@ -3,7 +3,7 @@ Microsoft.CodeCoverage [17.7.2](https://www.nuget.org/packages/Microsoft.CodeCov Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net7.0 +Target frameworks: net472, net6.0, net7.0, net8.0 License: [ms-net-library](../../../../licenses/ms-net-library) diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.7.2/index.json b/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.7.2/index.json index e934f5b7..3f13abfb 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.7.2/index.json +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.7.2/index.json @@ -11,7 +11,8 @@ "TargetFrameworks": [ "net472", "net6.0", - "net7.0" + "net7.0", + "net8.0" ], "Dependencies": [ { diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.7.2/readme.md b/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.7.2/readme.md index ef3dd1a0..51309baf 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.7.2/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.7.2/readme.md @@ -3,7 +3,7 @@ Microsoft.NET.Test.Sdk [17.7.2](https://www.nuget.org/packages/Microsoft.NET.Tes Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net7.0 +Target frameworks: net472, net6.0, net7.0, net8.0 License: [ms-net-library](../../../../licenses/ms-net-library) diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.7.2/index.json b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.7.2/index.json index 566ee42e..f4be26eb 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.7.2/index.json +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.7.2/index.json @@ -11,7 +11,8 @@ "TargetFrameworks": [ "net472", "net6.0", - "net7.0" + "net7.0", + "net8.0" ], "Dependencies": [ { diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.7.2/readme.md b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.7.2/readme.md index ef0d232a..3e833b6e 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.7.2/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.7.2/readme.md @@ -3,7 +3,7 @@ Microsoft.TestPlatform.ObjectModel [17.7.2](https://www.nuget.org/packages/Micro Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net7.0 +Target frameworks: net472, net6.0, net7.0, net8.0 License: [ms-net-library](../../../../licenses/ms-net-library) diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.7.2/index.json b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.7.2/index.json index 439cb41a..63502005 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.7.2/index.json +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.7.2/index.json @@ -11,7 +11,8 @@ "TargetFrameworks": [ "net472", "net6.0", - "net7.0" + "net7.0", + "net8.0" ], "Dependencies": [ { diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.7.2/readme.md b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.7.2/readme.md index 05226dfa..fbb4fa11 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.7.2/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.7.2/readme.md @@ -3,7 +3,7 @@ Microsoft.TestPlatform.TestHost [17.7.2](https://www.nuget.org/packages/Microsof Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net7.0 +Target frameworks: net472, net6.0, net7.0, net8.0 License: [ms-net-library](../../../../licenses/ms-net-library) diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/index.json b/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/index.json index e5c050c8..0eb6a2a4 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/index.json @@ -12,6 +12,7 @@ "net472", "net6.0", "net7.0", + "net8.0", "netstandard2.0" ], "Dependencies": [ diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/readme.md b/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/readme.md index 368b7740..7ed602a2 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/readme.md @@ -3,7 +3,7 @@ Microsoft.Win32.Registry [4.7.0](https://www.nuget.org/packages/Microsoft.Win32. Used by: SqlDatabase -Target frameworks: net472, net6.0, net7.0, netstandard2.0 +Target frameworks: net472, net6.0, net7.0, net8.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.2.0/index.json b/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.2.0/index.json index 01467737..24450662 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.2.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.2.0/index.json @@ -12,6 +12,7 @@ "net472", "net6.0", "net7.0", + "net8.0", "netstandard2.0" ] } diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.2.0/readme.md b/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.2.0/readme.md index aad964dc..17289c6e 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.2.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.2.0/readme.md @@ -3,7 +3,7 @@ Microsoft.WSMan.Runtime [7.2.0](https://www.nuget.org/packages/Microsoft.WSMan.R Used by: SqlDatabase -Target frameworks: net472, net6.0, net7.0, netstandard2.0 +Target frameworks: net472, net6.0, net7.0, net8.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.3.0/index.json b/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.3.0/index.json index 01467737..24450662 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.3.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.3.0/index.json @@ -12,6 +12,7 @@ "net472", "net6.0", "net7.0", + "net8.0", "netstandard2.0" ] } diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.3.0/readme.md b/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.3.0/readme.md index 2d195b40..f1e29f3f 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.3.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.wsman.runtime/7.3.0/readme.md @@ -3,7 +3,7 @@ Microsoft.WSMan.Runtime [7.3.0](https://www.nuget.org/packages/Microsoft.WSMan.R Used by: SqlDatabase -Target frameworks: net472, net6.0, net7.0, netstandard2.0 +Target frameworks: net472, net6.0, net7.0, net8.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/index.json b/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/index.json index d2766dbc..e616c4c1 100644 --- a/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/index.json +++ b/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/index.json @@ -12,6 +12,7 @@ "net472", "net6.0", "net7.0", + "net8.0", "netstandard2.0" ] } diff --git a/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/readme.md b/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/readme.md index cd57a863..54e2194d 100644 --- a/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/readme.md @@ -3,7 +3,7 @@ NETStandard.Library [2.0.3](https://www.nuget.org/packages/NETStandard.Library/2 Used by: SqlDatabase -Target frameworks: net472, net6.0, net7.0, netstandard2.0 +Target frameworks: net472, net6.0, net7.0, net8.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/index.json b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/index.json index 9ea13765..0bd3aac3 100644 --- a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/index.json +++ b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/index.json @@ -11,7 +11,8 @@ "TargetFrameworks": [ "net472", "net6.0", - "net7.0" + "net7.0", + "net8.0" ] } ], diff --git a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/readme.md b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/readme.md index 77437192..d7394d25 100644 --- a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/readme.md @@ -3,7 +3,7 @@ Newtonsoft.Json [13.0.1](https://www.nuget.org/packages/Newtonsoft.Json/13.0.1) Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net7.0 +Target frameworks: net472, net6.0, net7.0, net8.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/index.json b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/index.json index 9ea13765..0bd3aac3 100644 --- a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/index.json +++ b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/index.json @@ -11,7 +11,8 @@ "TargetFrameworks": [ "net472", "net6.0", - "net7.0" + "net7.0", + "net8.0" ] } ], diff --git a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/readme.md b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/readme.md index ef6caa82..3ee80dad 100644 --- a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/readme.md @@ -3,7 +3,7 @@ Newtonsoft.Json [13.0.3](https://www.nuget.org/packages/Newtonsoft.Json/13.0.3) Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net7.0 +Target frameworks: net472, net6.0, net7.0, net8.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/nuget.frameworks/6.5.0/index.json b/Build/third-party-libraries/packages/nuget.org/nuget.frameworks/6.5.0/index.json index bc28354a..2809b998 100644 --- a/Build/third-party-libraries/packages/nuget.org/nuget.frameworks/6.5.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/nuget.frameworks/6.5.0/index.json @@ -11,7 +11,8 @@ "TargetFrameworks": [ "net472", "net6.0", - "net7.0" + "net7.0", + "net8.0" ] } ], diff --git a/Build/third-party-libraries/packages/nuget.org/nuget.frameworks/6.5.0/readme.md b/Build/third-party-libraries/packages/nuget.org/nuget.frameworks/6.5.0/readme.md index 49077907..6d535493 100644 --- a/Build/third-party-libraries/packages/nuget.org/nuget.frameworks/6.5.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/nuget.frameworks/6.5.0/readme.md @@ -3,7 +3,7 @@ NuGet.Frameworks [6.5.0](https://www.nuget.org/packages/NuGet.Frameworks/6.5.0) Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net7.0 +Target frameworks: net472, net6.0, net7.0, net8.0 License: [Apache-2.0](../../../../licenses/apache-2.0) diff --git a/Build/third-party-libraries/packages/nuget.org/nunit/3.14.0/index.json b/Build/third-party-libraries/packages/nuget.org/nunit/3.14.0/index.json index ef0a10ca..27b50717 100644 --- a/Build/third-party-libraries/packages/nuget.org/nunit/3.14.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/nunit/3.14.0/index.json @@ -11,7 +11,8 @@ "TargetFrameworks": [ "net472", "net6.0", - "net7.0" + "net7.0", + "net8.0" ] } ], diff --git a/Build/third-party-libraries/packages/nuget.org/nunit/3.14.0/readme.md b/Build/third-party-libraries/packages/nuget.org/nunit/3.14.0/readme.md index 509b42fc..0e505383 100644 --- a/Build/third-party-libraries/packages/nuget.org/nunit/3.14.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/nunit/3.14.0/readme.md @@ -3,7 +3,7 @@ NUnit [3.14.0](https://www.nuget.org/packages/NUnit/3.14.0) Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net7.0 +Target frameworks: net472, net6.0, net7.0, net8.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.5.0/index.json b/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.5.0/index.json index 659b1c2b..0075237a 100644 --- a/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.5.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.5.0/index.json @@ -11,7 +11,8 @@ "TargetFrameworks": [ "net472", "net6.0", - "net7.0" + "net7.0", + "net8.0" ] } ], diff --git a/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.5.0/readme.md b/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.5.0/readme.md index 7310d040..85936e56 100644 --- a/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.5.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.5.0/readme.md @@ -3,7 +3,7 @@ NUnit3TestAdapter [4.5.0](https://www.nuget.org/packages/NUnit3TestAdapter/4.5.0 Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net7.0 +Target frameworks: net472, net6.0, net7.0, net8.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/powershellstandard.library/5.1.0/index.json b/Build/third-party-libraries/packages/nuget.org/powershellstandard.library/5.1.0/index.json index 9bf2f045..7ea9e2d3 100644 --- a/Build/third-party-libraries/packages/nuget.org/powershellstandard.library/5.1.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/powershellstandard.library/5.1.0/index.json @@ -12,6 +12,7 @@ "net472", "net6.0", "net7.0", + "net8.0", "netstandard2.0" ] } diff --git a/Build/third-party-libraries/packages/nuget.org/powershellstandard.library/5.1.0/readme.md b/Build/third-party-libraries/packages/nuget.org/powershellstandard.library/5.1.0/readme.md index 848489f5..3c701fff 100644 --- a/Build/third-party-libraries/packages/nuget.org/powershellstandard.library/5.1.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/powershellstandard.library/5.1.0/readme.md @@ -3,7 +3,7 @@ PowerShellStandard.Library [5.1.0](https://www.nuget.org/packages/PowerShellStan Used by: SqlDatabase -Target frameworks: net472, net6.0, net7.0, netstandard2.0 +Target frameworks: net472, net6.0, net7.0, net8.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.507/index.json b/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.507/index.json index 1c98ed25..b4213aec 100644 --- a/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.507/index.json +++ b/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.507/index.json @@ -12,6 +12,7 @@ "net472", "net6.0", "net7.0", + "net8.0", "netstandard2.0" ] } diff --git a/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.507/readme.md b/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.507/readme.md index 61302f29..bc613e4a 100644 --- a/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.507/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.507/readme.md @@ -3,7 +3,7 @@ StyleCop.Analyzers.Unstable [1.2.0.507](https://www.nuget.org/packages/StyleCop. Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net7.0, netstandard2.0 +Target frameworks: net472, net6.0, net7.0, net8.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.5/index.json b/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.5/index.json index 93ca46c5..8533ff19 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.5/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.5/index.json @@ -12,6 +12,7 @@ "net472", "net6.0", "net7.0", + "net8.0", "netstandard2.0" ], "Dependencies": [ diff --git a/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.5/readme.md b/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.5/readme.md index 9b149b43..f3bdcc99 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.5/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.5/readme.md @@ -3,7 +3,7 @@ System.Data.SqlClient [4.8.5](https://www.nuget.org/packages/System.Data.SqlClie Used by: SqlDatabase -Target frameworks: net472, net6.0, net7.0, netstandard2.0 +Target frameworks: net472, net6.0, net7.0, net8.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/index.json b/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/index.json index 89e227cd..1bbad59c 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/index.json @@ -11,7 +11,8 @@ "TargetFrameworks": [ "net472", "net6.0", - "net7.0" + "net7.0", + "net8.0" ] } ], diff --git a/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/readme.md b/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/readme.md index 98448f10..e2a51fb2 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/readme.md @@ -3,7 +3,7 @@ System.Reflection.Metadata [1.6.0](https://www.nuget.org/packages/System.Reflect Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net7.0 +Target frameworks: net472, net6.0, net7.0, net8.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/index.json b/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/index.json index b748b1b9..2fecc9f9 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/index.json @@ -12,6 +12,7 @@ "net472", "net6.0", "net7.0", + "net8.0", "netstandard2.0" ], "Dependencies": [ diff --git a/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/readme.md b/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/readme.md index 5c735a26..ba201c8e 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/readme.md @@ -3,7 +3,7 @@ System.Security.AccessControl [4.7.0](https://www.nuget.org/packages/System.Secu Used by: SqlDatabase -Target frameworks: net472, net6.0, net7.0, netstandard2.0 +Target frameworks: net472, net6.0, net7.0, net8.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/index.json b/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/index.json index 054eaff4..cefc7084 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/index.json @@ -12,6 +12,7 @@ "net472", "net6.0", "net7.0", + "net8.0", "netstandard2.0" ] } diff --git a/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/readme.md b/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/readme.md index 4651717f..c9e3bf5d 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/readme.md @@ -3,7 +3,7 @@ System.Security.Principal.Windows [4.7.0](https://www.nuget.org/packages/System. Used by: SqlDatabase -Target frameworks: net472, net6.0, net7.0, netstandard2.0 +Target frameworks: net472, net6.0, net7.0, net8.0, netstandard2.0 License: [MIT](../../../../licenses/mit) From 80a1d40cc3a09bf249ffde8352c1c8381847e48d Mon Sep 17 00:00:00 2001 From: max-ieremenko Date: Sun, 12 Nov 2023 14:59:15 +0100 Subject: [PATCH 3/4] build target .net8.0 --- Build/install-dependencies.ps1 | 1 + Build/tasks/build-tasks.ps1 | 11 +++++++-- Build/tasks/build-tasks.unit-test.ps1 | 2 +- Build/tasks/create-images-tasks.ps1 | 24 ++++++++++++++++++- .../image-dotnet-runtime-8.0.dockerfile | 8 +++++++ .../Docker/image-dotnet-sdk-8.0.dockerfile | 7 ++++++ 6 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 Sources/Docker/image-dotnet-runtime-8.0.dockerfile create mode 100644 Sources/Docker/image-dotnet-sdk-8.0.dockerfile diff --git a/Build/install-dependencies.ps1 b/Build/install-dependencies.ps1 index 695cb85c..6a782c06 100644 --- a/Build/install-dependencies.ps1 +++ b/Build/install-dependencies.ps1 @@ -17,6 +17,7 @@ $ErrorActionPreference = "Stop" if (".net" -in $List) { Invoke-InstallDotNet -Version "6.0.319" + Invoke-InstallDotNet -Version "7.0.100" $version = (Get-Content -Raw (Join-Path $PSScriptRoot "../Sources/global.json") | ConvertFrom-Json).sdk.version Invoke-InstallDotNet -Version $version diff --git a/Build/tasks/build-tasks.ps1 b/Build/tasks/build-tasks.ps1 index fd546885..f311e9ee 100644 --- a/Build/tasks/build-tasks.ps1 +++ b/Build/tasks/build-tasks.ps1 @@ -30,7 +30,7 @@ task Initialize { repositoryCommitId = git rev-parse HEAD } - $script:frameworks = "net472", "net6.0", "net7.0" + $script:frameworks = "net472", "net6.0", "net7.0", "net8.0" $script:databases = "MsSql", "PgSql", "MySql" Write-Output "PackageVersion: $($settings.version)" @@ -109,6 +109,7 @@ task PackNuget472 PackPoweShellModule, { task PackManualDownload PackGlobalTool, PackPoweShellModule, { Get-ChildItem -Path $settings.bin -Recurse -Directory -Filter "publish" | Remove-Item -Force -Recurse + Get-ChildItem -Path $settings.bin -Recurse -Directory -Filter "win-arm64" | Remove-Item -Force -Recurse $out = $settings.artifacts $lic = Join-Path $settings.sources "..\LICENSE.md" @@ -205,6 +206,10 @@ task PsCoreTest { , "mcr.microsoft.com/powershell:7.2.2-ubuntu-20.04" , "mcr.microsoft.com/powershell:7.3-ubuntu-20.04") + foreach ($image in $images) { + exec { docker pull $image } + } + $builds = @() foreach ($image in $images) { foreach ($database in $databases) { @@ -223,7 +228,8 @@ task PsCoreTest { task SdkToolTest { $images = $( "sqldatabase/dotnet_pwsh:6.0-sdk" - , "sqldatabase/dotnet_pwsh:7.0-sdk") + , "sqldatabase/dotnet_pwsh:7.0-sdk" + , "sqldatabase/dotnet_pwsh:8.0-sdk") $builds = @() foreach ($image in $images) { @@ -244,6 +250,7 @@ task NetRuntimeLinuxTest { $testCases = $( @{ targetFramework = "net6.0"; image = "sqldatabase/dotnet_pwsh:6.0-runtime" } , @{ targetFramework = "net7.0"; image = "sqldatabase/dotnet_pwsh:7.0-runtime" } + , @{ targetFramework = "net8.0"; image = "sqldatabase/dotnet_pwsh:8.0-runtime" } ) $builds = @() diff --git a/Build/tasks/build-tasks.unit-test.ps1 b/Build/tasks/build-tasks.unit-test.ps1 index 2fbfba06..05c1b871 100644 --- a/Build/tasks/build-tasks.unit-test.ps1 +++ b/Build/tasks/build-tasks.unit-test.ps1 @@ -5,7 +5,7 @@ param( $Sources, [Parameter(Mandatory)] - [ValidateSet("net472", "net6.0", "net7.0")] + [ValidateSet("net472", "net6.0", "net7.0", "net8.0")] [string] $Framework ) diff --git a/Build/tasks/create-images-tasks.ps1 b/Build/tasks/create-images-tasks.ps1 index 75695838..bc718538 100644 --- a/Build/tasks/create-images-tasks.ps1 +++ b/Build/tasks/create-images-tasks.ps1 @@ -1,8 +1,10 @@ task Default ` BuildDotnetSdk60 ` - , BuildDotnetRuntime60 ` , BuildDotnetSdk70 ` + , BuildDotnetSdk80 ` + , BuildDotnetRuntime60 ` , BuildDotnetRuntime70 ` + , BuildDotnetRuntime80 ` , BuildMsSqlDatabase ` , BuildPgSqlDatabase ` , BuildMySqlDatabase @@ -79,4 +81,24 @@ task BuildDotnetRuntime70 { -t sqldatabase/dotnet_pwsh:7.0-runtime ` . } +} + +task BuildDotnetSdk80 { + $dockerfile = Join-Path $context "image-dotnet-sdk-8.0.dockerfile" + exec { + docker build ` + -f $dockerfile ` + -t sqldatabase/dotnet_pwsh:8.0-sdk ` + . + } +} + +task BuildDotnetRuntime80 { + $dockerfile = Join-Path $context "image-dotnet-runtime-8.0.dockerfile" + exec { + docker build ` + -f $dockerfile ` + -t sqldatabase/dotnet_pwsh:8.0-runtime ` + . + } } \ No newline at end of file diff --git a/Sources/Docker/image-dotnet-runtime-8.0.dockerfile b/Sources/Docker/image-dotnet-runtime-8.0.dockerfile new file mode 100644 index 00000000..e1bb2bb7 --- /dev/null +++ b/Sources/Docker/image-dotnet-runtime-8.0.dockerfile @@ -0,0 +1,8 @@ +FROM mcr.microsoft.com/dotnet/runtime:8.0 + +RUN apt-get update && \ + apt-get install -y curl && \ + curl -L https://github.com/PowerShell/PowerShell/releases/download/v7.3.9/powershell_7.3.9-1.deb_amd64.deb --output powershell.deb && \ + dpkg -i powershell.deb && \ + apt-get install -f && \ + rm -f powershell.deb \ No newline at end of file diff --git a/Sources/Docker/image-dotnet-sdk-8.0.dockerfile b/Sources/Docker/image-dotnet-sdk-8.0.dockerfile new file mode 100644 index 00000000..e8a8bc5e --- /dev/null +++ b/Sources/Docker/image-dotnet-sdk-8.0.dockerfile @@ -0,0 +1,7 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 + +RUN apt-get update && \ + curl -L https://github.com/PowerShell/PowerShell/releases/download/v7.3.9/powershell_7.3.9-1.deb_amd64.deb --output powershell.deb && \ + dpkg -i powershell.deb && \ + apt-get install -f && \ + rm -f powershell.deb \ No newline at end of file From 9ff2f9404887c99ff3393dc3d529fcd7f8f50599 Mon Sep 17 00:00:00 2001 From: max-ieremenko Date: Sun, 12 Nov 2023 14:59:28 +0100 Subject: [PATCH 4/4] .net8.0 --- Build/README.md | 4 ++-- Examples/CSharpMirationStep/readme.md | 2 +- Examples/PowerShellScript/readme.md | 2 +- README.md | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Build/README.md b/Build/README.md index f827c40e..3aedcafc 100644 --- a/Build/README.md +++ b/Build/README.md @@ -3,12 +3,12 @@ build.ps1 is designed to run on windows - PowerShell Desktop 5.1 -- PowerShell [7.3.0](https://github.com/PowerShell/PowerShell/releases/tag/v7.3.0) for .net 7.0 tests +- PowerShell [7.3.0](https://github.com/PowerShell/PowerShell/releases/tag/v7.3.0) for .net 7.0 and 8.0 tests - PowerShell [7.2.1](https://github.com/PowerShell/PowerShell/releases/tag/v7.2.1) for .net 6.0 tests - Install-Module -Name [InvokeBuild](https://www.powershellgallery.com/packages/InvokeBuild/5.10.4) -RequiredVersion 5.10.4 - Install-Module -Name [ThirdPartyLibraries](https://www.powershellgallery.com/packages/ThirdPartyLibraries/3.4.1) -RequiredVersion 3.4.1 - .net framework 4.7.2+ sdk -- .net 7.0 sdk +- .net 8.0 sdk - docker, switched to linux containers ## How to build diff --git a/Examples/CSharpMirationStep/readme.md b/Examples/CSharpMirationStep/readme.md index 6551144b..fffbd9d3 100644 --- a/Examples/CSharpMirationStep/readme.md +++ b/Examples/CSharpMirationStep/readme.md @@ -4,7 +4,7 @@ Any assembly script is - .exe or .dll for target framework is 4.7.2+ -- .dll for .net 7.0 or 6.0 +- .dll for .net 6.0+ - has exactly one class with script implementation This project is an example of script implementation. diff --git a/Examples/PowerShellScript/readme.md b/Examples/PowerShellScript/readme.md index 15dfc6e8..44a06a19 100644 --- a/Examples/PowerShellScript/readme.md +++ b/Examples/PowerShellScript/readme.md @@ -73,7 +73,7 @@ Installed Powershell Desktop version. Pre-installed Powershell Core is required, will be used by SqlDatabase as external component. Due to the Powershell Core design: -* SqlDatabase .net 7.0 can host Powershell Core versions below 7.4 +* SqlDatabase .net 8.0 and 7.0 can host Powershell Core versions below 7.4 * SqlDatabase .net 6.0 can host Powershell Core versions below 7.3 PowerShell location can be passed via command line: diff --git a/README.md b/README.md index 7e7fc8e7..4b05e83c 100644 --- a/README.md +++ b/README.md @@ -41,9 +41,9 @@ Installation PowerShell module is compatible with Powershell Core 6.1+ and PowerShell Desktop 5.1. -.net tool is compatible with .net sdk 7.0, and 6.0. +.net tool is compatible with .net sdk 8.0, 7.0, and 6.0. -Command-line tool is compatible with .net runtime 7.0, 6.0 and .net framework 4.7.2+. +Command-line tool is compatible with .net runtime 8.0, 7.0, 6.0 and .net framework 4.7.2+. ### PowerShell, from gallery