From 99eb530038e6b63afb4710d537a9417393c32467 Mon Sep 17 00:00:00 2001
From: mawosoft <78562192+mawosoft@users.noreply.github.com>
Date: Mon, 20 Jan 2025 18:09:55 +0100
Subject: [PATCH 1/2] Update dependencies and TFMs. Closes #152, closes 135.
---
.github/workflows/ci.yml | 4 +--
Directory.Packages.props | 29 +++++++------------
build/azure-pipelines.yml | 4 +--
global.json | 2 +-
...werShell.WindowsSearchManager.Tests.csproj | 2 +-
5 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f7eeb2a..631d453 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -142,10 +142,10 @@ jobs:
id: test
if: ${{ github.event.inputs.skip-tests != 'true' }}
run: |
- ./build/invokeDotnetTest.ps1 -p ./tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/Mawosoft.PowerShell.WindowsSearchManager.Tests.csproj -c Debug, Release -f net7.0, net6.0, net48 -v detailed -r ./TestResults/WSearchDisabled -ff:$${{ strategy.fail-fast }} -a '--filter', 'WSearch=IsDisabled'
+ ./build/invokeDotnetTest.ps1 -p ./tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/Mawosoft.PowerShell.WindowsSearchManager.Tests.csproj -c Debug, Release -f net9.0, net8.0, net48 -v detailed -r ./TestResults/WSearchDisabled -ff:$${{ strategy.fail-fast }} -a '--filter', 'WSearch=IsDisabled'
Set-Service wsearch -StartupType Automatic
Start-Service wsearch
- ./build/invokeDotnetTest.ps1 -p ./tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/Mawosoft.PowerShell.WindowsSearchManager.Tests.csproj -c Debug, Release -f net7.0, net6.0, net48 -v detailed -r ./TestResults/WSearchNotDisabled -ff:$${{ strategy.fail-fast }} -a '--filter', 'WSearch!=IsDisabled'
+ ./build/invokeDotnetTest.ps1 -p ./tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/Mawosoft.PowerShell.WindowsSearchManager.Tests.csproj -c Debug, Release -f net9.0, net8.0, net48 -v detailed -r ./TestResults/WSearchNotDisabled -ff:$${{ strategy.fail-fast }} -a '--filter', 'WSearch!=IsDisabled'
- name: Upload Test results
if: ${{ always() && steps.test.outcome != 'skipped' }}
uses: actions/upload-artifact@v4
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9eb7146..2d3088b 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -10,39 +10,32 @@
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index 5dce84b..2883c2e 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -48,10 +48,10 @@ steps:
artifact: azp-Binlogs
displayName: Upload Binlogs
- pwsh: |
- ./build/invokeDotnetTest.ps1 -p ./tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/Mawosoft.PowerShell.WindowsSearchManager.Tests.csproj -c Debug -f net7.0, net6.0, net48 -v detailed -r ./TestResults/WSearchDisabled -s ./tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/coverlet.runsettings -a '--filter', 'WSearch=IsDisabled'
+ ./build/invokeDotnetTest.ps1 -p ./tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/Mawosoft.PowerShell.WindowsSearchManager.Tests.csproj -c Debug -f net9.0, net8.0, net48 -v detailed -r ./TestResults/WSearchDisabled -s ./tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/coverlet.runsettings -a '--filter', 'WSearch=IsDisabled'
Set-Service wsearch -StartupType Automatic
Start-Service wsearch
- ./build/invokeDotnetTest.ps1 -p ./tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/Mawosoft.PowerShell.WindowsSearchManager.Tests.csproj -c Debug -f net7.0, net6.0, net48 -v detailed -r ./TestResults/WSearchNotDisabled -s ./tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/coverlet.runsettings -a '--filter', 'WSearch!=IsDisabled'
+ ./build/invokeDotnetTest.ps1 -p ./tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/Mawosoft.PowerShell.WindowsSearchManager.Tests.csproj -c Debug -f net9.0, net8.0, net48 -v detailed -r ./TestResults/WSearchNotDisabled -s ./tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/coverlet.runsettings -a '--filter', 'WSearch!=IsDisabled'
displayName: Test
- task: reportgenerator@5
condition: succeededOrFailed()
diff --git a/global.json b/global.json
index dfd00f9..588f453 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "8.0.400",
+ "version": "9.0.102",
"rollForward": "disable"
},
"msbuild-sdks": {
diff --git a/tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/Mawosoft.PowerShell.WindowsSearchManager.Tests.csproj b/tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/Mawosoft.PowerShell.WindowsSearchManager.Tests.csproj
index 7cb401f..c9ebb8c 100644
--- a/tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/Mawosoft.PowerShell.WindowsSearchManager.Tests.csproj
+++ b/tests/Mawosoft.PowerShell.WindowsSearchManager.Tests/Mawosoft.PowerShell.WindowsSearchManager.Tests.csproj
@@ -1,7 +1,7 @@
- net8.0;net7.0;net6.0;$(NetFxTfm)
+ net9.0;net8.0;$(NetFxTfm)
false
Tests for Mawosoft.PowerShell.WindowsSearchManager