Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

T1.3 save python2 backup file on migration #6

Merged
merged 27 commits into from
Jul 6, 2020
Merged

T1.3 save python2 backup file on migration #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3eca0fb
add ScriptMigrator
SHKnudsen Jun 23, 2020
7833204
Add visual difference viewer
SHKnudsen Jun 29, 2020
2a4f662
Added methods for updating the ScriptEditors with the migrated code
SHKnudsen Jun 29, 2020
3c91641
Update PythonMigrationViewExtension.cs
SHKnudsen Jun 29, 2020
99e9835
Merge branch 'T1.1_CodeAnalysis' into T1.2_Accept/RejectCodeChanges
SHKnudsen Jun 29, 2020
f32cd3c
add mechanisme to save Python 2 backup
SHKnudsen Jun 29, 2020
91254a0
Merge branch 'T1.2_Accept/RejectCodeChanges' into T1.3_SavePython2Bac…
SHKnudsen Jun 29, 2020
43b0fbf
Add tooltip description to migration assistant
SHKnudsen Jun 30, 2020
e9e63f1
Merge branch 'T1.1_CodeAnalysis' into T1.2_Accept/RejectCodeChanges
SHKnudsen Jun 30, 2020
b7d4aec
Merge branch 'T1.2_Accept/RejectCodeChanges' into T1.3_SavePython2Bac…
SHKnudsen Jun 30, 2020
1af4cb3
updates
SHKnudsen Jun 30, 2020
694065c
comment updates
SHKnudsen Jul 1, 2020
d99808f
comment updates
SHKnudsen Jul 1, 2020
bc92ca5
Merge branch 'T1.1_CodeAnalysis' into T1.2_Accept/RejectCodeChanges
SHKnudsen Jul 1, 2020
b8deb93
Update ScriptEditorWindow.xaml.cs
SHKnudsen Jul 3, 2020
c187b22
Merge branch 'T1.1-CodeMigration' into T1.2_Accept/RejectCodeChanges
SHKnudsen Jul 3, 2020
b20ee1b
Update PythonMigrationViewExtension.csproj
SHKnudsen Jul 3, 2020
f3da2d5
Update PythonMigrationViewExtension.csproj
SHKnudsen Jul 3, 2020
2d2332a
comment updates
SHKnudsen Jul 3, 2020
48cbd8a
Revert "comment updates"
SHKnudsen Jul 3, 2020
eac5790
comment updates
SHKnudsen Jul 3, 2020
714b7ae
Update PythonMigrationAssistantViewModel.cs
SHKnudsen Jul 3, 2020
79e1bc5
comment updates 2
SHKnudsen Jul 3, 2020
9695a8c
Merge branch 'T1.2_Accept/RejectCodeChanges' into T1.3_SavePython2Bac…
SHKnudsen Jul 3, 2020
09c9efc
small clean ups
SHKnudsen Jul 3, 2020
8f7b283
Merge branch 'T1.2-AcceptReject-CodeChanges' into T1.3_SavePython2Bac…
SHKnudsen Jul 3, 2020
45cb401
Update PythonMigrationAssistantViewModel.cs
SHKnudsen Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/PythonMigrationViewExtension/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

165 changes: 84 additions & 81 deletions src/PythonMigrationViewExtension/Properties/Resources.en-US.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema

Version 2.0
Expand Down Expand Up @@ -59,87 +59,90 @@
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string"/>
<xsd:attribute name="type" type="xsd:string"/>
<xsd:attribute name="mimetype" type="xsd:string"/>
<xsd:attribute ref="xml:space"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string"/>
<xsd:attribute name="name" type="xsd:string"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
<xsd:attribute ref="xml:space"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AcceptButtonTooltip" xml:space="preserve">
<value>Accept the current code changes.</value>
</data>
<data name="DiffButtonTooltip" xml:space="preserve">
<value>Change between Side-by-Side and Inline view.</value>
</data>
<data name="IronPythonDialogDescription" xml:space="preserve">
<value>Dynamo is moving away from the old IronPython2 (Python 2) engine towards a new CPython3 (Python 3) engine.
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AcceptButtonTooltip" xml:space="preserve">
<value>Accept the current code changes.</value>
</data>
<data name="DiffButtonTooltip" xml:space="preserve">
<value>Change between Side-by-Side and Inline view.</value>
</data>
<data name="IronPythonDialogDescription" xml:space="preserve">
<value>Dynamo is moving away from the old IronPython2 (Python 2) engine towards a new CPython3 (Python 3) engine.
There will be a time of transition where both versions of Python node will work inside of Dynamo, but eventually the CPython3 engine will be set as default.</value>
</data>
<data name="IronPythonDialogSummary" xml:space="preserve">
<value>This graph contains nodes that reference an outdated Python engine.</value>
</data>
<data name="IronPythonDialogTitle" xml:space="preserve">
<value>Graph contains outdated Python engine</value>
</data>
<data name="IronPythonNotificationDetailedMessage" xml:space="preserve">
<value>This graph currently contains python nodes that are using the old IronPython Engine which will be deprecated in later versions.Consider updating these nodes to use the new CPython 3.7 Engine.</value>
</data>
<data name="IronPythonNotificationShortMessage" xml:space="preserve">
<value>This graph currently contains nodes that are using the old IronPython2 (Python 2) engine which will be deprecated in later versions. A new CPython3 (Python 3) has been implemented and is accessible inside the Python editor.</value>
</data>
<data name="RejectButtonTooltip" xml:space="preserve">
<value>Reject the current code changes.</value>
</data>
</data>
<data name="IronPythonDialogSummary" xml:space="preserve">
<value>This graph contains nodes that reference an outdated Python engine.</value>
</data>
<data name="IronPythonDialogTitle" xml:space="preserve">
<value>Graph contains outdated Python engine</value>
</data>
<data name="IronPythonNotificationDetailedMessage" xml:space="preserve">
<value>This graph currently contains python nodes that are using the old IronPython Engine which will be deprecated in later versions.Consider updating these nodes to use the new CPython 3.7 Engine.</value>
</data>
<data name="IronPythonNotificationShortMessage" xml:space="preserve">
<value>This graph currently contains nodes that are using the old IronPython2 (Python 2) engine which will be deprecated in later versions. A new CPython3 (Python 3) has been implemented and is accessible inside the Python editor.</value>
</data>
<data name="PythonMigrationBackupExtension" xml:space="preserve">
<value>Python2</value>
</data>
<data name="RejectButtonTooltip" xml:space="preserve">
<value>Reject the current code changes.</value>
</data>
</root>
165 changes: 84 additions & 81 deletions src/PythonMigrationViewExtension/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema

