Skip to content

Commit 7c27a4d

Browse files
JustinGroteJustinGrote
authored
Merge branch 'main' into rename-function-customvisitor
2 parents fc19679 + a1e354d commit 7c27a4d

File tree

13 files changed

+78
-212
lines changed

13 files changed

+78
-212
lines changed

‎.github/workflows/ci-test.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ jobs:
3030
with:
3131
cache: true
3232
cache-dependency-path: '**/*.csproj'
33-
dotnet-version: |
34-
6.0.x
35-
7.0.x
36-
8.0.x
33+
dotnet-version: 6.0.x
34+
global-json-file: "./global.json"
3735

3836
- name: Install PSResources
3937
shell: pwsh

‎.github/workflows/vim-test.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ jobs:
3535
run: Invoke-Build Build
3636

3737
- name: Install Vim
38+
id: vim
3839
uses: rhysd/action-setup-vim@v1
40+
with:
41+
version: nightly
3942

4043
- name: Checkout vim-ps1
4144
uses: actions/checkout@v4
@@ -59,6 +62,9 @@ jobs:
5962
repository: thinca/vim-themis
6063
path: vim-themis
6164

65+
# - name: Debug if run with debugging enabled
66+
# uses: lhotari/action-upterm@v1
67+
6268
- name: Run Themis with full CLI
6369
env:
6470
THEMIS_VIM: ${{ steps.vim.outputs.executable }}

‎.pipelines/PowerShellEditorServices-Official.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ extends:
4848
enabled: true
4949
forStages: [build]
5050
featureFlags:
51+
EnableCDPxPAT: false
5152
WindowsHostVersion:
5253
Version: 2022
5354
Network: Netlock
@@ -79,7 +80,7 @@ extends:
7980
displayName: Use .NET 8.x SDK
8081
inputs:
8182
packageType: sdk
82-
version: 8.x
83+
useGlobalJson: true
8384
- task: UseDotNet@2
8485
displayName: Use .NET 6.x runtime (for tests)
8586
inputs:

‎Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
</Project>

‎Directory.Packages.props

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
4+
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
5+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
6+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
7+
<PackageVersion Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
8+
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.5" />
9+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
10+
<PackageVersion Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.9" />
11+
<PackageVersion Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.9" />
12+
<PackageVersion Include="OmniSharp.Extensions.LanguageClient" Version="0.19.9" />
13+
<PackageVersion Include="OmniSharp.Extensions.LanguageServer" Version="0.19.9" />
14+
<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" />
19+
<PackageVersion Include="System.IO.Pipes.AccessControl" Version="5.0.0" />
20+
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
21+
<PackageVersion Include="System.Security.Principal" Version="4.3.0" />
22+
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
23+
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
24+
<PackageVersion Include="xunit" Version="2.9.0" />
25+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
26+
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
27+
</ItemGroup>
28+
</Project>

‎PowerShellEditorServices.sln

Lines changed: 0 additions & 160 deletions
This file was deleted.

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "8.0.110",
44
"rollForward": "latestFeature",
55
"allowPrerelease": false
66
}

‎src/PowerShellEditorServices.Hosting/PowerShellEditorServices.Hosting.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,17 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
15-
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" PrivateAssets="all" />
16-
<PackageReference Include="System.IO.Pipes.AccessControl" Version="5.0.0" />
17-
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
14+
<PackageReference Include="PowerShellStandard.Library" PrivateAssets="all" />
15+
<PackageReference Include="System.IO.Pipes.AccessControl" />
16+
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
1817
</ItemGroup>
1918

2019
<ItemGroup>
2120
<ProjectReference Include="..\PowerShellEditorServices\PowerShellEditorServices.csproj" PrivateAssets="all" />
2221
</ItemGroup>
2322

2423
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
25-
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
24+
<PackageReference Include="System.ValueTuple" />
2625

2726
<Compile Remove="Internal/PsesLoadContext.cs" />
2827
</ItemGroup>

‎src/PowerShellEditorServices/PowerShellEditorServices.csproj

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
36-
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
37-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
38-
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
39-
<PackageReference Include="Serilog" Version="4.0.0" />
40-
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
41-
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
42-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
43-
<PackageReference Include="System.IO.Pipes.AccessControl" Version="5.0.0" />
44-
<PackageReference Include="System.Security.Principal" Version="4.3.0" />
45-
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
35+
<PackageReference Include="Microsoft.CSharp" />
36+
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
37+
<PackageReference Include="Microsoft.Extensions.Logging" />
38+
<PackageReference Include="PowerShellStandard.Library" />
39+
<PackageReference Include="Serilog" />
40+
<PackageReference Include="Serilog.Extensions.Logging" />
41+
<PackageReference Include="Serilog.Sinks.Async" />
42+
<PackageReference Include="Serilog.Sinks.File" />
43+
<PackageReference Include="System.IO.Pipes.AccessControl" />
44+
<PackageReference Include="System.Security.Principal" />
45+
<PackageReference Include="System.Security.Principal.Windows" />
4646
</ItemGroup>
4747

4848
<Choose>
@@ -54,16 +54,9 @@
5454
</When>
5555
<Otherwise>
5656
<ItemGroup>
57-
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.9" />
58-
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.9" />
57+
<PackageReference Include="OmniSharp.Extensions.LanguageServer" />
58+
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" />
5959
</ItemGroup>
6060
</Otherwise>
6161
</Choose>
62-
63-
<!-- TODO: Remove these entirely. -->
64-
<ItemGroup>
65-
<Compile Remove="Services\Extension\Templating\**" />
66-
<EmbeddedResource Remove="Services\Extension\Templating\**" />
67-
<None Remove="Services\Extension\Templating\**" />
68-
</ItemGroup>
6962
</Project>

‎test/PowerShellEditorServices.Test.E2E/DebugAdapterProtocolMessageTests.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System;
55
using System.IO;
66
using System.Linq;
7-
using System.Reflection;
87
using System.Runtime.InteropServices;
98
using System.Text;
109
using System.Threading;
@@ -21,11 +20,8 @@ namespace PowerShellEditorServices.Test.E2E
2120
[Trait("Category", "DAP")]
2221
public class DebugAdapterProtocolMessageTests : IAsyncLifetime, IDisposable
2322
{
24-
private const string TestOutputFileName = "__dapTestOutputFile.txt";
2523
private static readonly bool s_isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
26-
private static readonly string s_binDir =
27-
Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
28-
private static readonly string s_testOutputPath = Path.Combine(s_binDir, TestOutputFileName);
24+
private static readonly string s_testOutputPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
2925

3026
private readonly ITestOutputHelper _output;
3127
private DebugAdapterClient PsesDebugAdapterClient;
@@ -116,7 +112,7 @@ public void Dispose()
116112
private static string NewTestFile(string script, bool isPester = false)
117113
{
118114
string fileExt = isPester ? ".Tests.ps1" : ".ps1";
119-
string filePath = Path.Combine(s_binDir, Path.GetRandomFileName() + fileExt);
115+
string filePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName() + fileExt);
120116
File.WriteAllText(filePath, script);
121117

122118
return filePath;

0 commit comments

Comments
 (0)