From 4d12241e5c2f7456a07387216639fad12508fd71 Mon Sep 17 00:00:00 2001 From: "Joseph L. Casale" <9957114+jcasale@users.noreply.github.com> Date: Fri, 18 Apr 2025 14:29:45 -0600 Subject: [PATCH 1/2] Updates nuget packages. --- src/PSDataProtection/PSDataProtection.csproj | 2 +- src/Tests/Tests.csproj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PSDataProtection/PSDataProtection.csproj b/src/PSDataProtection/PSDataProtection.csproj index e2b1639..28efb55 100644 --- a/src/PSDataProtection/PSDataProtection.csproj +++ b/src/PSDataProtection/PSDataProtection.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj index d3cbffb..2cc1ff9 100644 --- a/src/Tests/Tests.csproj +++ b/src/Tests/Tests.csproj @@ -9,10 +9,10 @@ - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all From 762d621ee1d2dfb7fa0a0114712dd2f349887b7c Mon Sep 17 00:00:00 2001 From: "Joseph L. Casale" <9957114+jcasale@users.noreply.github.com> Date: Fri, 18 Apr 2025 14:31:15 -0600 Subject: [PATCH 2/2] Updates wix toolset to v6.0.0. --- .github/workflows/main.yml | 4 +-- src/Product.wxs | 66 +++++++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 90ccf8b..27c8eca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,9 +23,9 @@ jobs: - name: Setup wix run: | - dotnet.exe tool install --global wix --version 5.0.2 --verbosity diag + dotnet.exe tool install --global wix --version 6.0.0 --verbosity diag - wix.exe extension add WixToolset.UI.wixext/5.0.2 --global + wix.exe extension add WixToolset.UI.wixext/6.0.0 --global wix.exe extension list --global - name: Generate version property diff --git a/src/Product.wxs b/src/Product.wxs index 07c98cd..620e89f 100644 --- a/src/Product.wxs +++ b/src/Product.wxs @@ -17,18 +17,7 @@ - - - - + @@ -45,4 +34,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file