Skip to content

Commit

Permalink
Dockerfile.testing: .net core sdk to dotnet:2.2-sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
razzmatazz committed Apr 7, 2019
1 parent c8ae9d9 commit 26c6637
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.testing
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:1.1.2-sdk
FROM microsoft/dotnet:2.2-sdk

WORKDIR /usr/src

Expand Down
4 changes: 2 additions & 2 deletions test-stuff/run-integration-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

echo "'dotnet --version' reports:" $(dotnet --version)

if [[ $(dotnet --version) != "1.1"* ]]; then
echo "Must install the .NET CLI 1.1.* http://dotnet.github.io/"
if [[ $(dotnet --version) != "2.2"* ]]; then
echo "Must install the .NET CLI 2.2.* http://dotnet.github.io/"
exit 1
fi

Expand Down
3 changes: 1 addition & 2 deletions test/MinimalProject/MinimalProject.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<AssemblyName>MinimalProject</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>MinimalProject</PackageId>
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion test/buttercup-tests/flycheck/flycheck-test.el
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
;; open error list and verify its contents
(flycheck-list-errors)

(ot--switch-to-the-window-in-the-buffer "*Flycheck errors*")
(ot--switch-to-the-window-in-the-buffer "*Flycheck errors* for buffer FlycheckTest.cs")
(ot--point-should-be-on-a-line-containing
(concat "The type or namespace name 'DoesNotExist' could not be found"
" (are you missing a using directive or an assembly reference?)"))
Expand Down
2 changes: 1 addition & 1 deletion test/buttercup-tests/navigation/go-to-definition-test.el
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@
;; TODO: for some reason I need to set current buffer from window list
;; with with-current-buffer..
(with-current-buffer (car (mapcar #'window-buffer (window-list)))
(ot--i-should-be-in-buffer-name "*omnisharp-metadata:MinimalProject:System.Runtime:System.String*")
(ot--i-should-be-in-buffer-name "*omnisharp-metadata:MiscellaneousFiles.csproj:mscorlib:System.String*")
(ot--point-should-be-on-a-line-containing "public sealed class String"))))
1 change: 0 additions & 1 deletion test/buttercup-tests/solution/solution-errors-test.el
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

(ot--switch-to-the-window-in-the-buffer "*omnisharp-solution-errors*")

(ot--buffer-should-contain "MyClass.cs(1,1): warning CS8019: Unnecessary using directive.")
(ot--buffer-should-contain "MyClass.cs(6,14): error CS1519: Invalid token '-' in class, struct, or interface member declaration")
(ot--buffer-should-contain "MyClass.cs(7,5): error CS1519: Invalid token '}' in class, struct, or interface member declaration")
(ot--buffer-should-contain "omnisharp-solution-errors: finished")))

0 comments on commit 26c6637

Please sign in to comment.