diff --git a/.cspell.jsonc b/.cspell.jsonc index b491f9e..ce17b21 100644 --- a/.cspell.jsonc +++ b/.cspell.jsonc @@ -1,9 +1,11 @@ { "words": [ "cimv", + "netstandard", "Nieto", "norestart", "runspace", + "Toolset", "wusa" ] } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e384ebb..9d12d0a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v4 - name: .NET Build - run: dotnet build --configuration Release + run: dotnet publish --configuration Release - name: Create module run: | diff --git a/BuildSettings.psd1 b/BuildSettings.psd1 index df8c191..aa61982 100644 --- a/BuildSettings.psd1 +++ b/BuildSettings.psd1 @@ -1,8 +1,8 @@ @{ Path = @( - './src/code/bin/Release/net461/MsuProvider.dll', - './src/code/bin/Release/net461/Microsoft.Deployment.Compression.dll', - './src/code/bin/Release/net461/Microsoft.Deployment.Compression.Cab.dll', + './src/code/bin/Release/netstandard2.0/publish/MsuProvider.dll', + './src/code/bin/Release/netstandard2.0/publish/WixToolset.Dtf.Compression.dll', + './src/code/bin/Release/netstandard2.0/publish/WixToolset.Dtf.Compression.Cab.dll', './src/AnyPackage.Msu.psd1' ) Destination = './module' diff --git a/src/code/MsuProvider.cs b/src/code/MsuProvider.cs index 1599e3e..4c98dea 100644 --- a/src/code/MsuProvider.cs +++ b/src/code/MsuProvider.cs @@ -1,17 +1,14 @@ -// Copyright (c) Thomas Nieto - All Rights Reserved +// Copyright (c) Thomas Nieto - All Rights Reserved // You may use, distribute and modify this code under the // terms of the MIT license. -using Microsoft.Deployment.Compression.Cab; - -using System.Collections.Generic; using System.Diagnostics; -using System.IO; -using System.Linq; using System.Management; using System.Management.Automation; using System.Text.RegularExpressions; +using WixToolset.Dtf.Compression.Cab; + namespace AnyPackage.Provider.Msu; [PackageProvider("Msu", PackageByName = false, FileExtensions = [".msu"])] diff --git a/src/code/MsuProvider.csproj b/src/code/MsuProvider.csproj index 58ad6f4..69ca43a 100644 --- a/src/code/MsuProvider.csproj +++ b/src/code/MsuProvider.csproj @@ -1,17 +1,18 @@ - net461 + netstandard2.0 latest enable + enable © 2024 Thomas Nieto. All rights reserved. - - - - + + + +