Fix scripts looking for 'microsoft.'

MixedRealityToolkit · Jul 31, 2023 · 0a9814a · 0a9814a
1 parent eec1fb6
commit 0a9814a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Pipelines/Scripts/pack-upm.ps1 b/Pipelines/Scripts/pack-upm.ps1
@@ -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 "com\.mrtk\.\w+" -Path $_ | Select-Object -First 1
 
         if (-not $packageName) {
             return # this is not an MRTK package, so skip
@@ -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 "com\.mrtk\.\w+" -Path $_ | Select-Object -First 1
         if (-not $currentPackageName) {
             return # this is not an MRTK package, so skip
         }

diff --git a/Pipelines/Scripts/repackage-for-release.ps1 b/Pipelines/Scripts/repackage-for-release.ps1
@@ -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 "com\.mrtk\.\w+" -Path $_.FullName | Select-Object -First 1
 
         if (-not $packageName) {
             return # this is not an MRTK package, so skip
@@ -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 "com\.mrtk\.\w+" -Path $_.FullName | Select-Object -First 1
 
         if (-not $currentPackageName) {
             return # this is not an MRTK package, so skip

diff --git a/Pipelines/Scripts/validatecode.ps1 b/Pipelines/Scripts/validatecode.ps1
@@ -221,8 +221,8 @@ function IsNamespace {
         [string]$Line
     )
     process {
-        if (($Line -match "^namespace\sMicrosoft\.MixedReality\.Toolkit") -or
-            ($Line -match "^namespace\sMicrosoft\.Windows\.MixedReality")) {
+        if (($Line -match "^namespace\sMixedReality\.Toolkit") -or
+            ($Line -match "^namespace\sWindows\.MixedReality")) {
             $true;
         }
         $false;

diff --git a/Tooling/create-assemblyinfo.ps1 b/Tooling/create-assemblyinfo.ps1
@@ -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 "com\.mrtk\.\w+" -Path $_ | Select-Object -First 1
 
     if (-not $packageName) {
         return # this is not an MRTK package, so skip
@@ -21,7 +21,7 @@ Get-ChildItem -Path (Join-Path $gitRoot * package.json) | ForEach-Object {
 
         if (-not (Test-Path -Path $filename)) {
             # Parse the assembly name for embedding into the AssemblyInfo file
-            $assemblyName = Select-String -Pattern "Microsoft\.MixedReality\.Toolkit\.(\w+(?:.\w+)*)" -Path $asmdef.FullName | Select-Object -First 1
+            $assemblyName = Select-String -Pattern "MixedReality\.Toolkit\.(\w+(?:.\w+)*)" -Path $asmdef.FullName | Select-Object -First 1
 
             if (-not $assemblyName) {
                 return # assembly isn't MRTK-branded, so skip