Merge branch 'main' into feature/breakpointLabelFrame

PowerShell · Nov 14, 2024 · 3fbc7b7 · 3fbc7b7
2 parents 0160a14 + feabfd5
commit 3fbc7b7
Show file tree

Hide file tree

Showing 28 changed files with 155 additions and 613 deletions.
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -38,6 +38,7 @@ jobs:
         run: ./tools/installPSResources.ps1
 
       - name: Download daily install script
+        if: ${{ github.event_name == 'schedule' || github.event_name == 'merge_group' }}
         uses: actions/checkout@v4
         with:
           repository: PowerShell/PowerShell

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,4 @@
 bin/
 obj/
-module/PowerShellEditorServices/NOTICE.txt
-module/PowerShellEditorServices/Commands/en-US/
-module/PSReadLine/
-module/PSScriptAnalyzer/
+module/
 TestResults/
diff --git a/.pipelines/PowerShellEditorServices-Official.yml b/.pipelines/PowerShellEditorServices-Official.yml
@@ -51,7 +51,9 @@ extends:
       EnableCDPxPAT: false
       WindowsHostVersion:
         Version: 2022
-        Network: Netlock
+        Network: KS3
+    release:
+      category: NonAzure
     stages:
     - stage: build
       jobs:
@@ -60,7 +62,7 @@ extends:
         pool:
           type: windows
         variables:
-          ob_outputDirectory: $(Build.SourcesDirectory)/module
+          ob_outputDirectory: $(Build.SourcesDirectory)/out
         steps:
           - pwsh: |
               [xml]$xml = Get-Content PowerShellEditorServices.Common.props
@@ -88,9 +90,10 @@ extends:
               version: 6.x
           - pwsh: |
               Register-PSRepository -Name CFS -SourceLocation "https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v2" -InstallationPolicy Trusted
-              Install-Module -Repository CFS -Name InvokeBuild -RequiredVersion 5.11.3
-              Install-Module -Repository CFS -Name platyPS -RequiredVersion 0.14.2
-              Invoke-Build TestFull -Configuration $(BuildConfiguration) -PSRepository CFS
+              Install-Module -Repository CFS -Name Microsoft.PowerShell.PSResourceGet
+              ./tools/installPSResources.ps1 -PSRepository CFS
+            displayName: Install PSResources
+          - pwsh: Invoke-Build TestFull -Configuration $(BuildConfiguration) -PSRepository CFS
             displayName: Build and test
           - task: PublishTestResults@2
             displayName: Publish test results
@@ -129,38 +132,38 @@ extends:
                 **/Nerdbank.Streams.dll;
                 **/Newtonsoft.Json.dll;
                 **/OmniSharp.Extensions*.dll;
-                **/Serilog*.dll;
                 **/System.Reactive.dll;
+          - task: ArchiveFiles@2
+            displayName: Zip signed artifacts
+            inputs:
+              rootFolderOrFile: $(Build.SourcesDirectory)/module
+              includeRootFolder: false
+              archiveType: zip
+              archiveFile: out/PowerShellEditorServices.zip
     - stage: release
       dependsOn: build
       condition: eq(variables['Build.Reason'], 'Manual')
       variables:
+        ob_release_environment: Production
         version: $[ stageDependencies.build.main.outputs['package.version'] ]
         prerelease: $[ stageDependencies.build.main.outputs['package.prerelease'] ]
-        drop: $(Pipeline.Workspace)/drop_build_main
       jobs:
       - job: github
         displayName: Publish draft to GitHub
         pool:
-          type: windows
-        variables:
-          ob_outputDirectory: $(Build.SourcesDirectory)/out
-        steps:
-        - download: current
-          displayName: Download artifacts
-        - task: ArchiveFiles@2
-          displayName: Zip signed artifacts
+          type: release
+        templateContext:
           inputs:
-            rootFolderOrFile: $(drop)
-            includeRootFolder: false
-            archiveType: zip
-            archiveFile: out/PowerShellEditorServices.zip
+          - input: pipelineArtifact
+            artifactName: drop_build_main
+        steps:
         - task: GitHubRelease@1
           displayName: Create GitHub release
           inputs:
             gitHubConnection: GitHub
             repositoryName: PowerShell/PowerShellEditorServices
-            assets: out/PowerShellEditorServices.zip
+            target: main
+            assets: $(Pipeline.Workspace)/PowerShellEditorServices.zip
             tagSource: userSpecifiedTag
             tag: v$(version)
             isDraft: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # PowerShell Editor Services Release History
 
+## v3.21.0
+### Wednesday, October 30, 2024
+
+See more details at the GitHub Release for [v3.21.0](https://github.com/PowerShell/PowerShellEditorServices/releases/tag/v3.21.0).
+
+Updates to PSScriptAnalyzer and Call-operator support
+
 ## v3.20.1
 ### Friday, May 03, 2024
 

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,20 +2,17 @@
   <ItemGroup>
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
-    <PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.5" />
+    <PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.6" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.9" />
     <PackageVersion Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.9" />
     <PackageVersion Include="OmniSharp.Extensions.LanguageClient" Version="0.19.9" />
     <PackageVersion Include="OmniSharp.Extensions.LanguageServer" Version="0.19.9" />
     <PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
-    <PackageVersion Include="Serilog" Version="4.0.0" />
-    <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageVersion Include="Serilog.Sinks.Async" Version="2.0.0" />
-    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageVersion Include="System.IO.Pipes.AccessControl" Version="5.0.0" />
     <PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageVersion Include="System.Security.Principal" Version="4.3.0" />