From d5052c0075b5b37629cd31f9097a8655c2c939d4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 17:29:49 +0200
Subject: [PATCH] chore(deps): update dependency windows to v2022 (#82)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency windows to v2022

* fix: signing tool path

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Christian Felipe Álvarez <calvarez@newrelic.com>
---
 .github/workflows/prerelease.yml                              | 4 ++--
 .github/workflows/push_pr.yml                                 | 2 +-
 build/package/windows/nri-386-installer/nri-installer.wixproj | 4 ++--
 .../package/windows/nri-amd64-installer/nri-installer.wixproj | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 7e40d2d..98c9183 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -30,7 +30,7 @@ jobs:
 
   test-windows:
     name: Run unit tests on Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
       GOPATH: ${{ github.workspace }}
     defaults:
@@ -96,7 +96,7 @@ jobs:
 
   package-win:
     name: Create MSI & Upload into GH Release assets
-    runs-on: windows-2019
+    runs-on: windows-2022
     needs: [prerelease]
     env:
       GOPATH: ${{ github.workspace }}
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 9e44756..c563023 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -49,7 +49,7 @@ jobs:
 
   test-windows:
     name: Run unit tests on Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
       GOPATH: ${{ github.workspace }}
     defaults:
diff --git a/build/package/windows/nri-386-installer/nri-installer.wixproj b/build/package/windows/nri-386-installer/nri-installer.wixproj
index 508f15f..c6fbac5 100644
--- a/build/package/windows/nri-386-installer/nri-installer.wixproj
+++ b/build/package/windows/nri-386-installer/nri-installer.wixproj
@@ -8,7 +8,7 @@
         <SchemaVersion>2.0</SchemaVersion>
         <OutputName>nri-$(IntegrationName)-386</OutputName>
         <OutputType>Package</OutputType>
-        <SignToolPath>C:\Program Files (x86)\Windows Kits\10\bin\x64\</SignToolPath>
+        <SignToolPath>C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\</SignToolPath>
         <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
         <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
         <Name>newrelic-nri-$(IntegrationName)-installer</Name>
@@ -49,4 +49,4 @@
         <!-- <Delete Files="$(OutputPath)$(OutputName).msi" /> -->
     </Target>
     <Target Name="AfterBuild" DependsOnTargets="SignInstaller"/>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/package/windows/nri-amd64-installer/nri-installer.wixproj b/build/package/windows/nri-amd64-installer/nri-installer.wixproj
index 852d3ed..5fb118d 100644
--- a/build/package/windows/nri-amd64-installer/nri-installer.wixproj
+++ b/build/package/windows/nri-amd64-installer/nri-installer.wixproj
@@ -8,7 +8,7 @@
         <SchemaVersion>2.0</SchemaVersion>
         <OutputName>nri-$(IntegrationName)-amd64</OutputName>
         <OutputType>Package</OutputType>
-        <SignToolPath>C:\Program Files (x86)\Windows Kits\10\bin\x64\</SignToolPath>
+        <SignToolPath>C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\</SignToolPath>
         <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
         <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
         <Name>newrelic-nri-$(IntegrationName)-installer</Name>
@@ -49,4 +49,4 @@
         <!-- <Delete Files="$(OutputPath)$(OutputName).msi" /> -->
     </Target>
     <Target Name="AfterBuild" DependsOnTargets="SignInstaller"/>
-</Project>
\ No newline at end of file
+</Project>