Merge pull request #33 from Syrx/2.4.0

2.4.0
Syrx · Jan 15, 2025 · f84e74a · f84e74a
2 parents 9bdbd4c + a01927e
commit f84e74a
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 41 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule ".submodules/Syrx"]
 	path = .submodules/Syrx
 	url = https://github.com/Syrx/Syrx
+	branch = main
diff --git a/.submodules/Syrx b/.submodules/Syrx
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -20,26 +20,12 @@
 		<!-- ============================================================================ -->
 		<!-- packaging info -->
 		<!-- ============================================================================ -->
-		<Version>2.3.1</Version>
+		<Version>2.4.0</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<EnablePackageValidation>true</EnablePackageValidation>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageTags>syrx;data access;orm;micro-orm</PackageTags>
-
-		<PackageReleaseNotes>
-			# Minor release
-			## Syrx.Commanders.Databases.Settings.Readers
-			* Returned inheritance to ICommandReader.
-
-			## Syrx.Commanders.Databases.Connectors
-			* Returned inheritance to IConnector.
-
-			## Other
-			* Update readme.md
-			* Cleaned up some using statements.
-			* Renamed file to match the type name.
-
-		</PackageReleaseNotes>
+		<PackageReleaseNotes>Last release on .NET8.0 exclusively. Next release will include .NET9.0.</PackageReleaseNotes>
 
 		<!-- ============================================================================ -->
 		<!-- organization info -->

diff --git a/...rs.Databases.Connectors.Extensions/Syrx.Commanders.Databases.Connectors.Extensions.csproj b/...rs.Databases.Connectors.Extensions/Syrx.Commanders.Databases.Connectors.Extensions.csproj
@@ -5,10 +5,6 @@
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\..\.submodules\Syrx\src\Syrx.Extensions\Syrx.Extensions.csproj" />
 		<ProjectReference Include="..\Syrx.Commanders.Databases.Connectors\Syrx.Commanders.Databases.Connectors.csproj" />

diff --git a/src/Syrx.Commanders.Databases.Extensions/Syrx.Commanders.Databases.Extensions.csproj b/src/Syrx.Commanders.Databases.Extensions/Syrx.Commanders.Databases.Extensions.csproj
@@ -5,10 +5,6 @@
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\Syrx.Commanders.Databases.Settings.Extensions\Syrx.Commanders.Databases.Settings.Extensions.csproj" />
 		<ProjectReference Include="..\Syrx.Commanders.Databases.Settings.Readers.Extensions\Syrx.Commanders.Databases.Settings.Readers.Extensions.csproj" />

diff --git a/...abases.Settings.Extensions.Json/Syrx.Commanders.Databases.Settings.Extensions.Json.csproj b/...abases.Settings.Extensions.Json/Syrx.Commanders.Databases.Settings.Extensions.Json.csproj
@@ -7,7 +7,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
 		<PackageReference Include="Syrx.Validation" Version="2.0.0" />
 	</ItemGroup>
 

diff --git a/...atabases.Settings.Extensions.Xml/Syrx.Commanders.Databases.Settings.Extensions.Xml.csproj b/...atabases.Settings.Extensions.Xml/Syrx.Commanders.Databases.Settings.Extensions.Xml.csproj
@@ -7,7 +7,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="9.0.1" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
 		<PackageReference Include="Syrx.Validation" Version="2.0.0" />
 	</ItemGroup>
 

diff --git a/...anders.Databases.Settings.Extensions/Syrx.Commanders.Databases.Settings.Extensions.csproj b/...anders.Databases.Settings.Extensions/Syrx.Commanders.Databases.Settings.Extensions.csproj
@@ -5,10 +5,6 @@
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\..\.submodules\Syrx\src\Syrx.Extensions\Syrx.Extensions.csproj" />
 		<ProjectReference Include="..\Syrx.Commanders.Databases.Settings\Syrx.Commanders.Databases.Settings.csproj" />

diff --git a/....Settings.Readers.Extensions/Syrx.Commanders.Databases.Settings.Readers.Extensions.csproj b/....Settings.Readers.Extensions/Syrx.Commanders.Databases.Settings.Readers.Extensions.csproj
@@ -5,10 +5,6 @@
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\..\.submodules\Syrx\src\Syrx.Extensions\Syrx.Extensions.csproj" />
 		<ProjectReference Include="..\Syrx.Commanders.Databases.Settings.Readers\Syrx.Commanders.Databases.Settings.Readers.csproj" />

diff --git a/...Commanders.Databases.Tests.Integration/Syrx.Commanders.Databases.Tests.Integration.csproj b/...Commanders.Databases.Tests.Integration/Syrx.Commanders.Databases.Tests.Integration.csproj
@@ -14,7 +14,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />	
     <PackageReference Include="xunit" Version="2.9.3" />

diff --git a/...rs.Databases.Extensions.Tests.Unit/Syrx.Commanders.Databases.Extensions.Tests.Unit.csproj b/...rs.Databases.Extensions.Tests.Unit/Syrx.Commanders.Databases.Extensions.Tests.Unit.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -14,7 +14,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">

diff --git a/...ions.Json.Tests.Unit/Syrx.Commanders.Databases.Settings.Extensions.Json.Tests.Unit.csproj b/...ions.Json.Tests.Unit/Syrx.Commanders.Databases.Settings.Extensions.Json.Tests.Unit.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -17,7 +17,6 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />

diff --git a/....Settings.Readers.Tests.Unit/Syrx.Commanders.Databases.Settings.Readers.Tests.Unit.csproj b/....Settings.Readers.Tests.Unit/Syrx.Commanders.Databases.Settings.Readers.Tests.Unit.csproj
@@ -15,7 +15,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
+0 −90		.scripts/branch-info.ps1
+0 −125		.scripts/clone.ps1
+0 −45		.scripts/list-branches.ps1
+0 −128		.scripts/remove-branches.ps1
+0 −139		.scripts/sync-branches.ps1
+2 −2		Directory.Build.props
+1 −1		src/Syrx.Extensions/Syrx.Extensions.csproj