Skip to content

Commit dacd293

Browse files
Added tests to release
1 parent 741c02d commit dacd293

File tree

5 files changed

+30
-13
lines changed

5 files changed

+30
-13
lines changed

.github/workflows/autobuild.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ jobs:
7474
run: |
7575
dotnet test DSInternals.TestsOnly.slnf --configuration Debug --no-build -- --report-trx --results-directory "${{ github.workspace }}/TestResults"
7676
77-
- name: Run Pester Tests - Desktop
77+
- name: Run PowerShell Desktop Tests
7878
working-directory: Scripts
7979
shell: powershell
8080
run: ./Invoke-SmokeTests.ps1 -Configuration 'Debug'
81-
82-
- name: Run Pester Tests - Core
81+
82+
- name: Run PowerShell Core Tests
8383
working-directory: Scripts
8484
shell: pwsh
8585
run: ./Invoke-SmokeTests.ps1 -Configuration 'Debug'

.github/workflows/release.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,20 @@ jobs:
234234
with:
235235
name: NuGet_v${{ steps.get-module-info.outputs.version }}
236236
path: Build/package/release/*nupkg
237-
238-
# TODO: Smoke Tests
237+
238+
- name: Run PowerShell Desktop Tests
239+
working-directory: Scripts
240+
shell: powershell
241+
run: ./Invoke-SmokeTests.ps1 -Configuration 'Release'
242+
243+
- name: Run PowerShell Core Tests
244+
working-directory: Scripts
245+
shell: pwsh
246+
run: ./Invoke-SmokeTests.ps1 -Configuration 'Release'
247+
248+
- name: Test Module Digital Signatures
249+
shell: powershell
250+
run: ./Build/bin/DSInternals.PowerShell/Release/DSInternals/Integrity.Tests.ps1
239251

240252
nuget:
241253
name: 'Publish to NuGet Gallery'

Src/DSInternals.PowerShell/DSInternals.PowerShell.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@
5757
<ProjectReference Include="..\DSInternals.Replication.Model\DSInternals.Replication.Model.csproj" />
5858
<ProjectReference Include="..\DSInternals.Replication\DSInternals.Replication.csproj" />
5959
<ProjectReference Include="..\DSInternals.SAM\DSInternals.SAM.csproj" />
60+
61+
<!-- The following dependency from DSInternals.Common is already bundled with PowerShell Core -->
62+
<PackageReference Include="System.DirectoryServices" Version="9.0.8" Condition="'$(TargetFramework)' == 'net8.0-windows'" IncludeAssets="compile" />
63+
64+
<!-- The following dependencies from DSInternals.Common are already bundled with PowerShell Desktop on Windows Server 2025, but are absent on Windows Server 2008 R2: -->
65+
<!-- System.Memory, System.Numerics.Vectors, System.Buffers, System.Runtime.CompilerServices.Unsafe -->
6066
</ItemGroup>
6167
<Target Name="RemoveRootInteropDll" AfterTargets="Build">
6268
<!-- TODO: Find a more elegant way of not including these 3 files. -->

Src/DSInternals.PowerShell/DSInternals.psd1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,7 @@ FileList = @(
212212
'net8.0-windows\Esent.Isam.dll',
213213
'net8.0-windows\CBOR.dll',
214214
'net8.0-windows\Numbers.dll',
215-
'net8.0-windows\URIUtility.dll',
216-
'net8.0-windows\System.DirectoryServices.dll',
217-
'net8.0-windows\runtimes\win\lib\net8.0\System.DirectoryServices.dll'
215+
'net8.0-windows\URIUtility.dll'
218216
)
219217

220218
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.

Src/DSInternals.PowerShell/packages.lock.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,12 @@
206206
"resolved": "5.1.1",
207207
"contentHash": "e31xJjG+Kjbv6YF3Yq6D4Dl3or8v7LrNF41k3CXrWozW6hR1zcOe5KYuZJaGSiAgLnwP8wcW+I3+IWEzMPZKXQ=="
208208
},
209+
"System.DirectoryServices": {
210+
"type": "Direct",
211+
"requested": "[9.0.8, )",
212+
"resolved": "9.0.8",
213+
"contentHash": "xN2JrOfhcOyswOflVZG27XlFJDPPqU7AQtAAStWcnKoC8W9XCLOLdAYIrrwiZMfeRhavVErI8HkSO/c2TQ+z2g=="
214+
},
209215
"DSInternals.ManagedEsent.Interop": {
210216
"type": "Transitive",
211217
"resolved": "2.0.4.1",
@@ -248,11 +254,6 @@
248254
"resolved": "1.0.0",
249255
"contentHash": "fpRTBsYACMp7NvTECauYRomubWTC3vUNw4hMXdIedP8ctBGK6tea9HOJwE+qVzis6MZYkL3LIs8qeY3rc6Jdlw=="
250256
},
251-
"System.DirectoryServices": {
252-
"type": "Transitive",
253-
"resolved": "9.0.8",
254-
"contentHash": "xN2JrOfhcOyswOflVZG27XlFJDPPqU7AQtAAStWcnKoC8W9XCLOLdAYIrrwiZMfeRhavVErI8HkSO/c2TQ+z2g=="
255-
},
256257
"dsinternals.common": {
257258
"type": "Project",
258259
"dependencies": {

0 commit comments

Comments
 (0)