From 79fede821c51285b6a5a5d5b087776c7b074f759 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 16 Jun 2024 01:34:18 +0000
Subject: [PATCH 1/2] Bump dependencies
---
.github/workflows/ci.yaml | 8 ++--
Aws/packages.lock.json | 30 +++++++--------
Cli/Cli.csproj | 8 ++--
Cli/Dockerfile | 6 +--
Cli/config/_default.yaml | 2 +-
Cli/packages.lock.json | 75 ++++++++++++++++++--------------------
K8s/K8s.csproj | 2 +-
K8s/packages.lock.json | 30 +++++++--------
Library/Library.csproj | 6 +--
Library/packages.lock.json | 18 ++++-----
10 files changed, 91 insertions(+), 94 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c029d53b..80ea6b7a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,14 +19,14 @@ jobs:
container: dockfool/cake-docker:latest
steps:
- name: Checkout source
- uses: actions/checkout@v4.1.1
+ uses: actions/checkout@v4.1.7
with:
fetch-depth: 0
filter: tree:0
show-progress: false
- name: Cache packages
- uses: actions/cache@v4.0.1
+ uses: actions/cache@v4.0.2
with:
path: ${{ env.NUGET_PACKAGES }}
key: ${{ runner.os }}-nuget-${{ hashFiles('.config/dotnet-tools.json', '**/packages.lock.json') }}
@@ -34,13 +34,13 @@ jobs:
- name: Docker login
if: github.event_name != 'pull_request'
- uses: docker/login-action@v3.1.0
+ uses: docker/login-action@v3.2.0
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}
- name: Setup buildx
- uses: docker/setup-buildx-action@v3.2.0
+ uses: docker/setup-buildx-action@v3.3.0
- name: Export runtime
uses: crazy-max/ghaction-github-runtime@v3.0.0
diff --git a/Aws/packages.lock.json b/Aws/packages.lock.json
index 80d9d87f..e95c265c 100644
--- a/Aws/packages.lock.json
+++ b/Aws/packages.lock.json
@@ -62,8 +62,8 @@
},
"FluentValidation": {
"type": "Transitive",
- "resolved": "11.9.0",
- "contentHash": "VneVlTvwYDkfHV5av3QrQ0amALgrLX6LV94wlYyEsh0B/klJBW7C8y2eAtj5tOZ3jH6CAVpr4s1ZGgew/QWyig=="
+ "resolved": "11.9.2",
+ "contentHash": "XeHp9LvFvu1fsQ/NvDCymV02GOCB1nz7ZUhfpI3uMhCcHTkV1K5bMkv+Nc/kuNYyAsX5+5bcmUanIEMd5QN+Eg=="
},
"Flurl": {
"type": "Transitive",
@@ -143,16 +143,16 @@
},
"Polly": {
"type": "Transitive",
- "resolved": "8.3.1",
- "contentHash": "xN9AxOudus8u4a//Tfu6Wxd5Oj7S4pjh/651S6FfIiVrbxQ8TeM+ieZC8c0y7Qto70zKBM5g8rBTqbAJnbetOA==",
+ "resolved": "8.4.0",
+ "contentHash": "z2EeUutuy49jBQyZ5s2FUuTCGx3GCzJ0cJ2HbjWwks94TsC6bKTtAHKBkMZOa/DyYRl5yIX7MshvMTWl1J6RNg==",
"dependencies": {
- "Polly.Core": "8.3.1"
+ "Polly.Core": "8.4.0"
}
},
"Polly.Core": {
"type": "Transitive",
- "resolved": "8.3.1",
- "contentHash": "b9mMAjqXuCXFCtf/RtRPwFUkAm/sz37s7G+taDvS5EqfkJsLiWfO2xO2cSISjIgIY+88oIZTGguP6UrRGRlqzg=="
+ "resolved": "8.4.0",
+ "contentHash": "3AZxuP//pxOeBo9tQs7/tz4Z5TTbu4BYfjpaXZD0JYKJo98ngN9TMUz1nybh4k0ykWkMBpGZALV/AmVIE3ew7A=="
},
"Pulumi.Kubernetes": {
"type": "Transitive",
@@ -178,8 +178,8 @@
},
"Scriban": {
"type": "Transitive",
- "resolved": "5.9.1",
- "contentHash": "Er0jZCXrHXtk+nnzmHVEnmz1pjfU+VL3GppO0UjtCMoZ0Se1plyPe1OLb6gM7ToSRA7nu/QIcdRFr29x8w8rQQ=="
+ "resolved": "5.10.0",
+ "contentHash": "qk2W8wQpm7mykWrEi9fhjC7uVapT2bkweMuMqebrF7gaVMt0WjmZzyVVTpom5cUsc3ddMDpo95SkNcTWGo+L6Q=="
},
"Semver": {
"type": "Transitive",
@@ -220,8 +220,8 @@
},
"YamlDotNet": {
"type": "Transitive",
- "resolved": "15.1.2",
- "contentHash": "qeX0XhzOIcQEvnI5JxnPaIwcINwyY4Qy/LXhSfsdHkFrl9F41AT52UFfy2nIE7kgrhMg+cP7xuS+GtPJhmHmTA=="
+ "resolved": "15.1.6",
+ "contentHash": "T/cQEK/KHK96Q8kytJ4iUGDXg1/fj2Qtk6rCQeIlHYU1zTeyGVHW0QNZgREQyxZpygGMDMmrXNWt0sj5TsQnjA=="
},
"k8s": {
"type": "Project",
@@ -229,7 +229,7 @@
"Flurl.Http": "[4.0.2, )",
"Library": "[1.0.0, )",
"Microsoft.Extensions.Options": "[8.0.2, )",
- "Polly": "[8.3.1, )",
+ "Polly": "[8.4.0, )",
"Pulumi": "[3.38.0, )",
"Pulumi.Aws": "[5.11.0, )",
"Pulumi.Kubernetes": "[3.20.5, )",
@@ -239,14 +239,14 @@
"library": {
"type": "Project",
"dependencies": {
- "FluentValidation": "[11.9.0, )",
+ "FluentValidation": "[11.9.2, )",
"Microsoft.Extensions.Logging.Abstractions": "[8.0.1, )",
"Microsoft.Extensions.Options": "[8.0.2, )",
"Pulumi": "[3.38.0, )",
"Pulumi.Aws": "[5.11.0, )",
"Pulumi.Kubernetes": "[3.20.5, )",
- "Scriban": "[5.9.1, )",
- "YamlDotNet": "[15.1.2, )"
+ "Scriban": "[5.10.0, )",
+ "YamlDotNet": "[15.1.6, )"
}
}
}
diff --git a/Cli/Cli.csproj b/Cli/Cli.csproj
index b064d0c4..acbb6a41 100644
--- a/Cli/Cli.csproj
+++ b/Cli/Cli.csproj
@@ -29,8 +29,8 @@
-
-
+
+
@@ -39,8 +39,8 @@
-
-
+
+
diff --git a/Cli/Dockerfile b/Cli/Dockerfile
index e4c78105..d78a75b3 100644
--- a/Cli/Dockerfile
+++ b/Cli/Dockerfile
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
-FROM mcr.microsoft.com/dotnet/aspnet:8.0.3-jammy
+FROM mcr.microsoft.com/dotnet/aspnet:8.0.6-jammy
LABEL org.opencontainers.image.source=https://github.com/gitfool/Pulumi.Dungeon
@@ -16,7 +16,7 @@ EOF
# renovate: datasource=github-tags depName=kubectl packageName=kubernetes/kubectl extractVersion=^kubernetes-(?.+)$
RUN < /etc/bash_completion.d/kubectl
@@ -37,7 +37,7 @@ EOF
# renovate: datasource=github-releases depName=helm packageName=helm/helm
RUN <
-
+
diff --git a/K8s/packages.lock.json b/K8s/packages.lock.json
index 3754aca7..21df4b80 100644
--- a/K8s/packages.lock.json
+++ b/K8s/packages.lock.json
@@ -23,11 +23,11 @@
},
"Polly": {
"type": "Direct",
- "requested": "[8.3.1, )",
- "resolved": "8.3.1",
- "contentHash": "xN9AxOudus8u4a//Tfu6Wxd5Oj7S4pjh/651S6FfIiVrbxQ8TeM+ieZC8c0y7Qto70zKBM5g8rBTqbAJnbetOA==",
+ "requested": "[8.4.0, )",
+ "resolved": "8.4.0",
+ "contentHash": "z2EeUutuy49jBQyZ5s2FUuTCGx3GCzJ0cJ2HbjWwks94TsC6bKTtAHKBkMZOa/DyYRl5yIX7MshvMTWl1J6RNg==",
"dependencies": {
- "Polly.Core": "8.3.1"
+ "Polly.Core": "8.4.0"
}
},
"Pulumi": {
@@ -84,8 +84,8 @@
},
"FluentValidation": {
"type": "Transitive",
- "resolved": "11.9.0",
- "contentHash": "VneVlTvwYDkfHV5av3QrQ0amALgrLX6LV94wlYyEsh0B/klJBW7C8y2eAtj5tOZ3jH6CAVpr4s1ZGgew/QWyig=="
+ "resolved": "11.9.2",
+ "contentHash": "XeHp9LvFvu1fsQ/NvDCymV02GOCB1nz7ZUhfpI3uMhCcHTkV1K5bMkv+Nc/kuNYyAsX5+5bcmUanIEMd5QN+Eg=="
},
"Flurl": {
"type": "Transitive",
@@ -157,8 +157,8 @@
},
"Polly.Core": {
"type": "Transitive",
- "resolved": "8.3.1",
- "contentHash": "b9mMAjqXuCXFCtf/RtRPwFUkAm/sz37s7G+taDvS5EqfkJsLiWfO2xO2cSISjIgIY+88oIZTGguP6UrRGRlqzg=="
+ "resolved": "8.4.0",
+ "contentHash": "3AZxuP//pxOeBo9tQs7/tz4Z5TTbu4BYfjpaXZD0JYKJo98ngN9TMUz1nybh4k0ykWkMBpGZALV/AmVIE3ew7A=="
},
"Pulumi.Protobuf": {
"type": "Transitive",
@@ -167,8 +167,8 @@
},
"Scriban": {
"type": "Transitive",
- "resolved": "5.9.1",
- "contentHash": "Er0jZCXrHXtk+nnzmHVEnmz1pjfU+VL3GppO0UjtCMoZ0Se1plyPe1OLb6gM7ToSRA7nu/QIcdRFr29x8w8rQQ=="
+ "resolved": "5.10.0",
+ "contentHash": "qk2W8wQpm7mykWrEi9fhjC7uVapT2bkweMuMqebrF7gaVMt0WjmZzyVVTpom5cUsc3ddMDpo95SkNcTWGo+L6Q=="
},
"Semver": {
"type": "Transitive",
@@ -209,20 +209,20 @@
},
"YamlDotNet": {
"type": "Transitive",
- "resolved": "15.1.2",
- "contentHash": "qeX0XhzOIcQEvnI5JxnPaIwcINwyY4Qy/LXhSfsdHkFrl9F41AT52UFfy2nIE7kgrhMg+cP7xuS+GtPJhmHmTA=="
+ "resolved": "15.1.6",
+ "contentHash": "T/cQEK/KHK96Q8kytJ4iUGDXg1/fj2Qtk6rCQeIlHYU1zTeyGVHW0QNZgREQyxZpygGMDMmrXNWt0sj5TsQnjA=="
},
"library": {
"type": "Project",
"dependencies": {
- "FluentValidation": "[11.9.0, )",
+ "FluentValidation": "[11.9.2, )",
"Microsoft.Extensions.Logging.Abstractions": "[8.0.1, )",
"Microsoft.Extensions.Options": "[8.0.2, )",
"Pulumi": "[3.38.0, )",
"Pulumi.Aws": "[5.11.0, )",
"Pulumi.Kubernetes": "[3.20.5, )",
- "Scriban": "[5.9.1, )",
- "YamlDotNet": "[15.1.2, )"
+ "Scriban": "[5.10.0, )",
+ "YamlDotNet": "[15.1.6, )"
}
}
}
diff --git a/Library/Library.csproj b/Library/Library.csproj
index b8c00426..ea284c28 100644
--- a/Library/Library.csproj
+++ b/Library/Library.csproj
@@ -4,13 +4,13 @@
-
+
-
-
+
+
diff --git a/Library/packages.lock.json b/Library/packages.lock.json
index 19b77e9d..0228cc24 100644
--- a/Library/packages.lock.json
+++ b/Library/packages.lock.json
@@ -4,9 +4,9 @@
"net8.0": {
"FluentValidation": {
"type": "Direct",
- "requested": "[11.9.0, )",
- "resolved": "11.9.0",
- "contentHash": "VneVlTvwYDkfHV5av3QrQ0amALgrLX6LV94wlYyEsh0B/klJBW7C8y2eAtj5tOZ3jH6CAVpr4s1ZGgew/QWyig=="
+ "requested": "[11.9.2, )",
+ "resolved": "11.9.2",
+ "contentHash": "XeHp9LvFvu1fsQ/NvDCymV02GOCB1nz7ZUhfpI3uMhCcHTkV1K5bMkv+Nc/kuNYyAsX5+5bcmUanIEMd5QN+Eg=="
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Direct",
@@ -64,15 +64,15 @@
},
"Scriban": {
"type": "Direct",
- "requested": "[5.9.1, )",
- "resolved": "5.9.1",
- "contentHash": "Er0jZCXrHXtk+nnzmHVEnmz1pjfU+VL3GppO0UjtCMoZ0Se1plyPe1OLb6gM7ToSRA7nu/QIcdRFr29x8w8rQQ=="
+ "requested": "[5.10.0, )",
+ "resolved": "5.10.0",
+ "contentHash": "qk2W8wQpm7mykWrEi9fhjC7uVapT2bkweMuMqebrF7gaVMt0WjmZzyVVTpom5cUsc3ddMDpo95SkNcTWGo+L6Q=="
},
"YamlDotNet": {
"type": "Direct",
- "requested": "[15.1.2, )",
- "resolved": "15.1.2",
- "contentHash": "qeX0XhzOIcQEvnI5JxnPaIwcINwyY4Qy/LXhSfsdHkFrl9F41AT52UFfy2nIE7kgrhMg+cP7xuS+GtPJhmHmTA=="
+ "requested": "[15.1.6, )",
+ "resolved": "15.1.6",
+ "contentHash": "T/cQEK/KHK96Q8kytJ4iUGDXg1/fj2Qtk6rCQeIlHYU1zTeyGVHW0QNZgREQyxZpygGMDMmrXNWt0sj5TsQnjA=="
},
"Ben.Demystifier": {
"type": "Transitive",
From df91334a2dd13269829de4542833b8886fd0aef1 Mon Sep 17 00:00:00 2001
From: Sean Fausett
Date: Sun, 16 Jun 2024 14:02:57 +1200
Subject: [PATCH 2/2] Use assembly informational version
---
Cli/HostBuilderExtensions.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/Cli/HostBuilderExtensions.cs b/Cli/HostBuilderExtensions.cs
index 3d2a6519..b19d0e62 100644
--- a/Cli/HostBuilderExtensions.cs
+++ b/Cli/HostBuilderExtensions.cs
@@ -53,6 +53,7 @@ public static async Task RunCommandAsync(this IHostBuilder hostBuilder, str
commandApp.Configure(config =>
{
config.SetApplicationName(Constants.AppName);
+ config.UseAssemblyInformationalVersion();
config.AddCommand("config");
config.AddCommand("deploy");
//config.PropagateExceptions();