Merge branch 'main' into dependabot/npm_and_yarn/dotenv-16.4.5

microsoft · Apr 29, 2024 · 866853a · 866853a
2 parents 6ea9a68 + 167aff3
commit 866853a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/create-environment/action.yml b/create-environment/action.yml
@@ -64,6 +64,10 @@ inputs:
     description: 'The ID of the Microsoft Teams team to create the Power Apps environment in.'
     required: false
 
+  security-group-id:
+    description: 'Microsoft Entra ID Security Group ID to use when creating the environment.'
+    required: false
+
 outputs:
   environment-url:
     description: 'URL of the freshly created environment'

diff --git a/gulpfile.mjs b/gulpfile.mjs
@@ -228,12 +228,12 @@ async function nugetInstallPortalPackages() {
 }
 
 async function nugetInstallLinux() {
-    await nugetInstall('CAP_ISVExp_Tools_Stable', PacInfo.LegacyLinuxPackage, PacInfo.PacPackageVersion, path.resolve(outdir, 'pac_linux'));
+    await nugetInstall('nuget.org', PacInfo.LegacyLinuxPackage, PacInfo.PacPackageVersion, path.resolve(outdir, 'pac_linux'));
     await setExecuteFlag(path.resolve(outdir, 'pac_linux', 'tools', 'pac'));
 }
 
 async function nugetInstallWindows() {
-    await nugetInstall('CAP_ISVExp_Tools_Stable', PacInfo.PacPackageName, PacInfo.PacPackageVersion, path.resolve(outdir, 'pac'));
+    await nugetInstall('nuget.org', PacInfo.PacPackageName, PacInfo.PacPackageVersion, path.resolve(outdir, 'pac'));
 }
 
 async function restore() {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
     "@actions/core": "^1.10.1",
     "@actions/exec": "^1.1.1",
     "@actions/io": "^1.1.3",
-    "@microsoft/powerplatform-cli-wrapper": "^0.1.118",
+    "@microsoft/powerplatform-cli-wrapper": "^0.1.120",
     "date-fns": "^2.30.0",
     "fs-extra": "^11.1.1",
     "js-yaml": "^4.1",

diff --git a/src/actions/create-environment/index.ts b/src/actions/create-environment/index.ts
@@ -32,6 +32,7 @@ export async function main(): Promise<void> {
         templates: parameterMap['templates'],
         domainName: parameterMap['domain'],
         teamId: parameterMap['team-id'],
+        securityGroupId: parameterMap['security-group-id'],
         logToConsole: false,
     }, runnerParameters, new ActionsHost());
 

diff --git a/src/test/createEnvironment.test.ts b/src/test/createEnvironment.test.ts
@@ -48,6 +48,7 @@ describe("create-environment tests", () => {
             templates: { name: 'templates', required: false, defaultValue: undefined },
             domainName: { name: 'domain', required: false, defaultValue: undefined },
             teamId: {name:'team-id', required: false, defaultValue: undefined},
+            securityGroupId: {name:'security-group-id', required: false, defaultValue: undefined},
             logToConsole: false,
         }, runnerParameters, new ActionsHost());
     });