From df68f58ada79e4e2f04b0ac1319e2ba837333a72 Mon Sep 17 00:00:00 2001 From: Tobias Kiertscher Date: Thu, 30 Mar 2023 08:36:56 +0000 Subject: [PATCH 1/6] updated bash icon in quick access toolbar --- .../BenchDashboard/BenchDashboard.csproj | 1 + BenchManager/BenchDashboard/MainForm.cs | 4 +--- .../Properties/Resources.Designer.cs | 12 +++++++++++- .../BenchDashboard/Properties/Resources.resx | 3 +++ .../BenchDashboard/Resources/bash.ico | Bin 5430 -> 5430 bytes .../BenchDashboard/Resources/bash_16.png | Bin 0 -> 220 bytes CHANGELOG.md | 3 +++ 7 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 BenchManager/BenchDashboard/Resources/bash_16.png diff --git a/BenchManager/BenchDashboard/BenchDashboard.csproj b/BenchManager/BenchDashboard/BenchDashboard.csproj index 374f5650..b314a12e 100644 --- a/BenchManager/BenchDashboard/BenchDashboard.csproj +++ b/BenchManager/BenchDashboard/BenchDashboard.csproj @@ -249,6 +249,7 @@ + diff --git a/BenchManager/BenchDashboard/MainForm.cs b/BenchManager/BenchDashboard/MainForm.cs index 3a0287d2..2ff0683d 100644 --- a/BenchManager/BenchDashboard/MainForm.cs +++ b/BenchManager/BenchDashboard/MainForm.cs @@ -208,11 +208,9 @@ private async void InitializeTopPanel() UpdateShellButtons(); var cmdImg = await ExtractIcon(core.CmdPath, "CMD"); var psImg = await ExtractIcon(core.PowerShellPath, "PowerShell"); - var imageResDllPath = Environment.ExpandEnvironmentVariables(@"%SystemRoot%\System32\imageres.dll"); - var bashImg = await ExtractIcon(imageResDllPath, "Bash", 95); btnShellCmd.Image = cmdImg ?? Resources.missing_app_16; btnShellPowerShell.Image = psImg ?? Resources.missing_app_16; - btnShellBash.Image = bashImg ?? Resources.missing_app_16; + btnShellBash.Image = Resources.bash_16; } private static Task ExtractIcon(string path, string name, int index = 0) diff --git a/BenchManager/BenchDashboard/Properties/Resources.Designer.cs b/BenchManager/BenchDashboard/Properties/Resources.Designer.cs index 2183938f..cc2128cd 100644 --- a/BenchManager/BenchDashboard/Properties/Resources.Designer.cs +++ b/BenchManager/BenchDashboard/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Mastersign.Bench.Dashboard.Properties { // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -89,6 +89,16 @@ internal static System.Drawing.Bitmap apps { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap bash_16 { + get { + object obj = ResourceManager.GetObject("bash_16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// diff --git a/BenchManager/BenchDashboard/Properties/Resources.resx b/BenchManager/BenchDashboard/Properties/Resources.resx index e07e0348..a2b907e6 100644 --- a/BenchManager/BenchDashboard/Properties/Resources.resx +++ b/BenchManager/BenchDashboard/Properties/Resources.resx @@ -319,4 +319,7 @@ ..\resources\log_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bash_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BenchManager/BenchDashboard/Resources/bash.ico b/BenchManager/BenchDashboard/Resources/bash.ico index 89a235f5dd625cdc19b015aa9ee894d63f00c527..f54734211b1ebe398889641c3ca712a47ca7a22b 100644 GIT binary patch literal 5430 zcmeHL&1)J_5Pyvlkq{IV4*_AtAc7G=1TlmV5fegC|Bc*B4}nr@n`li8*4AoEKhFJ6 z+9ZC`L)%MQdg#B9o;sa*apYzF=wiZp@xhOoH#;-Gd9&~B>I!jBEC@{#C^hlXDMUaB z;Y3OEeX9^{)Prb47qNvPJB`O^pO2vqETCl(v4mJQ3B*O5%nHwfHVc_d2KM&$WE~ENL-MMes;=f9XIFh#SNR*Y>RA4r zogGLd60#Pz+dWhZ=VNKKhDrRCgRr~13&fvJrw8|hulfCc;NDoR*1^4@I*imXj-O(= z|9bvpGAYjq`K+(6Lp&abSS$w7XcX4g)?jsYRdQ>Z241fhs9#Q}Q`V_JTPpvXdhHM0 zd)|N3@JAvM$sG!XAQ%inAP@kb&j%|jE8uduz;3tS=+QWS+JD?*l4}1at)G0u;V?|Y z|F%)T;`OWhU+sS?l>+A9*w`5AKdpaS{&%k%Gv$9jV}5-8UiG?d7@&iCr!|Bw+PZB* zQ=)^i)4Gr#dk^EfnCIH>`dYhr4y}tbXr6zDi?dGy^!K0q{d-a>{{4OV4Ssy>!Q~yJ zday5Z>Sdo_{{F9)OAl#oCg?v0KCAfu532Jqs}4Yan90waBwG+Z z-neWYPk1CMyRgjeKmW`>JG+7K%r#dm#m|l{Nt;~a z=6UnI;v=r}ql=$&s|I+Hi=SG+KAtUI&suGKIXB-&eSDha)cuQt1>-K_`H4Y0^0Zby z?u}UX@qI*|a?(q9#Nag^}keSjOnvRQ+d1i zs$G`*F7>}FN6FV$zZ5$Jwr>3)&QNodf7=7~#naSLJ5W2Yjt-=bF;qPr5{d5=e3lsd z)OU)hf5Z5Pqxk>G&$%*u@#_D7e4b4jO{_5Lh(6ZBRAY|i`^f)^uMbzb;V!FR=P7Z8 jMaz2GR87$j7WJbqUzg%@&WiUg_jgC~o6_ui3h}XD_k#=^ diff --git a/BenchManager/BenchDashboard/Resources/bash_16.png b/BenchManager/BenchDashboard/Resources/bash_16.png new file mode 100644 index 0000000000000000000000000000000000000000..b128a18be81834d7845187e58e947e331f8d5312 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!9q_L#}EtuWQmFk_L;xxy$o(NoHmyiI3hV! z*f3)UV+a5#|f38zmdg9e>4?V#ag$$b_d3 zCT)x-CcQA(Wy7&pf?<-wv?FN@M$#=CcQuIk*fMJzbZFLK Date: Thu, 30 Mar 2023 08:39:36 +0000 Subject: [PATCH 2/6] added VS 2022 as potential build environment --- build/build.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/build.ps1 b/build/build.ps1 index b00008df..2efee530 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -22,6 +22,9 @@ $mode = $Mode $target = "Clean;Build" $verbosity = $MsBuildVerbosity $msbuildPaths = @( + "${env:ProgramFiles}\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\MSBuild.exe" + "${env:ProgramFiles}\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" + "${env:ProgramFiles}\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\MSBuild.exe" "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe" "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" From 6482b89a77568788d87b67858e0bfeba403c6b91 Mon Sep 17 00:00:00 2001 From: Tobias Kiertscher Date: Thu, 30 Mar 2023 08:40:12 +0000 Subject: [PATCH 3/6] added PowerShell Core to quick access toolbar --- .../BenchDashboard/BenchDashboard.csproj | 2 ++ BenchManager/BenchDashboard/Core.cs | 10 ++++++ .../BenchDashboard/MainForm.Designer.cs | 20 +++++++++-- BenchManager/BenchDashboard/MainForm.cs | 31 ++++++++++++++++-- .../Properties/Resources.Designer.cs | 10 ++++++ .../BenchDashboard/Properties/Resources.resx | 3 ++ .../BenchDashboard/Resources/pwsh.ico | Bin 0 -> 5430 bytes .../BenchDashboard/Resources/pwsh_16.png | Bin 0 -> 756 bytes BenchManager/BenchLib/AppKeys.cs | 3 ++ BenchManager/BenchLib/BenchTasks.cs | 21 +++++++++--- BenchManager/BenchLib/ConfigPropertyKeys.cs | 1 + BenchManager/scripts/bench-ps.cmd | 2 +- BenchManager/scripts/bench-pwsh.cmd | 11 +++++++ CHANGELOG.md | 5 +++ build/build.ps1 | 1 + res/config.md | 1 + res/config.template.md | 1 + 17 files changed, 111 insertions(+), 11 deletions(-) create mode 100644 BenchManager/BenchDashboard/Resources/pwsh.ico create mode 100644 BenchManager/BenchDashboard/Resources/pwsh_16.png create mode 100644 BenchManager/scripts/bench-pwsh.cmd diff --git a/BenchManager/BenchDashboard/BenchDashboard.csproj b/BenchManager/BenchDashboard/BenchDashboard.csproj index b314a12e..a612f020 100644 --- a/BenchManager/BenchDashboard/BenchDashboard.csproj +++ b/BenchManager/BenchDashboard/BenchDashboard.csproj @@ -250,6 +250,8 @@ + + diff --git a/BenchManager/BenchDashboard/Core.cs b/BenchManager/BenchDashboard/Core.cs index b30357f7..8e4db5c4 100644 --- a/BenchManager/BenchDashboard/Core.cs +++ b/BenchManager/BenchDashboard/Core.cs @@ -852,6 +852,16 @@ public string PowerShellPath } } + public string PowerShellCorePath + { + get + { + return Path.Combine( + Config.Apps[AppKeys.PowerShellCore].Dir, + @"pwsh.exe"); + } + } + public string BashPath { get diff --git a/BenchManager/BenchDashboard/MainForm.Designer.cs b/BenchManager/BenchDashboard/MainForm.Designer.cs index f19ad6e6..1ddb28c0 100644 --- a/BenchManager/BenchDashboard/MainForm.Designer.cs +++ b/BenchManager/BenchDashboard/MainForm.Designer.cs @@ -40,6 +40,7 @@ private void InitializeComponent() this.tsslVersion = new System.Windows.Forms.ToolStripStatusLabel(); this.tsslVersionStatus = new System.Windows.Forms.ToolStripStatusLabel(); this.panelTop = new System.Windows.Forms.Panel(); + this.btnShellPowerShellCore = new System.Windows.Forms.Button(); this.btnAutoSetup = new System.Windows.Forms.Button(); this.btnDocs = new System.Windows.Forms.Button(); this.btnAbout = new System.Windows.Forms.Button(); @@ -105,7 +106,7 @@ private void InitializeComponent() // tsslSpacer // this.tsslSpacer.Name = "tsslSpacer"; - this.tsslSpacer.Size = new System.Drawing.Size(160, 19); + this.tsslSpacer.Size = new System.Drawing.Size(191, 19); this.tsslSpacer.Spring = true; // // tsslVersionLabel @@ -132,6 +133,7 @@ private void InitializeComponent() // // panelTop // + this.panelTop.Controls.Add(this.btnShellPowerShellCore); this.panelTop.Controls.Add(this.btnAutoSetup); this.panelTop.Controls.Add(this.btnDocs); this.panelTop.Controls.Add(this.btnAbout); @@ -145,6 +147,17 @@ private void InitializeComponent() this.panelTop.Size = new System.Drawing.Size(564, 29); this.panelTop.TabIndex = 0; // + // btnShellPowerShellCore + // + this.btnShellPowerShellCore.Image = global::Mastersign.Bench.Dashboard.Properties.Resources.missing_app_16; + this.btnShellPowerShellCore.Location = new System.Drawing.Point(64, 2); + this.btnShellPowerShellCore.Margin = new System.Windows.Forms.Padding(2, 2, 0, 2); + this.btnShellPowerShellCore.Name = "btnShellPowerShellCore"; + this.btnShellPowerShellCore.Size = new System.Drawing.Size(29, 25); + this.btnShellPowerShellCore.TabIndex = 7; + this.toolTip.SetToolTip(this.btnShellPowerShellCore, "PowerShell (Alt + P)"); + this.btnShellPowerShellCore.Click += new System.EventHandler(this.ShellPowerShellCoreHandler); + // // btnAutoSetup // this.btnAutoSetup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -184,7 +197,7 @@ private void InitializeComponent() // btnShellBash // this.btnShellBash.Image = global::Mastersign.Bench.Dashboard.Properties.Resources.missing_app_16; - this.btnShellBash.Location = new System.Drawing.Point(64, 2); + this.btnShellBash.Location = new System.Drawing.Point(95, 2); this.btnShellBash.Margin = new System.Windows.Forms.Padding(2, 2, 0, 2); this.btnShellBash.Name = "btnShellBash"; this.btnShellBash.Size = new System.Drawing.Size(29, 25); @@ -200,7 +213,7 @@ private void InitializeComponent() this.btnShellPowerShell.Name = "btnShellPowerShell"; this.btnShellPowerShell.Size = new System.Drawing.Size(29, 25); this.btnShellPowerShell.TabIndex = 1; - this.toolTip.SetToolTip(this.btnShellPowerShell, "Windows PowerShell (Alt + P)"); + this.toolTip.SetToolTip(this.btnShellPowerShell, "Windows PowerShell (Alt + W)"); this.btnShellPowerShell.Click += new System.EventHandler(this.ShellPowerShellHandler); // // btnShellCmd @@ -280,6 +293,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripStatusLabel tsslVersionLabel; private System.Windows.Forms.ToolStripStatusLabel tsslVersion; private System.Windows.Forms.ToolStripStatusLabel tsslVersionStatus; + private System.Windows.Forms.Button btnShellPowerShellCore; } } diff --git a/BenchManager/BenchDashboard/MainForm.cs b/BenchManager/BenchDashboard/MainForm.cs index 2ff0683d..e7f52bea 100644 --- a/BenchManager/BenchDashboard/MainForm.cs +++ b/BenchManager/BenchDashboard/MainForm.cs @@ -68,6 +68,7 @@ private void CoreBusyChangedHandler(object sender, EventArgs e) private void AppStateChangedHandler(object sender, EventArgs e) { if (core.Busy) return; + UpdateShellButtons(); InitializeAppLauncherList(); InitializeStatusStrip(); } @@ -210,6 +211,7 @@ private async void InitializeTopPanel() var psImg = await ExtractIcon(core.PowerShellPath, "PowerShell"); btnShellCmd.Image = cmdImg ?? Resources.missing_app_16; btnShellPowerShell.Image = psImg ?? Resources.missing_app_16; + btnShellPowerShellCore.Image = Resources.pwsh_16; btnShellBash.Image = Resources.bash_16; } @@ -238,12 +240,15 @@ private void UpdateShellButtons() { btnShellCmd, btnShellPowerShell, + btnShellPowerShellCore, btnShellBash, }; var buttonEnabled = new[] { core.Config.GetBooleanValue(ConfigPropertyKeys.QuickAccessCmd, true), core.Config.GetBooleanValue(ConfigPropertyKeys.QuickAccessPowerShell, false), + core.Config.GetBooleanValue(ConfigPropertyKeys.QuickAccessPowerShellCore, false) + && core.Config.Apps.ActiveApps.Any(app => app.ID == "Bench.PowerShellCore"), core.Config.GetBooleanValue(ConfigPropertyKeys.QuickAccessBash, false), }; var x = buttons[0].Left; @@ -319,7 +324,27 @@ private void ShellPowerShellHandler(object sender, EventArgs e) { new SimpleExecutionHost().StartProcess(core.Env, core.Config.GetStringValue(ConfigPropertyKeys.ProjectRootDir), - core.PowerShellPath, "", result => { }, ProcessMonitoring.ExitCode); + core.PowerShellPath, "-ExecutionPolicy RemoteSigned", result => { }, ProcessMonitoring.ExitCode); + } + + private void ShellPowerShellCoreHandler(object sender, EventArgs e) + { + var pwshPath = core.PowerShellCorePath; + if (File.Exists(pwshPath)) + { + new SimpleExecutionHost().StartProcess(core.Env, + core.Config.GetStringValue(ConfigPropertyKeys.ProjectRootDir), + pwshPath, "-ExecutionPolicy RemoteSigned", result => { }, ProcessMonitoring.ExitCode); + } + else + { + MessageBox.Show( + "The executable of PowerShell was not found." + + Environment.NewLine + Environment.NewLine + + pwshPath, + "Running PowerShell...", + MessageBoxButtons.OK, MessageBoxIcon.Warning); + } } private void ShellBashHandler(object sender, EventArgs e) @@ -411,8 +436,10 @@ private void KeyDownDownHandler(object sender, KeyEventArgs e) AutoSetupHandler(this, EventArgs.Empty); else if (e.KeyCode == Keys.C && e.Modifiers == Keys.Alt) ShellCmdHandler(this, EventArgs.Empty); - else if (e.KeyCode == Keys.P && e.Modifiers == Keys.Alt) + else if (e.KeyCode == Keys.W && e.Modifiers == Keys.Alt) ShellPowerShellHandler(this, EventArgs.Empty); + else if (e.KeyCode == Keys.P && e.Modifiers == Keys.Alt) + ShellPowerShellCoreHandler(this, EventArgs.Empty); else if (e.KeyCode == Keys.B && e.Modifiers == Keys.Alt) ShellBashHandler(this, EventArgs.Empty); } diff --git a/BenchManager/BenchDashboard/Properties/Resources.Designer.cs b/BenchManager/BenchDashboard/Properties/Resources.Designer.cs index cc2128cd..3c7d176e 100644 --- a/BenchManager/BenchDashboard/Properties/Resources.Designer.cs +++ b/BenchManager/BenchDashboard/Properties/Resources.Designer.cs @@ -569,6 +569,16 @@ internal static System.Drawing.Bitmap properties_16 { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap pwsh_16 { + get { + object obj = ResourceManager.GetObject("pwsh_16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// diff --git a/BenchManager/BenchDashboard/Properties/Resources.resx b/BenchManager/BenchDashboard/Properties/Resources.resx index a2b907e6..1412030e 100644 --- a/BenchManager/BenchDashboard/Properties/Resources.resx +++ b/BenchManager/BenchDashboard/Properties/Resources.resx @@ -319,6 +319,9 @@ ..\resources\log_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pwsh_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\bash_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/BenchManager/BenchDashboard/Resources/pwsh.ico b/BenchManager/BenchDashboard/Resources/pwsh.ico new file mode 100644 index 0000000000000000000000000000000000000000..ac79bdcf74f913c9abc576166a4dda6023cdd3c6 GIT binary patch literal 5430 zcmeHLYfuzd7H-5Rf`EWL1ZH^3`ymJlC<6$BFd|PODyWI5iBDYCP0ExQ-z$lQMiYz` zl2~DhOCoDxR!LmU8iOG%22_MB30V}PS$4CcR3%kZeS1z17iSo-@^81coT^i|d#Z1L zU!QyXJKt$ZGLgneYPCe8TB^2^ByUNQtZ3x(wPPiziH?2fKe|NHQ1Ji!E2aOR{GMb$ zKLhyNr&ajo6B+GwGTP3|xOGlO>z`%Z{8+|~vofxKB%|d+T{NGO@%5i%T&tDQbXvyM z4`j&i%lN8BM&lo4e0fU7mG?%A3VmF0jE)QPmc01BlrT3Wg{qJc?26a`7sU8Y#~dFg z%<^);Opj>@Qrp4b)dn-BPlbo06;#uvz}dze4px(4J7p5ACQrcRiQ_O~oGDDln1Jp- z6c%Qa2HH*?Y9VeKfh$JBuiv*mr#E$$JD5WvaflCcMM|hEGQw4u=cnTkI>^CK;b099 z2OWp$#KGRm3^o>%U}-iwhm)o2I|#o>;EEC7{-x}_gT-BoB0azyl8M8PEvs><`Y0-& zO~OvCFOoxClstsGa~^Er=VAlz>DF*}u*CKhZIMXpOF_G}m%iG!sKVRUAk?!5dueSx0p^1o7R(O*iSX+Mt{Cz6ziRq!oW1r`tPd0p(UgZdUPzDhL>j#l zIhtTJ%MAv(5POr?BR^85(+0tTwShP|5C@?R=A;d_mgWP5&wId0VDm`$78G(xeq4Y4 zAcyQ>99SDpzJADn1E28z=DoQ-&SPYK(&NDT^i5593+bd*A7A0nb*bub$2+VYoi2?55z6Moz@?l$c(s6;(#~w?EhZ&{)$_nBb4$ z9I~P)4|@7kcc#YR`H$}|!EDlnaHMEg1+k~w(VEBX{j?}V?* zRCo~wH+m;r?JRU0EY0xG3vXQ`4jO%YJ|+(JWt(z-S~=ezg2PjK9FFYXW`KR={0B&x zsYV>(&+~Ui)UV|5$?R_tV#^P3R(x|u#ENtb2zs5cLvyB5_Woo zI~EZB{16r50`)j}J0gtpK>8%KLF9q8p>%b258)fvqMnBQ=8r4dpH2*f;7}0nhl>3# z7+^QnoksQ?U9DIc?xy2FzClAA=5ij$H$-?lC>&TL1qY!|+UVdu_AW;G?`a4_PlNnS zQXmu#^8>KIc!dG>58vIwn$&OuebRXswc=fL9CY4=In4C1S9F@ai_l1awf%tNpPEh^ z*CN8-UYOV~IMlv#YzUvRpVLMt8aa|aC51lXApBE=;-Bn|{L|H{vR2|?T#I@dDk^ua zy~p?*rE9bCkGtKt^>riGY9oiVfpvN$ePRz6Z{Xn^4LqFCrz5{z)kQwixEA#^6gAWw z>Ja$4JOp4Rt;KL{c*Ma_pM-~t4RA&@`AF6V_L2JjX+v&eFL_zxTGZ2^x!Y9RvVPI5 z0eudLY6|h4LPOs${?~rWd&NC6_s60)=DwKwVeW;w z4>sGm-YY6kR%Kcb9&kaE;8>KJjewce6XRi>VqBZEmx(P>i zY*f55dsOzPyua9wu?OLAC(8b!d(A)fkvf)4?#IQ7=mAR6j1#Ift0{A8D?>Z2$lO literal 0 HcmV?d00001 diff --git a/BenchManager/BenchDashboard/Resources/pwsh_16.png b/BenchManager/BenchDashboard/Resources/pwsh_16.png new file mode 100644 index 0000000000000000000000000000000000000000..64ec2bdee6f22d82065d6105ad0dc85f918967b1 GIT binary patch literal 756 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0*OgPK~y+T&64d) z(@_-1_o`qpA8<~cZqD4CZf=w_%gvk`*~C`nbBWrMMnPp-L{XI0d_Xf+S)_tRBvvcw z!BA1u!m@R()Wk;CN-Q!Ya4O`hZ})dii2ee;VG7I6aqOgL4 zHSiQGAP`EBlwCA=pFqb1&3)rG^?DA@fiflo^0g`0w)YqtW!g1^0Bs_KGA)HeAn=xg z@9vEvOY@lRH3U4mZ9!FY-&j~22WK)kIp+XI9G{rLJ~9EBJ|CX`O1OCkg6|>1GQJzC zZx7j6_h(%mc<$QMt{bciZ`cc9J zJx&xFGY`+{5_8ef)6c+B=TD>--$2&Bv#6}8MR}DKmdXn_Usi#L$kkXApEgAWW+rGE z_|>4$r@~s_#Nb=4ZxNYZN|zRe%8Rw^?cbEuwP9!RB_|b#nZRlz4(?E5lJk(V--;kZ z-ol|sRB-oQfdE|w#4A(atJwsRItgA1BdVK*+ZoK|{}XL}5At{jJ5;t+W~d0000The app ID of NuGet. public const string NuGet = "Bench.NuGet"; + + /// The app ID of PowerShell + public const string PowerShellCore = "Bench.PowerShellCore"; } } diff --git a/BenchManager/BenchLib/BenchTasks.cs b/BenchManager/BenchLib/BenchTasks.cs index 4dd26719..1077529a 100644 --- a/BenchManager/BenchLib/BenchTasks.cs +++ b/BenchManager/BenchLib/BenchTasks.cs @@ -1703,13 +1703,13 @@ private static void CreateBenchDashboardLauncher(BenchConfiguration config) } private static void CreateActionLauncher(BenchConfiguration config, string label, string binFile, string icon = null, - string targetDir = null) + string targetDir = null, string arguments = null) { var launcherDir = targetDir ?? config.GetStringValue(ConfigPropertyKeys.LauncherDir); var binDir = config.GetStringValue(ConfigPropertyKeys.BenchBin); var shortcut = Path.Combine(launcherDir, label + ".lnk"); var target = Path.Combine(binDir, binFile); - FileSystem.CreateShortcut(shortcut, target, null, config.BenchRootDir, icon ?? target); + FileSystem.CreateShortcut(shortcut, target, arguments, config.BenchRootDir, icon ?? target); } private static void CreateActionLaunchers(BenchConfiguration config) @@ -1719,15 +1719,26 @@ private static void CreateActionLaunchers(BenchConfiguration config) if (!IsDashboardSupported) { CreateActionLauncher(config, "Bench CLI", "bench.exe"); - CreateActionLauncher(config, "Bench CLI", "bench.exe", null, config.BenchRootDir); + CreateActionLauncher(config, "Bench CLI", "bench.exe", + targetDir: config.BenchRootDir); } if (config.GetBooleanValue(ConfigPropertyKeys.QuickAccessCmd, true)) { - CreateActionLauncher(config, "Command Line", "bench-cmd.cmd", @"%SystemRoot%\System32\cmd.exe"); + CreateActionLauncher(config, "Bench Command Line", "bench-cmd.cmd", + icon: @"%SystemRoot%\System32\cmd.exe"); } if (config.GetBooleanValue(ConfigPropertyKeys.QuickAccessPowerShell, false)) { - CreateActionLauncher(config, "PowerShell", "bench-ps.cmd", @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe"); + CreateActionLauncher(config, "Bench Windows PowerShell", "bench-ps.cmd", + icon: @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe"); + } + var pwshApp = config.Apps[AppKeys.PowerShellCore]; + if (config.GetBooleanValue(ConfigPropertyKeys.QuickAccessPowerShellCore, true) + && pwshApp != null && pwshApp.IsActive) + { + CreateActionLauncher(config, "Bench PowerShell", "bench-pwsh.cmd", + icon: Path.Combine( + config.GetStringValue(ConfigPropertyKeys.AppsInstallDir), pwshApp.Dir, pwshApp.Exe)); } if (config.GetBooleanValue(ConfigPropertyKeys.QuickAccessBash, false)) { diff --git a/BenchManager/BenchLib/ConfigPropertyKeys.cs b/BenchManager/BenchLib/ConfigPropertyKeys.cs index 8091d378..d7a71bdf 100644 --- a/BenchManager/BenchLib/ConfigPropertyKeys.cs +++ b/BenchManager/BenchLib/ConfigPropertyKeys.cs @@ -50,6 +50,7 @@ public static class ConfigPropertyKeys public const string WizzardSelectedApps = "WizzardSelectedApps"; public const string QuickAccessCmd = "QuickAccessCmd"; public const string QuickAccessPowerShell = "QuickAccessPowerShell"; + public const string QuickAccessPowerShellCore = "QuickAccessPowerShellCore"; public const string QuickAccessBash = "QuickAccessBash"; public const string DashboardSetupAppListColumns = "DashboardSetupAppListColumns"; diff --git a/BenchManager/scripts/bench-ps.cmd b/BenchManager/scripts/bench-ps.cmd index 69f205b5..e08e72ef 100644 --- a/BenchManager/scripts/bench-ps.cmd +++ b/BenchManager/scripts/bench-ps.cmd @@ -2,7 +2,7 @@ CALL "%~dp0\..\..\env.cmd" IF "_%1_" == "__" ( - ECHO.BENCH v%BENCH_VERSION% PowerShell + ECHO.BENCH v%BENCH_VERSION% Windows PowerShell ECHO. powershell -NoLogo -NoProfile -ExecutionPolicy Unrestricted -NoExit GOTO:EOF diff --git a/BenchManager/scripts/bench-pwsh.cmd b/BenchManager/scripts/bench-pwsh.cmd new file mode 100644 index 00000000..25dabd4b --- /dev/null +++ b/BenchManager/scripts/bench-pwsh.cmd @@ -0,0 +1,11 @@ +@ECHO OFF +CALL "%~dp0\..\..\env.cmd" + +IF "_%1_" == "__" ( + ECHO.BENCH v%BENCH_VERSION% PowerShell + ECHO. + pwsh -NoLogo -NoProfile -ExecutionPolicy Unrestricted -NoExit + GOTO:EOF +) + +pwsh -NoLogo -NoProfile -ExecutionPolicy Unrestricted %* diff --git a/CHANGELOG.md b/CHANGELOG.md index e49871c4..e282469e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,8 +25,13 @@ Add a link to the GitHub diff like [Unreleased]: https://github.com/winbench/bench/compare/master...dev +### Added +* Config property `QuickAccessPowerShellCore` +* PowerShell Core button in quick access toolbar + ### Changed * New bash icon in quick access toolbar +* Hotkey for Windows PowerShell changed from Alt+P to Alt+W ## [0.22.4] - 2020-01-06 diff --git a/build/build.ps1 b/build/build.ps1 index 2efee530..4e4b60bb 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -66,6 +66,7 @@ $buildArtifacts = @( "packages\HtmlAgilityPack.1.8.11\lib\Net45\HtmlAgilityPack.dll", "scripts\bench-cmd.cmd", "scripts\bench-ps.cmd", + "scripts\bench-pwsh.cmd", "scripts\bench-bash.cmd", "scripts\runps.cmd" ) diff --git a/res/config.md b/res/config.md index bc7ba20a..263c8337 100644 --- a/res/config.md +++ b/res/config.md @@ -109,6 +109,7 @@ + LaTeX: `Bench.Group.LaTeXWriting` * QuickAccessCmd: `true` * QuickAccessPowerShell: `false` +* QuickAccessPowerShellCore: `true` * QuickAccessBash: `false` * TextEditorApp: `Bench.BenchNpp` * DashboardSetupAppListColumns: `Order`, `Label`, `Version`, `Active`, `Deactivated`, `Status`, `Typ`, `Comment` diff --git a/res/config.template.md b/res/config.template.md index f8832a4d..3dd70c4f 100644 --- a/res/config.template.md +++ b/res/config.template.md @@ -33,6 +33,7 @@ With the following properties, you can control the appearance of the launchers f * QuickAccessCmd: `false` * QuickAccessPowerShell: `true` +* QuickAccessPowerShellCore: `true` * QuickAccessBash: `false` ## Dashboard From 93a0c6bdda0237c539e4ad8171e84bbc5a76fb9e Mon Sep 17 00:00:00 2001 From: Tobias Kiertscher Date: Thu, 30 Mar 2023 09:06:28 +0000 Subject: [PATCH 4/6] added new bootstrap folder to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e282469e..3a363d91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ Add a link to the GitHub diff like ### Added * Config property `QuickAccessPowerShellCore` * PowerShell Core button in quick access toolbar +* `bootstrap` folder with Windows PowerShell scripts for bootstrapping a Bench environment ### Changed * New bash icon in quick access toolbar From db663593a064ba750b9e3926a9abca894ea7c1f5 Mon Sep 17 00:00:00 2001 From: Tobias Kiertscher Date: Thu, 30 Mar 2023 11:17:08 +0000 Subject: [PATCH 5/6] improved bash icon --- BenchManager/BenchDashboard/MainForm.cs | 2 +- .../BenchDashboard/Resources/bash.ico | Bin 5430 -> 32599 bytes BenchManager/BenchLib/BenchTasks.cs | 3 ++- build/build.ps1 | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BenchManager/BenchDashboard/MainForm.cs b/BenchManager/BenchDashboard/MainForm.cs index e7f52bea..251e0508 100644 --- a/BenchManager/BenchDashboard/MainForm.cs +++ b/BenchManager/BenchDashboard/MainForm.cs @@ -248,7 +248,7 @@ private void UpdateShellButtons() core.Config.GetBooleanValue(ConfigPropertyKeys.QuickAccessCmd, true), core.Config.GetBooleanValue(ConfigPropertyKeys.QuickAccessPowerShell, false), core.Config.GetBooleanValue(ConfigPropertyKeys.QuickAccessPowerShellCore, false) - && core.Config.Apps.ActiveApps.Any(app => app.ID == "Bench.PowerShellCore"), + && core.Config.Apps[AppKeys.PowerShellCore]?.IsActive == true, core.Config.GetBooleanValue(ConfigPropertyKeys.QuickAccessBash, false), }; var x = buttons[0].Left; diff --git a/BenchManager/BenchDashboard/Resources/bash.ico b/BenchManager/BenchDashboard/Resources/bash.ico index f54734211b1ebe398889641c3ca712a47ca7a22b..dbf7bfd178eda30a643d17c593e3869ee01cc32a 100644 GIT binary patch literal 32599 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 F{}0fk!DIjc delta 47 wcmccqk8zup3IhWp0~3RS0*F>%SRuf`pvJ(!AONI6{0tTbhI0a&U9*Hl0lD-CF#rGn diff --git a/BenchManager/BenchLib/BenchTasks.cs b/BenchManager/BenchLib/BenchTasks.cs index 1077529a..e86867f1 100644 --- a/BenchManager/BenchLib/BenchTasks.cs +++ b/BenchManager/BenchLib/BenchTasks.cs @@ -1742,7 +1742,8 @@ private static void CreateActionLaunchers(BenchConfiguration config) } if (config.GetBooleanValue(ConfigPropertyKeys.QuickAccessBash, false)) { - CreateActionLauncher(config, "Bash", "bench-bash.cmd", @"%SystemRoot%\System32\imageres.dll,95"); + CreateActionLauncher(config, "Bench Bash", "bench-bash.cmd", + icon: Path.Combine(config.GetStringValue(ConfigPropertyKeys.BenchBin), "bash.ico")); } } diff --git a/build/build.ps1 b/build/build.ps1 index 4e4b60bb..02dd3992 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -63,6 +63,7 @@ $buildArtifacts = @( "BenchDashboard\bin\$mode\BenchDashboard.exe", "BenchDashboard\bin\$mode\BenchDashboard.exe.config", "BenchDashboard\bin\$mode\ConEmu.WinForms.dll", + "BenchDashboard\Resources\bash.ico", "packages\HtmlAgilityPack.1.8.11\lib\Net45\HtmlAgilityPack.dll", "scripts\bench-cmd.cmd", "scripts\bench-ps.cmd", From c644a6d938795330823d5ace1298db64b74daf85 Mon Sep 17 00:00:00 2001 From: Tobias Kiertscher Date: Thu, 30 Mar 2023 11:27:22 +0000 Subject: [PATCH 6/6] pushed version to 0.22.5 --- BenchManager/BenchCLI/Properties/AssemblyInfo.cs | 4 ++-- BenchManager/BenchDashboard/Properties/AssemblyInfo.cs | 4 ++-- BenchManager/BenchLib/Properties/AssemblyInfo.cs | 4 ++-- CHANGELOG.md | 4 ++++ res/bench-install.bat | 2 +- res/version.txt | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/BenchManager/BenchCLI/Properties/AssemblyInfo.cs b/BenchManager/BenchCLI/Properties/AssemblyInfo.cs index 322a849a..2de7e3d0 100644 --- a/BenchManager/BenchCLI/Properties/AssemblyInfo.cs +++ b/BenchManager/BenchCLI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.22.4.0")] -[assembly: AssemblyFileVersion("0.22.4.0")] +[assembly: AssemblyVersion("0.22.5.0")] +[assembly: AssemblyFileVersion("0.22.5.0")] diff --git a/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs b/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs index e923612f..b4cde20a 100644 --- a/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs +++ b/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.22.4.0")] -[assembly: AssemblyFileVersion("0.22.4.0")] +[assembly: AssemblyVersion("0.22.5.0")] +[assembly: AssemblyFileVersion("0.22.5.0")] diff --git a/BenchManager/BenchLib/Properties/AssemblyInfo.cs b/BenchManager/BenchLib/Properties/AssemblyInfo.cs index f83f5252..30bae34f 100644 --- a/BenchManager/BenchLib/Properties/AssemblyInfo.cs +++ b/BenchManager/BenchLib/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.22.4.0")] -[assembly: AssemblyFileVersion("0.22.4.0")] +[assembly: AssemblyVersion("0.22.5.0")] +[assembly: AssemblyFileVersion("0.22.5.0")] diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a363d91..5e9f75b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,10 @@ Add a link to the GitHub diff like [Unreleased]: https://github.com/winbench/bench/compare/master...dev +## [0.22.5] - 2023-03-30 + +[0.22.5]: https://github.com/winbench/bench/compare/v0.22.4...v0.22.5 + ### Added * Config property `QuickAccessPowerShellCore` * PowerShell Core button in quick access toolbar diff --git a/res/bench-install.bat b/res/bench-install.bat index da69fc0f..19ed8a4f 100644 --- a/res/bench-install.bat +++ b/res/bench-install.bat @@ -7,7 +7,7 @@ SetLocal :: https://winbench.org/guide/setup/ :: -SET VERSION=0.22.4 +SET VERSION=0.22.5 SET TAG=v%VERSION% SET ROOT=%~dp0 IF [%1] NEQ [] SET ROOT=%~dpnx1\ diff --git a/res/version.txt b/res/version.txt index 424a130e..c9c211b5 100644 --- a/res/version.txt +++ b/res/version.txt @@ -1 +1 @@ -0.22.4 \ No newline at end of file +0.22.5 \ No newline at end of file