Skip to content

Commit

Permalink
Merge pull request #138 from datalust/dev
Browse files Browse the repository at this point in the history
2020.1 Maintenance Release
  • Loading branch information
KodrAus authored Jun 24, 2020
2 parents 96e126d + 9183d35 commit e95266e
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 4 deletions.
11 changes: 11 additions & 0 deletions Setup.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
$ErrorActionPreference = "Stop"

$RequiredDotnetVersion = $(cat ./global.json | convertfrom-json).sdk.version

New-Item -ItemType Directory -Force "./build/" | Out-Null

Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./build/installcli.ps1"
& ./build/installcli.ps1 -InstallDir "$pwd/.dotnetcli" -NoPath -Version $RequiredDotnetVersion
if ($LASTEXITCODE) { exit 1 }

$env:Path = "$pwd/.dotnetcli;$env:Path"
7 changes: 5 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ for:
only:
- image: Visual Studio 2019

build_script:
- ps: ./Build.ps1 -shortver "$($env:APPVEYOR_BUILD_VERSION)"
install:
- ps: ./Setup.ps1

build_script:
- ps: ./Build.ps1 -shortver "$($env:APPVEYOR_BUILD_VERSION)"

deploy:
- provider: GitHub
auth_token:
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.1.201"
"version": "3.1.301"
}
}
1 change: 1 addition & 0 deletions seqcli.sln
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{2EA56595-519
setup.sh = setup.sh
Build.Docker.ps1 = Build.Docker.ps1
docker-publish.ps1 = docker-publish.ps1
Setup.ps1 = Setup.ps1
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3587B633-0C03-4235-8903-6226900328F1}"
Expand Down
2 changes: 1 addition & 1 deletion src/SeqCli/SeqCli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Destructurama.JsonNet" Version="1.2.1" />
<PackageReference Include="Destructurama.JsonNet" Version="2.0.0" />
<PackageReference Include="newtonsoft.json" Version="12.0.3" />
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="serilog.filters.expressions" Version="2.0.0" />
Expand Down

0 comments on commit e95266e

Please sign in to comment.