Skip to content

Commit 4a901a6

Browse files
committed
Revert "Added MSI creation assets and CI/CD integration scripts."
This reverts commit d2f17f1.
1 parent 3f27711 commit 4a901a6

File tree

8 files changed

+10
-154
lines changed

8 files changed

+10
-154
lines changed

azure-pipelines.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ variables:
1919
devops_buildNumber: $[counter(format(''), 1500)]
2020
APPVEYOR_REPO_BRANCH: $[coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranchName'])]
2121
APPVEYOR_REPO_COMMIT: $(Build.SourceVersion)
22+
2223
steps:
2324
- pwsh: |
2425
Write-Host "Target branch: '$(APPVEYOR_REPO_BRANCH)'"
@@ -39,7 +40,7 @@ steps:
3940
$accessToken = (az account get-access-token --query "accessToken" | % { $_.Trim('"') })
4041
echo "##vso[task.setvariable variable=azure_management_access_token]$accessToken"
4142
- pwsh: |
42-
.\build.ps1 -MsiGenBranches master,v3.x
43+
.\build.ps1
4344
env:
4445
AzureBlobSigningConnectionString: $(AzureBlobSigningConnectionString)
4546
BuildArtifactsStorage: $(BuildArtifactsStorage)
@@ -55,9 +56,7 @@ steps:
5556
- task: CopyFiles@2
5657
inputs:
5758
SourceFolder: '$(Build.Repository.LocalPath)\artifacts'
58-
Contents: |
59-
Azure.Functions.Cli.*
60-
func-cli*.msi
59+
Contents: 'Azure.Functions.Cli.*'
6160
TargetFolder: '$(Build.ArtifactStagingDirectory)'
6261
CleanTargetFolder: true
6362
- task: PublishBuildArtifacts@1

build.ps1

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
param([String[]] $MsiGenBranches)
2-
3-
$baseDir = Get-Location
41

52
if ($env:APPVEYOR_REPO_BRANCH -eq "disabled") {
63
Set-Location ".\src\Azure.Functions.Cli"
@@ -37,54 +34,3 @@ else {
3734
Invoke-Expression -Command "dotnet run"
3835
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
3936
}
40-
41-
if ($MsiGenBranches.Contains($env:APPVEYOR_REPO_BRANCH)) {
42-
Write-Host "Generating MSI files"
43-
44-
# Add WiX to PATH
45-
if (-not (@($env:Path -split ";") -contains $env:WIX))
46-
{
47-
# Check if the Wix path points to the bin folder
48-
if ((Split-Path $env:WIX -Leaf) -ne "bin")
49-
{
50-
$env:Path += ";$env:WIX\bin"
51-
}
52-
else
53-
{
54-
$env:Path += ";$env:WIX"
55-
}
56-
}
57-
58-
# Get runtime version
59-
$artifactsPath = "$baseDir\artifacts"
60-
$buildDir = "$baseDir\build"
61-
$cli = Get-ChildItem -Path $artifactsPath -Include func.dll -Recurse | Select-Object -First 1
62-
$cliVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($cli).FileVersion
63-
64-
# Generate MSI installers for Windows
65-
@('x64', 'x86') | ForEach-Object {
66-
$platform = $_
67-
$targetDir = "$artifactsPath\win-$platform"
68-
69-
Copy-Item "$buildDir\icon.ico" -Destination $artifactsPath\win-$platform
70-
Copy-Item "$buildDir\license.rtf" -Destination $artifactsPath\win-$platform
71-
Copy-Item "$buildDir\installbanner.bmp" -Destination $artifactsPath\win-$platform
72-
Copy-Item "$buildDir\installdialog.bmp" -Destination $artifactsPath\win-$platform
73-
Set-Location $targetDir
74-
75-
$masterWxsName = "funcinstall"
76-
$fragmentName = "$platform-frag"
77-
$msiName = "func-cli-$cliVersion-$platform"
78-
79-
$masterWxsPath = "$buildDir\$masterWxsName.wxs"
80-
$fragmentPath = "$buildDir\$fragmentName.wxs"
81-
$msiPath = "$artifactsPath\$msiName.msi"
82-
83-
Invoke-Expression "heat dir '.' -cg FuncHost -dr INSTALLDIR -gg -ke -out $fragmentPath -srd -sreg -template fragment -var var.Source"
84-
Invoke-Expression "candle -arch $platform -dPlatform='$platform' -dSource='.' -dProductVersion='$cliVersion' $masterWxsPath $fragmentPath"
85-
Invoke-Expression "light -ext WixUIExtension -out $msiPath -sice:ICE61 $masterWxsName.wixobj $fragmentName.wixobj"
86-
87-
Set-Location $baseDir
88-
Get-ChildItem -Path $targetDir -Recurse | Remove-Item -Force -Recurse -ea SilentlyContinue
89-
}
90-
}

build/BuildSteps.cs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -425,16 +425,13 @@ public static void Zip()
425425
ColoredConsole.WriteLine($"Creating {shaPath}");
426426
File.WriteAllText(shaPath, ComputeSha256(zipPath));
427427

428-
if (!runtime.StartsWith("win")) {
429-
try
430-
{
431-
Directory.Delete(path, recursive: true);
432-
}
433-
catch
434-
{
435-
ColoredConsole.Error.WriteLine($"Error deleting {path}");
436-
}
437-
428+
try
429+
{
430+
Directory.Delete(path, recursive: true);
431+
}
432+
catch
433+
{
434+
ColoredConsole.Error.WriteLine($"Error deleting {path}");
438435
}
439436

440437
ColoredConsole.WriteLine();

build/funcinstall.wxs

Lines changed: 0 additions & 86 deletions
This file was deleted.

build/icon.ico

-32 KB
Binary file not shown.

build/installbanner.bmp

-83.9 KB
Binary file not shown.

build/installdialog.bmp

-451 KB
Binary file not shown.

build/license.rtf

-1.26 KB
Binary file not shown.

0 commit comments

Comments
 (0)