Skip to content

Commit f7517b3

Browse files
andyleejordanandyleejordan
committed
Add -LocalOmniSharp build flag
To build against project at `../csharp-language-server-protocol`.
1 parent f617fb4 commit f7517b3

File tree

5 files changed

+51
-15
lines changed

5 files changed

+51
-15
lines changed

‎PowerShellEditorServices.build.ps1

+19-11
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,36 @@ param(
55
[ValidateSet("Debug", "Release")]
66
[string]$Configuration = "Debug",
77

8+
[switch]$LocalOmniSharp,
9+
810
[string]$PsesSubmodulePath = "$PSScriptRoot/module",
911

1012
[string]$ModulesJsonPath = "$PSScriptRoot/modules.json",
1113

1214
[string]$DefaultModuleRepository = "PSGallery",
1315

14-
[string[]]$VerbosityArgs = @("--verbosity", "quiet", "--nologo"),
16+
[string]$Verbosity = "quiet",
1517

1618
# See: https://docs.microsoft.com/en-us/dotnet/core/testing/selective-unit-tests
1719
[string]$TestFilter = '',
1820

1921
# See: https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test
20-
[string[]]$TestArgs = $VerbosityArgs + @("--logger", "console;verbosity=normal", "--logger", "trx")
22+
[string[]]$TestArgs = @("--logger", "console;verbosity=normal", "--logger", "trx")
2123
)
2224

2325
#Requires -Modules @{ModuleName="InvokeBuild"; ModuleVersion="5.0.0"}
2426
#Requires -Modules @{ModuleName="platyPS"; ModuleVersion="0.14.0"}
2527

26-
$script:dotnetTestArgs = @(
27-
"test"
28-
$TestArgs
28+
$script:dotnetBuildArgs = @(
29+
"--verbosity"
30+
$Verbosity
31+
"--nologo"
32+
"-c"
33+
$Configuration
34+
if ($LocalOmniSharp) { "-property:LocalOmniSharp=true" }
35+
)
36+
37+
$script:dotnetTestArgs = @("test") + $script:dotnetBuildArgs + $TestArgs + @(
2938
if ($TestFilter) { "--filter", $TestFilter }
3039
"--framework"
3140
)
@@ -80,7 +89,7 @@ Task BinClean {
8089
}
8190

8291
Task Clean FindDotNet, BinClean, {
83-
Invoke-BuildExec { & dotnet clean $VerbosityArgs }
92+
Invoke-BuildExec { & dotnet clean --verbosity $Verbosity }
8493
Get-ChildItem -Recurse $PSScriptRoot\src\*.nupkg | Remove-BuildItem
8594
Get-ChildItem $PSScriptRoot\PowerShellEditorServices*.zip | Remove-BuildItem
8695
Get-ChildItem $PSScriptRoot\module\PowerShellEditorServices\Commands\en-US\*-help.xml | Remove-BuildItem
@@ -162,15 +171,14 @@ Task SetupHelpForTests {
162171
}
163172

164173
Task Build FindDotNet, CreateBuildInfo, {
165-
Invoke-BuildExec { & dotnet restore $VerbosityArgs }
166-
Invoke-BuildExec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:NetRuntime.Standard }
167-
Invoke-BuildExec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.PS7 }
174+
Invoke-BuildExec { & dotnet publish $script:dotnetBuildArgs .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:NetRuntime.Standard }
175+
Invoke-BuildExec { & dotnet publish $script:dotnetBuildArgs .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.PS7 }
168176
if (-not $script:IsNix) {
169-
Invoke-BuildExec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.Desktop }
177+
Invoke-BuildExec { & dotnet publish $script:dotnetBuildArgs .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.Desktop }
170178
}
171179

172180
# Build PowerShellEditorServices.VSCode module
173-
Invoke-BuildExec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj -f $script:NetRuntime.Standard }
181+
Invoke-BuildExec { & dotnet publish $script:dotnetBuildArgs .\src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj -f $script:NetRuntime.Standard }
174182
}
175183

176184
Task Test TestServer, TestE2E

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<ProjectReference Include="..\PowerShellEditorServices\PowerShellEditorServices.csproj" PrivateAssets="all" />
2222
</ItemGroup>
2323

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

2727
<Compile Remove="Internal/PsesLoadContext.cs" />

‎src/PowerShellEditorServices/PowerShellEditorServices.csproj

+16
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,22 @@
4242
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
4343
</ItemGroup>
4444

45+
<Choose>
46+
<When Condition=" '$(LocalOmniSharp)' == 'true' ">
47+
<ItemGroup>
48+
<ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Server\Server.csproj" />
49+
<ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Dap.Server\Dap.Server.csproj" />
50+
</ItemGroup>
51+
</When>
52+
<Otherwise>
53+
<ItemGroup>
54+
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.6" />
55+
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.6" />
56+
</ItemGroup>
57+
</Otherwise>
58+
</Choose>
59+
60+
<!-- TODO: Remove these entirely. -->
4561
<ItemGroup>
4662
<Compile Remove="Extensions\Api\DocumentSymbolService.cs" />
4763
<Compile Remove="Services\Extension\Templating\**" />

‎test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj

+15-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,26 @@
1010
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
1212
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
13-
<PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.6" />
14-
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.6" />
1513
<PackageReference Include="xunit" Version="2.4.2" />
1614
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1715
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
1816
</ItemGroup>
1917

18+
<Choose>
19+
<When Condition=" '$(LocalOmniSharp)' == 'true' ">
20+
<ItemGroup>
21+
<ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Client\Client.csproj" />
22+
<ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Dap.Client\Dap.client.csproj" />
23+
</ItemGroup>
24+
</When>
25+
<Otherwise>
26+
<ItemGroup>
27+
<PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.6" />
28+
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.6" />
29+
</ItemGroup>
30+
</Otherwise>
31+
</Choose>
32+
2033
<ItemGroup>
2134
<ProjectReference Include="..\..\src\PowerShellEditorServices\PowerShellEditorServices.csproj" />
2235
</ItemGroup>

‎test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<PackageReference Include="xunit" Version="2.4.2" />
4242
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
4343
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
44-
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.6" />
4544
</ItemGroup>
4645

4746
<ItemGroup>

0 commit comments

Comments
 (0)