Skip to content

Commit 365a01d

Browse files
wishbonesrwishbonesr
authored
Merge pull request #1 from wishbonesr/feature/Simulate2023
upgraded .NET to 4.8 and added libraries to compile for Simulate 2023
2 parents f8bc5e7 + b91bc64 commit 365a01d

31 files changed

Lines changed: 30 additions & 22 deletions

‎NavisPythonShell/NavisPythonShell.csproj‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
5151
</PropertyGroup>
5252
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
53-
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
53+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
5454
<DefineConstants>DEBUG;TRACE</DefineConstants>
5555
<DebugType>Full</DebugType>
5656
</PropertyGroup>
@@ -88,40 +88,40 @@
8888
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
8989
</PropertyGroup>
9090
<ItemGroup>
91-
<Reference Include="Autodesk.Navisworks.Api, Version=19.0.1374.1, Culture=neutral, PublicKeyToken=d85e58fa5af9b484">
92-
<HintPath>C:\Program Files\Autodesk\Navisworks Manage 2022\Autodesk.Navisworks.Api.dll</HintPath>
93-
<Private>False</Private>
91+
<Reference Include="Autodesk.Navisworks.Api">
92+
<SpecificVersion>False</SpecificVersion>
93+
<HintPath>..\RefrencedAssemblies\Sim2024\Autodesk.Navisworks.Api.dll</HintPath>
9494
</Reference>
95-
<Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
95+
<Reference Include="ICSharpCode.AvalonEdit">
9696
<SpecificVersion>False</SpecificVersion>
9797
<HintPath>..\RefrencedAssemblies\ICSharpCode.AvalonEdit.dll</HintPath>
9898
</Reference>
99-
<Reference Include="IronPython, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
99+
<Reference Include="IronPython">
100100
<SpecificVersion>False</SpecificVersion>
101101
<HintPath>..\RefrencedAssemblies\IronPython.dll</HintPath>
102102
</Reference>
103-
<Reference Include="IronPython.Modules, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
103+
<Reference Include="IronPython.Modules">
104104
<SpecificVersion>False</SpecificVersion>
105105
<HintPath>..\RefrencedAssemblies\IronPython.Modules.dll</HintPath>
106106
</Reference>
107-
<Reference Include="IronPython.SQLite, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
107+
<Reference Include="IronPython.SQLite">
108108
<SpecificVersion>False</SpecificVersion>
109109
<HintPath>..\RefrencedAssemblies\IronPython.SQLite.dll</HintPath>
110110
</Reference>
111-
<Reference Include="IronPython.Wpf, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
111+
<Reference Include="IronPython.Wpf">
112112
<SpecificVersion>False</SpecificVersion>
113113
<HintPath>..\RefrencedAssemblies\IronPython.Wpf.dll</HintPath>
114114
</Reference>
115115
<Reference Include="Microsoft.CSharp" />
116-
<Reference Include="Microsoft.Dynamic, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
116+
<Reference Include="Microsoft.Dynamic">
117117
<SpecificVersion>False</SpecificVersion>
118118
<HintPath>..\RefrencedAssemblies\Microsoft.Dynamic.dll</HintPath>
119119
</Reference>
120-
<Reference Include="Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
120+
<Reference Include="Microsoft.Scripting">
121121
<SpecificVersion>False</SpecificVersion>
122122
<HintPath>..\RefrencedAssemblies\Microsoft.Scripting.dll</HintPath>
123123
</Reference>
124-
<Reference Include="Microsoft.Scripting.Metadata, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
124+
<Reference Include="Microsoft.Scripting.Metadata">
125125
<SpecificVersion>False</SpecificVersion>
126126
<HintPath>..\RefrencedAssemblies\Microsoft.Scripting.Metadata.dll</HintPath>
127127
</Reference>
@@ -132,7 +132,7 @@
132132
<RequiredTargetFramework>3.5</RequiredTargetFramework>
133133
</Reference>
134134
<Reference Include="System.Drawing" />
135-
<Reference Include="System.Windows.Controls.WpfPropertyGrid, Version=2010.11.10.0, Culture=neutral, PublicKeyToken=be4b71144cd8a3e5, processorArchitecture=MSIL">
135+
<Reference Include="System.Windows.Controls.WpfPropertyGrid">
136136
<SpecificVersion>False</SpecificVersion>
137137
<HintPath>..\RefrencedAssemblies\System.Windows.Controls.WpfPropertyGrid.dll</HintPath>
138138
</Reference>
@@ -277,8 +277,9 @@
277277
</PreBuildEvent>
278278
</PropertyGroup>
279279
<PropertyGroup>
280-
<PostBuildEvent>xcopy $(TargetDir)*.* "C:\Program Files\Autodesk\Navisworks Manage 2022\Plugins\NavisPythonShell\" /Y /I /E /EXCLUDE:$(SolutionDir)exclude.txt
281-
xcopy $(TargetDir)*.* "C:\Program Files\Autodesk\Navisworks Manage 2022\Dependencies\" /Y /I /E /EXCLUDE:$(SolutionDir)noexclude.txt</PostBuildEvent>
280+
<PostBuildEvent>xcopy $(TargetDir)*.* "C:\Program Files\Autodesk\Navisworks Simulate 2023\Plugins\NavisPythonShell\" /Y /I /E /EXCLUDE:$(SolutionDir)exclude.txt
281+
xcopy $(TargetDir)*.* "C:\Program Files\Autodesk\Navisworks Simulate 2023\Dependencies\" /Y /I /E /EXCLUDE:$(SolutionDir)noexclude.txt
282+
</PostBuildEvent>
282283
</PropertyGroup>
283284
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
284285
Other similar extension points exist, see Microsoft.Common.targets.

