Skip to content

Commit

Permalink
Fix pipeline packaging (#25)
Browse files Browse the repository at this point in the history
  • Loading branch information
shaynie authored Aug 16, 2023
1 parent 20ca20c commit e830154
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions Pipelines/Scripts/pack-upm.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

<#
.SYNOPSIS
Expand Down Expand Up @@ -66,7 +66,7 @@ try {

# loop through package directories, update package version, assembly version, and build version hash for updating dependencies
Get-ChildItem -Path $ProjectRoot/*/package.json | ForEach-Object {
$packageName = Select-String -Pattern "com\.microsoft\.mrtk\.\w+" -Path $_ | Select-Object -First 1
$packageName = Select-String -Pattern "org\.mixedrealitytoolkit\.\w+" -Path $_ | Select-Object -First 1

if (-not $packageName) {
return # this is not an MRTK package, so skip
Expand Down Expand Up @@ -130,7 +130,7 @@ try {

# update dependencies using the versionHash map
Get-ChildItem -Path $ProjectRoot/*/package.json | ForEach-Object {
$currentPackageName = Select-String -Pattern "com\.microsoft\.mrtk\.\w+" -Path $_ | Select-Object -First 1
$currentPackageName = Select-String -Pattern "org\.mixedrealitytoolkit\.\w+" -Path $_ | Select-Object -First 1
if (-not $currentPackageName) {
return # this is not an MRTK package, so skip
}
Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Scripts/repackage-for-release.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ try {
Write-Output "PackageSearchPath: $packageSearchPath"

Get-ChildItem -Path $packageSearchPath | ForEach-Object {
$packageName = Select-String -Pattern "com\.microsoft\.mrtk\.\w+" -Path $_.FullName | Select-Object -First 1
$packageName = Select-String -Pattern "org\.mixedrealitytoolkit\.\w+" -Path $_.FullName | Select-Object -First 1

if (-not $packageName) {
return # this is not an MRTK package, so skip
Expand Down Expand Up @@ -91,7 +91,7 @@ try {
}
# update all dependencies and repackage
Get-ChildItem -Path $packageSearchPath | ForEach-Object {
$currentPackageName = Select-String -Pattern "com\.microsoft\.mrtk\.\w+" -Path $_.FullName | Select-Object -First 1
$currentPackageName = Select-String -Pattern "org\.mixedrealitytoolkit\.\w+" -Path $_.FullName | Select-Object -First 1

if (-not $currentPackageName) {
return # this is not an MRTK package, so skip
Expand Down
2 changes: 1 addition & 1 deletion Tooling/create-assemblyinfo.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$gitRoot = ((git -C $PSScriptRoot rev-parse --show-toplevel) | Out-String).Trim()

Get-ChildItem -Path (Join-Path $gitRoot * package.json) | ForEach-Object {
$packageName = Select-String -Pattern "com\.microsoft\.mrtk\.\w+" -Path $_ | Select-Object -First 1
$packageName = Select-String -Pattern "org\.mixedrealitytoolkit\.\w+" -Path $_ | Select-Object -First 1

if (-not $packageName) {
return # this is not an MRTK package, so skip
Expand Down

0 comments on commit e830154

Please sign in to comment.