Skip to content
This repository was archived by the owner on May 23, 2023. It is now read-only.

Commit 0b5cee2

Browse files
modernized build system (#130)
1 parent 254e6a6 commit 0b5cee2

File tree

5 files changed

+11
-28
lines changed

5 files changed

+11
-28
lines changed

build-system/azure-pipeline.template.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ jobs:
1515
clean: false # whether to fetch clean each time
1616
submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
1717
persistCredentials: true
18+
- task: UseDotNet@2
19+
displayName: 'Use .NET Core Runtime 3.1.10'
20+
inputs:
21+
version: '3.1.x'
1822
# Linux or macOS
1923
- task: Bash@3
2024
displayName: Linux / OSX Build

build.fsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Target "RunTests" (fun _ ->
121121
info.WorkingDirectory <- (Directory.GetParent project).FullName
122122
info.Arguments <- arguments) (TimeSpan.FromMinutes 30.0)
123123

124-
ResultHandling.failBuildIfXUnitReportedError TestRunnerErrorLevel.DontFailBuild result
124+
ResultHandling.failBuildIfXUnitReportedError TestRunnerErrorLevel.Error result
125125

126126
projects |> Seq.iter (log)
127127
projects |> Seq.iter (runSingleProject)
@@ -145,7 +145,7 @@ Target "NBench" <| fun _ ->
145145
info.WorkingDirectory <- (Directory.GetParent project).FullName
146146
info.Arguments <- arguments) (TimeSpan.FromMinutes 30.0)
147147

148-
ResultHandling.failBuildIfXUnitReportedError TestRunnerErrorLevel.DontFailBuild result
148+
ResultHandling.failBuildIfXUnitReportedError TestRunnerErrorLevel.Error result
149149

150150
projects |> Seq.iter runSingleProject
151151

build.ps1

-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ Param(
3030
)
3131

3232
$FakeVersion = "4.61.2"
33-
$DotNetChannel = "LTS";
34-
$DotNetVersion = "2.1.500";
35-
$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/v$DotNetVersion/scripts/obtain/dotnet-install.ps1";
3633
$NugetVersion = "4.1.0";
3734
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe"
3835
$ProtobufVersion = "3.4.0"

build.sh

-19
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ NUGET_EXE=$TOOLS_DIR/nuget.exe
1111
NUGET_URL=https://dist.nuget.org/win-x86-commandline/v4.0.0/nuget.exe
1212
FAKE_VERSION=4.61.2
1313
FAKE_EXE=$TOOLS_DIR/FAKE/tools/FAKE.exe
14-
DOTNET_VERSION=2.1.500
15-
DOTNET_INSTALLER_URL=https://raw.githubusercontent.com/dotnet/cli/v$DOTNET_VERSION/scripts/obtain/dotnet-install.sh
16-
DOTNET_CHANNEL=LTS;
1714
DOCFX_VERSION=2.40.5
1815
DOCFX_EXE=$TOOLS_DIR/docfx.console/tools/docfx.exe
1916

@@ -42,22 +39,6 @@ if [ ! -d "$TOOLS_DIR" ]; then
4239
mkdir "$TOOLS_DIR"
4340
fi
4441

45-
###########################################################################
46-
# INSTALL .NET CORE CLI
47-
###########################################################################
48-
49-
echo "Installing .NET CLI..."
50-
if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then
51-
mkdir "$SCRIPT_DIR/.dotnet"
52-
fi
53-
curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" $DOTNET_INSTALLER_URL
54-
bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version $DOTNET_VERSION --channel $DOTNET_CHANNEL --install-dir .dotnet --no-path
55-
export PATH="$SCRIPT_DIR/.dotnet":$PATH
56-
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
57-
export DOTNET_CLI_TELEMETRY_OPTOUT=1
58-
chmod -R 0755 ".dotnet"
59-
"$SCRIPT_DIR/.dotnet/dotnet" --info
60-
6142

6243
###########################################################################
6344
# INSTALL NUGET

src/common.props

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
<PropertyGroup>
33
<Copyright>Copyright © 2015-2020 Petabridge®</Copyright>
44
<Authors>Petabridge</Authors>
5-
<VersionPrefix>0.4.0</VersionPrefix>
6-
<PackageReleaseNotes>Upgraded to [Akka.NET v1.4.1](https://getakka.net/community/whats-new/akkadotnet-v1.4.html)</PackageReleaseNotes>
5+
<VersionPrefix>0.5.0</VersionPrefix>
6+
<PackageReleaseNotes>Upgraded to [Akka.NET v1.4.14](https://github.com/akkadotnet/akka.net/releases/tag/1.4.14)
7+
[Print seed nodes when bootstrapping from environment variables as array](https://github.com/petabridge/akkadotnet-bootstrap/issues/104)</PackageReleaseNotes>
78
<PackageIconUrl>https://petabridge.com/images/logo.png</PackageIconUrl>
89
<PackageProjectUrl>https://github.com/petabridge/akkadotnet-bootstrap</PackageProjectUrl>
910
<PackageLicenseUrl>https://github.com/petabridge/akkadotnet-bootstrap/blob/master/LICENSE</PackageLicenseUrl>
@@ -21,10 +22,10 @@
2122
<PropertyGroup>
2223
<XunitVersion>2.4.1</XunitVersion>
2324
<TestSdkVersion>16.9.4</TestSdkVersion>
24-
<NetCoreTestVersion>netcoreapp2.1</NetCoreTestVersion>
25+
<NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
2526
<NetStandardVersion>netstandard2.0</NetStandardVersion>
2627
<NetFrameworkTestVersion>net461</NetFrameworkTestVersion>
2728
<AkkaVersion>1.4.18</AkkaVersion>
2829
<SourceLinkVersion>1.0.0</SourceLinkVersion>
2930
</PropertyGroup>
30-
</Project>
31+
</Project>

0 commit comments

Comments
 (0)