Skip to content

Commit

Permalink
merge dev and solve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlanRynne
AlanRynne committed Oct 16, 2024
2 parents 7931d21 + da0a35a commit 03b36e2
Show file tree
Hide file tree
Showing 138 changed files with 2,874 additions and 5,572 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
needs: build
env:
IS_TAG_BUILD: ${{ github.ref_type == 'tag' }}
IS_RELEASE_BRANCH: ${{ startsWith(github.ref_name, 'release/') || github.ref_name == 'main'}}
steps:
- name: 🔫 Trigger Build Installers
uses: ALEEF02/[email protected]
Expand All @@ -57,7 +58,7 @@ jobs:
workflow: Build Installers
repo: specklesystems/connector-installers
token: ${{ secrets.CONNECTORS_GH_TOKEN }}
inputs: '{ "run_id": "${{ github.run_id }}", "version": "${{ needs.build.outputs.version }}", "public_release": ${{ env.IS_TAG_BUILD }} }'
inputs: '{ "run_id": "${{ github.run_id }}", "version": "${{ needs.build.outputs.version }}", "public_release": ${{ env.IS_TAG_BUILD }}, "store_artifacts": ${{ env.IS_RELEASE_BRANCH }} }'
ref: main
wait-for-completion: true
wait-for-completion-interval: 10s
Expand Down
22 changes: 11 additions & 11 deletions Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,16 +244,16 @@
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
"Speckle.Connectors.Logging": "[1.0.0, )",
"Speckle.Objects": "[3.1.0-dev.158, )",
"Speckle.Sdk": "[3.1.0-dev.158, )"
"Speckle.Objects": "[3.1.0-dev.162, )",
"Speckle.Sdk": "[3.1.0-dev.162, )"
}
},
"speckle.connectors.dui": {
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Connectors.Common": "[1.0.0, )",
"Speckle.Sdk": "[3.1.0-dev.158, )",
"Speckle.Sdk": "[3.1.0-dev.162, )",
"System.Threading.Tasks.Dataflow": "[6.0.0, )"
}
},
Expand All @@ -278,7 +278,7 @@
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Objects": "[3.1.0-dev.158, )"
"Speckle.Objects": "[3.1.0-dev.162, )"
}
},
"Microsoft.Extensions.DependencyInjection": {
Expand Down Expand Up @@ -310,18 +310,18 @@
},
"Speckle.Objects": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.158, )",
"resolved": "3.1.0-dev.158",
"contentHash": "+YwCWAlEOVU3lgTCdf5TgrQkF4wTSTjcUbino/GpvG+4uzSwzVKQbEzK7LlO6N2y0h7R2jTwpIfeIbNxWk+Ppw==",
"requested": "[3.1.0-dev.162, )",
"resolved": "3.1.0-dev.162",
"contentHash": "1fyaPjC1kVtroKfoXI7edJX0Uho/TNRWG9mtmIQ7jKhX1zElrJPSoH8zEIMqckZhGmwUrYjlQFPssASNCP721Q==",
"dependencies": {
"Speckle.Sdk": "3.1.0-dev.158"
"Speckle.Sdk": "3.1.0-dev.162"
}
},
"Speckle.Sdk": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.158, )",
"resolved": "3.1.0-dev.158",
"contentHash": "BvDSteT6AZJhjfcaGOI6UdMhqDBelAF9unY/Kks+LUXBqCnNuST9QQdOjvpI6tmBAUIpUZ81yldm2keJuaQErg==",
"requested": "[3.1.0-dev.162, )",
"resolved": "3.1.0-dev.162",
"contentHash": "ulT3XNgqIQSmpQFK5YEEwRq4RA6emXBKQHnZxtCz37SJin1PnVpH9m8vOAF9FmaWsgSAfjhhjIZDruMu1oKxSg==",
"dependencies": {
"GraphQL.Client": "6.0.0",
"Microsoft.CSharp": "4.7.0",
Expand Down
22 changes: 11 additions & 11 deletions Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,16 +274,16 @@
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
"Speckle.Connectors.Logging": "[1.0.0, )",
"Speckle.Objects": "[3.1.0-dev.158, )",
"Speckle.Sdk": "[3.1.0-dev.158, )"
"Speckle.Objects": "[3.1.0-dev.162, )",
"Speckle.Sdk": "[3.1.0-dev.162, )"
}
},
"speckle.connectors.dui": {
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Connectors.Common": "[1.0.0, )",
"Speckle.Sdk": "[3.1.0-dev.158, )",
"Speckle.Sdk": "[3.1.0-dev.162, )",
"System.Threading.Tasks.Dataflow": "[6.0.0, )"
}
},
Expand All @@ -308,7 +308,7 @@
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Objects": "[3.1.0-dev.158, )"
"Speckle.Objects": "[3.1.0-dev.162, )"
}
},
"Microsoft.Extensions.DependencyInjection": {
Expand Down Expand Up @@ -346,18 +346,18 @@
},
"Speckle.Objects": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.158, )",
"resolved": "3.1.0-dev.158",
"contentHash": "+YwCWAlEOVU3lgTCdf5TgrQkF4wTSTjcUbino/GpvG+4uzSwzVKQbEzK7LlO6N2y0h7R2jTwpIfeIbNxWk+Ppw==",
"requested": "[3.1.0-dev.162, )",
"resolved": "3.1.0-dev.162",
"contentHash": "1fyaPjC1kVtroKfoXI7edJX0Uho/TNRWG9mtmIQ7jKhX1zElrJPSoH8zEIMqckZhGmwUrYjlQFPssASNCP721Q==",
"dependencies": {
"Speckle.Sdk": "3.1.0-dev.158"
"Speckle.Sdk": "3.1.0-dev.162"
}
},
"Speckle.Sdk": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.158, )",
"resolved": "3.1.0-dev.158",
"contentHash": "BvDSteT6AZJhjfcaGOI6UdMhqDBelAF9unY/Kks+LUXBqCnNuST9QQdOjvpI6tmBAUIpUZ81yldm2keJuaQErg==",
"requested": "[3.1.0-dev.162, )",
"resolved": "3.1.0-dev.162",
"contentHash": "ulT3XNgqIQSmpQFK5YEEwRq4RA6emXBKQHnZxtCz37SJin1PnVpH9m8vOAF9FmaWsgSAfjhhjIZDruMu1oKxSg==",
"dependencies": {
"GraphQL.Client": "6.0.0",
"Microsoft.CSharp": "4.7.0",
Expand Down
22 changes: 11 additions & 11 deletions Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,16 +274,16 @@
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
"Speckle.Connectors.Logging": "[1.0.0, )",
"Speckle.Objects": "[3.1.0-dev.158, )",
"Speckle.Sdk": "[3.1.0-dev.158, )"
"Speckle.Objects": "[3.1.0-dev.162, )",
"Speckle.Sdk": "[3.1.0-dev.162, )"
}
},
"speckle.connectors.dui": {
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Connectors.Common": "[1.0.0, )",
"Speckle.Sdk": "[3.1.0-dev.158, )",
"Speckle.Sdk": "[3.1.0-dev.162, )",
"System.Threading.Tasks.Dataflow": "[6.0.0, )"
}
},
Expand All @@ -308,7 +308,7 @@
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Objects": "[3.1.0-dev.158, )"
"Speckle.Objects": "[3.1.0-dev.162, )"
}
},
"Microsoft.Extensions.DependencyInjection": {
Expand Down Expand Up @@ -346,18 +346,18 @@
},
"Speckle.Objects": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.158, )",
"resolved": "3.1.0-dev.158",
"contentHash": "+YwCWAlEOVU3lgTCdf5TgrQkF4wTSTjcUbino/GpvG+4uzSwzVKQbEzK7LlO6N2y0h7R2jTwpIfeIbNxWk+Ppw==",
"requested": "[3.1.0-dev.162, )",
"resolved": "3.1.0-dev.162",
"contentHash": "1fyaPjC1kVtroKfoXI7edJX0Uho/TNRWG9mtmIQ7jKhX1zElrJPSoH8zEIMqckZhGmwUrYjlQFPssASNCP721Q==",
"dependencies": {
"Speckle.Sdk": "3.1.0-dev.158"
"Speckle.Sdk": "3.1.0-dev.162"
}
},
"Speckle.Sdk": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.158, )",
"resolved": "3.1.0-dev.158",
"contentHash": "BvDSteT6AZJhjfcaGOI6UdMhqDBelAF9unY/Kks+LUXBqCnNuST9QQdOjvpI6tmBAUIpUZ81yldm2keJuaQErg==",
"requested": "[3.1.0-dev.162, )",
"resolved": "3.1.0-dev.162",
"contentHash": "ulT3XNgqIQSmpQFK5YEEwRq4RA6emXBKQHnZxtCz37SJin1PnVpH9m8vOAF9FmaWsgSAfjhhjIZDruMu1oKxSg==",
"dependencies": {
"GraphQL.Client": "6.0.0",
"Microsoft.CSharp": "4.7.0",
Expand Down
22 changes: 11 additions & 11 deletions Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,16 +274,16 @@
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
"Speckle.Connectors.Logging": "[1.0.0, )",
"Speckle.Objects": "[3.1.0-dev.158, )",
"Speckle.Sdk": "[3.1.0-dev.158, )"
"Speckle.Objects": "[3.1.0-dev.162, )",
"Speckle.Sdk": "[3.1.0-dev.162, )"
}
},
"speckle.connectors.dui": {
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Connectors.Common": "[1.0.0, )",
"Speckle.Sdk": "[3.1.0-dev.158, )",
"Speckle.Sdk": "[3.1.0-dev.162, )",
"System.Threading.Tasks.Dataflow": "[6.0.0, )"
}
},
Expand All @@ -309,7 +309,7 @@
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Objects": "[3.1.0-dev.158, )"
"Speckle.Objects": "[3.1.0-dev.162, )"
}
},
"Microsoft.Extensions.DependencyInjection": {
Expand Down Expand Up @@ -347,18 +347,18 @@
},
"Speckle.Objects": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.158, )",
"resolved": "3.1.0-dev.158",
"contentHash": "+YwCWAlEOVU3lgTCdf5TgrQkF4wTSTjcUbino/GpvG+4uzSwzVKQbEzK7LlO6N2y0h7R2jTwpIfeIbNxWk+Ppw==",
"requested": "[3.1.0-dev.162, )",
"resolved": "3.1.0-dev.162",
"contentHash": "1fyaPjC1kVtroKfoXI7edJX0Uho/TNRWG9mtmIQ7jKhX1zElrJPSoH8zEIMqckZhGmwUrYjlQFPssASNCP721Q==",
"dependencies": {
"Speckle.Sdk": "3.1.0-dev.158"
"Speckle.Sdk": "3.1.0-dev.162"
}
},
"Speckle.Sdk": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.158, )",
"resolved": "3.1.0-dev.158",
"contentHash": "BvDSteT6AZJhjfcaGOI6UdMhqDBelAF9unY/Kks+LUXBqCnNuST9QQdOjvpI6tmBAUIpUZ81yldm2keJuaQErg==",
"requested": "[3.1.0-dev.162, )",
"resolved": "3.1.0-dev.162",
"contentHash": "ulT3XNgqIQSmpQFK5YEEwRq4RA6emXBKQHnZxtCz37SJin1PnVpH9m8vOAF9FmaWsgSAfjhhjIZDruMu1oKxSg==",
"dependencies": {
"GraphQL.Client": "6.0.0",
"Microsoft.CSharp": "4.7.0",
Expand Down
22 changes: 11 additions & 11 deletions Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,16 @@
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
"Speckle.Connectors.Logging": "[1.0.0, )",
"Speckle.Objects": "[3.1.0-dev.158, )",
"Speckle.Sdk": "[3.1.0-dev.158, )"
"Speckle.Objects": "[3.1.0-dev.162, )",
"Speckle.Sdk": "[3.1.0-dev.162, )"
}
},
"speckle.connectors.dui": {
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Connectors.Common": "[1.0.0, )",
"Speckle.Sdk": "[3.1.0-dev.158, )",
"Speckle.Sdk": "[3.1.0-dev.162, )",
"System.Threading.Tasks.Dataflow": "[6.0.0, )"
}
},
Expand All @@ -273,7 +273,7 @@
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Objects": "[3.1.0-dev.158, )"
"Speckle.Objects": "[3.1.0-dev.162, )"
}
},
"Microsoft.Extensions.DependencyInjection": {
Expand Down Expand Up @@ -311,18 +311,18 @@
},
"Speckle.Objects": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.158, )",
"resolved": "3.1.0-dev.158",
"contentHash": "+YwCWAlEOVU3lgTCdf5TgrQkF4wTSTjcUbino/GpvG+4uzSwzVKQbEzK7LlO6N2y0h7R2jTwpIfeIbNxWk+Ppw==",
"requested": "[3.1.0-dev.162, )",
"resolved": "3.1.0-dev.162",
"contentHash": "1fyaPjC1kVtroKfoXI7edJX0Uho/TNRWG9mtmIQ7jKhX1zElrJPSoH8zEIMqckZhGmwUrYjlQFPssASNCP721Q==",
"dependencies": {
"Speckle.Sdk": "3.1.0-dev.158"
"Speckle.Sdk": "3.1.0-dev.162"
}
},
"Speckle.Sdk": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.158, )",
"resolved": "3.1.0-dev.158",
"contentHash": "BvDSteT6AZJhjfcaGOI6UdMhqDBelAF9unY/Kks+LUXBqCnNuST9QQdOjvpI6tmBAUIpUZ81yldm2keJuaQErg==",
"requested": "[3.1.0-dev.162, )",
"resolved": "3.1.0-dev.162",
"contentHash": "ulT3XNgqIQSmpQFK5YEEwRq4RA6emXBKQHnZxtCz37SJin1PnVpH9m8vOAF9FmaWsgSAfjhhjIZDruMu1oKxSg==",
"dependencies": {
"GraphQL.Client": "6.0.0",
"Microsoft.CSharp": "4.7.0",
Expand Down
8 changes: 8 additions & 0 deletions .../Autocad/Speckle.Connectors.AutocadShared/Operations/Send/AutocadRootObjectBaseBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ private RootObjectBuilderResult BuildSync(
// 5 - Unpack the color proxies
root[ProxyKeys.COLOR] = _colorUnpacker.UnpackColors(atomicObjects, usedAcadLayers);

// add any additional properties (most likely from verticals)
AddAdditionalProxiesToRoot(root);

return new RootObjectBuilderResult(root, results);
}
}
Expand All @@ -146,6 +149,11 @@ public virtual (Collection, LayerTableRecord?) CreateObjectCollection(Entity ent
return (new(), null);
}

