Skip to content

Commit a4858b8

Browse files
daren-thomasdaren-thomas
authored
Merge pull request #68 from architecture-building-systems/feature/avalonupdate
Updated AvalonEdit to 5.0.4
2 parents a6b2d31 + e968fd9 commit a4858b8

File tree

10 files changed

+145
-141
lines changed

10 files changed

+145
-141
lines changed

‎.gitignore‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
1-
# Project specific files and folders to ignore
2-
PythonConsoleControl/obj/
3-
RevitPythonShell/obj/
4-
RpsRuntime/obj/
5-
6-
7-
# Byte-compiled / optimized / DLL files
8-
__pycache__/
9-
*.py[cod]
10-
11-
# C extensions
12-
*.so
13-
14-
# Distribution / packaging
15-
.Python
16-
env/
17-
bin/
18-
build/
19-
develop-eggs/
20-
dist/
21-
eggs/
22-
lib/
23-
lib64/
24-
parts/
25-
sdist/
26-
var/
27-
*.egg-info/
28-
.installed.cfg
29-
*.egg
30-
31-
# Installer logs
32-
pip-log.txt
33-
pip-delete-this-directory.txt
34-
35-
# Unit test / coverage reports
36-
htmlcov/
37-
.tox/
38-
.coverage
39-
.cache
40-
nosetests.xml
41-
coverage.xml
42-
43-
# Translations
44-
*.mo
45-
46-
# Mr Developer
47-
.mr.developer.cfg
48-
.project
49-
.pydevproject
50-
51-
# Rope
52-
.ropeproject
53-
54-
# Django stuff:
55-
*.log
56-
*.pot
57-
58-
# Sphinx documentation
59-
docs/_build/
60-
61-
*.swp
62-
63-
# project specific stuff
64-
.DS_Store
65-
RevitPythonShell/Examples/Output
66-
RevitPythonShell/Examples/Output_HelloWorld
67-
*.suo
68-
69-
70-
# Visual Studio 2015 cache/options directory
1+
# Project specific files and folders to ignore
2+
PythonConsoleControl/obj/
3+
RevitPythonShell/obj/
4+
RpsRuntime/obj/
5+
6+
7+
# Byte-compiled / optimized / DLL files
8+
__pycache__/
9+
*.py[cod]
10+
11+
# C extensions
12+
*.so
13+
14+
# Distribution / packaging
15+
.Python
16+
env/
17+
bin/
18+
build/
19+
develop-eggs/
20+
dist/
21+
eggs/
22+
lib/
23+
lib64/
24+
parts/
25+
sdist/
26+
var/
27+
*.egg-info/
28+
.installed.cfg
29+
*.egg
30+
31+
# Installer logs
32+
pip-log.txt
33+
pip-delete-this-directory.txt
34+
35+
# Unit test / coverage reports
36+
htmlcov/
37+
.tox/
38+
.coverage
39+
.cache
40+
nosetests.xml
41+
coverage.xml
42+
43+
# Translations
44+
*.mo
45+
46+
# Mr Developer
47+
.mr.developer.cfg
48+
.project
49+
.pydevproject
50+
51+
# Rope
52+
.ropeproject
53+
54+
# Django stuff:
55+
*.log
56+
*.pot
57+
58+
# Sphinx documentation
59+
docs/_build/
60+
61+
*.swp
62+
63+
# project specific stuff
64+
.DS_Store
65+
RevitPythonShell/Examples/Output
66+
RevitPythonShell/Examples/Output_HelloWorld
67+
*.suo
68+
69+
70+
# Visual Studio 2015 cache/options directory
7171
.vs/

‎PythonConsoleControl/PythonConsoleControl.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
</PropertyGroup>
105105
<ItemGroup>
106106
<Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
107-
<HintPath>..\packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
107+
<HintPath>..\packages\AvalonEdit.5.0.4\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
108108
</Reference>
109109
<Reference Include="IronPython">
110110
<HintPath>..\RequiredLibraries\IronPython.dll</HintPath>

