Merge pull request #274 from datalust/dev

2023.1 Release

Author: nblumhardt

Build.Docker.ps1

@@ -2,7 +2,7 @@ $IsCIBuild = $null -ne $env:APPVEYOR_BUILD_NUMBER
 $IsPublishedBuild = ($env:APPVEYOR_REPO_BRANCH -eq "main" -or $env:APPVEYOR_REPO_BRANCH -eq "dev") -and $null -eq $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH
 
 $version = @{ $true = $env:APPVEYOR_BUILD_VERSION; $false = "99.99.99" }[$env:APPVEYOR_BUILD_VERSION -ne $NULL];
-$framework = "net6.0"
+$framework = "net7.0"
 $image = "datalust/seqcli"
 $archs = @(
     @{ rid = "x64"; platform = "linux/amd64" },
@@ -28,7 +28,7 @@ function Execute-Tests
 function Build-DockerImage($arch)
 {
     $rid = "linux-$($arch.rid)"
-    & dotnet publish src/SeqCli/SeqCli.csproj -c Release -f $framework -r $rid --self-contained /p:VersionPrefix=$version
+    & dotnet publish src/SeqCli/SeqCli.csproj -c Release -f $framework -r $rid --self-contained /p:VersionPrefix=$version /p:PublishSingleFile=true
     if($LASTEXITCODE -ne 0) { exit 2 }
 
     & docker buildx build --platform "$($arch.platform)" -f dockerfiles/seqcli/$rid.Dockerfile -t "$image-ci:$version-$($arch.rid)" .

Build.ps1

@@ -1,6 +1,6 @@
 $ErrorActionPreference = 'Stop'
 
-$framework = 'net6.0'
+$framework = 'net7.0'
 $windowsTfmSuffix = '-windows'
 
 function Clean-Output
@@ -14,7 +14,7 @@ function Restore-Packages
     if($LASTEXITCODE -ne 0) { throw "Build failed" }
 }
 
-function Execute-Tests
+function Execute-Tests($version)
 {
     & dotnet test ./test/SeqCli.Tests/SeqCli.Tests.csproj -c Release /p:Configuration=Release /p:Platform=x64 /p:VersionPrefix=$version
     if($LASTEXITCODE -ne 0) { throw "Build failed" }
@@ -85,7 +85,7 @@ Create-ArtifactDir
 Restore-Packages
 Publish-Archives($version)
 Publish-DotNetTool($version)
-Execute-Tests
+Execute-Tests($version)
 Publish-Docs($version)
 
 Pop-Location

README.md

@@ -1,4 +1,4 @@
-version: 2022.1.{build}
+version: 2023.1.{build}
 skip_tags: true
 image:
 - Visual Studio 2022

appveyor.yml

@@ -1,21 +1,18 @@
-# based on: https://github.com/dotnet/dotnet-docker/blob/master/2.0/runtime-deps/jessie/amd64/Dockerfile
-
-FROM --platform=linux/arm/v8 ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         ca-certificates \
         libc6 \
         libgcc1 \
         libgssapi-krb5-2 \
-        libicu66 \
-        liblttng-ust0 \
-        libssl1.1 \
+        libicu70 \
+        libssl3 \
         libstdc++6 \
         zlib1g \
-&& rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/*
 
-COPY src/SeqCli/bin/Release/net6.0/linux-arm64/publish /bin/seqcli
+COPY src/SeqCli/bin/Release/net7.0/linux-arm64/publish /bin/seqcli
 
 ENTRYPOINT ["/bin/seqcli/seqcli"]
 

dockerfiles/seqcli/linux-arm64.Dockerfile

@@ -1,21 +1,18 @@
-# based on: https://github.com/dotnet/dotnet-docker/blob/master/2.0/runtime-deps/jessie/amd64/Dockerfile
-
-FROM --platform=linux/amd64 ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         ca-certificates \
         libc6 \
         libgcc1 \
         libgssapi-krb5-2 \
-        libicu66 \
-        liblttng-ust0 \
-        libssl1.1 \
+        libicu70 \
+        libssl3 \
         libstdc++6 \
         zlib1g \
-&& rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/*
 
-COPY src/SeqCli/bin/Release/net6.0/linux-x64/publish /bin/seqcli
+COPY src/SeqCli/bin/Release/net7.0/linux-x64/publish /bin/seqcli
 
 ENTRYPOINT ["/bin/seqcli/seqcli"]
 

dockerfiles/seqcli/linux-x64.Dockerfile

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.402"
+    "version": "7.0.102"
   }
 }

global.json

@@ -40,8 +40,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "seqcli", "seqcli", "{7F7CAC3A-1046-4D2B-BF9F-F14525918295}"
 ProjectSection(SolutionItems) = preProject
 	dockerfiles\seqcli\.gitignore = dockerfiles\seqcli\.gitignore
-	dockerfiles\seqcli\Dockerfile = dockerfiles\seqcli\Dockerfile
-	dockerfiles\seqcli\run.sh = dockerfiles\seqcli\run.sh
+	dockerfiles\seqcli\linux-arm64.Dockerfile = dockerfiles\seqcli\linux-arm64.Dockerfile
+	dockerfiles\seqcli\linux-x64.Dockerfile = dockerfiles\seqcli\linux-x64.Dockerfile
 EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Roastery", "src\Roastery\Roastery.csproj", "{D2CB1112-7CD3-4A1B-A114-25130C96295E}"

seqcli.sln

@@ -14,5 +14,5 @@ chmod +x dotnet-install.sh
 ./dotnet-install.sh --install-dir $HOME/.dotnetcli --no-path --version $RequiredDotnetVersion
 rm dotnet-install.sh
 
-docker run --privileged --rm docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
+docker run --privileged --rm linuxkit/binfmt:bebbae0c1100ebf7bf2ad4dfb9dfd719cf0ef132
 sudo service docker restart

setup.sh

@@ -4,51 +4,50 @@
 using System.Threading.Tasks;
 using Roastery.Util;
 
-namespace Roastery.Agents
+namespace Roastery.Agents;
+
+abstract class Agent
 {
-    abstract class Agent
-    {
-        protected delegate Task Behavior(CancellationToken cancellationToken);
+    protected delegate Task Behavior(CancellationToken cancellationToken);
 
-        readonly int _meanBehaviorIntervalMilliseconds;
+    readonly int _meanBehaviorIntervalMilliseconds;
 
-        protected Agent(int meanBehaviorIntervalMilliseconds)
-        {
-            _meanBehaviorIntervalMilliseconds = meanBehaviorIntervalMilliseconds;
-        }
+    protected Agent(int meanBehaviorIntervalMilliseconds)
+    {
+        _meanBehaviorIntervalMilliseconds = meanBehaviorIntervalMilliseconds;
+    }
 
-        public static Task Run(Agent agent, CancellationToken cancellationToken)
-        {
-            return Task.Run(() => agent.RunBehaviorsAsync(cancellationToken), cancellationToken);
-        }
+    public static Task Run(Agent agent, CancellationToken cancellationToken)
+    {
+        return Task.Run(() => agent.RunBehaviorsAsync(cancellationToken), cancellationToken);
+    }
 
-        async Task RunBehaviorsAsync(CancellationToken cancellationToken)
-        {
-            var behaviors = GetBehaviors().ToArray();
-            if (behaviors.Length == 0)
-                return;
+    async Task RunBehaviorsAsync(CancellationToken cancellationToken)
+    {
+        var behaviors = GetBehaviors().ToArray();
+        if (behaviors.Length == 0)
+            return;
 
-            while (!cancellationToken.IsCancellationRequested)
-            {
-                var behavior = Distribution.Uniform(behaviors);
+        while (!cancellationToken.IsCancellationRequested)
+        {
+            var behavior = Distribution.Uniform(behaviors);
 
-                await Task.Delay((int) Distribution.Uniform(0, _meanBehaviorIntervalMilliseconds), cancellationToken);
+            await Task.Delay((int) Distribution.Uniform(0, _meanBehaviorIntervalMilliseconds), cancellationToken);
 
-                try
-                {
-                    await behavior(cancellationToken);
-                }
-                catch
-                {
-                    // Exceptions are swallowed here; agents can log exceptions if they wish
-                }
+            try
+            {
+                await behavior(cancellationToken);
+            }
+            catch
+            {
+                // Exceptions are swallowed here; agents can log exceptions if they wish
+            }
 
-                await Task.Delay(_meanBehaviorIntervalMilliseconds / 2 +
-                                 (int) (_meanBehaviorIntervalMilliseconds * Distribution.Uniform()), cancellationToken);
+            await Task.Delay(_meanBehaviorIntervalMilliseconds / 2 +
+                             (int) (_meanBehaviorIntervalMilliseconds * Distribution.Uniform()), cancellationToken);
 
-            }
         }
-
-        protected abstract IEnumerable<Behavior> GetBehaviors();
     }
-}
+
+    protected abstract IEnumerable<Behavior> GetBehaviors();
+}