public virtual void AddAdditionalProxiesToRoot(Collection rootCollection)
{
return;
}

private SendConversionResult ConvertAutocadEntity(
Entity entity,
string applicationId,
Expand Down
8 changes: 4 additions & 4 deletions Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
using Speckle.Connectors.Autocad.DependencyInjection;
using Speckle.Converters.Autocad;
#elif CIVIL3D
using Speckle.Converters.Civil3d;
using Speckle.Connectors.Civil3d.DependencyInjection;
using Speckle.Converters.Civil3dShared;
using Speckle.Connectors.Civil3dShared.DependencyInjection;
#endif
namespace Speckle.Connectors.Autocad.Plugin;

Expand All @@ -31,7 +31,7 @@ public void Command()
return;
}

PaletteSet = new PaletteSet($"Speckle (Beta) for {AppUtils.App}", s_id)
PaletteSet = new PaletteSet($"Speckle (Beta) for {AppUtils.App.Name}", s_id)
{
Size = new Size(400, 500),
DockEnabled = (DockSides)((int)DockSides.Left + (int)DockSides.Right)
Expand All @@ -52,7 +52,7 @@ public void Command()

var panelWebView = Container.GetRequiredService<DUI3ControlWebView>();

PaletteSet.AddVisual($"Speckle (Beta) for {AppUtils.App} WebView", panelWebView);
PaletteSet.AddVisual($"Speckle (Beta) for {AppUtils.App.Name} WebView", panelWebView);

FocusPalette();
}
Expand Down
22 changes: 11 additions & 11 deletions Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,16 +283,16 @@
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
"Speckle.Connectors.Logging": "[1.0.0, )",
"Speckle.Objects": "[3.1.0-dev.158, )",
"Speckle.Sdk": "[3.1.0-dev.158, )"
"Speckle.Objects": "[3.1.0-dev.162, )",
"Speckle.Sdk": "[3.1.0-dev.162, )"
}
},
"speckle.connectors.dui": {
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Connectors.Common": "[1.0.0, )",
"Speckle.Sdk": "[3.1.0-dev.158, )",
"Speckle.Sdk": "[3.1.0-dev.162, )",
"System.Threading.Tasks.Dataflow": "[6.0.0, )"
}
},
Expand All @@ -318,7 +318,7 @@
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Objects": "[3.1.0-dev.158, )"
"Speckle.Objects": "[3.1.0-dev.162, )"
}
},
"Microsoft.Extensions.DependencyInjection": {
Expand Down Expand Up @@ -356,18 +356,18 @@
},
"Speckle.Objects": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.158, )",
"resolved": "3.1.0-dev.158",
"contentHash": "+YwCWAlEOVU3lgTCdf5TgrQkF4wTSTjcUbino/GpvG+4uzSwzVKQbEzK7LlO6N2y0h7R2jTwpIfeIbNxWk+Ppw==",
"requested": "[3.1.0-dev.162, )",
"resolved": "3.1.0-dev.162",
"contentHash": "1fyaPjC1kVtroKfoXI7edJX0Uho/TNRWG9mtmIQ7jKhX1zElrJPSoH8zEIMqckZhGmwUrYjlQFPssASNCP721Q==",
"dependencies": {
"Speckle.Sdk": "3.1.0-dev.158"
"Speckle.Sdk": "3.1.0-dev.162"
}
},
"Speckle.Sdk": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.158, )",
"resolved": "3.1.0-dev.158",
"contentHash": "BvDSteT6AZJhjfcaGOI6UdMhqDBelAF9unY/Kks+LUXBqCnNuST9QQdOjvpI6tmBAUIpUZ81yldm2keJuaQErg==",
"requested": "[3.1.0-dev.162, )",
"resolved": "3.1.0-dev.162",
"contentHash": "ulT3XNgqIQSmpQFK5YEEwRq4RA6emXBKQHnZxtCz37SJin1PnVpH9m8vOAF9FmaWsgSAfjhhjIZDruMu1oKxSg==",
"dependencies": {
"GraphQL.Client": "6.0.0",
"Microsoft.CSharp": "4.7.0",
Expand Down
Loading

0 comments on commit 03b36e2

Please sign in to comment.