‎NavisPythonShell/Properties/Resources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎NpsRuntime/NpsRuntime.csproj‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
3131
</PropertyGroup>
3232
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
33-
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
33+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
3434
<DefineConstants>DEBUG;TRACE</DefineConstants>
3535
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
3636
<DebugType>Full</DebugType>
@@ -65,11 +65,16 @@
6565
<Prefer32Bit />
6666
</PropertyGroup>
6767
<ItemGroup>
68-
<Reference Include="Autodesk.Navisworks.Api, Version=19.0.1374.1, Culture=neutral, PublicKeyToken=d85e58fa5af9b484">
69-
<HintPath>C:\Program Files\Autodesk\Navisworks Manage 2022\Autodesk.Navisworks.Api.dll</HintPath>
68+
<Reference Include="Autodesk.Navisworks.Api, Version=21.0.0.0, Culture=neutral, PublicKeyToken=d85e58fa5af9b484, processorArchitecture=AMD64">
69+
<SpecificVersion>False</SpecificVersion>
70+
<HintPath>..\RefrencedAssemblies\Sim2023\Autodesk.Navisworks.Api.dll</HintPath>
71+
</Reference>
72+
<Reference Include="Autodesk.Navisworks.Clash, Version=21.0.0.0, Culture=neutral, PublicKeyToken=d85e58fa5af9b484, processorArchitecture=AMD64">
73+
<SpecificVersion>False</SpecificVersion>
74+
<HintPath>..\RefrencedAssemblies\Sim2023\Autodesk.Navisworks.Clash.dll</HintPath>
7075
</Reference>
71-
<Reference Include="Autodesk.Navisworks.Clash, Version=19.0.1374.1, Culture=neutral, PublicKeyToken=d85e58fa5af9b484">
72-
<HintPath>C:\Program Files\Autodesk\Navisworks Manage 2022\Autodesk.Navisworks.Clash.dll</HintPath>
76+
<Reference Include="Autodesk.Navisworks.Timeliner">
77+
<HintPath>..\RefrencedAssemblies\Sim2023\Autodesk.Navisworks.Timeliner.dll</HintPath>
7378
</Reference>
7479
<Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
7580
<SpecificVersion>False</SpecificVersion>

‎NpsRuntime/ScriptExecutor.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Collections.Generic;
88
using Autodesk.Navisworks.Api;
99
using Autodesk.Navisworks.Api.Clash;
10+
using Autodesk.Navisworks.Api.Timeliner;
1011
namespace NavisPythonShell.NpsRuntime
1112
{
1213
/// <summary>
@@ -144,6 +145,7 @@ public void SetupEnvironment(ScriptEngine engine, ScriptScope scope)
144145
// reference Navisworks Api Document and Application
145146
engine.Runtime.LoadAssembly(typeof(Autodesk.Navisworks.Api.Document).Assembly);
146147
engine.Runtime.LoadAssembly(typeof(Autodesk.Navisworks.Api.Clash.ClashTest).Assembly);
148+
engine.Runtime.LoadAssembly(typeof(Autodesk.Navisworks.Api.Timeliner.DocumentTimeliner).Assembly);
147149
// also, allow access to the RPS internals
148150
engine.Runtime.LoadAssembly(typeof(NavisPythonShell.NpsRuntime.ScriptExecutor).Assembly);
149151
}

‎PythonConsoleControl/PythonConsoleControl.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<OutputPath>bin\$(Configuration)\</OutputPath>
4343
</PropertyGroup>
4444
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
45-
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
45+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
4646
<DebugType>Full</DebugType>
4747
<DefineConstants>DEBUG;TRACE</DefineConstants>
4848
<Optimize>False</Optimize>

‎RefrencedAssemblies/Microsoft.CSharp.dll‎

46.2 KB
Binary file not shown.

‎RefrencedAssemblies/Microsoft.Scripting.AspNet.dll‎

43 KB
Binary file not shown.

‎RefrencedAssemblies/Sim2023/Autodesk.Navisworks.Api.dll‎

3.82 MB
Binary file not shown.

‎RefrencedAssemblies/Sim2023/Autodesk.Navisworks.Automation.dll‎

177 KB
Binary file not shown.

‎RefrencedAssemblies/Sim2023/Autodesk.Navisworks.Clash.dll‎

459 KB
Binary file not shown.

0 commit comments

Comments
 (0)