updated runtime files for 2023

pyrevitlabs · May 16, 2022 · 5db685e · 5db685e
1 parent bcd9741
commit 5db685e
Show file tree

Hide file tree

Showing 16 changed files with 112 additions and 50 deletions.
diff --git a/dev/libs/Revit/2023/AdWindows.dll b/dev/libs/Revit/2023/AdWindows.dll
diff --git a/dev/libs/Revit/2023/RevitAPI.dll b/dev/libs/Revit/2023/RevitAPI.dll
diff --git a/dev/libs/Revit/2023/RevitAPIUI.dll b/dev/libs/Revit/2023/RevitAPIUI.dll
diff --git a/dev/libs/Revit/2023/UIFramework.dll b/dev/libs/Revit/2023/UIFramework.dll
diff --git a/dev/libs/Revit/2023/Xceed.Wpf.AvalonDock.dll b/dev/libs/Revit/2023/Xceed.Wpf.AvalonDock.dll
diff --git a/dev/pyRevitLabs.PyRevit.Runtime/Directory.Build.props b/dev/pyRevitLabs.PyRevit.Runtime/Directory.Build.props
@@ -1,49 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <Import Project="../Directory.Build.props" />
-
-    <ItemGroup>
-        <Reference Include="pyRevitLabs.Json" HintPath="$(PyRevitDevLibsDir)\pyRevitLabs.Json.dll" Private="false" />
-        <Reference Include="pyRevitLabs.NLog" HintPath="$(PyRevitDevLibsDir)\pyRevitLabs.NLog.dll" Private="false" />
-        <Reference Include="pyRevitLabs.MahAppsMetro" HintPath="$(PyRevitDevLibsDir)\pyRevitLabs.MahAppsMetro.dll" Private="false" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Reference Include="WindowsBase" />
-        <Reference Include="WindowsFormsIntegration" />
-        <Reference Include="PresentationCore" />
-        <Reference Include="PresentationFramework" />
-        <Reference Include="System.Windows.Forms" />
-        <Reference Include="System.Xaml" />
-        <Reference Include="System.Web" />
-
-        <Reference Include="pyRevitLoader" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLoader.dll" />
-        <Reference Include="IronPython" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.IronPython.dll" />
-        <Reference Include="IronPython.Modules" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.IronPython.Modules.dll" />
-        <Reference Include="IronPython.SQLite" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.IronPython.SQLite.dll" />
-        <Reference Include="IronPython.Wpf" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.IronPython.Wpf.dll" />
-        <Reference Include="IronPython.Wpf" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.IronPython.Wpf.dll" />
-        <Reference Include="Microsoft.Dynamic" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.Microsoft.Dynamic.dll" />
-        <Reference Include="Microsoft.Scripting" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.Microsoft.Scripting.dll" />
-
-        <Reference Include="pyRevitLabs.PythonNet" HintPath="$(PyRevitDevModulesDir)\pyRevitLabs.Python.Net\src\runtime\bin\pyRevitLabs.PythonNet.dll" />
-
-        <Reference Include="pyRevitLabs.Common" HintPath="$(PyRevitBinDir)\pyRevitLabs.Common.dll" />
-        <Reference Include="pyRevitLabs.CommonWPF" HintPath="$(PyRevitBinDir)\pyRevitLabs.CommonWPF.dll" />
-        <Reference Include="pyRevitLabs.Emojis" HintPath="$(PyRevitBinDir)\pyRevitLabs.Emojis.dll" />
-        <Reference Include="pyRevitLabs.PyRevit" HintPath="$(PyRevitBinDir)\pyRevitLabs.PyRevit.dll" />
-        <Reference Include="pyRevitLabs.TargetApps.Revit" HintPath="$(PyRevitBinDir)\pyRevitLabs.TargetApps.Revit.dll" />
-
-        <Reference Include="AdWindows" HintPath="$(PyRevitDevLibsDir)\Revit\$(RevitVersion)\AdWindows.dll" />
-        <Reference Include="UIFramework" HintPath="$(PyRevitDevLibsDir)\Revit\$(RevitVersion)\UIFramework.dll" />
-        <Reference Include="RevitAPI" HintPath="$(PyRevitDevLibsDir)\Revit\$(RevitVersion)\RevitAPI.dll" />
-        <Reference Include="RevitAPIUI" HintPath="$(PyRevitDevLibsDir)\Revit\$(RevitVersion)\RevitAPIUI.dll" />
-        <Reference Include="Xceed.Wpf.AvalonDock" HintPath="$(PyRevitDevLibsDir)\Revit\$(RevitVersion)\Xceed.Wpf.AvalonDock.dll" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="docopt.net" Version="0.6.1.10" />
-        <PackageReference Include="AirspaceFixer" Version="1.0.5" />
-        <PackageReference Include="ControlzEx" Version="3.0.2.4" />
-    </ItemGroup>
 </Project>
