Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate plugin to .NET 6 + performance optimizations + architecture improvements #88

Merged
merged 83 commits into from
Jan 15, 2024
Merged

Migrate plugin to .NET 6 + performance optimizations + architecture improvements #88

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
b8fce35
wip: compile without RestSharp & Newtonsoft (replaced by HttpClient)
VianneyDoleans Dec 4, 2023
6c3e5f7
chore: regenerate some projects using .NET 6 & ArcGis Pro SDK template
VianneyDoleans Dec 4, 2023
5e82c26
wip: front work a bit (display all result) & auth
VianneyDoleans Dec 4, 2023
218a0c4
wip: save config work now
VianneyDoleans Dec 4, 2023
ed3b4b1
wip: tags works now
VianneyDoleans Dec 4, 2023
6de4583
fix: fix open external window
VianneyDoleans Dec 4, 2023
b94b8d3
fix: fix metadata display
VianneyDoleans Dec 4, 2023
85fc19d
chore: migrate map project to new csproj format
VianneyDoleans Dec 4, 2023
9530676
chore: regenerate all remaining isogeo projects to new csproj format
VianneyDoleans Dec 4, 2023
8f901fe
chore: regenerate mvvmpattern project to new csproj format
VianneyDoleans Dec 4, 2023
5fca5f8
wip: migrate Utils project to new csproj format
VianneyDoleans Dec 4, 2023
63319eb
chore: remove test project (empty)
VianneyDoleans Dec 4, 2023
bc3b6aa
chore: refact mapFunctions (add interface & remove global (static))
VianneyDoleans Dec 4, 2023
72e6970
wip: refact RestFunction dependencies & interdepencies
VianneyDoleans Dec 4, 2023
31d8427
wip: rework dependencies to RestFunction, FilterManager & MapFunction
VianneyDoleans Dec 4, 2023
cde01f0
wip(asynchrone); fix async & UI thread
VianneyDoleans Dec 4, 2023
f7c214c
fix(searchbar): repair searchbar search by user action
VianneyDoleans Dec 4, 2023
39680ee
wip(ui thread): fix async + parts that need Ui Thread by running with it
VianneyDoleans Dec 4, 2023
28396a6
chore: small refacto (rename, resharper advices, etc.
VianneyDoleans Dec 4, 2023
bfdc3d4
wip: remove other useless setter (lists)
VianneyDoleans Dec 4, 2023
555a8d1
chore: remove another public setter & add a safe method to set (list)
VianneyDoleans Dec 4, 2023
6b9ff95
chore: rename some class & namespace + apply some resharper advices
VianneyDoleans Dec 4, 2023
ab45010
Revert "chore: remove another public setter & add a safe method to se…
VianneyDoleans Dec 4, 2023
d2e230a
fix(searchbar): fix searchbar loading (ChangeSearchTextEvent method)
VianneyDoleans Dec 4, 2023
6b775e3
fix: re-implement resetdata after auth by mediatior event + clean code
VianneyDoleans Dec 4, 2023
1dd1d39
chore: optimize time by asking significantly less tokens
VianneyDoleans Dec 4, 2023
5dd9662
chore: improve time performance of Filters
VianneyDoleans Dec 4, 2023
11a4103
chore: refact serviceType (getter only) + clean code
VianneyDoleans Dec 4, 2023
793bda7
chore: apply models (dto) clean code (uppercase, nullable, etc.)
VianneyDoleans Dec 4, 2023
6af6380
chore: rename restfunction namespace file & apply interface in code
VianneyDoleans Dec 4, 2023
545dc5e
chore: rename restfunction to networkManager
VianneyDoleans Dec 4, 2023
2ed6f02
chore: remove unused directory (network)
VianneyDoleans Dec 4, 2023
18e69e5
chore: remove unused using
VianneyDoleans Dec 4, 2023
04d7399
fix: repair namespace (authentication view)
VianneyDoleans Dec 4, 2023
18336a7
chore: rename MapFunctions to MapManager
VianneyDoleans Dec 4, 2023
db66efa
chore(network): remove reloadData & fix minor problem with box (linked)
VianneyDoleans Dec 4, 2023
a17230e
chre(network): remove commented code
VianneyDoleans Dec 4, 2023
0fd8c7c
chore: add FilterManager Interface & implement it
VianneyDoleans Dec 4, 2023
e05f161
chore: erase FunctionsSetList global variable (add filterManager method)
VianneyDoleans Dec 4, 2023
6950006
chore: erase listLoading global variable (add filterManager property)
VianneyDoleans Dec 4, 2023
be09f55
chore: erase configurationManager from global variable
VianneyDoleans Dec 4, 2023
b973e0f
chore: move ConfigurationManager, add interface, remove esri dependency
VianneyDoleans Dec 4, 2023
233f315
chore: remove searchText global variable, replace it by SearchTextFilter
VianneyDoleans Dec 4, 2023
9dd65da
chore: erase Encrypt & NbResult global vars, put them in Config Manager
VianneyDoleans Dec 4, 2023
bf2ba3c
chore(perf): add viewModel for resultItem (results listbox)
VianneyDoleans Dec 4, 2023
bbd15e7
chore(archi): minor fix when geographical filter is not set
VianneyDoleans Dec 4, 2023
ee965c1
chore(resultsViewModel): optimize observable collections filling
VianneyDoleans Dec 4, 2023
cb137b4
chore: replace mediator magic string token for MediatorEvent
VianneyDoleans Dec 4, 2023
f5d768d
chore: remove unused meditatorEvent IsCustomQuery
VianneyDoleans Dec 4, 2023
cac9eaf
chore: re-arrange mediatorEvent by "section" + rename if needed
VianneyDoleans Dec 4, 2023
580aa35
chore(network): create dedicated file for ApiParameters class
VianneyDoleans Dec 4, 2023
1fb5a81
chore: rename arcgis pro isogeo module + minor clean
VianneyDoleans Dec 4, 2023
64a239c
wip(results): start to improve results loading (too heavy)
VianneyDoleans Dec 4, 2023
7039c28
feat: finish add combobox/button loading on result items (asynchrone)
VianneyDoleans Dec 4, 2023
73c4af0
chore(network): remove unused include inside get isogeo resource by id
VianneyDoleans Dec 4, 2023
42f74eb
chore(resultItem): change loading in progress position
VianneyDoleans Dec 4, 2023
07d218e
chore: remove unused variable (IsCustomQuery)
VianneyDoleans Dec 4, 2023
34da2da
fix: fix search button + refresh commands (WPF UI issue) + clean code
VianneyDoleans Dec 4, 2023
2900e46
chore: replace previous ListBox Scroll behavior by a better one (perf)
VianneyDoleans Dec 4, 2023
c8bc08a
chore: remove unused mediator event
VianneyDoleans Dec 4, 2023
ce4f631
fix(QuickSearch): fix geographical operator
VianneyDoleans Dec 4, 2023
691e759
fix(resourcesSettings): add ResourcesSettingsViewModel (MVVM)
VianneyDoleans Dec 4, 2023
8a57c1f
fix: remove default search from network, put it in DockPaneViewModel
VianneyDoleans Dec 4, 2023
8af494c
fix: add xml config support + add some elements inside save + clean code
VianneyDoleans Dec 4, 2023
11d6071
fix: repair Filters AddItem() & QuickSearchFilters
VianneyDoleans Dec 4, 2023
61f86fe
chore(UI): replace white by less bright color (dark theme)
VianneyDoleans Dec 4, 2023
a972bad
fix(Isogeo logo): recover isogeo logo in themes
VianneyDoleans Dec 4, 2023
f62df6e
fix(comboBoxLoading): fix confict thread execution orders + thread safe
VianneyDoleans Dec 4, 2023
1092fc8
chore: bump version (2.0.0-beta1)
VianneyDoleans Dec 4, 2023
ce42b24
fix: add mediator inisde FilterManager to erase combobox refresh problem
VianneyDoleans Dec 4, 2023
4302238
chore: remove the todos that are no longer useful
VianneyDoleans Dec 4, 2023
bea84b2
fix(geographicalOperator): add better security inside box refresh
VianneyDoleans Dec 4, 2023
1b5e17e
fix: fix result display order on ResultsViewModel
VianneyDoleans Dec 4, 2023
7678a7b
chore: bump version (2.0.0-beta2)
VianneyDoleans Dec 4, 2023
9a9464a
fix(metadata): fix last modification metadata item binding (uppercase)
VianneyDoleans Dec 4, 2023
0fc08c4
fix: can change connection without restart software + rename methods
VianneyDoleans Dec 4, 2023
8d6fbf6
chore: add uppercase to binding properties on Views
VianneyDoleans Dec 4, 2023
cd8a6dc
chore(network): rename namespace for some files in network project
VianneyDoleans Dec 4, 2023
d4f9e55
chore: remove commented code & unused method on interface
VianneyDoleans Dec 4, 2023
29667e5
chore(readme): update readme
VianneyDoleans Dec 4, 2023
d50bf50
chore: recover ArcGis Pro Add-In id from 1.0.0 (config.daml)
VianneyDoleans Dec 4, 2023
3def20f
chore: bump version (2.0.0-beta3)
VianneyDoleans Dec 4, 2023
41c3fbc
fix(resultItem): change tooltip binding: was assigned to the wrong label
VianneyDoleans Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: migrate map project to new csproj format
  • Loading branch information
@VianneyDoleans
VianneyDoleans committed Dec 4, 2023
commit 85fc19d8371a2ad99908ea01ce48281bdb57ac4c
20 changes: 10 additions & 10 deletions IsogeoArcGisProAddIn.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Isogeo.Utils", "Utils\Isoge
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVVMPattern", "MVVMPattern\MVVMPattern.csproj", "{56D3F8E9-8476-4413-819E-CCD79480AADB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Isogeo.Map", "Map\Isogeo.Map.csproj", "{D7471EF8-A270-48C1-B9E4-CAD9562BCDD6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Isogeo.Resources", "Resources\Isogeo.Resources.csproj", "{CE0EDC45-3843-49BA-B792-CAA39FEAE4AD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Isogeo.AddIn", "Addin\Isogeo.AddIn.csproj", "{3380BD95-8579-444B-9257-0384DD9710E4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Isogeo.Models", "Models\Isogeo.Models.csproj", "{76FFE0AF-6B1D-4B70-A672-62FFAEA7ADA7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Isogeo.Map", "Map\Isogeo.Map.csproj", "{E26962D6-7BCE-4193-958D-BBFE0AAD893C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -59,14 +59,6 @@ Global
{56D3F8E9-8476-4413-819E-CCD79480AADB}.Release|Any CPU.Build.0 = Release|Any CPU
{56D3F8E9-8476-4413-819E-CCD79480AADB}.Release|x64.ActiveCfg = Release|x64
{56D3F8E9-8476-4413-819E-CCD79480AADB}.Release|x64.Build.0 = Release|x64
{D7471EF8-A270-48C1-B9E4-CAD9562BCDD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D7471EF8-A270-48C1-B9E4-CAD9562BCDD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D7471EF8-A270-48C1-B9E4-CAD9562BCDD6}.Debug|x64.ActiveCfg = Debug|Any CPU
{D7471EF8-A270-48C1-B9E4-CAD9562BCDD6}.Debug|x64.Build.0 = Debug|Any CPU
{D7471EF8-A270-48C1-B9E4-CAD9562BCDD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D7471EF8-A270-48C1-B9E4-CAD9562BCDD6}.Release|Any CPU.Build.0 = Release|Any CPU
{D7471EF8-A270-48C1-B9E4-CAD9562BCDD6}.Release|x64.ActiveCfg = Release|Any CPU
{D7471EF8-A270-48C1-B9E4-CAD9562BCDD6}.Release|x64.Build.0 = Release|Any CPU
{CE0EDC45-3843-49BA-B792-CAA39FEAE4AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE0EDC45-3843-49BA-B792-CAA39FEAE4AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE0EDC45-3843-49BA-B792-CAA39FEAE4AD}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -91,6 +83,14 @@ Global
{76FFE0AF-6B1D-4B70-A672-62FFAEA7ADA7}.Release|Any CPU.Build.0 = Release|Any CPU
{76FFE0AF-6B1D-4B70-A672-62FFAEA7ADA7}.Release|x64.ActiveCfg = Release|Any CPU
{76FFE0AF-6B1D-4B70-A672-62FFAEA7ADA7}.Release|x64.Build.0 = Release|Any CPU
{E26962D6-7BCE-4193-958D-BBFE0AAD893C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E26962D6-7BCE-4193-958D-BBFE0AAD893C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E26962D6-7BCE-4193-958D-BBFE0AAD893C}.Debug|x64.ActiveCfg = Debug|Any CPU
{E26962D6-7BCE-4193-958D-BBFE0AAD893C}.Debug|x64.Build.0 = Debug|Any CPU
{E26962D6-7BCE-4193-958D-BBFE0AAD893C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E26962D6-7BCE-4193-958D-BBFE0AAD893C}.Release|Any CPU.Build.0 = Release|Any CPU
{E26962D6-7BCE-4193-958D-BBFE0AAD893C}.Release|x64.ActiveCfg = Release|Any CPU
{E26962D6-7BCE-4193-958D-BBFE0AAD893C}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
17 changes: 7 additions & 10 deletions Map/Isogeo.Map.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<OutputType>library</OutputType>
</PropertyGroup>
<PropertyGroup>
<UseWPF>true</UseWPF>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="log4net" Version="2.0.15" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Language\Isogeo.Language.csproj" />
<ProjectReference Include="..\Utils\Isogeo.Utils.csproj" />
<ProjectReference Include="..\Language\Isogeo.Language.csproj" />
<ProjectReference Include="..\Utils\Isogeo.Utils.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="ArcGIS.Desktop.Core">
<HintPath>C:\Program Files\ArcGIS\Pro\bin\Extensions\Core\ArcGIS.Desktop.Core.dll</HintPath>
<HintPath>C:\Program Files\ArcGIS\Pro\bin\Extensions\Core\ArcGIS.Desktop.Core.dll</HintPath>
</Reference>
<Reference Include="ArcGIS.Desktop.Framework">
<HintPath>C:\Program Files\ArcGIS\Pro\bin\ArcGIS.Desktop.Framework.dll</HintPath>
Expand All @@ -40,4 +37,4 @@
<HintPath>C:\Program Files\ArcGIS\Pro\bin\ArcGIS.Desktop.Shared.Wpf.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
</Project>
53 changes: 0 additions & 53 deletions Map/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions Map/Properties/Resources.Designer.cs
View file
Open in desktop

This file was deleted.

117 changes: 0 additions & 117 deletions Map/Properties/Resources.resx
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions Map/Properties/Settings.Designer.cs
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Map/Properties/Settings.settings
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Map/packages.config
View file
Open in desktop

This file was deleted.