‎PythonConsoleControl/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AvalonEdit" version="5.0.3" targetFramework="net46" />
3+
<package id="AvalonEdit" version="5.0.4" targetFramework="net46" />
44
</packages>

‎RevitPythonShell/RevitPythonShell.csproj‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
</ItemGroup>
167167
<ItemGroup>
168168
<Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
169-
<HintPath>..\packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
169+
<HintPath>..\packages\AvalonEdit.5.0.4\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
170170
</Reference>
171171
<Reference Include="IronPython">
172172
<HintPath>..\RequiredLibraries\IronPython.dll</HintPath>
@@ -190,15 +190,9 @@
190190
</Reference>
191191
<Reference Include="PresentationCore" />
192192
<Reference Include="PresentationFramework" />
193-
<Reference Include="PythonConsoleControl">
194-
<HintPath>..\PythonConsoleControl\bin\Debug 2017\PythonConsoleControl.dll</HintPath>
195-
</Reference>
196193
<Reference Include="PythonConsoleControl">
197194
<HintPath>..\PythonConsoleControl\bin\Debug 2018\PythonConsoleControl.dll</HintPath>
198195
</Reference>
199-
<Reference Include="RpsRuntime">
200-
<HintPath>..\RpsRuntime\bin\Debug 2017\RpsRuntime.dll</HintPath>
201-
</Reference>
202196
<Reference Include="RpsRuntime">
203197
<HintPath>..\RpsRuntime\bin\Debug 2018\RpsRuntime.dll</HintPath>
204198
</Reference>
@@ -325,6 +319,16 @@
325319
<Generator>MSBuild:Compile</Generator>
326320
</Page>
327321
</ItemGroup>
322+
<ItemGroup>
323+
<ProjectReference Include="..\PythonConsoleControl\PythonConsoleControl.csproj">
324+
<Project>{f1152d68-346b-4f48-8db7-be67b5cb1f49}</Project>
325+
<Name>PythonConsoleControl</Name>
326+
</ProjectReference>
327+
<ProjectReference Include="..\RpsRuntime\RpsRuntime.csproj">
328+
<Project>{c8446636-c663-409f-82d0-72c0d55bba1c}</Project>
329+
<Name>RpsRuntime</Name>
330+
</ProjectReference>
331+
</ItemGroup>
328332
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
329333
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
330334
Other similar extension points exist, see Microsoft.Common.targets.

‎RevitPythonShell/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AvalonEdit" version="5.0.3" targetFramework="net46" />
3+
<package id="AvalonEdit" version="5.0.4" targetFramework="net46" />
44
</packages>

‎RpsRuntime/RpsRuntime.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</ItemGroup>
125125
<ItemGroup>
126126
<Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
127-
<HintPath>..\packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
127+
<HintPath>..\packages\AvalonEdit.5.0.4\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
128128
</Reference>
129129
<Reference Include="IronPython, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
130130
<SpecificVersion>False</SpecificVersion>

‎RpsRuntime/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AvalonEdit" version="5.0.3" targetFramework="net46" />
3+
<package id="AvalonEdit" version="5.0.4" targetFramework="net46" />
44
</packages>

