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

Task/RDMP-129 Remove wix toolset #1789

Merged
merged 7 commits into from
Mar 27, 2024
Merged

Task/RDMP-129 Remove wix toolset #1789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bb800ee
start of msi upgrade
JFriel Mar 18, 2024
a58d09b
Merge branch 'develop' of https://github.com/HicServices/RDMP into ta…
JFriel Mar 26, 2024
d960acd
remove wix
JFriel Mar 26, 2024
c269b0e
update build steps
JFriel Mar 26, 2024
2e8f572
tidy up
JFriel Mar 26, 2024
670f291
restore file
JFriel Mar 26, 2024
879a316
update sln
JFriel Mar 26, 2024
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
1 change: 0 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ jobs:
AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v PublishWindows/rdmp.exe
AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v PublishWinForms/ResearchDataManagementPlatform.exe
mkdir -p dist
cmd /c wix\\build.cmd ${{ steps.version.outputs.rdmpversion }}
(cd PublishWindows ; echo 7z a -mx=9 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-win-x64.zip . | cmd)
(cd PublishLinux ; echo 7z a -mx=0 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux-x64.zip . | cmd)
mv PublishLinux rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux
Expand Down
4 changes: 2 additions & 2 deletions AnalysisReport.sarif
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"$schema": "https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0-rtm.5.json",
"version": "2.1.0",
"runs": [
Expand Down Expand Up @@ -497,4 +497,4 @@
"columnKind": "utf16CodeUnits"
}
]
}
}
2 changes: 1 addition & 1 deletion HIC.DataManagementPlatform.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,4 +315,4 @@ Global
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal
EndGlobal
9 changes: 0 additions & 9 deletions wix/build.cmd
View file
Open in desktop

This file was deleted.

81 changes: 0 additions & 81 deletions wix/rdmp.wxs
View file
Open in desktop

This file was deleted.

Loading