Merge pull request #367 from datalust/dev

2024.3 Maintenance Release 2

Author: nblumhardt

.gitignore

@@ -287,3 +287,6 @@ __pycache__/
 *.xsd.cs
 
 .DS_Store
+
+# ci.global.json is used in CI; local builds are unconstrained
+global.json

Build.ps1

@@ -78,16 +78,32 @@ function Publish-Docs($version)
     if($LASTEXITCODE -ne 0) { throw "Build failed" }
 }
 
+function Remove-GlobalJson
+{
+    if(Test-Path ./global.json) { rm ./global.json }    
+}
+
+function Create-GlobalJson
+{
+    # It's very important that SeqCli use the same .NET SDK version as its matching Seq version, to avoid
+    # container and installer bloat. But, highly-restrictive global.json files are annoying during development. So,
+    # we create a temporary global.json from ci.global.json to use during CI builds.
+    Remove-GlobalJson
+    cp ./ci.global.json global.json
+}
+
 Write-Output "Building version $version"
 
 $env:Path = "$pwd/.dotnetcli;$env:Path"
 
 Clean-Output
 Create-ArtifactDir
+Create-GlobalJson
 Restore-Packages
 Publish-Archives($version)
 Publish-DotNetTool($version)
 Execute-Tests($version)
 Publish-Docs($version)
+Remove-GlobalJson
 
 Pop-Location

README.md

@@ -1,6 +1,6 @@
 $ErrorActionPreference = "Stop"
 
-$RequiredDotnetVersion =  $(cat ./global.json | convertfrom-json).sdk.version
+$RequiredDotnetVersion =  $(cat ./ci.global.json | convertfrom-json).sdk.version
 
 New-Item -ItemType Directory -Force "./build/" | Out-Null
 

Setup.ps1

@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "8.0.303"
+  }
+}

ci.global.json

@@ -10,14 +10,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{2EA56595-519
 		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
 		Build.ps1 = Build.ps1
-		global.json = global.json
 		LICENSE = LICENSE
 		README.md = README.md
 		setup.sh = setup.sh
 		Build.Docker.ps1 = Build.Docker.ps1
 		docker-publish.ps1 = docker-publish.ps1
 		Setup.ps1 = Setup.ps1
 		CONTRIBUTING.md = CONTRIBUTING.md
+		ci.global.json = ci.global.json
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3587B633-0C03-4235-8903-6226900328F1}"

global.json

@@ -7,7 +7,7 @@ set -o pipefail
 sudo apt-get update || true
 sudo apt-get install -y --no-install-recommends jq
 
-RequiredDotnetVersion=$(jq -r '.sdk.version' global.json)
+RequiredDotnetVersion=$(jq -r '.sdk.version' ci.global.json)
 
 curl https://dot.net/v1/dotnet-install.sh -sSfL --output dotnet-install.sh
 chmod +x dotnet-install.sh

seqcli.sln

@@ -6,8 +6,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Serilog" Version="3.1.1" />
-        <PackageReference Include="SerilogTracing" Version="1.0.0" />
+        <PackageReference Include="Serilog" Version="4.0.2" />
+        <PackageReference Include="SerilogTracing" Version="2.1.2" />
     </ItemGroup>
 
 </Project>

setup.sh

@@ -75,7 +75,7 @@ public CreateCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config
 
         Options.Add(
             "permissions=",
-            "A comma-separated list of permissions to delegate to the API key; valid permissions are `Ingest` (default), `Read`, `Write`, `Project` and `System`",
+            "A comma-separated list of permissions to delegate to the API key; valid permissions are `Ingest` (default), `Read`, `Write`, `Project`, `Organization`, and `System`",
             v => _permissions = ArgumentString.NormalizeList(v));
 
         Options.Add(
@@ -133,7 +133,7 @@ protected override async Task<int> Run()
         {
             foreach (var permission in _permissions)
             {
-                if (!Enum.TryParse<Permission>(permission, out var p))
+                if (!Enum.TryParse<Permission>(permission, true, out var p))
                 {
                     Log.Error("Unrecognized permission {Permission}", permission);
                     return 1;