diff --git a/All.sln b/All.sln index 5b20618c3b..0ac1813031 100644 --- a/All.sln +++ b/All.sln @@ -370,6 +370,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorAdvanceSteel2024", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAdvanceSteel2024", "Objects\Converters\ConverterAutocadCivil\ConverterAdvanceSteel2024\ConverterAdvanceSteel2024.csproj", "{737D5567-7B1F-410D-9B7B-BAE8065ED15B}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDynamoRevit2024", "Objects\Converters\ConverterDynamo\ConverterDynamoRevit2024\ConverterDynamoRevit2024.csproj", "{75144587-6F51-46C8-8E40-DA652FBC53F4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Mac|Any CPU = Debug Mac|Any CPU @@ -1605,14 +1607,14 @@ Global {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Debug|Any CPU.Build.0 = Debug|Any CPU {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Debug|x64.ActiveCfg = Debug|Any CPU {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Debug|x64.Build.0 = Debug|Any CPU + {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Release Mac|Any CPU.Build.0 = Release|Any CPU {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Release Mac|x64.ActiveCfg = Debug|Any CPU {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Release Mac|x64.Build.0 = Debug|Any CPU {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Release|Any CPU.ActiveCfg = Release|Any CPU {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Release|Any CPU.Build.0 = Release|Any CPU {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Release|x64.ActiveCfg = Release|Any CPU {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Release|x64.Build.0 = Release|Any CPU - {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU - {EA81F83C-1485-49C8-AB05-9DF2798D70EC}.Release Mac|Any CPU.Build.0 = Release|Any CPU {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Debug Mac|x64.ActiveCfg = Debug|Any CPU {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Debug Mac|x64.Build.0 = Debug|Any CPU @@ -1620,14 +1622,14 @@ Global {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Debug|Any CPU.Build.0 = Debug|Any CPU {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Debug|x64.ActiveCfg = Debug|Any CPU {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Debug|x64.Build.0 = Debug|Any CPU + {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Release Mac|Any CPU.Build.0 = Release|Any CPU {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Release Mac|x64.ActiveCfg = Debug|Any CPU {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Release Mac|x64.Build.0 = Debug|Any CPU {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Release|Any CPU.ActiveCfg = Release|Any CPU {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Release|Any CPU.Build.0 = Release|Any CPU {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Release|x64.ActiveCfg = Release|Any CPU {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Release|x64.Build.0 = Release|Any CPU - {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU - {A8607330-1B23-43CC-8B9B-25818D9C1D64}.Release Mac|Any CPU.Build.0 = Release|Any CPU {48C44A7A-122F-4A1F-B3BA-613CB432A7BC}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU {48C44A7A-122F-4A1F-B3BA-613CB432A7BC}.Debug Mac|x64.ActiveCfg = Debug|Any CPU {48C44A7A-122F-4A1F-B3BA-613CB432A7BC}.Debug Mac|x64.Build.0 = Debug|Any CPU @@ -2039,6 +2041,22 @@ Global {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Release|Any CPU.Build.0 = Release|Any CPU {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Release|x64.ActiveCfg = Release|Any CPU {737D5567-7B1F-410D-9B7B-BAE8065ED15B}.Release|x64.Build.0 = Release|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Debug Mac|x64.Build.0 = Debug|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Debug|x64.ActiveCfg = Debug|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Debug|x64.Build.0 = Debug|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Release Mac|x64.ActiveCfg = Release|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Release Mac|x64.Build.0 = Release|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Release|Any CPU.Build.0 = Release|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Release|x64.ActiveCfg = Release|Any CPU + {75144587-6F51-46C8-8E40-DA652FBC53F4}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2195,6 +2213,7 @@ Global {4D1C70D7-FFD5-4518-A374-2A23E020D416} = {8AA78EE8-C33B-4BC5-992A-E5DE7AB0BEC7} {3B9189B9-E485-448A-8793-9B9587A36791} = {7B7C4CB1-3D60-4A5B-9902-C812521A24B3} {737D5567-7B1F-410D-9B7B-BAE8065ED15B} = {BE521908-7944-46F3-98BF-B47D34509934} + {75144587-6F51-46C8-8E40-DA652FBC53F4} = {F0DD5C38-083B-43EA-8654-96247028D8AC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14} @@ -2248,6 +2267,8 @@ Global Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{67a463d3-e98b-4b16-b069-d7bbb05386a1}*SharedItemsImports = 5 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{737d5567-7b1f-410d-9b7b-bae8065ed15b}*SharedItemsImports = 5 ConnectorNavisworks\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems*{74e39841-b2fa-494d-ac40-a6e505de6b33}*SharedItemsImports = 5 + Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{75144587-6f51-46c8-8e40-da652fbc53f4}*SharedItemsImports = 5 + Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{75144587-6f51-46c8-8e40-da652fbc53f4}*SharedItemsImports = 5 Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{76937388-bc9e-4083-9d6e-59cc627e3804}*SharedItemsImports = 5 ConnectorNavisworks\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems*{77d4f346-aca5-42c8-8522-5ef176f3adf1}*SharedItemsImports = 5 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{78573adc-87a5-489f-8134-fb4a435a05f0}*SharedItemsImports = 5 diff --git a/ConnectorDynamo/ConnectorDynamo.sln b/ConnectorDynamo/ConnectorDynamo.sln index 19a3fa7619..bc4b283768 100644 --- a/ConnectorDynamo/ConnectorDynamo.sln +++ b/ConnectorDynamo/ConnectorDynamo.sln @@ -44,16 +44,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDxf", "..\Objects\ EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "RevitSharedResources", "..\ConnectorRevit\RevitSharedResources\RevitSharedResources.shproj", "{071F914C-F473-4FB2-9FAF-98632AFB164B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitSharedResources2020", "..\ConnectorRevit\RevitSharedResources2020\RevitSharedResources2020.csproj", "{4CC1D828-8882-4F95-ADE3-8250A0FB2699}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RevitSharedResources2020", "..\ConnectorRevit\RevitSharedResources2020\RevitSharedResources2020.csproj", "{4CC1D828-8882-4F95-ADE3-8250A0FB2699}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitSharedResources2021", "..\ConnectorRevit\RevitSharedResources2021\RevitSharedResources2021.csproj", "{69E0C134-46DB-43F8-A9DB-85C6DCB0267A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RevitSharedResources2021", "..\ConnectorRevit\RevitSharedResources2021\RevitSharedResources2021.csproj", "{69E0C134-46DB-43F8-A9DB-85C6DCB0267A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitSharedResources2022", "..\ConnectorRevit\RevitSharedResources2022\RevitSharedResources2022.csproj", "{B171B450-9ECC-4EA4-9C36-D47220B429D9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RevitSharedResources2022", "..\ConnectorRevit\RevitSharedResources2022\RevitSharedResources2022.csproj", "{B171B450-9ECC-4EA4-9C36-D47220B429D9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitSharedResources2023", "..\ConnectorRevit\RevitSharedResources2023\RevitSharedResources2023.csproj", "{D747DFD2-8589-4E51-B558-63623E0623EE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RevitSharedResources2023", "..\ConnectorRevit\RevitSharedResources2023\RevitSharedResources2023.csproj", "{D747DFD2-8589-4E51-B558-63623E0623EE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RevitShared", "RevitShared", "{AEC63D80-B13F-44CB-896E-5F8EFD3654B6}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RevitSharedResources2024", "..\ConnectorRevit\RevitSharedResources2024\RevitSharedResources2024.csproj", "{427191E3-9B99-4DF9-AF5E-3F76D4478D09}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDynamoRevit2024", "..\Objects\Converters\ConverterDynamo\ConverterDynamoRevit2024\ConverterDynamoRevit2024.csproj", "{CDA6EF42-ED63-4638-8697-79CE164C9140}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -124,6 +128,14 @@ Global {D747DFD2-8589-4E51-B558-63623E0623EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {D747DFD2-8589-4E51-B558-63623E0623EE}.Release|Any CPU.ActiveCfg = Release|Any CPU {D747DFD2-8589-4E51-B558-63623E0623EE}.Release|Any CPU.Build.0 = Release|Any CPU + {427191E3-9B99-4DF9-AF5E-3F76D4478D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {427191E3-9B99-4DF9-AF5E-3F76D4478D09}.Debug|Any CPU.Build.0 = Debug|Any CPU + {427191E3-9B99-4DF9-AF5E-3F76D4478D09}.Release|Any CPU.ActiveCfg = Release|Any CPU + {427191E3-9B99-4DF9-AF5E-3F76D4478D09}.Release|Any CPU.Build.0 = Release|Any CPU + {CDA6EF42-ED63-4638-8697-79CE164C9140}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CDA6EF42-ED63-4638-8697-79CE164C9140}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CDA6EF42-ED63-4638-8697-79CE164C9140}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CDA6EF42-ED63-4638-8697-79CE164C9140}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -146,20 +158,30 @@ Global {69E0C134-46DB-43F8-A9DB-85C6DCB0267A} = {AEC63D80-B13F-44CB-896E-5F8EFD3654B6} {B171B450-9ECC-4EA4-9C36-D47220B429D9} = {AEC63D80-B13F-44CB-896E-5F8EFD3654B6} {D747DFD2-8589-4E51-B558-63623E0623EE} = {AEC63D80-B13F-44CB-896E-5F8EFD3654B6} + {427191E3-9B99-4DF9-AF5E-3F76D4478D09} = {AEC63D80-B13F-44CB-896E-5F8EFD3654B6} + {CDA6EF42-ED63-4638-8697-79CE164C9140} = {6E326DD0-9617-4A93-B410-69AFFB446B1C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14} EndGlobalSection GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\ConnectorRevit\RevitSharedResources\RevitSharedResources.projitems*{071f914c-f473-4fb2-9faf-98632afb164b}*SharedItemsImports = 13 ..\Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{0b3d9ae3-def6-4cd6-be44-9c7cf190e207}*SharedItemsImports = 5 ..\Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{0b3d9ae3-def6-4cd6-be44-9c7cf190e207}*SharedItemsImports = 5 ..\Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{2a97fbbe-9ee1-4f52-adf1-26ccdb739797}*SharedItemsImports = 5 ..\Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{2a97fbbe-9ee1-4f52-adf1-26ccdb739797}*SharedItemsImports = 5 ..\Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{2dcd648d-dca5-4d2a-8b14-ad2cb85d24b0}*SharedItemsImports = 13 + ..\ConnectorRevit\RevitSharedResources\RevitSharedResources.projitems*{427191e3-9b99-4df9-af5e-3f76d4478d09}*SharedItemsImports = 5 + ..\ConnectorRevit\RevitSharedResources\RevitSharedResources.projitems*{4cc1d828-8882-4f95-ade3-8250a0fb2699}*SharedItemsImports = 5 ..\Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{4fb7ca53-b611-4ba3-831b-8bb8eaa0611c}*SharedItemsImports = 5 ..\Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{5bab09dc-b0fc-4004-9fd5-6496a9634071}*SharedItemsImports = 13 + ..\ConnectorRevit\RevitSharedResources\RevitSharedResources.projitems*{69e0c134-46db-43f8-a9db-85c6dcb0267a}*SharedItemsImports = 5 ..\Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{88d1ccc9-6fde-452f-bc7c-d03560ce57d2}*SharedItemsImports = 5 ..\Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{88d1ccc9-6fde-452f-bc7c-d03560ce57d2}*SharedItemsImports = 5 + ..\ConnectorRevit\RevitSharedResources\RevitSharedResources.projitems*{b171b450-9ecc-4ea4-9c36-d47220b429d9}*SharedItemsImports = 5 + ..\Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{cda6ef42-ed63-4638-8697-79ce164c9140}*SharedItemsImports = 5 + ..\Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{cda6ef42-ed63-4638-8697-79ce164c9140}*SharedItemsImports = 5 + ..\ConnectorRevit\RevitSharedResources\RevitSharedResources.projitems*{d747dfd2-8589-4e51-b558-63623e0623ee}*SharedItemsImports = 5 ..\Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{f9c3aec5-95cf-4fbc-8c19-189597f24171}*SharedItemsImports = 5 ..\Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{f9c3aec5-95cf-4fbc-8c19-189597f24171}*SharedItemsImports = 5 EndGlobalSection diff --git a/ConnectorDynamo/ConnectorDynamo.slnf b/ConnectorDynamo/ConnectorDynamo.slnf index 12122a2a99..7bf2cb30df 100644 --- a/ConnectorDynamo/ConnectorDynamo.slnf +++ b/ConnectorDynamo/ConnectorDynamo.slnf @@ -12,6 +12,7 @@ "Objects\\Converters\\ConverterDynamo\\ConverterDynamoRevit2021\\ConverterDynamoRevit2021.csproj", "Objects\\Converters\\ConverterDynamo\\ConverterDynamoRevit2022\\ConverterDynamoRevit2022.csproj", "Objects\\Converters\\ConverterDynamo\\ConverterDynamoRevit2023\\ConverterDynamoRevit2023.csproj", + "Objects\\Converters\\ConverterDynamo\\ConverterDynamoRevit2024\\ConverterDynamoRevit2024.csproj", "Objects\\Converters\\ConverterDynamo\\ConverterDynamoRevit\\ConverterDynamoRevit.csproj", "Objects\\Converters\\ConverterDynamo\\ConverterDynamoSandbox\\ConverterDynamoSandbox.csproj", "Objects\\Converters\\ConverterDynamo\\ConverterDynamoShared\\ConverterDynamoShared.shproj", @@ -19,6 +20,7 @@ "Objects\\Converters\\ConverterRevit\\ConverterRevit2021\\ConverterRevit2021.csproj", "Objects\\Converters\\ConverterRevit\\ConverterRevit2022\\ConverterRevit2022.csproj", "Objects\\Converters\\ConverterRevit\\ConverterRevit2023\\ConverterRevit2023.csproj", + "Objects\\Converters\\ConverterRevit\\ConverterRevit2024\\ConverterRevit2024.csproj", "Objects\\Converters\\ConverterRevit\\ConverterRevitShared\\ConverterRevitShared.shproj", "Objects\\Objects\\Objects.csproj", "Objects\\Tests\\Tests.csproj" diff --git a/ConnectorDynamo/ConnectorDynamo/ConnectorDynamo.csproj b/ConnectorDynamo/ConnectorDynamo/ConnectorDynamo.csproj index ba4daa9636..eb4ca09e61 100644 --- a/ConnectorDynamo/ConnectorDynamo/ConnectorDynamo.csproj +++ b/ConnectorDynamo/ConnectorDynamo/ConnectorDynamo.csproj @@ -7,7 +7,6 @@ ConnectorDynamo ConnectorDynamo false - C:\Program Files\Dynamo\Dynamo Core\2.7\DynamoSandbox.exe true true false diff --git a/ConnectorDynamo/ConnectorDynamo/Properties/launchSettings.json b/ConnectorDynamo/ConnectorDynamo/Properties/launchSettings.json new file mode 100644 index 0000000000..25125b88eb --- /dev/null +++ b/ConnectorDynamo/ConnectorDynamo/Properties/launchSettings.json @@ -0,0 +1,8 @@ +{ + "profiles": { + "Dynamo Revit 2024": { + "commandName": "Executable", + "executablePath": "C:\\Program Files\\Autodesk\\Revit 2024\\Revit.exe" + } + } +} \ No newline at end of file diff --git a/Objects/Converters/ConverterDynamo/ConverterDynamoRevit2024/ConverterDynamoRevit2024.csproj b/Objects/Converters/ConverterDynamo/ConverterDynamoRevit2024/ConverterDynamoRevit2024.csproj new file mode 100644 index 0000000000..6cbff7af23 --- /dev/null +++ b/Objects/Converters/ConverterDynamo/ConverterDynamoRevit2024/ConverterDynamoRevit2024.csproj @@ -0,0 +1,44 @@ + + + + netstandard2.0 + Objects.Converter.Dynamo + Objects.Converter.DynamoRevit2024 + Debug;Release + $(DefineConstants);REVIT;REVIT2024 + Speckle.Objects.Converter.DynamoRevit + Objects.Converter.DynamoRevit + Converter for Dynamo 2 for Revit 2024 + $(PackageTags) objects converter dynamo revit + true + + + + + + all + + + + all + + + + + + + + + + + + + + ..\..\..\..\ConnectorDynamo\RevitNodes-2.6.1.dll + + + + + + + diff --git a/Objects/Converters/ConverterDynamo/ConverterDynamoRevit2024/Properties/launchSettings.json b/Objects/Converters/ConverterDynamo/ConverterDynamoRevit2024/Properties/launchSettings.json new file mode 100644 index 0000000000..33fdafe959 --- /dev/null +++ b/Objects/Converters/ConverterDynamo/ConverterDynamoRevit2024/Properties/launchSettings.json @@ -0,0 +1,8 @@ +{ + "profiles": { + "ConverterDynamo": { + "commandName": "Executable", + "executablePath": "C:\\Program Files\\Dynamo\\Dynamo Core\\2.7\\DynamoSandbox.exe" + } + } +} \ No newline at end of file diff --git a/Objects/Converters/ConverterDynamo/ConverterDynamoShared/ConverterDynamo.Units.cs b/Objects/Converters/ConverterDynamo/ConverterDynamoShared/ConverterDynamo.Units.cs index 552438312d..04af1f2fc8 100644 --- a/Objects/Converters/ConverterDynamo/ConverterDynamoShared/ConverterDynamo.Units.cs +++ b/Objects/Converters/ConverterDynamo/ConverterDynamoShared/ConverterDynamo.Units.cs @@ -1,4 +1,4 @@ -#if REVIT +#if REVIT using Autodesk.Revit.DB; using Objects.Converter.Revit; #endif @@ -36,7 +36,7 @@ public string GetRevitDocUnits() return Speckle.Core.Kits.Units.Meters; } -#if !(REVIT2022 || REVIT2023) +#if (REVIT2020 || REVIT2021 ) private DisplayUnitType _revitUnitsTypeId = DisplayUnitType.DUT_UNDEFINED; public DisplayUnitType RevitLengthTypeId diff --git a/Objects/Converters/ConverterDynamo/ConverterDynamoShared/ConverterDynamo.cs b/Objects/Converters/ConverterDynamo/ConverterDynamoShared/ConverterDynamo.cs index 4d92af9f00..fbc1a7ecf0 100644 --- a/Objects/Converters/ConverterDynamo/ConverterDynamoShared/ConverterDynamo.cs +++ b/Objects/Converters/ConverterDynamo/ConverterDynamoShared/ConverterDynamo.cs @@ -27,7 +27,9 @@ namespace Objects.Converter.Dynamo { public partial class ConverterDynamo : ISpeckleConverter { -#if REVIT2023 +#if REVIT2024 + public static string AppName = HostApplications.Dynamo.GetVersion(HostAppVersion.vRevit2024); +#elif REVIT2023 public static string AppName = HostApplications.Dynamo.GetVersion(HostAppVersion.vRevit2023); #elif REVIT2022 public static string AppName = HostApplications.Dynamo.GetVersion(HostAppVersion.vRevit2022); diff --git a/Objects/Objects/ObjectsKit.cs b/Objects/Objects/ObjectsKit.cs index 88906e33f6..ed1b16856c 100644 --- a/Objects/Objects/ObjectsKit.cs +++ b/Objects/Objects/ObjectsKit.cs @@ -99,7 +99,10 @@ private static ISpeckleConverter LoadConverterFromDisk(string app) .GetTypes() .Where(type => typeof(ISpeckleConverter).IsAssignableFrom(type)) .Select(type => (ISpeckleConverter)Activator.CreateInstance(type)) - .First(converter => converter.GetServicedApplications().Contains(app)); + .FirstOrDefault(converter => converter.GetServicedApplications().Contains(app)); + + if (converterInstance == null) + throw new SpeckleException($"No suitable converter instance found for {app}"); SpeckleLog.Logger .ForContext()