From 9750e9cff1ccf31e66301de16da74de226a15c78 Mon Sep 17 00:00:00 2001 From: BHoMBot Date: Fri, 23 Jun 2023 19:36:21 +0100 Subject: [PATCH 1/7] Upgrade AssemblyFileVersion to 6.3.0.0 --- CarbonQueryDatabase_Adapter/Properties/AssemblyInfo.cs | 2 +- CarbonQueryDatabase_Engine/Properties/AssemblyInfo.cs | 2 +- CarbonQueryDatabase_oM/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CarbonQueryDatabase_Adapter/Properties/AssemblyInfo.cs b/CarbonQueryDatabase_Adapter/Properties/AssemblyInfo.cs index 8e8ecb8..3ebdf67 100644 --- a/CarbonQueryDatabase_Adapter/Properties/AssemblyInfo.cs +++ b/CarbonQueryDatabase_Adapter/Properties/AssemblyInfo.cs @@ -55,7 +55,7 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.2.0.0")] +[assembly: AssemblyFileVersion("6.3.0.0")] diff --git a/CarbonQueryDatabase_Engine/Properties/AssemblyInfo.cs b/CarbonQueryDatabase_Engine/Properties/AssemblyInfo.cs index 836902c..a990578 100644 --- a/CarbonQueryDatabase_Engine/Properties/AssemblyInfo.cs +++ b/CarbonQueryDatabase_Engine/Properties/AssemblyInfo.cs @@ -55,7 +55,7 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.2.0.0")] +[assembly: AssemblyFileVersion("6.3.0.0")] diff --git a/CarbonQueryDatabase_oM/Properties/AssemblyInfo.cs b/CarbonQueryDatabase_oM/Properties/AssemblyInfo.cs index d3fedd4..6fdd81a 100644 --- a/CarbonQueryDatabase_oM/Properties/AssemblyInfo.cs +++ b/CarbonQueryDatabase_oM/Properties/AssemblyInfo.cs @@ -55,7 +55,7 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.2.0.0")] +[assembly: AssemblyFileVersion("6.3.0.0")] From 15a09ad3b1a6e03ea61d131a314464c78fa7564a Mon Sep 17 00:00:00 2001 From: BHoMBot Date: Fri, 23 Jun 2023 21:24:28 +0100 Subject: [PATCH 2/7] Remove Previous Version Attributes for 6.2 --- .../CarbonQueryDatabase_Adapter.cs | 1 - CarbonQueryDatabase_Engine/Versioning_62.json | 36 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 CarbonQueryDatabase_Engine/Versioning_62.json diff --git a/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.cs b/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.cs index 8621409..da5d2be 100644 --- a/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.cs +++ b/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.cs @@ -41,7 +41,6 @@ public partial class CarbonQueryDatabaseAdapter : BHoMAdapter /**** Constructors ****/ /***************************************************/ - [PreviousVersion("6.2", "BH.Adapter.CarbonQueryDatabaseAdapter(System.String, System.String, System.Bool)")] [Description("Adapter to connect to CarbonQueryDatabase.")] [Input("apiToken", "Provide EC3 API Token")] [Output("adapter", "Adapter results")] diff --git a/CarbonQueryDatabase_Engine/Versioning_62.json b/CarbonQueryDatabase_Engine/Versioning_62.json deleted file mode 100644 index 090e47f..0000000 --- a/CarbonQueryDatabase_Engine/Versioning_62.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "Namespace": { - "ToNew": { - }, - "ToOld": { - } - }, - "Type": { - "ToNew": { - - }, - "ToOld": { - - } - }, - "Method": { - "ToNew": { - - }, - "ToOld": { - } - }, - "Property": { - "ToNew": { - - }, - "ToOld": { - - } - }, - "MessageForDeleted": { - "BH.Engine.Adapters.CarbonQueryDatabase.Compute.CQDBearerToken(System.String, System.String)" : "This method has been removed following a refactor to utilise API keys rather than usernames and passwords for security purposes. Please obtain an API key from the provider and plug that into the Adapter to use this toolkit.",}, - "MessageForNoUpgrade": { - - } -} \ No newline at end of file From 28a3e9c59aee853c2020cd4a950599abf6200752 Mon Sep 17 00:00:00 2001 From: Desai Wang Date: Fri, 30 Jun 2023 10:32:51 -0400 Subject: [PATCH 3/7] Updated file name to match method name --- .../CarbonQueryDatabase_Engine.csproj | 6 +++--- .../Create/{GetRequest.cs => CarbonQueryDatabaseRequest.cs} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename CarbonQueryDatabase_Engine/Create/{GetRequest.cs => CarbonQueryDatabaseRequest.cs} (100%) diff --git a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj index 27a1033..d8ef6b6 100644 --- a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj +++ b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj @@ -1,4 +1,4 @@ - + @@ -76,7 +76,7 @@ - + @@ -103,4 +103,4 @@ --> - + \ No newline at end of file diff --git a/CarbonQueryDatabase_Engine/Create/GetRequest.cs b/CarbonQueryDatabase_Engine/Create/CarbonQueryDatabaseRequest.cs similarity index 100% rename from CarbonQueryDatabase_Engine/Create/GetRequest.cs rename to CarbonQueryDatabase_Engine/Create/CarbonQueryDatabaseRequest.cs From 63ce7622038f0856136b9648e4dd236efdeb0cef Mon Sep 17 00:00:00 2001 From: Desai Wang Date: Fri, 30 Jun 2023 11:57:39 -0400 Subject: [PATCH 4/7] Changed names to GetRequest to match return type -Create methods names must match type of item created --- CarbonQueryDatabase_Adapter/CRUD/Read.cs | 4 ++-- CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj | 2 +- .../Create/{CarbonQueryDatabaseRequest.cs => GetRequest.cs} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename CarbonQueryDatabase_Engine/Create/{CarbonQueryDatabaseRequest.cs => GetRequest.cs} (96%) diff --git a/CarbonQueryDatabase_Adapter/CRUD/Read.cs b/CarbonQueryDatabase_Adapter/CRUD/Read.cs index 76959e8..e03c94a 100644 --- a/CarbonQueryDatabase_Adapter/CRUD/Read.cs +++ b/CarbonQueryDatabase_Adapter/CRUD/Read.cs @@ -71,11 +71,11 @@ private List ReadEnvironmentalProductDeclaratio GetRequest epdGetRequest; if (id == null) { - epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.CarbonQueryDatabaseRequest("epds", m_apiToken, config); + epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.GetRequest("epds", m_apiToken, config); } else { - epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.CarbonQueryDatabaseRequest("epds/" + id, m_apiToken, config); + epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.GetRequest("epds/" + id, m_apiToken, config); } string reqString = epdGetRequest.ToUrlString(); diff --git a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj index d8ef6b6..5fb441b 100644 --- a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj +++ b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj @@ -76,7 +76,7 @@ - + diff --git a/CarbonQueryDatabase_Engine/Create/CarbonQueryDatabaseRequest.cs b/CarbonQueryDatabase_Engine/Create/GetRequest.cs similarity index 96% rename from CarbonQueryDatabase_Engine/Create/CarbonQueryDatabaseRequest.cs rename to CarbonQueryDatabase_Engine/Create/GetRequest.cs index c9d614c..dcf3466 100644 --- a/CarbonQueryDatabase_Engine/Create/CarbonQueryDatabaseRequest.cs +++ b/CarbonQueryDatabase_Engine/Create/GetRequest.cs @@ -40,7 +40,7 @@ public static partial class Create [Input("apiToken", "The user's CarbonQueryDatabase APIToken")] [Input("parameters", "An optional config object with properties representing parameters to create the GetRequest with (ie count, name_like, etc)")] [Output("GetRequest", "A GetRequest with CarbonQueryDatabase specific headers and uri")] - public static GetRequest CarbonQueryDatabaseRequest(string apiCommand, string apiToken, CQDConfig parameters = null) + public static GetRequest GetRequest(string apiCommand, string apiToken, CQDConfig parameters = null) { Dictionary param = new Dictionary(); if(parameters.Count > 0) From 35100e271e41dc6671300f63b4439ebac9e62b30 Mon Sep 17 00:00:00 2001 From: Desai Wang Date: Fri, 30 Jun 2023 12:01:31 -0400 Subject: [PATCH 5/7] Renamed to CarbonQueryRequest -per Fraser's suggestion, we are still using CarbonQueryDatabaseRequest for the method name, but created a subfolder named GetRequest inside Create --- CarbonQueryDatabase_Adapter/CRUD/Read.cs | 4 ++-- CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj | 2 +- .../CarbonQueryDatabaseRequest.cs} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename CarbonQueryDatabase_Engine/Create/{GetRequest.cs => GetRequest/CarbonQueryDatabaseRequest.cs} (96%) diff --git a/CarbonQueryDatabase_Adapter/CRUD/Read.cs b/CarbonQueryDatabase_Adapter/CRUD/Read.cs index e03c94a..76959e8 100644 --- a/CarbonQueryDatabase_Adapter/CRUD/Read.cs +++ b/CarbonQueryDatabase_Adapter/CRUD/Read.cs @@ -71,11 +71,11 @@ private List ReadEnvironmentalProductDeclaratio GetRequest epdGetRequest; if (id == null) { - epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.GetRequest("epds", m_apiToken, config); + epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.CarbonQueryDatabaseRequest("epds", m_apiToken, config); } else { - epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.GetRequest("epds/" + id, m_apiToken, config); + epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.CarbonQueryDatabaseRequest("epds/" + id, m_apiToken, config); } string reqString = epdGetRequest.ToUrlString(); diff --git a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj index 5fb441b..8eb6868 100644 --- a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj +++ b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj @@ -76,7 +76,7 @@ - + diff --git a/CarbonQueryDatabase_Engine/Create/GetRequest.cs b/CarbonQueryDatabase_Engine/Create/GetRequest/CarbonQueryDatabaseRequest.cs similarity index 96% rename from CarbonQueryDatabase_Engine/Create/GetRequest.cs rename to CarbonQueryDatabase_Engine/Create/GetRequest/CarbonQueryDatabaseRequest.cs index dcf3466..c9d614c 100644 --- a/CarbonQueryDatabase_Engine/Create/GetRequest.cs +++ b/CarbonQueryDatabase_Engine/Create/GetRequest/CarbonQueryDatabaseRequest.cs @@ -40,7 +40,7 @@ public static partial class Create [Input("apiToken", "The user's CarbonQueryDatabase APIToken")] [Input("parameters", "An optional config object with properties representing parameters to create the GetRequest with (ie count, name_like, etc)")] [Output("GetRequest", "A GetRequest with CarbonQueryDatabase specific headers and uri")] - public static GetRequest GetRequest(string apiCommand, string apiToken, CQDConfig parameters = null) + public static GetRequest CarbonQueryDatabaseRequest(string apiCommand, string apiToken, CQDConfig parameters = null) { Dictionary param = new Dictionary(); if(parameters.Count > 0) From 7352ae735ae09363e205e406a6edf3ce179bf1de Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Mon, 3 Jul 2023 18:02:41 +0100 Subject: [PATCH 6/7] Fix project compliance --- CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj | 2 +- CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj b/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj index 75d4bab..315175f 100644 --- a/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj +++ b/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj @@ -33,7 +33,7 @@ - C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll + $(ProgramData)\BHoM\Assemblies\Adapter_oM.dll False False diff --git a/CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj b/CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj index 1d4c74b..892aeae 100644 --- a/CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj +++ b/CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj @@ -32,7 +32,7 @@ - C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll + $(ProgramData)\BHoM\Assemblies\Adapter_oM.dll False False From 3e8bdf8dfcf41aa15aaae640a8ea5c69ce6b18da Mon Sep 17 00:00:00 2001 From: BHoMBot Date: Mon, 3 Jul 2023 18:05:09 +0100 Subject: [PATCH 7/7] Update project compliance --- .../CarbonQueryDatabase_Adapter.csproj | 26 +++++++++---------- .../CarbonQueryDatabase_oM.csproj | 6 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj b/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj index 315175f..1a3e001 100644 --- a/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj +++ b/CarbonQueryDatabase_Adapter/CarbonQueryDatabase_Adapter.csproj @@ -1,4 +1,4 @@ - + @@ -38,57 +38,57 @@ False - C:\ProgramData\BHoM\Assemblies\BHoM.dll + $(ProgramData)\BHoM\Assemblies\BHoM.dll False False - C:\ProgramData\BHoM\Assemblies\BHoM_Adapter.dll + $(ProgramData)\BHoM\Assemblies\BHoM_Adapter.dll False False False False - C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll + $(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll - C:\ProgramData\BHoM\Assemblies\Data_oM.dll + $(ProgramData)\BHoM\Assemblies\Data_oM.dll False False - C:\ProgramData\BHoM\Assemblies\HTTP_Engine.dll + $(ProgramData)\BHoM\Assemblies\HTTP_Engine.dll False False - C:\ProgramData\BHoM\Assemblies\HTTP_oM.dll + $(ProgramData)\BHoM\Assemblies\HTTP_oM.dll False False - C:\ProgramData\BHoM\Assemblies\LifeCycleAssessment_oM.dll + $(ProgramData)\BHoM\Assemblies\LifeCycleAssessment_oM.dll False False False False - C:\ProgramData\BHoM\Assemblies\Physical_oM.dll + $(ProgramData)\BHoM\Assemblies\Physical_oM.dll - C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll + $(ProgramData)\BHoM\Assemblies\Reflection_Engine.dll False False - C:\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll + $(ProgramData)\BHoM\Assemblies\Serialiser_Engine.dll False False - C:\ProgramData\BHoM\Assemblies\Units_Engine.dll + $(ProgramData)\BHoM\Assemblies\Units_Engine.dll False False @@ -125,4 +125,4 @@ xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y - \ No newline at end of file + diff --git a/CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj b/CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj index 892aeae..546ce85 100644 --- a/CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj +++ b/CarbonQueryDatabase_oM/CarbonQueryDatabase_oM.csproj @@ -37,18 +37,18 @@ False - C:\ProgramData\BHoM\Assemblies\BHoM.dll + $(ProgramData)\BHoM\Assemblies\BHoM.dll False False - C:\ProgramData\BHoM\Assemblies\Data_oM.dll + $(ProgramData)\BHoM\Assemblies\Data_oM.dll False False False - C:\ProgramData\BHoM\Assemblies\LifeCycleAssessment_oM.dll + $(ProgramData)\BHoM\Assemblies\LifeCycleAssessment_oM.dll False