diff --git a/dev/pyRevitLabs.PyRevit.Runtime/Directory.Build.targets b/dev/pyRevitLabs.PyRevit.Runtime/Directory.Build.targets
@@ -1,5 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <PropertyGroup>
+        <DefineConstants>$(DefineConstants);REVIT$(RevitVersion)</DefineConstants>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Reference Include="pyRevitLabs.Json" HintPath="$(PyRevitDevLibsDir)\pyRevitLabs.Json.dll" Private="false" />
+        <Reference Include="pyRevitLabs.NLog" HintPath="$(PyRevitDevLibsDir)\pyRevitLabs.NLog.dll" Private="false" />
+        <Reference Include="pyRevitLabs.MahAppsMetro" HintPath="$(PyRevitDevLibsDir)\pyRevitLabs.MahAppsMetro.dll" Private="false" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Reference Include="WindowsBase" />
+        <Reference Include="WindowsFormsIntegration" />
+        <Reference Include="PresentationCore" />
+        <Reference Include="PresentationFramework" />
+        <Reference Include="System.Windows.Forms" />
+        <Reference Include="System.Xaml" />
+        <Reference Include="System.Web" />
+
+        <Reference Include="pyRevitLoader" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLoader.dll" />
+        <Reference Include="IronPython" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.IronPython.dll" />
+        <Reference Include="IronPython.Modules" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.IronPython.Modules.dll" />
+        <Reference Include="IronPython.SQLite" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.IronPython.SQLite.dll" />
+        <Reference Include="IronPython.Wpf" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.IronPython.Wpf.dll" />
+        <Reference Include="IronPython.Wpf" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.IronPython.Wpf.dll" />
+        <Reference Include="Microsoft.Dynamic" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.Microsoft.Dynamic.dll" />
+        <Reference Include="Microsoft.Scripting" HintPath="$(PyRevitEnginesDir)\IPY2711PR\pyRevitLabs.Microsoft.Scripting.dll" />
+
+        <Reference Include="pyRevitLabs.PythonNet" HintPath="$(PyRevitEnginesDir)\CPY385\pyRevitLabs.PythonNet.dll" />
+
+        <Reference Include="pyRevitLabs.Common" HintPath="$(PyRevitBinDir)\pyRevitLabs.Common.dll" />
+        <Reference Include="pyRevitLabs.CommonWPF" HintPath="$(PyRevitBinDir)\pyRevitLabs.CommonWPF.dll" />
+        <Reference Include="pyRevitLabs.Emojis" HintPath="$(PyRevitBinDir)\pyRevitLabs.Emojis.dll" />
+        <Reference Include="pyRevitLabs.PyRevit" HintPath="$(PyRevitBinDir)\pyRevitLabs.PyRevit.dll" />
+        <Reference Include="pyRevitLabs.TargetApps.Revit" HintPath="$(PyRevitBinDir)\pyRevitLabs.TargetApps.Revit.dll" />
+
+        <Reference Include="AdWindows" HintPath="$(PyRevitDevLibsDir)\Revit\$(RevitVersion)\AdWindows.dll" />
+        <Reference Include="UIFramework" HintPath="$(PyRevitDevLibsDir)\Revit\$(RevitVersion)\UIFramework.dll" />
+        <Reference Include="RevitAPI" HintPath="$(PyRevitDevLibsDir)\Revit\$(RevitVersion)\RevitAPI.dll" />
+        <Reference Include="RevitAPIUI" HintPath="$(PyRevitDevLibsDir)\Revit\$(RevitVersion)\RevitAPIUI.dll" />
+        <Reference Include="Xceed.Wpf.AvalonDock" HintPath="$(PyRevitDevLibsDir)\Revit\$(RevitVersion)\Xceed.Wpf.AvalonDock.dll" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="docopt.net" Version="0.6.1.10" />
+        <PackageReference Include="AirspaceFixer" Version="1.0.5" />
+        <PackageReference Include="ControlzEx" Version="3.0.2.4" />
+    </ItemGroup>
+
     <ItemGroup>
         <Compile Include="$(PyRevitLibDir)\pyrevit\runtime\CLREngine.cs" />
         <Compile Include="$(PyRevitLibDir)\pyrevit\runtime\ContentEngine.cs" />

diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2017.csproj b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2017.csproj
@@ -2,4 +2,8 @@
   <PropertyGroup>
     <RevitVersion>2017</RevitVersion>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
 </Project>
diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2018.csproj b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2018.csproj
@@ -2,4 +2,8 @@
   <PropertyGroup>
     <RevitVersion>2018</RevitVersion>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
 </Project>
diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2019.csproj b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2019.csproj
@@ -2,4 +2,8 @@
   <PropertyGroup>
     <RevitVersion>2019</RevitVersion>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
 </Project>
diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2020.csproj b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2020.csproj
@@ -2,4 +2,8 @@
   <PropertyGroup>
     <RevitVersion>2020</RevitVersion>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
 </Project>
diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2021.csproj b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2021.csproj
@@ -2,4 +2,8 @@
   <PropertyGroup>
     <RevitVersion>2021</RevitVersion>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
 </Project>
diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2022.csproj b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2022.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <RevitVersion>2022</RevitVersion>
-    </PropertyGroup>
+  <PropertyGroup>
+    <RevitVersion>2022</RevitVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
 </Project>
diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2023.csproj b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.2023.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RevitVersion>2023</RevitVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+</Project>
diff --git a/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.sln b/dev/pyRevitLabs.PyRevit.Runtime/pyRevitLabs.PyRevit.Runtime.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30320.27
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32421.90
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "pyRevitLabs.PyRevit.Runtime.2021", "pyRevitLabs.PyRevit.Runtime.2021.csproj", "{479435EA-C820-49E4-942F-1274C151EE71}"
 EndProject
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "pyRevitLabs.PyRevit.Runtime
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "pyRevitLabs.PyRevit.Runtime.2022", "pyRevitLabs.PyRevit.Runtime.2022.csproj", "{DB535262-30DA-404D-A32E-F024FF37935C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "pyRevitLabs.PyRevit.Runtime.2023", "pyRevitLabs.PyRevit.Runtime.2023.csproj", "{E05891D9-4833-45B5-84B4-8237D9AF6A4C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -123,6 +125,22 @@ Global
 		{DB535262-30DA-404D-A32E-F024FF37935C}.ReleasePY38|Any CPU.Build.0 = Release|Any CPU
 		{DB535262-30DA-404D-A32E-F024FF37935C}.ReleasePY38|x64.ActiveCfg = Release|Any CPU
 		{DB535262-30DA-404D-A32E-F024FF37935C}.ReleasePY38|x64.Build.0 = Release|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.Debug|x64.Build.0 = Debug|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.Release|x64.ActiveCfg = Release|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.Release|x64.Build.0 = Release|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.ReleasePY37|Any CPU.ActiveCfg = Release|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.ReleasePY37|Any CPU.Build.0 = Release|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.ReleasePY37|x64.ActiveCfg = Release|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.ReleasePY37|x64.Build.0 = Release|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.ReleasePY38|Any CPU.ActiveCfg = Release|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.ReleasePY38|Any CPU.Build.0 = Release|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.ReleasePY38|x64.ActiveCfg = Release|Any CPU
+		{E05891D9-4833-45B5-84B4-8237D9AF6A4C}.ReleasePY38|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/pyrevitlib/pyrevit/runtime/EventTelemetry.cs b/pyrevitlib/pyrevit/runtime/EventTelemetry.cs
@@ -133,8 +133,14 @@ public static Dictionary<string, object> GetPrintSettings(PrintParameters printP
 
             // some print parameters throw exceptions
             try {
+#if REVIT2023
+                marginx = printParams.OriginOffsetX;
+                marginy = printParams.OriginOffsetY;
+
+#else
                 marginx = printParams.UserDefinedMarginX;
                 marginy = printParams.UserDefinedMarginY;
+#endif
             }
             catch {
                 marginx = marginy = 0.0;