diff --git a/.github/workflows/dev-release.yaml b/.github/workflows/dev-release.yaml
index 5629a68..190e012 100644
--- a/.github/workflows/dev-release.yaml
+++ b/.github/workflows/dev-release.yaml
@@ -12,6 +12,6 @@ jobs:
uses: docker/setup-buildx-action@v3
-
name: Build and push
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
with:
push: false
diff --git a/.github/workflows/master-release.yaml b/.github/workflows/master-release.yaml
index 2c38717..5bfed01 100644
--- a/.github/workflows/master-release.yaml
+++ b/.github/workflows/master-release.yaml
@@ -31,7 +31,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Build and push
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
diff --git a/Directory.Build.props b/Directory.Build.props
index 3a1c515..1afea84 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
- 1.2.1
+ 1.2.2
net8.0
enable
12
diff --git a/TeaTime.slnx b/TeaTime.slnx
new file mode 100644
index 0000000..af94734
--- /dev/null
+++ b/TeaTime.slnx
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sql/V0_3_1__Add_soft_delete.sql b/sql/V0_3_1__Add_soft_delete.sql
index 637c873..9d4c0b9 100644
--- a/sql/V0_3_1__Add_soft_delete.sql
+++ b/sql/V0_3_1__Add_soft_delete.sql
@@ -1,11 +1,13 @@
alter table `options`
add column deleted boolean default 0,
add column deletedDate datetime default null,
+ add column activeName VARCHAR(40) AS (IF(deleted = 0, name, NULL)),
drop index `idx_options_name`,
- add unique `idx_options_name` (`groupId`, `name`, (IF(deleted,null,1)));
+ add unique `idx_options_name` (`groupId`, `activeName`);
alter table `option_groups`
add column deleted boolean default 0,
add column deletedDate datetime default null,
+ add column activeName VARCHAR(40) AS (IF(deleted = 0, name, NULL)),
drop index `idx_optiongroups_name`,
- add unique `idx_optiongroups_name` (`roomId`, `name`, (IF(deleted,null,1)));
+ add unique `idx_optiongroups_name` (`roomId`, `activeName`);
diff --git a/src/TeaTime.Common/TeaTime.Common.csproj b/src/TeaTime.Common/TeaTime.Common.csproj
index eea3a79..fc29e8e 100644
--- a/src/TeaTime.Common/TeaTime.Common.csproj
+++ b/src/TeaTime.Common/TeaTime.Common.csproj
@@ -1,11 +1,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/TeaTime.Data.MySql/TeaTime.Data.MySql.csproj b/src/TeaTime.Data.MySql/TeaTime.Data.MySql.csproj
index 76057c0..ed4cde8 100644
--- a/src/TeaTime.Data.MySql/TeaTime.Data.MySql.csproj
+++ b/src/TeaTime.Data.MySql/TeaTime.Data.MySql.csproj
@@ -3,7 +3,7 @@
-
+
@@ -11,14 +11,9 @@
-
-
-
-
-
-
-
-
+
+ Sql\%(FileName).sql
+
diff --git a/src/TeaTime.Slack/TeaTime.Slack.csproj b/src/TeaTime.Slack/TeaTime.Slack.csproj
index 05fda20..15fbff4 100644
--- a/src/TeaTime.Slack/TeaTime.Slack.csproj
+++ b/src/TeaTime.Slack/TeaTime.Slack.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/src/TeaTime/TeaTime.csproj b/src/TeaTime/TeaTime.csproj
index 0498065..9609e00 100644
--- a/src/TeaTime/TeaTime.csproj
+++ b/src/TeaTime/TeaTime.csproj
@@ -5,11 +5,8 @@
-
-
-
-
-
+
+
diff --git a/test/TeaTime.Common.Tests/TeaTime.Common.Tests.csproj b/test/TeaTime.Common.Tests/TeaTime.Common.Tests.csproj
index 37bba66..3ddba48 100644
--- a/test/TeaTime.Common.Tests/TeaTime.Common.Tests.csproj
+++ b/test/TeaTime.Common.Tests/TeaTime.Common.Tests.csproj
@@ -5,10 +5,10 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/test/TeaTime.Data.MySql.Tests/TeaTime.Data.MySql.Tests.csproj b/test/TeaTime.Data.MySql.Tests/TeaTime.Data.MySql.Tests.csproj
index d120240..9267d54 100644
--- a/test/TeaTime.Data.MySql.Tests/TeaTime.Data.MySql.Tests.csproj
+++ b/test/TeaTime.Data.MySql.Tests/TeaTime.Data.MySql.Tests.csproj
@@ -5,11 +5,11 @@
-
-
-
-
-
+
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/test/TeaTime.Slack.Tests/TeaTime.Slack.Tests.csproj b/test/TeaTime.Slack.Tests/TeaTime.Slack.Tests.csproj
index f90a0cd..4537491 100644
--- a/test/TeaTime.Slack.Tests/TeaTime.Slack.Tests.csproj
+++ b/test/TeaTime.Slack.Tests/TeaTime.Slack.Tests.csproj
@@ -5,9 +5,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive