Merge pull request #139 from MrSmoke/release/1.2.2

1.2.2
MrSmoke · Nov 17, 2024 · f5d7c65 · f5d7c65
2 parents a7b1f3c + 1f5c29b
commit f5d7c65
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 37 deletions.
diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>1.2.1</Version>
+    <Version>1.2.2</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>12</LangVersion>

diff --git a/TeaTime.slnx b/TeaTime.slnx
@@ -0,0 +1,23 @@
+<Solution>
+  <Folder Name="/Tests/">
+    <Project Path="test\TeaTime.Common.Tests\TeaTime.Common.Tests.csproj" />
+    <Project Path="test\TeaTime.Data.MySql.Tests\TeaTime.Data.MySql.Tests.csproj" />
+    <Project Path="test\TeaTime.Slack.Tests\TeaTime.Slack.Tests.csproj" />
+  </Folder>
+  <Folder Name="/_Build/">
+    <File Path=".github\workflows\dev-release.yaml" />
+    <File Path=".github\workflows\master-release.yaml" />
+  </Folder>
+  <Folder Name="/_Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path="LICENSE" />
+    <File Path="README.md" />
+    <File Path=".dockerignore" />
+    <File Path="Dockerfile" />
+    <File Path="Directory.Build.props" />
+  </Folder>
+  <Project Path="src\TeaTime.Common\TeaTime.Common.csproj" />
+  <Project Path="src\TeaTime.Data.MySql\TeaTime.Data.MySql.csproj" />
+  <Project Path="src\TeaTime.Slack\TeaTime.Slack.csproj" />
+  <Project Path="src\TeaTime\TeaTime.csproj" />
+</Solution>
diff --git 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
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="MediatR" Version="12.3.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+    <PackageReference Include="MediatR" Version="12.4.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TeaTime.Data.MySql/TeaTime.Data.MySql.csproj b/src/TeaTime.Data.MySql/TeaTime.Data.MySql.csproj
@@ -3,22 +3,17 @@
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="Evolve" Version="3.2.0" />
-    <PackageReference Include="MySqlConnector" Version="2.3.7" />
+    <PackageReference Include="MySqlConnector" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\TeaTime.Common\TeaTime.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="..\..\sql\V0_1_0__Create_tables.sql" Link="Sql\V0_1_0__Create_tables.sql" />
-    <EmbeddedResource Include="..\..\sql\V0_2_0__Add_illmake.sql" Link="Sql\V0_2_0__Add_illmake.sql" />
-    <EmbeddedResource Include="..\..\sql\V0_3_0__Add_hashes_table.sql" Link="Sql\V0_3_0__Add_hashes_table.sql" />
-    <EmbeddedResource Include="..\..\sql\V0_3_1__Add_soft_delete.sql" Link="Sql\V0_3_1__Add_soft_delete.sql" />
-    <EmbeddedResource Include="..\..\sql\V0_3_2__Add_missing_deleted_data.sql" Link="Sql\V0_3_2__Add_missing_deleted_data.sql" />
-    <EmbeddedResource Include="..\..\sql\V0_4_0__Add_foreign_keys.sql" Link="Sql\V0_4_0__Add_foreign_keys.sql" />
-    <EmbeddedResource Include="..\..\sql\V0_4_1__Add_indexes.sql" Link="Sql\V0_4_1__Add_indexes.sql" />
-    <EmbeddedResource Include="..\..\sql\V0_5_0__Nullable_fixes.sql" Link="Sql\V0_5_0__Nullable_fixes.sql" />
+    <EmbeddedResource Include="..\..\sql\*.sql" >
+      <Link>Sql\%(FileName).sql</Link>
+    </EmbeddedResource>
   </ItemGroup>
 
 </Project>
diff --git a/src/TeaTime.Slack/TeaTime.Slack.csproj b/src/TeaTime.Slack/TeaTime.Slack.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="CommandRouter" Version="1.0.0-beta6" />
     <PackageReference Include="CommandRouter.Integration.AspNetCore" Version="1.0.0-beta3" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.6" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/TeaTime/TeaTime.csproj b/src/TeaTime/TeaTime.csproj
@@ -5,11 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/TeaTime.Common.Tests/TeaTime.Common.Tests.csproj b/test/TeaTime.Common.Tests/TeaTime.Common.Tests.csproj
@@ -5,10 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git 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 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/test/TeaTime.Slack.Tests/TeaTime.Slack.Tests.csproj b/test/TeaTime.Slack.Tests/TeaTime.Slack.Tests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>