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

Fix build #3539

Merged
merged 7 commits into from
Apr 1, 2022
Merged

Fix build #3539

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
7e0609f
Set dotnet root
nohwnd Mar 31, 2022
fcb36e5
Add to Path
nohwnd Apr 1, 2022
c83dc98
Add pack step, and revert package cleanup
nohwnd Apr 1, 2022
0320c94
Split publish and pacck for vsix to get all dlls in place
nohwnd Apr 1, 2022
670781e
Remove unused script
nohwnd Apr 1, 2022
7c29e29
Make manifest a pack Step
nohwnd Apr 1, 2022
768b716
Make manifest it's own step
nohwnd Apr 1, 2022
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
24 changes: 18 additions & 6 deletions scripts/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Param(
[Switch] $Force,

[Alias("s")]
[String[]] $Steps = @("InstallDotnet", "Restore", "UpdateLocalization", "Build", "Publish", "PrepareAcceptanceTests")
[String[]] $Steps = @("InstallDotnet", "Restore", "UpdateLocalization", "Build", "Publish", "Pack", "Manifest", "PrepareAcceptanceTests")
)

$ErrorActionPreference = 'Stop'
Expand Down Expand Up @@ -759,12 +759,10 @@ function Move-Loc-Files($sourceDir, $destinationDir, $dllName) {
}
}

function Create-VsixPackage {
Write-Log "Create-VsixPackage: Started."
function Publish-VsixPackage {
Write-Log "Publish-VsixPackage: Started."
$timer = Start-Timer

$vsixSourceDir = Join-Path $env:TP_ROOT_DIR "src\package\VSIXProject"
$vsixProjectDir = Join-Path $env:TP_OUT_DIR "$TPB_Configuration\VSIX"
$packageDir = Get-FullCLRPackageDirectory
$extensionsPackageDir = Join-Path $packageDir "Extensions"
$testImpactComComponentsDir = Join-Path $extensionsPackageDir "TestImpact"
Expand Down Expand Up @@ -847,10 +845,20 @@ function Create-VsixPackage {
Copy-Item -Recurse $comComponentsDirectoryTIA\* $legacyTestImpactComComponentsDir -Force

Copy-Item (Join-Path $env:TP_PACKAGE_PROJ_DIR "ThirdPartyNotices.txt") $packageDir -Force

Write-Log "Publish-VsixPackage: Complete. {$(Get-ElapsedTime($timer))}"
}

function Create-VsixPackage {
Write-Log "Create-VsixPackage: Started."
$timer = Start-Timer

Write-Verbose "Locating MSBuild install path..."
$msbuildPath = Locate-MSBuildPath

$vsixSourceDir = Join-Path $env:TP_ROOT_DIR "src\package\VSIXProject"
$vsixProjectDir = Join-Path $env:TP_OUT_DIR "$TPB_Configuration\VSIX"

# Create vsix only when msbuild is installed.
if (![string]::IsNullOrEmpty($msbuildPath)) {
# Copy the vsix project to artifacts directory to modify manifest
Expand Down Expand Up @@ -1276,11 +1284,15 @@ if ($Force -or $Steps -contains "Build") {

if ($Force -or $Steps -contains "Publish") {
Publish-Package
Publish-VsixPackage
}

if ($Force -or $Steps -contains "Pack") {
Create-VsixPackage
Create-NugetPackages
}

if ($Force -or $Steps -contains "Publish" -or $Steps -contains "Manifest") {
if ($Force -or $Steps -contains "Manifest") {
Generate-Manifest -PackageFolder $TPB_PackageOutDir
if (Test-Path $TPB_SourceBuildPackageOutDir)
{
Expand Down
2 changes: 1 addition & 1 deletion scripts/verify-nupkgs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function Verify-Nuget-Packages($packageDirectory, $version)

# Don't remove the directories after you unpacked them
# they are useful for reviewing what is in the package.
# Remove-Item -Force -Recurse $unzipNugetPackageDir | Out-Null
Remove-Item -Force -Recurse $unzipNugetPackageDir | Out-Null
}

Write-Log "Completed Verify-Nuget-Packages."
Expand Down