From 3e10978ef4f79240d878c2dfda527adf36950be5 Mon Sep 17 00:00:00 2001 From: mrward Date: Mon, 2 May 2011 16:59:05 +0100 Subject: [PATCH] Update WPF template for IronPython 2.7 --- .../Project/PythonBinding.csproj | 10 ++++ .../Project/Templates/WPFApplication.xpt | 25 ++++++--- .../RequiredLibraries/DLLs/IronPython.Wpf.dll | Bin 0 -> 6144 bytes .../RequiredLibraries/DLLs/IronPython.Wpf.xml | 53 ++++++++++++++++++ src/Setup/Files.wxs | 5 ++ src/Setup/Setup.wxs | 3 +- 6 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 src/AddIns/BackendBindings/Python/RequiredLibraries/DLLs/IronPython.Wpf.dll create mode 100644 src/AddIns/BackendBindings/Python/RequiredLibraries/DLLs/IronPython.Wpf.xml diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj index ba1b6be44d..3f3af141de 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj @@ -48,18 +48,23 @@ ..\..\RequiredLibraries\IronPython.dll + True ..\..\RequiredLibraries\IronPython.Modules.dll + True ..\..\RequiredLibraries\Microsoft.Dynamic.dll + True ..\..\RequiredLibraries\Microsoft.Scripting.dll + True ..\..\RequiredLibraries\Microsoft.Scripting.Metadata.dll + True 3.0 @@ -186,6 +191,10 @@ Chiron.exe.Config Always + + DLLs\IronPython.Wpf.dll + Always + License.Rtf Always @@ -245,6 +254,7 @@ + diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Templates/WPFApplication.xpt b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Templates/WPFApplication.xpt index daf0a0eb80..ea99603f8f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Templates/WPFApplication.xpt +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Templates/WPFApplication.xpt @@ -54,21 +54,20 @@ ${addinpath:ICSharpCode.PythonBinding}\IronPython.Modules.dll + + ${addinpath:ICSharpCode.PythonBinding}\DLLs\IronPython.Wpf.dll + - @@ -86,6 +85,18 @@ app.Run(window) ]]> + + diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/DLLs/IronPython.Wpf.dll b/src/AddIns/BackendBindings/Python/RequiredLibraries/DLLs/IronPython.Wpf.dll new file mode 100644 index 0000000000000000000000000000000000000000..db1a2badcd45db46267c93d4916fee44d42fab2e GIT binary patch literal 6144 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 literal 0 HcmV?d00001 diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/DLLs/IronPython.Wpf.xml b/src/AddIns/BackendBindings/Python/RequiredLibraries/DLLs/IronPython.Wpf.xml new file mode 100644 index 0000000000..0fa838bfd6 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/RequiredLibraries/DLLs/IronPython.Wpf.xml @@ -0,0 +1,53 @@ + + + + IronPython.Wpf + + + + + Provides helpers for interacting with Windows Presentation Foundation applications. + + + + + Loads XAML from the specified XmlReader and returns the deserialized object. Any event handlers + are bound to methods defined in the provided module. Any named objects are assigned to the object. + + The provided object is expected to be the same type as the root of the XAML element. + + + + + Loads XAML from the specified XmlReader and returns the deserialized object. Any event handlers + are bound to methods defined in the provided module. Any named objects are assigned to the object. + + The provided object is expected to be the same type as the root of the XAML element. + + + + + Loads XAML from the specified XmlReader and returns the deserialized object. Any event handlers + are bound to methods defined in the provided module. Any named objects are assigned to the object. + + The provided object is expected to be the same type as the root of the XAML element. + + + + + Loads XAML from the specified XmlReader and returns the deserialized object. Any event handlers + are bound to methods defined in the provided module. Any named objects are assigned to the object. + + The provided object is expected to be the same type as the root of the XAML element. + + + + + Loads XAML from the specified XmlReader and returns the deserialized object. Any event handlers + are bound to methods defined in the provided module. Any named objects are assigned to the object. + + The provided object is expected to be the same type as the root of the XAML element. + + + + diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs index 1faefee5ae..471d8ecc40 100644 --- a/src/Setup/Files.wxs +++ b/src/Setup/Files.wxs @@ -1112,6 +1112,11 @@ + + + + + diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs index fd5994c389..b01a24a538 100644 --- a/src/Setup/Setup.wxs +++ b/src/Setup/Setup.wxs @@ -408,8 +408,9 @@ - + +