diff --git a/DubUrl.Adomd/DubUrl.Adomd.csproj b/DubUrl.Adomd/DubUrl.Adomd.csproj index df833827..35a4a9a9 100644 --- a/DubUrl.Adomd/DubUrl.Adomd.csproj +++ b/DubUrl.Adomd/DubUrl.Adomd.csproj @@ -22,7 +22,7 @@ DubUrl.Adomd https://github.com/Seddryck/DubUrl connection-string;database;dax;adomd-net;powerbi - Duburl provides a standardized URL-style mechanism for providing database connection information and opening a DbConnection in the .NET ecosystem + DubUrl provides a standardized URL-style mechanism for providing database connection information and opening a DbConnection in the .NET ecosystem diff --git a/DubUrl.Core/DubUrl.csproj b/DubUrl.Core/DubUrl.csproj index 3b2595c1..a6a740ff 100644 --- a/DubUrl.Core/DubUrl.csproj +++ b/DubUrl.Core/DubUrl.csproj @@ -1,10 +1,10 @@ - + DubUrl https://github.com/Seddryck/DubUrl connection-string;database;sql;odbc;ado-net;adonet - Duburl provides a standardized URL-style mechanism for providing database connection information and opening a DbConnection in the .NET ecosystem + DubUrl provides a standardized URL-style mechanism for providing database connection information and opening a DbConnection in the .NET ecosystem diff --git a/DubUrl.Extensions.DependencyInjection/DubUrl.Extensions.DependencyInjection.csproj b/DubUrl.Extensions.DependencyInjection/DubUrl.Extensions.DependencyInjection.csproj index fcf34108..0d3a76eb 100644 --- a/DubUrl.Extensions.DependencyInjection/DubUrl.Extensions.DependencyInjection.csproj +++ b/DubUrl.Extensions.DependencyInjection/DubUrl.Extensions.DependencyInjection.csproj @@ -16,7 +16,7 @@ DubUrl.Extensions.DependencyInjection https://github.com/Seddryck/DubUrl connection-string;database;sql;dependency-injection - Duburl provides a standardized URL-style mechanism for providing database connection information and opening a DbConnection in the .NET ecosystem + DubUrl provides a standardized URL-style mechanism for providing database connection information and opening a DbConnection in the .NET ecosystem diff --git a/DubUrl.OleDb.Testing/DubUrl.OleDb.Testing.csproj b/DubUrl.OleDb.Testing/DubUrl.OleDb.Testing.csproj index 6ab8aec9..db6d4e25 100644 --- a/DubUrl.OleDb.Testing/DubUrl.OleDb.Testing.csproj +++ b/DubUrl.OleDb.Testing/DubUrl.OleDb.Testing.csproj @@ -18,12 +18,9 @@ - + - - - None diff --git a/Duburl.OleDb/AlternativeProviderAttribute.cs b/DubUrl.OleDb/AlternativeProviderAttribute.cs similarity index 97% rename from Duburl.OleDb/AlternativeProviderAttribute.cs rename to DubUrl.OleDb/AlternativeProviderAttribute.cs index 4a26a75d..9840bb65 100644 --- a/Duburl.OleDb/AlternativeProviderAttribute.cs +++ b/DubUrl.OleDb/AlternativeProviderAttribute.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using DubUrl.Rewriting; -using Duburl.OleDb.Mapping; +using DubUrl.OleDb.Mapping; namespace DubUrl.OleDb { diff --git a/Duburl.OleDb/AssemblyTypesProbeOleDb.cs b/DubUrl.OleDb/AssemblyTypesProbeOleDb.cs similarity index 100% rename from Duburl.OleDb/AssemblyTypesProbeOleDb.cs rename to DubUrl.OleDb/AssemblyTypesProbeOleDb.cs diff --git a/Duburl.OleDb/BaseProviderLocator.cs b/DubUrl.OleDb/BaseProviderLocator.cs similarity index 100% rename from Duburl.OleDb/BaseProviderLocator.cs rename to DubUrl.OleDb/BaseProviderLocator.cs diff --git a/Duburl.OleDb/BaseProviderRegex.cs b/DubUrl.OleDb/BaseProviderRegex.cs similarity index 100% rename from Duburl.OleDb/BaseProviderRegex.cs rename to DubUrl.OleDb/BaseProviderRegex.cs diff --git a/Duburl.OleDb/Duburl.OleDb.csproj b/DubUrl.OleDb/DubUrl.OleDb.csproj similarity index 83% rename from Duburl.OleDb/Duburl.OleDb.csproj rename to DubUrl.OleDb/DubUrl.OleDb.csproj index befc5143..bf8d5c13 100644 --- a/Duburl.OleDb/Duburl.OleDb.csproj +++ b/DubUrl.OleDb/DubUrl.OleDb.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ DubUrl.OleDb https://github.com/Seddryck/DubUrl connection-string;database;sql;oledb - Duburl provides a standardized URL-style mechanism for providing database connection information and opening a DbConnection in the .NET ecosystem + DubUrl provides a standardized URL-style mechanism for providing database connection information and opening a DbConnection in the .NET ecosystem diff --git a/Duburl.OleDb/IProviderLocator.cs b/DubUrl.OleDb/IProviderLocator.cs similarity index 100% rename from Duburl.OleDb/IProviderLocator.cs rename to DubUrl.OleDb/IProviderLocator.cs diff --git a/Duburl.OleDb/IProviderRegex.cs b/DubUrl.OleDb/IProviderRegex.cs similarity index 100% rename from Duburl.OleDb/IProviderRegex.cs rename to DubUrl.OleDb/IProviderRegex.cs diff --git a/Duburl.OleDb/Mapping/IOleDbMapper.cs b/DubUrl.OleDb/Mapping/IOleDbMapper.cs similarity index 86% rename from Duburl.OleDb/Mapping/IOleDbMapper.cs rename to DubUrl.OleDb/Mapping/IOleDbMapper.cs index cbf6c384..26f97e6d 100644 --- a/Duburl.OleDb/Mapping/IOleDbMapper.cs +++ b/DubUrl.OleDb/Mapping/IOleDbMapper.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; -namespace Duburl.OleDb.Mapping +namespace DubUrl.OleDb.Mapping { public interface IOleDbMapper : IMapper { } } diff --git a/Duburl.OleDb/Mapping/OleDbConnectivity.cs b/DubUrl.OleDb/Mapping/OleDbConnectivity.cs similarity index 100% rename from Duburl.OleDb/Mapping/OleDbConnectivity.cs rename to DubUrl.OleDb/Mapping/OleDbConnectivity.cs diff --git a/Duburl.OleDb/Mapping/OleDbMapper.cs b/DubUrl.OleDb/Mapping/OleDbMapper.cs similarity index 97% rename from Duburl.OleDb/Mapping/OleDbMapper.cs rename to DubUrl.OleDb/Mapping/OleDbMapper.cs index 5aad9037..252c094e 100644 --- a/Duburl.OleDb/Mapping/OleDbMapper.cs +++ b/DubUrl.OleDb/Mapping/OleDbMapper.cs @@ -12,7 +12,7 @@ using DubUrl.Querying.Parametrizing; using DubUrl.Rewriting.Tokening; using DubUrl.Rewriting; -using Duburl.OleDb.Mapping; +using DubUrl.OleDb.Mapping; namespace DubUrl.OleDb.Mapping { diff --git a/Duburl.OleDb/ProviderAttribute.cs b/DubUrl.OleDb/ProviderAttribute.cs similarity index 98% rename from Duburl.OleDb/ProviderAttribute.cs rename to DubUrl.OleDb/ProviderAttribute.cs index fad9d40e..2340550e 100644 --- a/Duburl.OleDb/ProviderAttribute.cs +++ b/DubUrl.OleDb/ProviderAttribute.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using DubUrl.Rewriting; -using Duburl.OleDb.Mapping; +using DubUrl.OleDb.Mapping; namespace DubUrl.OleDb { diff --git a/Duburl.OleDb/ProviderInfo.cs b/DubUrl.OleDb/ProviderInfo.cs similarity index 100% rename from Duburl.OleDb/ProviderInfo.cs rename to DubUrl.OleDb/ProviderInfo.cs diff --git a/Duburl.OleDb/ProviderLister.cs b/DubUrl.OleDb/ProviderLister.cs similarity index 100% rename from Duburl.OleDb/ProviderLister.cs rename to DubUrl.OleDb/ProviderLister.cs diff --git a/Duburl.OleDb/ProviderLocatorFactory.cs b/DubUrl.OleDb/ProviderLocatorFactory.cs similarity index 100% rename from Duburl.OleDb/ProviderLocatorFactory.cs rename to DubUrl.OleDb/ProviderLocatorFactory.cs diff --git a/Duburl.OleDb/ProviderLocatorIntrospector.cs b/DubUrl.OleDb/ProviderLocatorIntrospector.cs similarity index 98% rename from Duburl.OleDb/ProviderLocatorIntrospector.cs rename to DubUrl.OleDb/ProviderLocatorIntrospector.cs index eb3aee45..fc65ca2e 100644 --- a/Duburl.OleDb/ProviderLocatorIntrospector.cs +++ b/DubUrl.OleDb/ProviderLocatorIntrospector.cs @@ -1,4 +1,4 @@ -using Duburl.OleDb; +using DubUrl.OleDb; using DubUrl.Mapping; using System; using System.Collections.Generic; diff --git a/Duburl.OleDb/Providers/AceProviderLocator.cs b/DubUrl.OleDb/Providers/AceProviderLocator.cs similarity index 100% rename from Duburl.OleDb/Providers/AceProviderLocator.cs rename to DubUrl.OleDb/Providers/AceProviderLocator.cs diff --git a/Duburl.OleDb/Providers/MssqlNCliProviderLocator.cs b/DubUrl.OleDb/Providers/MssqlNCliProviderLocator.cs similarity index 100% rename from Duburl.OleDb/Providers/MssqlNCliProviderLocator.cs rename to DubUrl.OleDb/Providers/MssqlNCliProviderLocator.cs diff --git a/Duburl.OleDb/Providers/MssqlOleDbProviderLocator.cs b/DubUrl.OleDb/Providers/MssqlOleDbProviderLocator.cs similarity index 100% rename from Duburl.OleDb/Providers/MssqlOleDbProviderLocator.cs rename to DubUrl.OleDb/Providers/MssqlOleDbProviderLocator.cs diff --git a/Duburl.OleDb/Providers/MySqlProviderLocator.cs b/DubUrl.OleDb/Providers/MySqlProviderLocator.cs similarity index 100% rename from Duburl.OleDb/Providers/MySqlProviderLocator.cs rename to DubUrl.OleDb/Providers/MySqlProviderLocator.cs diff --git a/Duburl.OleDb/Rewriting/OleDbRewriter.cs b/DubUrl.OleDb/Rewriting/OleDbRewriter.cs similarity index 100% rename from Duburl.OleDb/Rewriting/OleDbRewriter.cs rename to DubUrl.OleDb/Rewriting/OleDbRewriter.cs diff --git a/DubUrl.QA/DubUrl.QA.csproj b/DubUrl.QA/DubUrl.QA.csproj index 291c9bee..67e9c8f6 100644 --- a/DubUrl.QA/DubUrl.QA.csproj +++ b/DubUrl.QA/DubUrl.QA.csproj @@ -92,7 +92,7 @@ - + diff --git a/DubUrl.QA/deploy-test-harness.ps1 b/DubUrl.QA/deploy-test-harness.ps1 index 5ebb00a5..9ed0750d 100644 --- a/DubUrl.QA/deploy-test-harness.ps1 +++ b/DubUrl.QA/deploy-test-harness.ps1 @@ -72,7 +72,7 @@ if ($suites.Length -eq 0 -and "" -ne $suite -and $null -ne $suite) { if ($suites.Length -eq 0) { Write-Host "Executing test harness for all the test suites ..." - $suites = Get-ChildItem -Path ".\Duburl.QA" -Filter "deploy-*-test-env.ps1" -Recurse ` + $suites = Get-ChildItem -Path ".\DubUrl.QA" -Filter "deploy-*-test-env.ps1" -Recurse ` | Select-Object "Name" | ForEach{$_.Name.Substring(7,$_.Name.Substring(7).IndexOf("-"))} if ($exclude.Length -gt 0) { diff --git a/appveyor.yml b/appveyor.yml index a1823108..5bd2e9b5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -64,7 +64,7 @@ test_script: - pwsh: | $force = ($env:APPVEYOR_REPO_BRANCH -eq "main") #Valid for a Pull Request or a Commit on main - & .\Duburl.QA\deploy-test-harness.ps1 -force:$force -config "Release" -frameworks @("net6.0") -exclude @("CockRoach", "Drill", "Trino", "PowerBIDesktop") + & .\DubUrl.QA\deploy-test-harness.ps1 -force:$force -config "Release" -frameworks @("net6.0") -exclude @("CockRoach", "Drill", "Trino", "PowerBIDesktop") if ($lastexitcode -gt 0) { throw "At least one of the test-suite was not successful. Build stopped." } diff --git a/generate-oledb-provider-info.ps1 b/generate-oledb-provider-info.ps1 index 52b54651..a86fbf64 100644 --- a/generate-oledb-provider-info.ps1 +++ b/generate-oledb-provider-info.ps1 @@ -15,7 +15,7 @@ If(Test-Path -LiteralPath $destinationPath\$destinationFile -PathType leaf) { ########### Generate JSON file ############# -$assemblyPath = "DubUrl.OleDb\bin" +$assemblyPath = "DubUrl.QA\bin" Set-Location $assemblyPath $dllfile = "net6.0\DubUrl.OleDb.dll" @@ -25,6 +25,7 @@ If ((-not (Test-Path -Path "Release\$dllfile")) -or ("Release\$dllfile".Creation $directory = "Release" } +Add-Type -Path "$directory\net6.0\Antlr4.StringTemplate.dll" Add-Type -Path "$directory\$dllfile" @@ -51,4 +52,4 @@ If ($hash.Hash -eq (Get-FileHash $destinationPath\$destinationFile).Hash) { Exit 1 } -Remove-Type -Path "$directory\$dllfile" \ No newline at end of file +Remove-Type -Path "$directory\$dllfile"