Unverified Commit 2464a542 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #136329 from avdv/omnisharp-roslyn-update

parents bfa2e03c f76bd3ba
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p msbuild -p jq -p xmlstarlet -p curl
#!nix-shell -I nixpkgs=../../../../.. -i bash -p msbuild dotnet-sdk_3 jq xmlstarlet curl
set -euo pipefail

cat << EOL
@@ -20,7 +20,6 @@ mapfile -t repos < <(

msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \
        -p:RestoreNoCache=true -p:RestoreForce=true \
        -p:NuGetPackageVersion=5.9.1-rc.8 \
        src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj >&2

cd "$tmpdir"
+2 −5
Original line number Diff line number Diff line
@@ -68,26 +68,23 @@ let
in stdenv.mkDerivation rec {

  pname = "omnisharp-roslyn";
  version = "1.37.12";
  version = "1.37.15";

  src = fetchFromGitHub {
    owner = "OmniSharp";
    repo = pname;
    rev = "v${version}";
    sha256 = "0gyy49v3pslr0l0q6h8hzah4s0iwkhkyckyrj3g2cg08w20b10gw";
    sha256 = "070wqs667si3f78fy6w4rrfm8qncnabg0yckjhll0yv1pzbj9q42";
  };

  nativeBuildInputs = [ makeWrapper msbuild ];

  # NuGetPackageVersion is overridden to be to be compatible with msbuild 16.10,
  # it needs to be kept in sync with ./create-deps.sh
  buildPhase = ''
    runHook preBuild

    HOME=$(pwd)/fake-home msbuild -r \
      -p:Configuration=Release \
      -p:RestoreConfigFile=${nuget-config} \
      -p:NuGetPackageVersion=5.9.1-rc.8 \
      src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj

    runHook postBuild
+126 −134

File changed.

Preview size limit exceeded, changes collapsed.