Target PowerShell 7.2 and .NET 6

sharpjs · Dec 23, 2023 · df20630 · df20630
1 parent 112ce2f
commit df20630
Show file tree

Hide file tree

Showing 20 changed files with 33 additions and 10 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -63,7 +63,6 @@ jobs:
         #url: https://github.com/actions/setup-dotnet
         with:
           dotnet-version: |
-            3.1.x
             6.0.x
 
       - name: Stamp Version

diff --git a/.root.targets b/.root.targets
@@ -7,7 +7,6 @@
   -->
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <EnableDefaultItems>false</EnableDefaultItems>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>

diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,7 @@ Most lines should begin with one of these words:
 *Add*, *Fix*, *Update*, *Change*, *Deprecate*, *Remove*.
 
 ## [Unreleased](https://github.com/sharpjs/PSql/compare/release/2.1.0..HEAD)
+- Change target to PowerShell 7.2 / .NET 6.
 - Change how the module loads dependencies.  Now, the module loads dependencies
   into a private context using [the recommended technique](https://learn.microsoft.com/en-us/powershell/scripting/dev-cross-plat/resolving-dependency-conflicts)
   to prevent errors if other moduels load conflicting dependencies.

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -30,6 +30,7 @@
 
   <!-- Build properties -->
   <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>12</LangVersion>
     <ImplicitUsings>true</ImplicitUsings>
     <Nullable>enable</Nullable>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -24,11 +24,11 @@
 
   <ItemGroup>
     <PackageVersion Include="Microsoft.Data.SqlClient"                   Version="5.1.2" />
-    <PackageVersion Include="Microsoft.PowerShell.SDK"                   Version="7.0.13" />
+    <PackageVersion Include="Microsoft.PowerShell.SDK"                   Version="7.2.17" />
     <PackageVersion Include="Prequel"                                    Version="1.0.3" />
     <PackageVersion Include="Subatomix.Build.Packaging.PowerShellModule" Version="1.1.1" />
     <PackageVersion Include="Subatomix.Testing"                          Version="2.5.0" />
-    <PackageVersion Include="System.Management.Automation"               Version="[7.0.0, 8.0.0)" />
+    <PackageVersion Include="System.Management.Automation"               Version="[7.2.0, 8.0.0)" />
     <PackageVersion Include="Unindent"                                   Version="1.1.1" />
   </ItemGroup>
 

diff --git a/PSql.Core/PSql.Core.csproj b/PSql.Core/PSql.Core.csproj
@@ -7,7 +7,6 @@
 
   <PropertyGroup>
     <Description>PSql Core Types Library</Description>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RootNamespace>PSql</RootNamespace>
     <IsPackable>false</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/PSql.Tests/PSql.Tests.csproj b/PSql.Tests/PSql.Tests.csproj
@@ -7,7 +7,6 @@
 
   <PropertyGroup>
     <Description>Tests for PSql</Description>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RootNamespace>PSql</RootNamespace>
   </PropertyGroup>
 

diff --git a/PSql.private/PSql.private.csproj b/PSql.private/PSql.private.csproj
@@ -7,7 +7,6 @@
 
   <PropertyGroup>
     <Description>PSql Private Dependencies Library</Description>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;unix</RuntimeIdentifiers>
     <RootNamespace>PSql</RootNamespace>
     <IsPackable>false</IsPackable>

diff --git a/PSql/PSql.csproj b/PSql/PSql.csproj
@@ -7,7 +7,6 @@
 
   <PropertyGroup>
     <Description>Cmdlets to connect and invoke commands against SQL Server, Azure SQL Database, or compatible products.</Description>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git a/PSql/PSql.psd1.t b/PSql/PSql.psd1.t
@@ -14,7 +14,7 @@
 
     # Requirements
     CompatiblePSEditions = 'Core'
-    PowerShellVersion    = '7.0'
+    PowerShellVersion    = '7.2'
     #RequiredModules     = @(...)
     RequiredAssemblies   = @("PSql.Core")
 

diff --git a/PSql/_Commands/ConnectSqlCommand.cs b/PSql/_Commands/ConnectSqlCommand.cs
@@ -1,6 +1,9 @@
 // Copyright 2023 Subatomix Research Inc.
 // SPDX-License-Identifier: ISC
 
+// Don't require doc comments.  Commands are documented via a help file.
+#pragma warning disable CS1591
+
 namespace PSql;
 
 [Cmdlet(VerbsCommunications.Connect, "Sql")]

diff --git a/PSql/_Commands/ConnectedCmdlet.cs b/PSql/_Commands/ConnectedCmdlet.cs
@@ -1,6 +1,9 @@
 // Copyright 2023 Subatomix Research Inc.
 // SPDX-License-Identifier: ISC
 
+// Don't require doc comments.  Commands are documented via a help file.
+#pragma warning disable CS1591
+
 namespace PSql;
 
 /// <summary>

diff --git a/PSql/_Commands/DisconnectSqlCommand.cs b/PSql/_Commands/DisconnectSqlCommand.cs
@@ -1,6 +1,9 @@
 // Copyright 2023 Subatomix Research Inc.
 // SPDX-License-Identifier: ISC
 
+// Don't require doc comments.  Commands are documented via a help file.
+#pragma warning disable CS1591
+
 namespace PSql;
 
 [Cmdlet(VerbsCommunications.Disconnect, "Sql")]

diff --git a/PSql/_Commands/ExpandSqlCmdDirectivesCommand.cs b/PSql/_Commands/ExpandSqlCmdDirectivesCommand.cs
@@ -1,6 +1,9 @@
 // Copyright 2023 Subatomix Research Inc.
 // SPDX-License-Identifier: ISC
 
+// Don't require doc comments.  Commands are documented via a help file.
+#pragma warning disable CS1591
+
 using System.Collections;
 
 namespace PSql;

diff --git a/PSql/_Commands/InvokeSqlCommand.cs b/PSql/_Commands/InvokeSqlCommand.cs
@@ -1,6 +1,9 @@
 // Copyright 2023 Subatomix Research Inc.
 // SPDX-License-Identifier: ISC
 
+// Don't require doc comments.  Commands are documented via a help file.
+#pragma warning disable CS1591
+
 using System.Collections;
 
 namespace PSql;

diff --git a/PSql/_Commands/NewSqlContextCommand.cs b/PSql/_Commands/NewSqlContextCommand.cs
@@ -1,6 +1,9 @@
 // Copyright 2023 Subatomix Research Inc.
 // SPDX-License-Identifier: ISC
 
+// Don't require doc comments.  Commands are documented via a help file.
+#pragma warning disable CS1591
+
 namespace PSql;
 
 using static ApplicationIntent;

diff --git a/PSql/_Data/SqlContext.cs b/PSql/_Data/SqlContext.cs
@@ -1,6 +1,9 @@
 // Copyright 2023 Subatomix Research Inc.
 // SPDX-License-Identifier: ISC
 
+// TODO: Document
+#pragma warning disable CS1591
+
 using System.Globalization;
 using System.Net;
 using System.Runtime.CompilerServices;

diff --git a/PSql/_Metadata/ValidateNullOrPositiveUInt16Attribute.cs b/PSql/_Metadata/ValidateNullOrPositiveUInt16Attribute.cs
@@ -1,6 +1,9 @@
 // Copyright 2023 Subatomix Research Inc.
 // SPDX-License-Identifier: ISC
 
+// TODO: Document
+#pragma warning disable CS1591
+
 namespace PSql;
 
 public class ValidateNullOrPositiveUInt16Attribute : ValidateArgumentsAttribute

diff --git a/PSql/_Metadata/ValidateNullOrTimeoutAttribute.cs b/PSql/_Metadata/ValidateNullOrTimeoutAttribute.cs
@@ -1,6 +1,9 @@
 // Copyright 2023 Subatomix Research Inc.
 // SPDX-License-Identifier: ISC
 
+// TODO: Document
+#pragma warning disable CS1591
+
 namespace PSql;
 
 public class ValidateNullOrTimeoutAttribute : ValidateArgumentsAttribute

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ of production use too.
 
 ## Installation
 
-PSql requires PowerShell 7.0 or later and should work on any platform where
+PSql requires PowerShell 7.2 or later and should work on any platform where
 PowerShell runs.
 
 To install PSql from [PowerShell Gallery](https://www.powershellgallery.com/packages/PSql),
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,6 @@ jobs: @@
             #url: https://github.com/actions/setup-dotnet
             with:
               dotnet-version: |
-.1.x
 .0.x
           - name: Stamp Version
@@ Expand Down @@