Merge branch 'PowerShell:main' into main

Author: Fantoom

.git-blame-ignore-revs

@@ -0,0 +1,9 @@
+# Enable this file in your git config: git config blame.ignoreRevsFile .git-blame-ignore-revs
+# Enabled on GitHub automatically
+
+# Close Over APIs, was mostly reformatting
+945d61634784db2e51f894c9606e785a099fd23d
+# Dotnet Format Style
+44387b36695607248cebb9467ad48061c19354cb
+# Formatting Fixup
+7233182585b63760992545c7407b17fb2965bc5c

.github/workflows/ci-test.yml

@@ -5,11 +5,6 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
-  merge_group:
-    types: [ checks_requested ]
-  schedule:
-    # 6am UTC which should be after a new daily build posts
-    - cron: "0 6 * * *"
 
 jobs:
   ci:
@@ -30,36 +25,33 @@ jobs:
         with:
           cache: true
           cache-dependency-path: '**/*.csproj'
-          dotnet-version: 6.0.x
-          global-json-file: "./global.json"
+          global-json-file: ./global.json
 
       - name: Install PSResources
         shell: pwsh
         run: ./tools/installPSResources.ps1
 
-      - name: Download daily install script
-        if: ${{ github.event_name == 'schedule' || github.event_name == 'merge_group' }}
+      - name: Download PowerShell install script
         uses: actions/checkout@v4
         with:
           repository: PowerShell/PowerShell
           path: pwsh
           sparse-checkout: tools/install-powershell.ps1
           sparse-checkout-cone-mode: false
 
-      - name: Install daily
-        if: ${{ github.event_name == 'schedule' || github.event_name == 'merge_group' }}
-        continue-on-error: true
+      - name: Install preview
         shell: pwsh
-        run: ./pwsh/tools/install-powershell.ps1 -Daily
+        run: ./pwsh/tools/install-powershell.ps1 -Preview -Destination ./preview
 
-      - name: Build and test
-        shell: pwsh
-        run: Invoke-Build -Configuration Release ${{ github.event_name == 'merge_group' && 'TestFull' || 'Test' }}
+      - name: If debugging, start upterm for interactive pipeline troubleshooting
+        if: ${{ runner.debug == 1 }}
+        uses: lhotari/action-upterm@v1
+        with:
+          wait-timeout-minutes: 1
 
-      - name: Test daily
-        if: ${{ github.event_name == 'schedule' }}
+      - name: Build and test
         shell: pwsh
-        run: Invoke-Build -Configuration Release TestE2EDaily
+        run: Invoke-Build -Configuration Release TestFull
 
       - name: Upload build artifacts
         if: always()

.pipelines/PowerShellEditorServices-Official.yml

@@ -88,10 +88,7 @@ extends:
             inputs:
               packageType: runtime
               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 Microsoft.PowerShell.PSResourceGet
-              ./tools/installPSResources.ps1 -PSRepository CFS
+          - pwsh: ./tools/installPSResources.ps1 -PSRepository CFS
             displayName: Install PSResources
           - pwsh: Invoke-Build TestFull -Configuration $(BuildConfiguration) -PSRepository CFS
             displayName: Build and test
@@ -132,7 +129,6 @@ extends:
                 **/Nerdbank.Streams.dll;
                 **/Newtonsoft.Json.dll;
                 **/OmniSharp.Extensions*.dll;
-                **/Serilog*.dll;
                 **/System.Reactive.dll;
           - task: ArchiveFiles@2
             displayName: Zip signed artifacts

ADOPTERS.md

@@ -1,5 +1,41 @@
 # PowerShell Editor Services Release History
 
+## v4.3.0
+### Tuesday, March 18, 2025
+
+See more details at the GitHub Release for [v4.3.0](https://github.com/PowerShell/PowerShellEditorServices/releases/tag/v4.3.0).
+
+New packages!
+
+## v4.2.0
+### Thursday, January 16, 2025
+
+See more details at the GitHub Release for [v4.2.0](https://github.com/PowerShell/PowerShellEditorServices/releases/tag/v4.2.0).
+
+Support PSScriptAnalyzer config in multi-root workspaces
+
+## v4.1.0
+### Wednesday, December 04, 2024
+
+See more details at the GitHub Release for [v4.1.0](https://github.com/PowerShell/PowerShellEditorServices/releases/tag/v4.1.0).
+
+Debugger optimizations and incremental build support!
+
+## v4.0.0
+### Monday, November 18, 2024
+
+See more details at the GitHub Release for [v4.0.0](https://github.com/PowerShell/PowerShellEditorServices/releases/tag/v4.0.0).
+
+Drop support for PowerShell <7.4 and logging overhaul
+
+PowerShell 7.2 LTS and 7.3 are now past end-of-support and are now unsupported.
+This is an incompatible API change so we're bumping the major version.
+Please update to PowerShell 7.4 LTS going forward.
+
+This release contains a logging overhaul which purposely removes our
+dependency on Serilog and should lead to improved stability with
+PowerShell 5.1 (by avoiding a major GAC assembly conflict).
+
 ## v3.21.0
 ### Wednesday, October 30, 2024
 

CHANGELOG.md

@@ -1,9 +1,10 @@
 <Project>
   <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.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageVersion Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
     <PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.6" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -12,17 +13,25 @@
     <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="Roslynator.Analyzers" Version="4.12.10">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageVersion>
+    <PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.10">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageVersion>
+    <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.12.10">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageVersion>
     <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" />
     <PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
-    <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
-    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="System.ValueTuple" Version="4.6.0" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
+    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
   </ItemGroup>
 </Project>