Pipeline fix, test 2

akkadotnet · Feb 11, 2021 · 056dda1 · 056dda1
1 parent 2132947
commit 056dda1
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 29 deletions.
diff --git a/build-system/azure-pipeline.template.yaml b/build-system/azure-pipeline.template.yaml
@@ -19,6 +19,11 @@ jobs:
         clean: false  # whether to fetch clean each time
         submodules: recursive  # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: true
+      - task: UseDotNet@2
+        displayName: 'Use .NET Core Runtime 3.1.10'
+        inputs:
+          packageType: runtime
+          version: 3.1.10
       # Linux or macOS
       - task: Bash@3 
         displayName: Linux / OSX Build

diff --git a/build-system/windows-release.yaml b/build-system/windows-release.yaml
@@ -21,6 +21,11 @@ variables:
   - name: githubRepositoryName
     value: akkadotnet/Akka.Persistence.PostgreSql
 steps:
+- task: UseDotNet@2
+  displayName: 'Use .NET Core Runtime 3.1.10'
+  inputs:
+    packageType: runtime
+    version: 3.1.10
 - task: BatchScript@1
   displayName: 'FAKE Build'
   inputs:

diff --git a/build.fsx b/build.fsx
@@ -359,7 +359,7 @@ Target "All" DoNothing
 Target "Nuget" DoNothing
 
 // build dependencies
-"Clean" ==> "AssemblyInfo" ==> "RestorePackages" ==> "Build"
+"Clean" ==> "AssemblyInfo" ==> "Build"
 "Build" ==> "BuildRelease"
 
 // test dependencies

diff --git a/build.sh b/build.sh
@@ -7,11 +7,13 @@
 SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 TOOLS_DIR=$SCRIPT_DIR/tools
 NUGET_EXE=$TOOLS_DIR/nuget.exe
-NUGET_URL=https://dist.nuget.org/win-x86-commandline/v4.0.0/nuget.exe
-FAKE_VERSION=4.61.2
+NUGET_URL=https://dist.nuget.org/win-x86-commandline/v5.8.0/nuget.exe
+FAKE_VERSION=4.63.0
 FAKE_EXE=$TOOLS_DIR/FAKE/tools/FAKE.exe
-DOTNET_VERSION=3.1.100
+DOTNET_EXE=$SCRIPT_DIR/.dotnet/dotnet
+DOTNETCORE_VERSION=3.1.105
 DOTNET_INSTALLER_URL=https://dot.net/v1/dotnet-install.sh
+DOTNET_CHANNEL=LTS
 
 # Define default arguments.
 TARGET="Default"
@@ -38,22 +40,6 @@ if [ ! -d "$TOOLS_DIR" ]; then
   mkdir "$TOOLS_DIR"
 fi
 
-###########################################################################
-# INSTALL .NET CORE CLI
-###########################################################################
-
-echo "Installing .NET CLI..."
-if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then
-  mkdir "$SCRIPT_DIR/.dotnet"
-fi
-curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" $DOTNET_INSTALLER_URL
-bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version $DOTNET_VERSION --install-dir .dotnet --no-path
-export PATH="$SCRIPT_DIR/.dotnet":$PATH
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-chmod -R 0755 ".dotnet"
-"$SCRIPT_DIR/.dotnet/dotnet" --info
-
 ###########################################################################
 # INSTALL NUGET
 ###########################################################################

diff --git a/src/Akka.Persistence.PostgreSql.Tests/Akka.Persistence.PostgreSql.Tests.csproj b/src/Akka.Persistence.PostgreSql.Tests/Akka.Persistence.PostgreSql.Tests.csproj
@@ -7,13 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Docker.DotNet" Version="3.125.2" />
+    <PackageReference Include="Docker.DotNet" Version="3.125.4" />
     <PackageReference Include="Akka.Persistence.Sql.TestKit" Version="$(AkkaVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
-    <PackageReference Include="Npgsql" Version="$(PostgresVersion)" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Akka.Persistence.PostgreSql.Tests/PostgresFixture.cs b/src/Akka.Persistence.PostgreSql.Tests/PostgresFixture.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Common;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading.Tasks;
 using Akka.Util;
 using Docker.DotNet;

diff --git a/src/common.props b/src/common.props
@@ -13,11 +13,12 @@
   </PropertyGroup>
   <PropertyGroup>
     <XunitVersion>2.4.1</XunitVersion>
+    <XunitRunnerVersion>2.4.3</XunitRunnerVersion>
     <AkkaVersion>1.4.16</AkkaVersion>
-    <PostgresVersion>3.2.5</PostgresVersion>
+    <PostgresVersion>5.0.3</PostgresVersion>
     <NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
     <NetFrameworkVersion>net45</NetFrameworkVersion>
-    <TestSdkVersion>15.3.0</TestSdkVersion>
+    <TestSdkVersion>16.8.3</TestSdkVersion>
     <NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
     <NetFrameworkTestVersion>net471</NetFrameworkTestVersion>
   </PropertyGroup>