From 047d87c246ee977d902e46ff2a8c0a4a885b7a57 Mon Sep 17 00:00:00 2001 From: "Ilya.Kazakevich" Date: Thu, 24 Jan 2019 01:02:54 +0300 Subject: [PATCH] test fix for IronPython, sources added to simplify such fixes next time, just rebuild .dll from .cs --- python/testData/dotNet/PythonLibs.dll | Bin 4096 -> 3584 bytes python/testData/dotNet/SingleNameSpace.dll | Bin 4096 -> 3584 bytes .../dllSources/PythonLibs/LikeJavaClass.cs | 17 +++++ .../PythonLibs/Properties/AssemblyInfo.cs | 36 +++++++++++ .../dllSources/PythonLibs/PythonLibs.csproj | 59 ++++++++++++++++++ python/testData/dotNet/dllSources/README.txt | 5 ++ .../dotNet/dllSources/SingleNameSpace/Deep.cs | 9 +++ .../SingleNameSpace/SingleNameSpace.cs | 11 ++++ .../SingleNameSpace/SingleNameSpace.csproj | 59 ++++++++++++++++++ .../testData/dotNet/dllSources/dllSources.sln | 28 +++++++++ 10 files changed, 224 insertions(+) create mode 100644 python/testData/dotNet/dllSources/PythonLibs/LikeJavaClass.cs create mode 100644 python/testData/dotNet/dllSources/PythonLibs/Properties/AssemblyInfo.cs create mode 100644 python/testData/dotNet/dllSources/PythonLibs/PythonLibs.csproj create mode 100644 python/testData/dotNet/dllSources/README.txt create mode 100644 python/testData/dotNet/dllSources/SingleNameSpace/Deep.cs create mode 100644 python/testData/dotNet/dllSources/SingleNameSpace/SingleNameSpace.cs create mode 100644 python/testData/dotNet/dllSources/SingleNameSpace/SingleNameSpace.csproj create mode 100644 python/testData/dotNet/dllSources/dllSources.sln diff --git a/python/testData/dotNet/PythonLibs.dll b/python/testData/dotNet/PythonLibs.dll index cfdfa746d3a8576091700871f056a313f1fa4b25..0736ed47a64b6fdffcec8ee26c9aed5d1c9636b7 100644 GIT binary patch literal 3584 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 literal 4096 zcmeHK-ES0C6hE`wmQtjA1|eddrhuU7WVhW~Dx%wVp;X)L+9?H0Bb}YS-44votTVIN zYJ&Aa49bHqMqku74JJk(2oe*bA;u^8ADZ}}i6)w8eDDGM-7~xGeiWiUqIY|L_nwb? z?m1`9+&dkA;T>usqA2>EJ4Dwo%9dojH!MNi{>WGDbY=am&TGopt!WYQfD3ZR5taJ!R9GBSd3L6ZP%y)hoL#Q>1f)vVo`-oR*N= z{wPKjJ&7(s#SjVo#*F=!BQ2qWFIy8O-yqt|f2(7e3{~jbJ|f;YNpw&qqQ1=%Jpf(; zdb{go_oCI%{fbH}=wlTEqZWvT0OR&`02N)vTJ{?=ZYt5N=J}opihWCBA|F&6dR0pz zA(|&_7mCtXnnjnk+R>|8l4z)kTF zXNQ!sb?NK59xbNz#rk{tmJx)Mx{Bk%l$>z=s&S7$0YT zFC7N|5Obbm)af`lCcOqcOP7E?y$gJmKBVYUC0A5#vWPi_Wm+MNXU+V4>8WuySF**^ zq@#>%kv0lKFB+!Ma<)z5i^I0z`}Hy!#NjnByij;T95c>|H5E18EeI_oM3D-<>3X)6 zC4JEkM1dx(a3IV)fCjJt^oMZ;NaT$k~X3NvUF47*`?4aaTIUh!@ zO_rR%LRvr=5svRr$+bZ|;u?Jk1 zs`{Us$$N)zg5%JxX|g1UP%aI8sV2W2PA2h8WHFT6as)L=)A+VJ4Lm}Vn2qArN`oE+ z9>rX?>(O6sSKqpoll>W%hWB%oS>~pI3alEqmyhD4w@JXJgF19szK2i!DM$@)eaH<8 zpyz@L+ZWL!j4JRcfR+V*eho{zSto|L!(W23G6#rv6V_ICPGNT+H + + + + Debug + AnyCPU + {5F3A396C-3DE2-48A6-91DB-418B6C9E1BBB} + Library + Properties + PythonLibs + PythonLibs + v4.0 + 512 + + + true + full + false + ..\..\ + DEBUG;TRACE + prompt + 4 + x64 + + + pdbonly + true + ..\..\ + + + prompt + 4 + x64 + + + + + + + + + + + + + + + + + cmd /C del *.pdb + + + \ No newline at end of file diff --git a/python/testData/dotNet/dllSources/README.txt b/python/testData/dotNet/dllSources/README.txt new file mode 100644 index 000000000000..a0869bffc4c3 --- /dev/null +++ b/python/testData/dotNet/dllSources/README.txt @@ -0,0 +1,5 @@ +VS sln builds .dll files from .cs files. +Make sure .net version is the same as one used by IronPython. +AfterBuild action deletes .pdb files. + +Build with Studio or with cmd: "msbuild dllSources.sln /t:Rebuild /p:Configuration=Release" \ No newline at end of file diff --git a/python/testData/dotNet/dllSources/SingleNameSpace/Deep.cs b/python/testData/dotNet/dllSources/SingleNameSpace/Deep.cs new file mode 100644 index 000000000000..25f16a086ca1 --- /dev/null +++ b/python/testData/dotNet/dllSources/SingleNameSpace/Deep.cs @@ -0,0 +1,9 @@ +namespace SingleNameSpace.Some.Deep +{ + public class WeHaveClass + { + public class MyClass + { + } + } +} \ No newline at end of file diff --git a/python/testData/dotNet/dllSources/SingleNameSpace/SingleNameSpace.cs b/python/testData/dotNet/dllSources/SingleNameSpace/SingleNameSpace.cs new file mode 100644 index 000000000000..e5c161a52957 --- /dev/null +++ b/python/testData/dotNet/dllSources/SingleNameSpace/SingleNameSpace.cs @@ -0,0 +1,11 @@ + +namespace SingleNameSpace +{ + public class MyClass + { + } + + public class AnotherClass + { + } +} \ No newline at end of file diff --git a/python/testData/dotNet/dllSources/SingleNameSpace/SingleNameSpace.csproj b/python/testData/dotNet/dllSources/SingleNameSpace/SingleNameSpace.csproj new file mode 100644 index 000000000000..d6164d46f9cb --- /dev/null +++ b/python/testData/dotNet/dllSources/SingleNameSpace/SingleNameSpace.csproj @@ -0,0 +1,59 @@ + + + + + Debug + AnyCPU + {9B61AF9B-D0C6-4BC9-A200-CA79FCA4D4FF} + Library + Properties + SingleNameSpace + SingleNameSpace + v4.0 + 512 + + + true + full + false + ..\..\ + DEBUG;TRACE + prompt + 4 + x64 + + + pdbonly + true + ..\..\ + TRACE + prompt + 4 + x64 + + + + + + + + + + + + + + + + + + cmd /C del *.pdb + + + \ No newline at end of file diff --git a/python/testData/dotNet/dllSources/dllSources.sln b/python/testData/dotNet/dllSources/dllSources.sln new file mode 100644 index 000000000000..58977f74182a --- /dev/null +++ b/python/testData/dotNet/dllSources/dllSources.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SingleNameSpace", "SingleNameSpace\SingleNameSpace.csproj", "{9B61AF9B-D0C6-4BC9-A200-CA79FCA4D4FF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonLibs", "PythonLibs\PythonLibs.csproj", "{5F3A396C-3DE2-48A6-91DB-418B6C9E1BBB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9B61AF9B-D0C6-4BC9-A200-CA79FCA4D4FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9B61AF9B-D0C6-4BC9-A200-CA79FCA4D4FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9B61AF9B-D0C6-4BC9-A200-CA79FCA4D4FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9B61AF9B-D0C6-4BC9-A200-CA79FCA4D4FF}.Release|Any CPU.Build.0 = Release|Any CPU + {5F3A396C-3DE2-48A6-91DB-418B6C9E1BBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5F3A396C-3DE2-48A6-91DB-418B6C9E1BBB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5F3A396C-3DE2-48A6-91DB-418B6C9E1BBB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5F3A396C-3DE2-48A6-91DB-418B6C9E1BBB}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal