|
3 | 3 | dotnetCorePackages,
|
4 | 4 | fetchFromGitHub,
|
5 | 5 | lib,
|
6 |
| - stdenv, |
7 | 6 | runCommand,
|
8 | 7 | expect,
|
9 | 8 | }:
|
10 | 9 |
|
11 | 10 | let
|
12 |
| - inherit (dotnetCorePackages) sdk_8_0 runtime_6_0; |
| 11 | + inherit (dotnetCorePackages) sdk_8_0 sdk_9_0 runtime_8_0; |
13 | 12 | in
|
14 | 13 | let
|
15 | 14 | finalPackage = buildDotnetModule rec {
|
|
26 | 25 | projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
|
27 | 26 | nugetDeps = ./deps.nix;
|
28 | 27 |
|
29 |
| - dotnet-sdk = |
30 |
| - with dotnetCorePackages; |
31 |
| - combinePackages [ |
32 |
| - sdk_6_0 |
33 |
| - sdk_8_0 |
34 |
| - ]; |
| 28 | + dotnet-sdk = sdk_8_0; |
35 | 29 | dotnet-runtime = sdk_8_0;
|
36 | 30 |
|
37 |
| - dotnetInstallFlags = [ "--framework net6.0" ]; |
| 31 | + dotnetInstallFlags = [ "--framework net8.0" ]; |
38 | 32 | dotnetBuildFlags = [
|
39 |
| - "--framework net6.0" |
| 33 | + "--framework net8.0" |
40 | 34 | "--no-self-contained"
|
41 | 35 | ];
|
42 | 36 | dotnetFlags = [
|
|
45 | 39 | "-property:AssemblyVersion=${version}.0"
|
46 | 40 | "-property:FileVersion=${version}.0"
|
47 | 41 | "-property:InformationalVersion=${version}"
|
48 |
| - "-property:RuntimeFrameworkVersion=${runtime_6_0.version}" |
| 42 | + "-property:RuntimeFrameworkVersion=${runtime_8_0.version}" |
49 | 43 | "-property:RollForward=LatestMajor"
|
50 | 44 | ];
|
51 | 45 |
|
|
56 | 50 | # Patch the project files so we can compile them properly
|
57 | 51 | for project in src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj; do
|
58 | 52 | substituteInPlace $project \
|
59 |
| - --replace '<RuntimeIdentifiers>win7-x64;win7-x86;win10-arm64</RuntimeIdentifiers>' '<RuntimeIdentifiers>linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>' |
| 53 | + --replace-fail '<RuntimeIdentifiers>win7-x64;win7-x86;win10-arm64</RuntimeIdentifiers>' '<RuntimeIdentifiers>linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>' |
60 | 54 | done
|
| 55 | + substituteInPlace src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj \ |
| 56 | + --replace-fail 'net6.0' 'net8.0' \ |
| 57 | + --replace-fail '<RuntimeFrameworkVersion>6.0.0-preview.7.21317.1</RuntimeFrameworkVersion>' "" |
61 | 58 | '';
|
62 | 59 |
|
63 | 60 | useDotnetFromEnv = true;
|
|
96 | 93 | in
|
97 | 94 | {
|
98 | 95 | # Make sure we can run OmniSharp with any supported SDK version, as well as without
|
99 |
| - with-net6-sdk = with-sdk dotnetCorePackages.sdk_6_0; |
100 |
| - with-net8-sdk = with-sdk dotnetCorePackages.sdk_8_0; |
| 96 | + with-net8-sdk = with-sdk sdk_8_0; |
| 97 | + with-net9-sdk = with-sdk sdk_9_0; |
101 | 98 | no-sdk = with-sdk null;
|
102 | 99 | };
|
103 | 100 |
|
|
0 commit comments