Version 2.0
Expand Down Expand Up @@ -59,87 +59,90 @@
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string"/>
<xsd:attribute name="type" type="xsd:string"/>
<xsd:attribute name="mimetype" type="xsd:string"/>
<xsd:attribute ref="xml:space"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string"/>
<xsd:attribute name="name" type="xsd:string"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
<xsd:attribute ref="xml:space"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AcceptButtonTooltip" xml:space="preserve">
<value>Accept the current code changes.</value>
</data>
<data name="DiffButtonTooltip" xml:space="preserve">
<value>Change between Side-by-Side and Inline view.</value>
</data>
<data name="IronPythonDialogDescription" xml:space="preserve">
<value>Dynamo is moving away from the old IronPython2 (Python 2) engine towards a new CPython3 (Python 3) engine.
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AcceptButtonTooltip" xml:space="preserve">
<value>Accept the current code changes.</value>
</data>
<data name="DiffButtonTooltip" xml:space="preserve">
<value>Change between Side-by-Side and Inline view.</value>
</data>
<data name="IronPythonDialogDescription" xml:space="preserve">
<value>Dynamo is moving away from the old IronPython2 (Python 2) engine towards a new CPython3 (Python 3) engine.
There will be a time of transition where both versions of Python node will work inside of Dynamo, but eventually the CPython3 engine will be set as default.</value>
</data>
<data name="IronPythonDialogSummary" xml:space="preserve">
<value>This graph contains nodes that reference an outdated Python engine.</value>
</data>
<data name="IronPythonDialogTitle" xml:space="preserve">
<value>Graph contains outdated Python engine</value>
</data>
<data name="IronPythonNotificationDetailedMessage" xml:space="preserve">
<value>This graph currently contains python nodes that are using the old IronPython Engine which will be deprecated in later versions.Consider updating these nodes to use the new CPython 3.7 Engine.</value>
</data>
<data name="IronPythonNotificationShortMessage" xml:space="preserve">
<value>This graph currently contains nodes that are using the old IronPython2 (Python 2) engine which will be deprecated in later versions. A new CPython3 (Python 3) has been implemented and is accessible inside the Python editor.</value>
</data>
<data name="RejectButtonTooltip" xml:space="preserve">
<value>Reject the current code changes.</value>
</data>
</data>
<data name="IronPythonDialogSummary" xml:space="preserve">
<value>This graph contains nodes that reference an outdated Python engine.</value>
</data>
<data name="IronPythonDialogTitle" xml:space="preserve">
<value>Graph contains outdated Python engine</value>
</data>
<data name="IronPythonNotificationDetailedMessage" xml:space="preserve">
<value>This graph currently contains python nodes that are using the old IronPython Engine which will be deprecated in later versions.Consider updating these nodes to use the new CPython 3.7 Engine.</value>
</data>
<data name="IronPythonNotificationShortMessage" xml:space="preserve">
<value>This graph currently contains nodes that are using the old IronPython2 (Python 2) engine which will be deprecated in later versions. A new CPython3 (Python 3) has been implemented and is accessible inside the Python editor.</value>
</data>
<data name="PythonMigrationBackupExtension" xml:space="preserve">
<value>Python2</value>
</data>
<data name="RejectButtonTooltip" xml:space="preserve">
<value>Reject the current code changes.</value>
</data>
</root>
Loading