‎Setup_RevitPythonShell_2018.iss‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
[Files]
2-
Source: "RevitPythonShell\bin\Debug 2018\PythonConsoleControl.dll"; DestDir: "{app}"; Flags: replacesameversion
3-
Source: "RevitPythonShell\bin\Debug 2018\RevitPythonShell.dll"; DestDir: "{app}"; Flags: replacesameversion
4-
Source: "RevitPythonShell\bin\Debug 2018\RpsRuntime.dll"; DestDir: "{app}"; Flags: replacesameversion
5-
Source: "packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll"; DestDir: "{app}"
6-
Source: "RequiredLibraries\IronPython.dll"; DestDir: "{app}"
7-
Source: "RequiredLibraries\IronPython.Modules.dll"; DestDir: "{app}"
8-
Source: "RequiredLibraries\Microsoft.Scripting.Metadata.dll"; DestDir: "{app}"
9-
Source: "RequiredLibraries\Microsoft.Dynamic.dll"; DestDir: "{app}"
10-
Source: "RequiredLibraries\Microsoft.Scripting.dll"; DestDir: "{app}"
11-
Source: "RevitPythonShell\RevitPythonShell.xml"; DestDir: "{userappdata}\RevitPythonShell2018"; Flags: onlyifdoesntexist
12-
Source: RevitPythonShell\init.py; DestDir: {userappdata}\RevitPythonShell2018; Flags: confirmoverwrite;
13-
Source: RevitPythonShell\startup.py; DestDir: {userappdata}\RevitPythonShell2018; Flags: confirmoverwrite;
14-
15-
[code]
16-
{ HANDLE INSTALL PROCESS STEPS }
17-
procedure CurStepChanged(CurStep: TSetupStep);
18-
var
19-
AddInFilePath: String;
20-
AddInFileContents: String;
21-
begin
22-
23-
if CurStep = ssPostInstall then
24-
begin
25-
26-
{ GET LOCATION OF USER AppData (Roaming) }
27-
AddInFilePath := ExpandConstant('{userappdata}\Autodesk\Revit\Addins\2018\RevitPythonShell2018.addin');
28-
29-
{ CREATE NEW ADDIN FILE }
30-
AddInFileContents := '<?xml version="1.0" encoding="utf-16" standalone="no"?>' + #13#10;
31-
AddInFileContents := AddInFileContents + '<RevitAddIns>' + #13#10;
32-
AddInFileContents := AddInFileContents + ' <AddIn Type="Application">' + #13#10;
33-
AddInFileContents := AddInFileContents + ' <Name>RevitPythonShell</Name>' + #13#10;
34-
AddInFileContents := AddInFileContents + ' <Assembly>' + ExpandConstant('{app}') + '\RevitPythonShell.dll</Assembly>' + #13#10;
35-
AddInFileContents := AddInFileContents + ' <AddInId>3a7a1d24-51ed-462b-949f-1ddcca12008d</AddInId>' + #13#10;
36-
AddInFileContents := AddInFileContents + ' <FullClassName>RevitPythonShell.RevitPythonShellApplication</FullClassName>' + #13#10;
37-
AddInFileContents := AddInFileContents + ' <VendorId>RIPS</VendorId>' + #13#10;
38-
AddInFileContents := AddInFileContents + ' </AddIn>' + #13#10;
39-
AddInFileContents := AddInFileContents + '</RevitAddIns>' + #13#10;
40-
SaveStringToFile(AddInFilePath, AddInFileContents, False);
41-
42-
end;
43-
end;
44-
45-
46-
[Setup]
47-
AppName=RevitPythonShell for Autodesk Revit 2018
48-
AppVerName=RevitPythonShell for Autodesk Revit 2018
49-
RestartIfNeededByRun=false
50-
DefaultDirName={pf32}\RevitPythonShell2018
51-
OutputBaseFilename=Setup_RevitPythonShell_2018
52-
ShowLanguageDialog=auto
53-
FlatComponentsList=false
54-
UninstallFilesDir={app}\Uninstall
55-
UninstallDisplayName=RevitPythonShell for Autodesk Revit 2018
56-
AppVersion=2018.0
57-
VersionInfoVersion=2018.0
58-
VersionInfoDescription=RevitPythonShell for Autodesk Revit 2018
59-
VersionInfoTextVersion=RevitPythonShell for Autodesk Revit 2018
1+
[Files]
2+
Source: "RevitPythonShell\bin\Debug 2018\PythonConsoleControl.dll"; DestDir: "{app}"; Flags: replacesameversion
3+
Source: "RevitPythonShell\bin\Debug 2018\RevitPythonShell.dll"; DestDir: "{app}"; Flags: replacesameversion
4+
Source: "RevitPythonShell\bin\Debug 2018\RpsRuntime.dll"; DestDir: "{app}"; Flags: replacesameversion
5+
Source: "packages\AvalonEdit.5.0.4\lib\Net40\ICSharpCode.AvalonEdit.dll"; DestDir: "{app}"
6+
Source: "RequiredLibraries\IronPython.dll"; DestDir: "{app}"
7+
Source: "RequiredLibraries\IronPython.Modules.dll"; DestDir: "{app}"
8+
Source: "RequiredLibraries\Microsoft.Scripting.Metadata.dll"; DestDir: "{app}"
9+
Source: "RequiredLibraries\Microsoft.Dynamic.dll"; DestDir: "{app}"
10+
Source: "RequiredLibraries\Microsoft.Scripting.dll"; DestDir: "{app}"
11+
Source: "RevitPythonShell\RevitPythonShell.xml"; DestDir: "{userappdata}\RevitPythonShell2018"; Flags: onlyifdoesntexist
12+
Source: RevitPythonShell\init.py; DestDir: {userappdata}\RevitPythonShell2018; Flags: confirmoverwrite;
13+
Source: RevitPythonShell\startup.py; DestDir: {userappdata}\RevitPythonShell2018; Flags: confirmoverwrite;
14+
15+
[code]
16+
{ HANDLE INSTALL PROCESS STEPS }
17+
procedure CurStepChanged(CurStep: TSetupStep);
18+
var
19+
AddInFilePath: String;
20+
AddInFileContents: String;
21+
begin
22+
23+
if CurStep = ssPostInstall then
24+
begin
25+
26+
{ GET LOCATION OF USER AppData (Roaming) }
27+
AddInFilePath := ExpandConstant('{userappdata}\Autodesk\Revit\Addins\2018\RevitPythonShell2018.addin');
28+
29+
{ CREATE NEW ADDIN FILE }
30+
AddInFileContents := '<?xml version="1.0" encoding="utf-16" standalone="no"?>' + #13#10;
31+
AddInFileContents := AddInFileContents + '<RevitAddIns>' + #13#10;
32+
AddInFileContents := AddInFileContents + ' <AddIn Type="Application">' + #13#10;
33+
AddInFileContents := AddInFileContents + ' <Name>RevitPythonShell</Name>' + #13#10;
34+
AddInFileContents := AddInFileContents + ' <Assembly>' + ExpandConstant('{app}') + '\RevitPythonShell.dll</Assembly>' + #13#10;
35+
AddInFileContents := AddInFileContents + ' <AddInId>3a7a1d24-51ed-462b-949f-1ddcca12008d</AddInId>' + #13#10;
36+
AddInFileContents := AddInFileContents + ' <FullClassName>RevitPythonShell.RevitPythonShellApplication</FullClassName>' + #13#10;
37+
AddInFileContents := AddInFileContents + ' <VendorId>RIPS</VendorId>' + #13#10;
38+
AddInFileContents := AddInFileContents + ' </AddIn>' + #13#10;
39+
AddInFileContents := AddInFileContents + '</RevitAddIns>' + #13#10;
40+
SaveStringToFile(AddInFilePath, AddInFileContents, False);
41+
42+
end;
43+
end;
44+
45+
46+
[Setup]
47+
AppName=RevitPythonShell for Autodesk Revit 2018
48+
AppVerName=RevitPythonShell for Autodesk Revit 2018
49+
RestartIfNeededByRun=false
50+
DefaultDirName={pf32}\RevitPythonShell2018
51+
OutputBaseFilename=Setup_RevitPythonShell_2018
52+
ShowLanguageDialog=auto
53+
FlatComponentsList=false
54+
UninstallFilesDir={app}\Uninstall
55+
UninstallDisplayName=RevitPythonShell for Autodesk Revit 2018
56+
AppVersion=2018.0
57+
VersionInfoVersion=2018.0
58+
VersionInfoDescription=RevitPythonShell for Autodesk Revit 2018
59+
VersionInfoTextVersion=RevitPythonShell for Autodesk Revit 2018

‎packages/AvalonEdit.5.0.3/AvalonEdit.5.0.3.nupkg‎

-549 KB
Binary file not shown.

‎packages/AvalonEdit.5.0.4/AvalonEdit.5.0.4.nupkg‎

560 KB
Binary file not shown.

0 commit comments

Comments
 (0)