From 2c91b8933439c9a50145ae67635076838bf78e5a Mon Sep 17 00:00:00 2001 From: Kevin Nguyen Date: Thu, 18 May 2023 09:33:25 -0700 Subject: [PATCH 01/11] Add another folder --- DevBoxTestConfig/DevBox/devbox.yaml | 13 +++++++++++++ .../InstallChocolatey/install-chocolatey.ps1 | 1 + DevBoxTestConfig/InstallChocolatey/task.yaml | 2 ++ DevBoxTestConfig/choco/choco.ps1 | 6 ++++++ DevBoxTestConfig/choco/task.yaml | 7 +++++++ 5 files changed, 29 insertions(+) create mode 100644 DevBoxTestConfig/DevBox/devbox.yaml create mode 100644 DevBoxTestConfig/InstallChocolatey/install-chocolatey.ps1 create mode 100644 DevBoxTestConfig/InstallChocolatey/task.yaml create mode 100644 DevBoxTestConfig/choco/choco.ps1 create mode 100644 DevBoxTestConfig/choco/task.yaml diff --git a/DevBoxTestConfig/DevBox/devbox.yaml b/DevBoxTestConfig/DevBox/devbox.yaml new file mode 100644 index 0000000..0b9ebb1 --- /dev/null +++ b/DevBoxTestConfig/DevBox/devbox.yaml @@ -0,0 +1,13 @@ +name: devbox-customization +image: microsoftvisualstudio_visualstudioplustools_vs-2022-ent-general-win11-m365-gen2@1.0.0 +hostInformation: general_a_8c32gb256ssd_v1 +supportsHibernation: false +setupTasks: + - task: chocolatey + inputs: + packages: git.install, nodejs + - task: write-text + inputs: + boolParam: false + stringParam: hello devbox + arrayParam: 1, 2, 3 \ No newline at end of file diff --git a/DevBoxTestConfig/InstallChocolatey/install-chocolatey.ps1 b/DevBoxTestConfig/InstallChocolatey/install-chocolatey.ps1 new file mode 100644 index 0000000..ab74106 --- /dev/null +++ b/DevBoxTestConfig/InstallChocolatey/install-chocolatey.ps1 @@ -0,0 +1 @@ +Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) diff --git a/DevBoxTestConfig/InstallChocolatey/task.yaml b/DevBoxTestConfig/InstallChocolatey/task.yaml new file mode 100644 index 0000000..2dc80d3 --- /dev/null +++ b/DevBoxTestConfig/InstallChocolatey/task.yaml @@ -0,0 +1,2 @@ +name: install-chocolatey +command: "./install-chocolatey.ps1" \ No newline at end of file diff --git a/DevBoxTestConfig/choco/choco.ps1 b/DevBoxTestConfig/choco/choco.ps1 new file mode 100644 index 0000000..b69217d --- /dev/null +++ b/DevBoxTestConfig/choco/choco.ps1 @@ -0,0 +1,6 @@ +param( + [Parameter()] + [string]$Package + ) + +choco install $Package -y \ No newline at end of file diff --git a/DevBoxTestConfig/choco/task.yaml b/DevBoxTestConfig/choco/task.yaml new file mode 100644 index 0000000..70d84d3 --- /dev/null +++ b/DevBoxTestConfig/choco/task.yaml @@ -0,0 +1,7 @@ +name: choco +command: "./choco.ps1 -Package parameters('package')" +inputs: + package: + defaultValue: "" + type: "string" + required: true \ No newline at end of file From 737f4ca1efb6fd87b90f4645712cc4fd6e563b65 Mon Sep 17 00:00:00 2001 From: Kevin Nguyen Date: Thu, 18 May 2023 10:32:50 -0700 Subject: [PATCH 02/11] Update devbox.yaml --- DevBoxTestConfig/DevBox/devbox.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DevBoxTestConfig/DevBox/devbox.yaml b/DevBoxTestConfig/DevBox/devbox.yaml index 0b9ebb1..d032d1c 100644 --- a/DevBoxTestConfig/DevBox/devbox.yaml +++ b/DevBoxTestConfig/DevBox/devbox.yaml @@ -3,11 +3,11 @@ image: microsoftvisualstudio_visualstudioplustools_vs-2022-ent-general-win11-m36 hostInformation: general_a_8c32gb256ssd_v1 supportsHibernation: false setupTasks: - - task: chocolatey + - task: choco inputs: packages: git.install, nodejs - task: write-text inputs: boolParam: false stringParam: hello devbox - arrayParam: 1, 2, 3 \ No newline at end of file + arrayParam: 1, 2, 3 From 6452f437e30a12abb2210ff6bc27ce32cf66b1bf Mon Sep 17 00:00:00 2001 From: Kevin Nguyen Date: Thu, 18 May 2023 10:44:06 -0700 Subject: [PATCH 03/11] Add write text task --- DevBoxTestConfig/WriteText/Write-Text.ps1 | 18 ++++++++++++++++++ DevBoxTestConfig/WriteText/task.yaml | 23 +++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 DevBoxTestConfig/WriteText/Write-Text.ps1 create mode 100644 DevBoxTestConfig/WriteText/task.yaml diff --git a/DevBoxTestConfig/WriteText/Write-Text.ps1 b/DevBoxTestConfig/WriteText/Write-Text.ps1 new file mode 100644 index 0000000..31749d8 --- /dev/null +++ b/DevBoxTestConfig/WriteText/Write-Text.ps1 @@ -0,0 +1,18 @@ +param( + [Parameter()] + [double]$DoubleParam, + + [Parameter()] + [string]$StringParam, + + [Parameter()] + [bool]$BoolParam, + + [Parameter()] + [array]$ArrayParam +) + +Write-Output "DoubleParam value is $DoubleParam" +Write-Output "StringParam value is $StringParam" +Write-Output "BoolParam value is $BoolParam" +Write-Output "ArrayParam value is $ArrayParam" \ No newline at end of file diff --git a/DevBoxTestConfig/WriteText/task.yaml b/DevBoxTestConfig/WriteText/task.yaml new file mode 100644 index 0000000..b16619b --- /dev/null +++ b/DevBoxTestConfig/WriteText/task.yaml @@ -0,0 +1,23 @@ +name: write-text +command: .\Write-Text.ps1 -DoubleParam parameters('doubleParam') -BoolParam parameters('boolParam') -StringParam parameters('stringParam') -ArrayParam parameters('arrayParam') > C:\\result.txt +inputs: + stringParam: + type: string + defaultValue: some value + required: false + boolParam: + type: bool + defaultValue: $True + required: false + intParam: + type: int + defaultValue: 33 + required: false + doubleParam: + type: double + defaultValue: 33.12 + required: false + arrayParam: + type: array + defaultValue: 2, 3, 4 + required: false \ No newline at end of file From dfd312976f75aef2403b86f7859010fcbb7f0a8a Mon Sep 17 00:00:00 2001 From: Kevin Nguyen Date: Tue, 30 May 2023 14:39:18 -0700 Subject: [PATCH 04/11] Update devbox.yaml --- Devbox/devbox.yaml | 11 ++++------- Powershell/task.yaml | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Devbox/devbox.yaml b/Devbox/devbox.yaml index b987f01..07dabba 100644 --- a/Devbox/devbox.yaml +++ b/Devbox/devbox.yaml @@ -1,12 +1,9 @@ -name: sample +name: powershell-customization-test image: microsoftwindowsdesktop_windows-ent-cpc_win11-22h2-ent-cpc-m365@1.0.0 hostInformation: general_a_8c32gb256ssd_v1 supportsHibernation: false setupTasks: - - task: write-to-file - - task: install-by-uri + - task: powershell inputs: - uri: 'https://community.chocolatey.org/install.ps1' - - task: choco - inputs: - package: vscode + command: echo "Testing Powershell Task" >> C:\\intital-setup-test.txt + diff --git a/Powershell/task.yaml b/Powershell/task.yaml index 51d48b3..eb908d9 100644 --- a/Powershell/task.yaml +++ b/Powershell/task.yaml @@ -1,7 +1,7 @@ name: powershell -command: "parameters('powershellInput')" +command: "{{command}}" inputs: - powershellInput: + command: type: string defaultValue: "" required: true \ No newline at end of file From 3e216fd5c270b92538d332e1887a4ab6cd67aa12 Mon Sep 17 00:00:00 2001 From: Kevin Nguyen Date: Wed, 31 May 2023 09:49:12 -0700 Subject: [PATCH 05/11] Update devboxyaml --- Devbox/devbox.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Devbox/devbox.yaml b/Devbox/devbox.yaml index 07dabba..bd6fd22 100644 --- a/Devbox/devbox.yaml +++ b/Devbox/devbox.yaml @@ -3,7 +3,13 @@ image: microsoftwindowsdesktop_windows-ent-cpc_win11-22h2-ent-cpc-m365@1.0.0 hostInformation: general_a_8c32gb256ssd_v1 supportsHibernation: false setupTasks: + - task: write-to-file - task: powershell inputs: - command: echo "Testing Powershell Task" >> C:\\intital-setup-test.txt - + command: echo "Testing Powershell Task" >> C:\\powershell-test.txt + - task: install-by-uri + inputs: + uri: 'https://community.chocolatey.org/install.ps1' + - task: choco + inputs: + package: vscode From 94c9d043412d6e3288c23f5884bcfe62e789977e Mon Sep 17 00:00:00 2001 From: Kevin Nguyen Date: Wed, 31 May 2023 10:34:26 -0700 Subject: [PATCH 06/11] new folder strucvt --- {Devbox => DevBoxConfig1/Devbox}/devbox.yaml | 0 .../InstallByUri}/install-by-uri.ps1 | 0 .../InstallByUri}/task.yaml | 0 .../InstallPackages}/choco.ps1 | 10 +++++----- .../InstallPackages}/task.yaml | 12 ++++++------ {Powershell => DevBoxConfig1/Powershell}/task.yaml | 0 .../TestWriteToFile}/task.yaml | 0 .../TestWriteToFile}/testfolder/task.yaml | 0 .../TestWriteToFile}/testfolder/test.ps1 | 0 .../TestWriteToFile}/write-to-file.ps1 | 0 10 files changed, 11 insertions(+), 11 deletions(-) rename {Devbox => DevBoxConfig1/Devbox}/devbox.yaml (100%) rename {InstallByUri => DevBoxConfig1/InstallByUri}/install-by-uri.ps1 (100%) rename {InstallByUri => DevBoxConfig1/InstallByUri}/task.yaml (100%) rename {InstallPackages => DevBoxConfig1/InstallPackages}/choco.ps1 (93%) rename {InstallPackages => DevBoxConfig1/InstallPackages}/task.yaml (95%) rename {Powershell => DevBoxConfig1/Powershell}/task.yaml (100%) rename {TestWriteToFile => DevBoxConfig1/TestWriteToFile}/task.yaml (100%) rename {TestWriteToFile => DevBoxConfig1/TestWriteToFile}/testfolder/task.yaml (100%) rename {TestWriteToFile => DevBoxConfig1/TestWriteToFile}/testfolder/test.ps1 (100%) rename {TestWriteToFile => DevBoxConfig1/TestWriteToFile}/write-to-file.ps1 (100%) diff --git a/Devbox/devbox.yaml b/DevBoxConfig1/Devbox/devbox.yaml similarity index 100% rename from Devbox/devbox.yaml rename to DevBoxConfig1/Devbox/devbox.yaml diff --git a/InstallByUri/install-by-uri.ps1 b/DevBoxConfig1/InstallByUri/install-by-uri.ps1 similarity index 100% rename from InstallByUri/install-by-uri.ps1 rename to DevBoxConfig1/InstallByUri/install-by-uri.ps1 diff --git a/InstallByUri/task.yaml b/DevBoxConfig1/InstallByUri/task.yaml similarity index 100% rename from InstallByUri/task.yaml rename to DevBoxConfig1/InstallByUri/task.yaml diff --git a/InstallPackages/choco.ps1 b/DevBoxConfig1/InstallPackages/choco.ps1 similarity index 93% rename from InstallPackages/choco.ps1 rename to DevBoxConfig1/InstallPackages/choco.ps1 index bd26ae8..b69217d 100644 --- a/InstallPackages/choco.ps1 +++ b/DevBoxConfig1/InstallPackages/choco.ps1 @@ -1,6 +1,6 @@ -param( - [Parameter()] - [string]$Package - ) - +param( + [Parameter()] + [string]$Package + ) + choco install $Package -y \ No newline at end of file diff --git a/InstallPackages/task.yaml b/DevBoxConfig1/InstallPackages/task.yaml similarity index 95% rename from InstallPackages/task.yaml rename to DevBoxConfig1/InstallPackages/task.yaml index bde05cf..317f167 100644 --- a/InstallPackages/task.yaml +++ b/DevBoxConfig1/InstallPackages/task.yaml @@ -1,7 +1,7 @@ -name: choco -command: "./choco.ps1 -Package parameters('package')" -inputs: - package: - type: "string" - defaultValue: "" +name: choco +command: "./choco.ps1 -Package parameters('package')" +inputs: + package: + type: "string" + defaultValue: "" required: true \ No newline at end of file diff --git a/Powershell/task.yaml b/DevBoxConfig1/Powershell/task.yaml similarity index 100% rename from Powershell/task.yaml rename to DevBoxConfig1/Powershell/task.yaml diff --git a/TestWriteToFile/task.yaml b/DevBoxConfig1/TestWriteToFile/task.yaml similarity index 100% rename from TestWriteToFile/task.yaml rename to DevBoxConfig1/TestWriteToFile/task.yaml diff --git a/TestWriteToFile/testfolder/task.yaml b/DevBoxConfig1/TestWriteToFile/testfolder/task.yaml similarity index 100% rename from TestWriteToFile/testfolder/task.yaml rename to DevBoxConfig1/TestWriteToFile/testfolder/task.yaml diff --git a/TestWriteToFile/testfolder/test.ps1 b/DevBoxConfig1/TestWriteToFile/testfolder/test.ps1 similarity index 100% rename from TestWriteToFile/testfolder/test.ps1 rename to DevBoxConfig1/TestWriteToFile/testfolder/test.ps1 diff --git a/TestWriteToFile/write-to-file.ps1 b/DevBoxConfig1/TestWriteToFile/write-to-file.ps1 similarity index 100% rename from TestWriteToFile/write-to-file.ps1 rename to DevBoxConfig1/TestWriteToFile/write-to-file.ps1 From d07d46210581176399f7370528b1a694eef50231 Mon Sep 17 00:00:00 2001 From: Kevin Nguyen Date: Wed, 31 May 2023 12:46:14 -0700 Subject: [PATCH 07/11] modify psh task --- DevBoxConfig1/Devbox/devbox.yaml | 2 +- DevBoxConfig1/Powershell/task.yaml | 4 ++-- DevBoxConfig1/TestWriteToFile/testfolder/task.yaml | 2 -- DevBoxConfig1/TestWriteToFile/testfolder/test.ps1 | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 DevBoxConfig1/TestWriteToFile/testfolder/task.yaml delete mode 100644 DevBoxConfig1/TestWriteToFile/testfolder/test.ps1 diff --git a/DevBoxConfig1/Devbox/devbox.yaml b/DevBoxConfig1/Devbox/devbox.yaml index bd6fd22..2bac412 100644 --- a/DevBoxConfig1/Devbox/devbox.yaml +++ b/DevBoxConfig1/Devbox/devbox.yaml @@ -6,7 +6,7 @@ setupTasks: - task: write-to-file - task: powershell inputs: - command: echo "Testing Powershell Task" >> C:\\powershell-test.txt + script: echo "Testing Powershell Task" >> C:\\powershell-test.txt - task: install-by-uri inputs: uri: 'https://community.chocolatey.org/install.ps1' diff --git a/DevBoxConfig1/Powershell/task.yaml b/DevBoxConfig1/Powershell/task.yaml index eb908d9..75dec79 100644 --- a/DevBoxConfig1/Powershell/task.yaml +++ b/DevBoxConfig1/Powershell/task.yaml @@ -1,7 +1,7 @@ name: powershell -command: "{{command}}" +command: "{{script}}" inputs: - command: + script: type: string defaultValue: "" required: true \ No newline at end of file diff --git a/DevBoxConfig1/TestWriteToFile/testfolder/task.yaml b/DevBoxConfig1/TestWriteToFile/testfolder/task.yaml deleted file mode 100644 index f65e566..0000000 --- a/DevBoxConfig1/TestWriteToFile/testfolder/task.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: test-folder-inside -command: "./test.ps1" \ No newline at end of file diff --git a/DevBoxConfig1/TestWriteToFile/testfolder/test.ps1 b/DevBoxConfig1/TestWriteToFile/testfolder/test.ps1 deleted file mode 100644 index da12eec..0000000 --- a/DevBoxConfig1/TestWriteToFile/testfolder/test.ps1 +++ /dev/null @@ -1 +0,0 @@ -echo "sometest" >> C:\\test.txt From 7101cba068e0e3c4e166c851730fdf27047c4577 Mon Sep 17 00:00:00 2001 From: Kevin Nguyen Date: Thu, 1 Jun 2023 13:55:00 -0700 Subject: [PATCH 08/11] Update devbox.yaml --- DevBoxConfig1/Devbox/devbox.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/DevBoxConfig1/Devbox/devbox.yaml b/DevBoxConfig1/Devbox/devbox.yaml index 2bac412..9533755 100644 --- a/DevBoxConfig1/Devbox/devbox.yaml +++ b/DevBoxConfig1/Devbox/devbox.yaml @@ -3,7 +3,6 @@ image: microsoftwindowsdesktop_windows-ent-cpc_win11-22h2-ent-cpc-m365@1.0.0 hostInformation: general_a_8c32gb256ssd_v1 supportsHibernation: false setupTasks: - - task: write-to-file - task: powershell inputs: script: echo "Testing Powershell Task" >> C:\\powershell-test.txt From cba01e068b885577eb7a44bde00ed1890e150a75 Mon Sep 17 00:00:00 2001 From: Antonella Avogadro <122132762+antonellaavogadro@users.noreply.github.com> Date: Mon, 12 Jun 2023 16:26:23 -0700 Subject: [PATCH 09/11] Update Powershell task --- DevBoxConfig1/Powershell/task.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DevBoxConfig1/Powershell/task.yaml b/DevBoxConfig1/Powershell/task.yaml index 75dec79..908acd3 100644 --- a/DevBoxConfig1/Powershell/task.yaml +++ b/DevBoxConfig1/Powershell/task.yaml @@ -1,7 +1,7 @@ name: powershell -command: "{{script}}" +command: "powershell {{script}}" inputs: script: type: string defaultValue: "" - required: true \ No newline at end of file + required: true From 60f65e4bbc4028c72990d35a1aeb9e0448e9f1ae Mon Sep 17 00:00:00 2001 From: Antonella Avogadro <122132762+antonellaavogadro@users.noreply.github.com> Date: Mon, 12 Jun 2023 16:35:13 -0700 Subject: [PATCH 10/11] Update devbox.yaml with test powershell tasks --- DevBoxConfig1/Devbox/devbox.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DevBoxConfig1/Devbox/devbox.yaml b/DevBoxConfig1/Devbox/devbox.yaml index 9533755..b651aaa 100644 --- a/DevBoxConfig1/Devbox/devbox.yaml +++ b/DevBoxConfig1/Devbox/devbox.yaml @@ -6,6 +6,9 @@ setupTasks: - task: powershell inputs: script: echo "Testing Powershell Task" >> C:\\powershell-test.txt + - task: powershell + inputs: + script: calc - task: install-by-uri inputs: uri: 'https://community.chocolatey.org/install.ps1' From 50e354fae38655908477ed5a6fbffb025e608569 Mon Sep 17 00:00:00 2001 From: Antonella Avogadro <122132762+antonellaavogadro@users.noreply.github.com> Date: Mon, 12 Jun 2023 16:35:43 -0700 Subject: [PATCH 11/11] Create Powershell.ps1 --- DevBoxConfig1/Powershell/Powershell.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 DevBoxConfig1/Powershell/Powershell.ps1 diff --git a/DevBoxConfig1/Powershell/Powershell.ps1 b/DevBoxConfig1/Powershell/Powershell.ps1 new file mode 100644 index 0000000..e94a7e4 --- /dev/null +++ b/DevBoxConfig1/Powershell/Powershell.ps1 @@ -0,0 +1,6 @@ +param( + [Parameter()] + [string]$powershell + ) + + $powershell