Merge pull request #19 from freddydk/h4o4ehni.je0

Collect changes from freddydk/*@main
microsoft · May 3, 2022 · 567280d · 567280d
2 parents 6ecefb6 + 55f9260
commit 567280d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Templates/AppSource App/.github/workflows/CICD.yaml b/Templates/AppSource App/.github/workflows/CICD.yaml
@@ -243,9 +243,9 @@ jobs:
             }            
           }
           if (!($environmentName)) {
-            $envName = '${{ steps.envName.outputs.envName }}'
+            $environmentName = '${{ steps.envName.outputs.envName }}'
           }
-          $environmentName = $environmentName + '${{ matrix.environment }}'.SubString($envName.Length)
+          $environmentName = ($environmentName + '${{ matrix.environment }}'.SubString($envName.Length)).ToUpperInvariant()
           Write-Host "::set-output name=authContext::$authContext"
           Write-Host "set-output name=authContext::$authContext"
           Write-Host "::set-output name=environmentName::$environmentName"

diff --git a/Templates/AppSource App/.github/workflows/PublishToEnvironment.yaml b/Templates/AppSource App/.github/workflows/PublishToEnvironment.yaml
@@ -113,9 +113,9 @@ jobs:
             }            
           }
           if (!($environmentName)) {
-            $envName = '${{ steps.envName.outputs.envName }}'
+            $environmentName = '${{ steps.envName.outputs.envName }}'
           }
-          $environmentName = $environmentName + '${{ matrix.environment }}'.SubString($envName.Length)
+          $environmentName = ($environmentName + '${{ matrix.environment }}'.SubString($envName.Length)).ToUpperInvariant()
           Write-Host "::set-output name=authContext::$authContext"
           Write-Host "set-output name=authContext::$authContext"
           Write-Host "::set-output name=environmentName::$environmentName"

diff --git a/Templates/Per Tenant Extension/.github/workflows/CICD.yaml b/Templates/Per Tenant Extension/.github/workflows/CICD.yaml
@@ -243,9 +243,9 @@ jobs:
             }            
           }
           if (!($environmentName)) {
-            $envName = '${{ steps.envName.outputs.envName }}'
+            $environmentName = '${{ steps.envName.outputs.envName }}'
           }
-          $environmentName = $environmentName + '${{ matrix.environment }}'.SubString($envName.Length)
+          $environmentName = ($environmentName + '${{ matrix.environment }}'.SubString($envName.Length)).ToUpperInvariant()
           Write-Host "::set-output name=authContext::$authContext"
           Write-Host "set-output name=authContext::$authContext"
           Write-Host "::set-output name=environmentName::$environmentName"

diff --git a/Templates/Per Tenant Extension/.github/workflows/PublishToEnvironment.yaml b/Templates/Per Tenant Extension/.github/workflows/PublishToEnvironment.yaml
@@ -113,9 +113,9 @@ jobs:
             }            
           }
           if (!($environmentName)) {
-            $envName = '${{ steps.envName.outputs.envName }}'
+            $environmentName = '${{ steps.envName.outputs.envName }}'
           }
-          $environmentName = $environmentName + '${{ matrix.environment }}'.SubString($envName.Length)
+          $environmentName = ($environmentName + '${{ matrix.environment }}'.SubString($envName.Length)).ToUpperInvariant()
           Write-Host "::set-output name=authContext::$authContext"
           Write-Host "set-output name=authContext::$authContext"
           Write-Host "::set-output name=environmentName::$environmentName"