Skip to content

Commit 49702be

Browse files
abbgradeabbgrade
committed
Merge branch 'release/2.2.0'
2 parents 25b7abc + dc488c8 commit 49702be

File tree

11 files changed

+134
-108
lines changed

11 files changed

+134
-108
lines changed

‎.github/workflows/build-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ on:
66

77
jobs:
88
build-validation:
9-
uses: abbgrade/PsBuildTasks/.github/workflows/build-validation-matrix.yml@1.8.2
9+
uses: abbgrade/PsBuildTasks/.github/workflows/build-validation-matrix.yml@1.11.1

‎.github/workflows/pre-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
on:
22
push:
3-
branches: [ release/* ]
3+
branches: [ release/*, 'hotfix/*' ]
44
workflow_dispatch:
55

66
jobs:
77
pre-release:
8-
uses: abbgrade/PsBuildTasks/.github/workflows/pre-release-windows.yml@1.8.2
8+
uses: abbgrade/PsBuildTasks/.github/workflows/pre-release-windows.yml@1.11.1
99
with:
1010
module-name: PsSqlClient
1111
secrets:

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
release:
8-
uses: abbgrade/PsBuildTasks/.github/workflows/release-windows.yml@1.8.2
8+
uses: abbgrade/PsBuildTasks/.github/workflows/release-windows.yml@1.11.1
99
with:
1010
module-name: PsSqlClient
1111
secrets:

‎.vscode/launch.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": []
4+
}

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [2.2.0] - 2023-11-27
11+
12+
### Changed
13+
14+
- Updated Microsoft.Data.SqlClient to 5.1.1.
15+
- Updated System.Management.Automation to 7.2.16 and PowerShell 7.2.16.
16+
17+
## [2.1.1] - 2023-08-16
18+
19+
### Fixed
20+
21+
- PipelineStoppedException does not longer write en ErrorRecord but throws and exception.
22+
1023
## [2.1.0] - 2023-08-02
1124

1225
### Added

‎docs/Connect-TSqlInstance.md‎

Lines changed: 98 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -99,141 +99,115 @@ Accept pipeline input: False
9999
Accept wildcard characters: False
100100
```
101101
102-
### -ConnectTimeout
103-
{{ Fill ConnectTimeout Description }}
102+
### -AcquireToken
103+
{{ Fill AcquireToken Description }}
104104
105105
```yaml
106-
Type: Int32
107-
Parameter Sets: Properties_Basic, Properties_Basic_withToken, Properties_Basic_acquireToken, Properties_Credential, Properties_CredentialObject
106+
Type: SwitchParameter
107+
Parameter Sets: ConnectionString_acquireToken, Properties_Basic_acquireToken
108108
Aliases:
109109

110-
Required: False
110+
Required: True
111111
Position: Named
112112
Default value: None
113-
Accept pipeline input: True (ByPropertyName)
113+
Accept pipeline input: False
114114
Accept wildcard characters: False
115115
```
116116
117-
### -ConnectionString
118-
{{ Fill ConnectionString Description }}
119-
120-
```yaml
121-
Type: String
122-
Parameter Sets: ConnectionString
123-
Aliases:
124-
125-
Required: True
126-
Position: 0
127-
Default value: None
128-
Accept pipeline input: True (ByPropertyName, ByValue)
129-
Accept wildcard characters: False
130-
```
117+
### -Authentication
118+
{{ Fill Authentication Description }}
131119
132120
```yaml
133-
Type: String
134-
Parameter Sets: ConnectionString_withToken, ConnectionString_acquireToken
121+
Type: SqlAuthenticationMethod
122+
Parameter Sets: (All)
135123
Aliases:
124+
Accepted values: NotSpecified, SqlPassword, ActiveDirectoryPassword, ActiveDirectoryIntegrated, ActiveDirectoryInteractive, ActiveDirectoryServicePrincipal, ActiveDirectoryDeviceCodeFlow, ActiveDirectoryManagedIdentity, ActiveDirectoryMSI, ActiveDirectoryDefault
136125

137-
Required: True
138-
Position: 0
126+
Required: False
127+
Position: Named
139128
Default value: None
140-
Accept pipeline input: True (ByPropertyName, ByValue)
129+
Accept pipeline input: False
141130
Accept wildcard characters: False
142131
```
143132
144-
### -DataSource
145-
{{ Fill DataSource Description }}
133+
### -ConnectRetryCount
134+
{{ Fill ConnectRetryCount Description }}
146135
147136
```yaml
148-
Type: String
137+
Type: Int32
149138
Parameter Sets: Properties_Basic, Properties_Basic_withToken, Properties_Basic_acquireToken, Properties_Credential, Properties_CredentialObject
150-
Aliases: Server, ServerName, ServerInstance
139+
Aliases: RetryCount
151140

152-
Required: True
153-
Position: 0
141+
Required: False
142+
Position: Named
154143
Default value: None
155144
Accept pipeline input: True (ByPropertyName)
156145
Accept wildcard characters: False
157146
```
158147
159-
### -InitialCatalog
160-
{{ Fill InitialCatalog Description }}
148+
### -ConnectRetryInterval
149+
{{ Fill ConnectRetryInterval Description }}
161150
162151
```yaml
163-
Type: String
164-
Parameter Sets: Properties_Basic, Properties_Credential, Properties_CredentialObject
165-
Aliases: Database, DatabaseName
152+
Type: Int32
153+
Parameter Sets: Properties_Basic, Properties_Basic_withToken, Properties_Basic_acquireToken, Properties_Credential, Properties_CredentialObject
154+
Aliases: RetryInterval
166155

167156
Required: False
168-
Position: 1
157+
Position: Named
169158
Default value: None
170159
Accept pipeline input: True (ByPropertyName)
171160
Accept wildcard characters: False
172161
```
173162
163+
### -ConnectTimeout
164+
{{ Fill ConnectTimeout Description }}
165+
174166
```yaml
175-
Type: String
176-
Parameter Sets: Properties_Basic_withToken, Properties_Basic_acquireToken
177-
Aliases: Database, DatabaseName
167+
Type: Int32
168+
Parameter Sets: Properties_Basic, Properties_Basic_withToken, Properties_Basic_acquireToken, Properties_Credential, Properties_CredentialObject
169+
Aliases:
178170

179-
Required: True
180-
Position: 1
171+
Required: False
172+
Position: Named
181173
Default value: None
182174
Accept pipeline input: True (ByPropertyName)
183175
Accept wildcard characters: False
184176
```
185177
186-
### -Password
187-
{{ Fill Password Description }}
178+
### -ConnectionString
179+
{{ Fill ConnectionString Description }}
188180
189181
```yaml
190-
Type: SecureString
191-
Parameter Sets: Properties_Credential
182+
Type: String
183+
Parameter Sets: ConnectionString
192184
Aliases:
193185

194186
Required: True
195-
Position: 1
187+
Position: 0
196188
Default value: None
197189
Accept pipeline input: True (ByPropertyName, ByValue)
198190
Accept wildcard characters: False
199191
```
200192
201-
### -Port
202-
{{ Fill Port Description }}
203-
204-
```yaml
205-
Type: Int32
206-
Parameter Sets: Properties_Basic, Properties_Basic_withToken, Properties_Basic_acquireToken, Properties_Credential, Properties_CredentialObject
207-
Aliases:
208-
209-
Required: False
210-
Position: Named
211-
Default value: None
212-
Accept pipeline input: True (ByPropertyName)
213-
Accept wildcard characters: False
214-
```
215-
216-
### -UserId
217-
{{ Fill UserId Description }}
218-
219193
```yaml
220194
Type: String
221-
Parameter Sets: Properties_Credential
195+
Parameter Sets: ConnectionString_withToken, ConnectionString_acquireToken
222196
Aliases:
223197

224198
Required: True
225-
Position: 1
199+
Position: 0
226200
Default value: None
227201
Accept pipeline input: True (ByPropertyName, ByValue)
228202
Accept wildcard characters: False
229203
```
230204
231-
### -Authentication
232-
{{ Fill Authentication Description }}
205+
### -Credential
206+
{{ Fill Credential Description }}
233207
234208
```yaml
235-
Type: SqlAuthenticationMethod
236-
Parameter Sets: (All)
209+
Type: PSCredential
210+
Parameter Sets: Properties_CredentialObject
237211
Aliases:
238212

239213
Required: False
@@ -243,48 +217,45 @@ Accept pipeline input: False
243217
Accept wildcard characters: False
244218
```
245219
246-
### -ConnectRetryCount
247-
{{ Fill ConnectRetryCount Description }}
220+
### -DataSource
221+
{{ Fill DataSource Description }}
248222
249223
```yaml
250-
Type: Int32
224+
Type: String
251225
Parameter Sets: Properties_Basic, Properties_Basic_withToken, Properties_Basic_acquireToken, Properties_Credential, Properties_CredentialObject
252-
Aliases: RetryCount
226+
Aliases: Server, ServerName, ServerInstance
253227

254-
Required: False
255-
Position: Named
228+
Required: True
229+
Position: 0
256230
Default value: None
257231
Accept pipeline input: True (ByPropertyName)
258232
Accept wildcard characters: False
259233
```
260234
261-
### -ConnectRetryInterval
262-
{{ Fill ConnectRetryInterval Description }}
235+
### -InitialCatalog
236+
{{ Fill InitialCatalog Description }}
263237
264238
```yaml
265-
Type: Int32
266-
Parameter Sets: Properties_Basic, Properties_Basic_withToken, Properties_Basic_acquireToken, Properties_Credential, Properties_CredentialObject
267-
Aliases: RetryInterval
239+
Type: String
240+
Parameter Sets: Properties_Basic, Properties_Credential, Properties_CredentialObject
241+
Aliases: Database, DatabaseName
268242

269243
Required: False
270-
Position: Named
244+
Position: 1
271245
Default value: None
272246
Accept pipeline input: True (ByPropertyName)
273247
Accept wildcard characters: False
274248
```
275249
276-
### -Credential
277-
{{ Fill Credential Description }}
278-
279250
```yaml
280-
Type: PSCredential
281-
Parameter Sets: Properties_CredentialObject
282-
Aliases:
251+
Type: String
252+
Parameter Sets: Properties_Basic_withToken, Properties_Basic_acquireToken
253+
Aliases: Database, DatabaseName
283254

284-
Required: False
285-
Position: Named
255+
Required: True
256+
Position: 1
286257
Default value: None
287-
Accept pipeline input: False
258+
Accept pipeline input: True (ByPropertyName)
288259
Accept wildcard characters: False
289260
```
290261
@@ -303,18 +274,33 @@ Accept pipeline input: False
303274
Accept wildcard characters: False
304275
```
305276
306-
### -AcquireToken
307-
{{ Fill AcquireToken Description }}
277+
### -Password
278+
{{ Fill Password Description }}
308279
309280
```yaml
310-
Type: SwitchParameter
311-
Parameter Sets: ConnectionString_acquireToken, Properties_Basic_acquireToken
281+
Type: SecureString
282+
Parameter Sets: Properties_Credential
312283
Aliases:
313284

314285
Required: True
286+
Position: 1
287+
Default value: None
288+
Accept pipeline input: True (ByPropertyName, ByValue)
289+
Accept wildcard characters: False
290+
```
291+
292+
### -Port
293+
{{ Fill Port Description }}
294+
295+
```yaml
296+
Type: Int32
297+
Parameter Sets: Properties_Basic, Properties_Basic_withToken, Properties_Basic_acquireToken, Properties_Credential, Properties_CredentialObject
298+
Aliases:
299+
300+
Required: False
315301
Position: Named
316302
Default value: None
317-
Accept pipeline input: False
303+
Accept pipeline input: True (ByPropertyName)
318304
Accept wildcard characters: False
319305
```
320306
@@ -348,6 +334,21 @@ Accept pipeline input: True (ByPropertyName)
348334
Accept wildcard characters: False
349335
```
350336
337+
### -UserId
338+
{{ Fill UserId Description }}
339+
340+
```yaml
341+
Type: String
342+
Parameter Sets: Properties_Credential
343+
Aliases:
344+
345+
Required: True
346+
Position: 1
347+
Default value: None
348+
Accept pipeline input: True (ByPropertyName, ByValue)
349+
Accept wildcard characters: False
350+
```
351+
351352
### CommonParameters
352353
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
353354

‎src/PsSqlClient/ConnectInstanceCommand.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,10 @@ protected override void ProcessRecord()
491491
OpenConnection(connection);
492492
SessionConnection = connection;
493493
}
494+
catch (PipelineStoppedException)
495+
{
496+
throw;
497+
}
494498
catch (Exception ex)
495499
{
496500
WriteVerbose($"Exception thrown {ex}.");

‎src/PsSqlClient/PsSqlClient.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" />
11-
<PackageReference Include="System.Management.Automation" Version="7.2.10" />
10+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
11+
<PackageReference Include="System.Management.Automation" Version="7.2.16" />
1212
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
1313
</ItemGroup>
1414

‎src/PsSqlClient/PsSqlClient.psd1‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)