Skip to content

Commit

Permalink
bundle is no longer needed
Browse files Browse the repository at this point in the history
  • Loading branch information
dinhngtu committed Aug 10, 2022
1 parent 08a2a69 commit 7bfcb6f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 113 deletions.
20 changes: 1 addition & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,7 @@ jobs:
- name: Build x64
run: msbuild -m -target:VietTypeSetup:Rebuild -p:Configuration=Release -p:Platform=x64 .

- name: Fetch VCRedist
shell: powershell
run: |
$ErrorActionPreference = "Stop"
Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vc_redist.x86.exe" -OutFile VietTypeBundle/vc_redist.x86.exe
if ((Get-AuthenticodeSignature VietTypeBundle/vc_redist.x86.exe).Status -ne "Valid") {
throw "Invalid VCRedist signature"
}
Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vc_redist.x64.exe" -OutFile VietTypeBundle/vc_redist.x64.exe
if ((Get-AuthenticodeSignature VietTypeBundle/vc_redist.x64.exe).Status -ne "Valid") {
throw "Invalid VCRedist signature"
}
- name: Build setup bundle
run: msbuild -m -target:VietTypeBundle:Rebuild -p:Configuration=Release -p:Platform=x64 .

- name: Upload a Build Artifact
uses: actions/upload-artifact@v3
with:
path: |
VietTypeSetup/bin/Release/*.msi
VietTypeBundle/bin/Release/*.exe
path: VietTypeSetup/bin/Release/*.msi
11 changes: 0 additions & 11 deletions VietType.sln
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Telex", "Telex\Telex.vcxproj", "{4C4CE742-99A9-40E7-B03A-68A3CBE0AE77}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "VietTypeBundle", "VietTypeBundle\VietTypeBundle.wixproj", "{86E52E95-ECAA-4785-831F-BA7E605E109D}"
ProjectSection(ProjectDependencies) = postProject
{8882E9D2-7670-4906-98F5-60A147BF5ECA} = {8882E9D2-7670-4906-98F5-60A147BF5ECA}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -77,12 +72,6 @@ Global
{4C4CE742-99A9-40E7-B03A-68A3CBE0AE77}.Release|Win32.Build.0 = Release|Win32
{4C4CE742-99A9-40E7-B03A-68A3CBE0AE77}.Release|x64.ActiveCfg = Release|x64
{4C4CE742-99A9-40E7-B03A-68A3CBE0AE77}.Release|x64.Build.0 = Release|x64
{86E52E95-ECAA-4785-831F-BA7E605E109D}.Debug|Win32.ActiveCfg = Debug|x86
{86E52E95-ECAA-4785-831F-BA7E605E109D}.Debug|Win32.Build.0 = Debug|x86
{86E52E95-ECAA-4785-831F-BA7E605E109D}.Debug|x64.ActiveCfg = Debug|x86
{86E52E95-ECAA-4785-831F-BA7E605E109D}.Release|Win32.ActiveCfg = Release|x86
{86E52E95-ECAA-4785-831F-BA7E605E109D}.Release|x64.ActiveCfg = Release|x86
{86E52E95-ECAA-4785-831F-BA7E605E109D}.Release|x64.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
40 changes: 0 additions & 40 deletions VietTypeBundle/Bundle.wxs

This file was deleted.

43 changes: 0 additions & 43 deletions VietTypeBundle/VietTypeBundle.wixproj

This file was deleted.

0 comments on commit 7bfcb6f

Please sign in to comment.