another attempt to make it work

OmniSharp · Apr 7, 2019 · 51a8bad · 51a8bad
1 parent 68e7ff5
commit 51a8bad
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/Dockerfile.testing b/Dockerfile.testing
@@ -1,10 +1,14 @@
-FROM microsoft/dotnet:2.2-sdk
+FROM microsoft/dotnet:2.1-sdk
 
 WORKDIR /usr/src
 
-# Install dependencies
+# We need mono for now as it provides msbuild-16x which is used by omnisharp-roslyn on linux for our test project
 RUN apt-get update \
-    && apt-get install -y git emacs24-nox wget curl make \
+    && apt-get install -y apt-transport-https dirmngr gnupg ca-certificates \
+    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
+    && (echo "deb https://download.mono-project.com/repo/debian stable-stretch main" | tee /etc/apt/sources.list.d/mono-official-stable.list) \
+    && apt-get update \
+    && apt-get install -y git emacs24-nox wget curl make mono-devel \
     && rm -rf /var/lib/apt/lists/*
 
 # Install Cask
@@ -13,7 +17,7 @@ ENV PATH /root/.cask/bin:$PATH
 
 # Install sample project's dependencies
 COPY test/MinimalProject test/MinimalProject
-RUN (cd ./test/MinimalProject && dotnet restore)
+RUN (cd ./test/MinimalProject && dotnet build)
 
 # Install omnisharp and it's dependency packages via Cask
 COPY Cask Cask

diff --git a/test-stuff/run-integration-tests.sh b/test-stuff/run-integration-tests.sh
@@ -2,8 +2,8 @@
 
 echo "'dotnet --version' reports:" $(dotnet --version)
 
-if [[ $(dotnet --version) != "2.2"* ]]; then
-    echo "Must install the .NET CLI 2.2.* http://dotnet.github.io/"
+if [[ $(dotnet --version) != "2.1"* ]]; then
+    echo "Must install the .NET CLI 2.1.* http://dotnet.github.io/"
     exit 1
 fi
 

diff --git a/test/MinimalProject/MinimalProject.csproj b/test/MinimalProject/MinimalProject.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>MinimalProject</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>MinimalProject</PackageId>

diff --git a/test/MinimalProject/MyClass.cs b/test/MinimalProject/MyClass.cs
@@ -1,10 +1,12 @@
-namespace MyNamespace {
-    public class Class321
+using System;
+
+namespace minimal
+{
+    public class MyClass
     {
-        public void Whatever()
+        public static void Main(string[] args)
         {
-            IPAddress.Parse();
-            Gu$id.NewGuid();
+            Console.WriteLine("hello, world");
         }
     }
 }