resolve #6

chuongmep · Dec 17, 2022 · 65e40f3 · 65e40f3
1 parent 083ba68
commit 65e40f3
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/CADPythonShell/CADPythonShell.csproj b/CADPythonShell/CADPythonShell.csproj
@@ -7,15 +7,16 @@
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<UseWindowsForms>true</UseWindowsForms>
 		<UseWPF>true</UseWPF>
+		<PlatformTarget>x64</PlatformTarget>
 		<Configurations>Debug A23</Configurations>
 		<Configurations>$(Configurations);Release A23</Configurations>
 		<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
 	</PropertyGroup>
-	<PropertyGroup>
+	<!--<PropertyGroup>
 		<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
 			None
 		</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-	</PropertyGroup>
+	</PropertyGroup>-->
 	<PropertyGroup Condition="$(Configuration.Contains('Debug'))">
 		<DebugSymbols>true</DebugSymbols>
 		<DebugType>full</DebugType>

diff --git a/CADPythonShell/PackageContents.xml b/CADPythonShell/PackageContents.xml
@@ -26,5 +26,25 @@
                     AppDescription="a module snoop entities of CAD PythonShell"
                     LoadOnAutoCADStartup="True">
     </ComponentEntry>
+	  <ComponentEntry AppName="CADPythonShell"
+	                  ModuleName="./Microsoft.Dynamic.dll"
+	                  AppDescription="sub module python shell"
+	                  LoadOnAutoCADStartup="True">
+	  </ComponentEntry>
+	  <ComponentEntry AppName="CADPythonShell"
+	                  ModuleName="./Microsoft.Scripting.dll"
+	                  AppDescription="sub module python shell"
+	                  LoadOnAutoCADStartup="True">
+	  </ComponentEntry>
+	  <ComponentEntry AppName="CADPythonShell"
+	                  ModuleName="./IronPython.dll"
+	                  AppDescription="sub module python shell"
+	                  LoadOnAutoCADStartup="True">
+	  </ComponentEntry>
+	  <ComponentEntry AppName="CADPythonShell"
+	                  ModuleName="./IronPython.Modules.dll"
+	                  AppDescription="sub module python shell"
+	                  LoadOnAutoCADStartup="True">
+	  </ComponentEntry>
   </Components>
 </ApplicationPackage>
diff --git a/global.json b/global.json
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "6.*.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": false
+  }
+}
diff --git a/global.json.bak b/global.json.bak
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "6.0.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": true
+  }
+}