Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): update dependency windows to v2022 #82

Merged
merged 2 commits into from
Oct 24, 2023
Merged

chore(deps): update dependency windows to v2022 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
836a1c6
chore(deps): update dependency windows to v2022
renovate[bot] Oct 16, 2023
7a815a3
fix: signing tool path
sigilioso Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/prerelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions build/package/windows/nri-386-installer/nri-installer.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -49,4 +49,4 @@
<!-- <Delete Files="$(OutputPath)$(OutputName).msi" /> -->
</Target>
<Target Name="AfterBuild" DependsOnTargets="SignInstaller"/>
</Project>
</Project>
4 changes: 2 additions & 2 deletions build/package/windows/nri-amd64-installer/nri-installer.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -49,4 +49,4 @@
<!-- <Delete Files="$(OutputPath)$(OutputName).msi" /> -->
</Target>
<Target Name="AfterBuild" DependsOnTargets="SignInstaller"/>
</Project>
</Project>
Loading