From e7fe8ddbe78c579dc45f46e89909b5b6999a7c9f Mon Sep 17 00:00:00 2001 From: stijnmoreels <9039753+stijnmoreels@users.noreply.github.com> Date: Fri, 30 Dec 2022 07:12:41 +0100 Subject: [PATCH 1/3] chore: remove all module --- build/templates/run-pester-tests.yml | 4 +- .../Arcus.Scripting.All.psd1 | Bin 8856 -> 0 bytes .../Arcus.Scripting.All.psm1 | 0 .../Arcus.Scripting.All.pssproj | 36 ------------------ src/Arcus.Scripting.sln | 10 +---- 5 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 src/Arcus.Scripting.All/Arcus.Scripting.All.psd1 delete mode 100644 src/Arcus.Scripting.All/Arcus.Scripting.All.psm1 delete mode 100644 src/Arcus.Scripting.All/Arcus.Scripting.All.pssproj diff --git a/build/templates/run-pester-tests.yml b/build/templates/run-pester-tests.yml index 09ad0390..968ed8c1 100644 --- a/build/templates/run-pester-tests.yml +++ b/build/templates/run-pester-tests.yml @@ -25,7 +25,7 @@ steps: - powershell: | Write-Host "Installing Pester test framework and Az required modules" Install-Module -Name Pester -Force -SkipPublisherCheck -MaximumVersion 5.1.1 - Get-ChildItem ./src -Filter *.psd1 -Recurse -Exclude "*.All.psd1" | + Get-ChildItem ./src -Filter *.psd1 -Recurse | % { Write-Host "Inspect PowerShell '$($_.Name)' datafile" $content = Import-PowerShellDataFile $_.FullName $content.RequiredModules | @@ -39,7 +39,7 @@ steps: displayName: 'Install Pester test framework and Az required modules' - powershell: | Import-Module ./src/Arcus.Scripting.Security - Get-ChildItem -Path ./src -Filter *.psm1 -Recurse -Exclude "*Arcus.Scripting.Security*", "*.All.psm1" | + Get-ChildItem -Path ./src -Filter *.psm1 -Recurse -Exclude "*Arcus.Scripting.Security*" | % { Write-Host "Import $($_.DirectoryName) module" Import-Module -Name $_.DirectoryName -ErrorAction Stop } Invoke-Pester -Script "./src/${{ parameters.projectName }}/" -OutputFile "./pester.test.results.xml" -OutputFormat 'NUnitXML' -EnableExit diff --git a/src/Arcus.Scripting.All/Arcus.Scripting.All.psd1 b/src/Arcus.Scripting.All/Arcus.Scripting.All.psd1 deleted file mode 100644 index 1a50ee952335ea92ee56506a0a7076b4342cbe3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8856 zcmd6sZEu=46o&nI(*6SylSro(k|^!kO_hq0rj3@gQIc-^N`Npnk}x1iyD5Kt+kN@q z+J*-TNuwbI&x`Hj`@A0?{{5%yzII=^vMad*cj;R0%Jp1ZPv@@TE?n20>1pUjdUK}n zfgefdRWvg`SH{!=&DUCeq3=M{M!L4N{?vVRKj>Q5+otv#F0kfOR9Lg&YHrg#^S|r5 z+wkw!HMXTEexG{E2MJBEymWv2Hv!kNb{>ekzUM6Epfu+4RHGL{JrG)?5qU%s-LaG! zLO;}4Q*R=NH+mYm-?Wb3u4YWjv+D62Y3-$E<+6XF`ISUIRhQxgSI1Q~-qWWl9)`lV zp%ri!IQ-d5eW=}$T}j_7%{ujO;qhz&UF6S@rHCeJ8NPMxZQp$7J+~v;=+*Q+(r!Fs zO@Hdz7HVYLl{H`;Bi)_(H>tED9yogK-aDgfdv9s&6LIrQ*QR^!9_xNfck8;_64mE= z|5&4&qWrz?8h-55|E_Dap|R)s=E&f!Bj54k(L00vMs2|JnYX8=c(Cz?cEab7ZC|u6McwQx zM4a3gbL*P5r}3HkUf`fNmL$~8zU%HUVS>Ayp9A5*^3OGTuGw%skOYeP`o+)2B5pLN ziWAy_${JZ?Bh?QpUKD)Eic!}V%YI6%O}g@F3*t2 zn=#FZtjH%GLK6?kO|eGqVqI{KM- zg~KWYDkrLmrmz#K+PWJFA2>>GO;Ur4w);*`zbZ35^>=k~*V6sgJupurvC69mN3q|; zXh}>$`s5L68nQfh)D>iOavU}kYCU3~#mAttjw0Bl<`c0kk`bw~%?qs#d5IWKghXn# zKBa9H(7cF#BuZ&aOsg4qfX|nbI(1<>79z+CMe$gl&Z@uq!gwG~F7(CX0{)8oF{7H> z3$)AH_fV^v@-|yrb@{AY&8fIsS;74<9tp|n;MozkR3W>bcQi|Vy-N7n%Fyp*#lsas z^^~XocOIK$aQz)D>suttQ9_=&%qt`Uk3B8_!(P~P(4NK)5jrWAkTI3f5)3iYPDx*`3Vq273 z-V;Y&u0%y@)MXLmbc%PcxNqg{;0;nEzmuyPJ}QQocsB&ov=&7{><0rqn)_%Wr?cqp z`(CGA@wX_*skEn2B5X-mVy3pL z#jJ8s#JzdxMl%3m3#iE07m^Rp;oq5AG9k(Y z%HfLTMH=tDorQifJ>!w2Hq^f=HGQb^p?#(3RMje?a82?E|KZSM4_v12tD=y0bLr63 ze1xM5Q1iLja>YPT`|9#h9hV|0QB7XD-!+fy zQ>;&`kHVb!a+>D0IzviTZ&f34y{rw;ai9`F3*1p%!UqxCIw)}8(a18^us5bRpFetq zHjykD(+%=LGM$Ubuf0>WjcpxRxaiteR+-?qdHEk#Ed?mX+9Sx+byt zn%fn>a2R48D6j%fNa&CVPUjb^2D#Zc@AG&LPqF)l=B - - Debug - 2.0 - {a3fd9c88-5283-40bb-81d0-44708c8313d8} - Exe - Arcus.Scripting.All - Arcus.Scripting.All - Arcus.Scripting.All - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - \ No newline at end of file diff --git a/src/Arcus.Scripting.sln b/src/Arcus.Scripting.sln index ea000e16..a8585b1a 100644 --- a/src/Arcus.Scripting.sln +++ b/src/Arcus.Scripting.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.4.32916.344 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31702.278 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5C8B7391-D202-4B09-8991-3EBAC09A585E}" EndProject @@ -33,8 +33,6 @@ Project("{F5034706-568F-408A-B7B3-4D38C6DB8A32}") = "Arcus.Scripting.Storage.Fil EndProject Project("{F5034706-568F-408A-B7B3-4D38C6DB8A32}") = "Arcus.Scripting.Storage.All", "Arcus.Scripting.Storage.All\Arcus.Scripting.Storage.All.pssproj", "{40345308-5871-4BDC-8D77-07E7B702F169}" EndProject -Project("{F5034706-568F-408A-B7B3-4D38C6DB8A32}") = "Arcus.Scripting.All", "Arcus.Scripting.All\Arcus.Scripting.All.pssproj", "{A3FD9C88-5283-40BB-81D0-44708C8313D8}" -EndProject Project("{F5034706-568F-408A-B7B3-4D38C6DB8A32}") = "Arcus.Scripting.IntegrationAccount", "Arcus.Scripting.IntegrationAccount\Arcus.Scripting.IntegrationAccount.pssproj", "{AFCEA845-372E-4000-85FD-5672D7551527}" EndProject Project("{F5034706-568F-408A-B7B3-4D38C6DB8A32}") = "Arcus.Scripting.AppService", "Arcus.Scripting.AppService\Arcus.Scripting.AppService.pssproj", "{342747E9-6406-4DA8-B238-37335ADBA79C}" @@ -105,10 +103,6 @@ Global {40345308-5871-4BDC-8D77-07E7B702F169}.Debug|Any CPU.Build.0 = Debug|Any CPU {40345308-5871-4BDC-8D77-07E7B702F169}.Release|Any CPU.ActiveCfg = Release|Any CPU {40345308-5871-4BDC-8D77-07E7B702F169}.Release|Any CPU.Build.0 = Release|Any CPU - {A3FD9C88-5283-40BB-81D0-44708C8313D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3FD9C88-5283-40BB-81D0-44708C8313D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3FD9C88-5283-40BB-81D0-44708C8313D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3FD9C88-5283-40BB-81D0-44708C8313D8}.Release|Any CPU.Build.0 = Release|Any CPU {AFCEA845-372E-4000-85FD-5672D7551527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AFCEA845-372E-4000-85FD-5672D7551527}.Debug|Any CPU.Build.0 = Debug|Any CPU {AFCEA845-372E-4000-85FD-5672D7551527}.Release|Any CPU.ActiveCfg = Release|Any CPU From c711df86b5719d5ba209780df642ce39711b86a9 Mon Sep 17 00:00:00 2001 From: stijnmoreels <9039753+stijnmoreels@users.noreply.github.com> Date: Fri, 30 Dec 2022 07:15:33 +0100 Subject: [PATCH 2/3] pr-rev: vs sln version --- src/Arcus.Scripting.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Arcus.Scripting.sln b/src/Arcus.Scripting.sln index a8585b1a..37490e16 100644 --- a/src/Arcus.Scripting.sln +++ b/src/Arcus.Scripting.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31702.278 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.32916.344 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5C8B7391-D202-4B09-8991-3EBAC09A585E}" EndProject From cf77c5a853abec87cb3aab7b59dfdf5a16d5ffe2 Mon Sep 17 00:00:00 2001 From: Stijn Moreels <9039753+stijnmoreels@users.noreply.github.com> Date: Fri, 30 Dec 2022 08:44:06 +0100 Subject: [PATCH 3/3] Update run-pester-tests.yml --- build/templates/run-pester-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/templates/run-pester-tests.yml b/build/templates/run-pester-tests.yml index 968ed8c1..09ad0390 100644 --- a/build/templates/run-pester-tests.yml +++ b/build/templates/run-pester-tests.yml @@ -25,7 +25,7 @@ steps: - powershell: | Write-Host "Installing Pester test framework and Az required modules" Install-Module -Name Pester -Force -SkipPublisherCheck -MaximumVersion 5.1.1 - Get-ChildItem ./src -Filter *.psd1 -Recurse | + Get-ChildItem ./src -Filter *.psd1 -Recurse -Exclude "*.All.psd1" | % { Write-Host "Inspect PowerShell '$($_.Name)' datafile" $content = Import-PowerShellDataFile $_.FullName $content.RequiredModules | @@ -39,7 +39,7 @@ steps: displayName: 'Install Pester test framework and Az required modules' - powershell: | Import-Module ./src/Arcus.Scripting.Security - Get-ChildItem -Path ./src -Filter *.psm1 -Recurse -Exclude "*Arcus.Scripting.Security*" | + Get-ChildItem -Path ./src -Filter *.psm1 -Recurse -Exclude "*Arcus.Scripting.Security*", "*.All.psm1" | % { Write-Host "Import $($_.DirectoryName) module" Import-Module -Name $_.DirectoryName -ErrorAction Stop } Invoke-Pester -Script "./src/${{ parameters.projectName }}/" -OutputFile "./pester.test.results.xml" -OutputFormat 'NUnitXML' -EnableExit