Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3fbc7b7

Browse files
Merge branch 'main' into feature/breakpointLabelFrame
2 parents 0160a14 + feabfd5 commit 3fbc7b7

File tree

28 files changed

+155
-613
lines changed

28 files changed

+155
-613
lines changed

‎.github/workflows/ci-test.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
run: ./tools/installPSResources.ps1
3939

4040
- name: Download daily install script
41+
if: ${{ github.event_name == 'schedule' || github.event_name == 'merge_group' }}
4142
uses: actions/checkout@v4
4243
with:
4344
repository: PowerShell/PowerShell

‎.gitignore‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
bin/
22
obj/
3-
module/PowerShellEditorServices/NOTICE.txt
4-
module/PowerShellEditorServices/Commands/en-US/
5-
module/PSReadLine/
6-
module/PSScriptAnalyzer/
3+
module/
74
TestResults/

‎.pipelines/PowerShellEditorServices-Official.yml‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ extends:
5151
EnableCDPxPAT: false
5252
WindowsHostVersion:
5353
Version: 2022
54-
Network: Netlock
54+
Network: KS3
55+
release:
56+
category: NonAzure
5557
stages:
5658
- stage: build
5759
jobs:
@@ -60,7 +62,7 @@ extends:
6062
pool:
6163
type: windows
6264
variables:
63-
ob_outputDirectory: $(Build.SourcesDirectory)/module
65+
ob_outputDirectory: $(Build.SourcesDirectory)/out
6466
steps:
6567
- pwsh: |
6668
[xml]$xml = Get-Content PowerShellEditorServices.Common.props
@@ -88,9 +90,10 @@ extends:
8890
version: 6.x
8991
- pwsh: |
9092
Register-PSRepository -Name CFS -SourceLocation "https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v2" -InstallationPolicy Trusted
91-
Install-Module -Repository CFS -Name InvokeBuild -RequiredVersion 5.11.3
92-
Install-Module -Repository CFS -Name platyPS -RequiredVersion 0.14.2
93-
Invoke-Build TestFull -Configuration $(BuildConfiguration) -PSRepository CFS
93+
Install-Module -Repository CFS -Name Microsoft.PowerShell.PSResourceGet
94+
./tools/installPSResources.ps1 -PSRepository CFS
95+
displayName: Install PSResources
96+
- pwsh: Invoke-Build TestFull -Configuration $(BuildConfiguration) -PSRepository CFS
9497
displayName: Build and test
9598
- task: PublishTestResults@2
9699
displayName: Publish test results
@@ -129,38 +132,38 @@ extends:
129132
**/Nerdbank.Streams.dll;
130133
**/Newtonsoft.Json.dll;
131134
**/OmniSharp.Extensions*.dll;
132-
**/Serilog*.dll;
133135
**/System.Reactive.dll;
136+
- task: ArchiveFiles@2
137+
displayName: Zip signed artifacts
138+
inputs:
139+
rootFolderOrFile: $(Build.SourcesDirectory)/module
140+
includeRootFolder: false
141+
archiveType: zip
142+
archiveFile: out/PowerShellEditorServices.zip
134143
- stage: release
135144
dependsOn: build
136145
condition: eq(variables['Build.Reason'], 'Manual')
137146
variables:
147+
ob_release_environment: Production
138148
version: $[ stageDependencies.build.main.outputs['package.version'] ]
139149
prerelease: $[ stageDependencies.build.main.outputs['package.prerelease'] ]
140-
drop: $(Pipeline.Workspace)/drop_build_main
141150
jobs:
142151
- job: github
143152
displayName: Publish draft to GitHub
144153
pool:
145-
type: windows
146-
variables:
147-
ob_outputDirectory: $(Build.SourcesDirectory)/out
148-
steps:
149-
- download: current
150-
displayName: Download artifacts
151-
- task: ArchiveFiles@2
152-
displayName: Zip signed artifacts
154+
type: release
155+
templateContext:
153156
inputs:
154-
rootFolderOrFile: $(drop)
155-
includeRootFolder: false
156-
archiveType: zip
157-
archiveFile: out/PowerShellEditorServices.zip
157+
- input: pipelineArtifact
158+
artifactName: drop_build_main
159+
steps:
158160
- task: GitHubRelease@1
159161
displayName: Create GitHub release
160162
inputs:
161163
gitHubConnection: GitHub
162164
repositoryName: PowerShell/PowerShellEditorServices
163-
assets: out/PowerShellEditorServices.zip
165+
target: main
166+
assets: $(Pipeline.Workspace)/PowerShellEditorServices.zip
164167
tagSource: userSpecifiedTag
165168
tag: v$(version)
166169
isDraft: true

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# PowerShell Editor Services Release History
22

3+
## v3.21.0
4+
### Wednesday, October 30, 2024
5+
6+
See more details at the GitHub Release for [v3.21.0](https://github.com/PowerShell/PowerShellEditorServices/releases/tag/v3.21.0).
7+
8+
Updates to PSScriptAnalyzer and Call-operator support
9+
310
## v3.20.1
411
### Friday, May 03, 2024
512

‎Directory.Packages.props‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@
22
<ItemGroup>
33
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
44
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
5-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
5+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
6+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
67
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
78
<PackageVersion Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
8-
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.5" />
9+
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.6" />
910
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
1011
<PackageVersion Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.9" />
1112
<PackageVersion Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.9" />
1213
<PackageVersion Include="OmniSharp.Extensions.LanguageClient" Version="0.19.9" />
1314
<PackageVersion Include="OmniSharp.Extensions.LanguageServer" Version="0.19.9" />
1415
<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
15-
<PackageVersion Include="Serilog" Version="4.0.0" />
16-
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
17-
<PackageVersion Include="Serilog.Sinks.Async" Version="2.0.0" />
18-
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
1916
<PackageVersion Include="System.IO.Pipes.AccessControl" Version="5.0.0" />
2017
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
2118
<PackageVersion Include="System.Security.Principal" Version="4.3.0" />

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /