Set a logical name for the clr.py resource.

tonyroberts · tonyroberts · commit 3c3919de4232 · 2015-06-24T18:04:02.000+01:00
diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj
@@ -183,7 +183,9 @@
     <None Include="x86\clrmodule-platform.il" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="resources\clr.py" />
+    <EmbeddedResource Include="resources\clr.py">
+        <LogicalName>clr.py</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <ProjectExtensions>
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -159,7 +159,7 @@ public static void Initialize() {
                     Runtime.PyDict_SetItemString(module_globals, "__builtins__", builtins);
 
                     var assembly = Assembly.GetExecutingAssembly();
-                    using (Stream stream = assembly.GetManifestResourceStream("Python.Runtime.resources.clr.py"))
+                    using (Stream stream = assembly.GetManifestResourceStream("clr.py"))
                     using (StreamReader reader = new StreamReader(stream))
                     {
                         // add the contents of clr.py to the module

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public static void Initialize() {`
`159`	`159`	`Runtime.PyDict_SetItemString(module_globals, "__builtins__", builtins);`
`160`	`160`
`161`	`161`	`var assembly = Assembly.GetExecutingAssembly();`
`162`		`- using (Stream stream = assembly.GetManifestResourceStream("Python.Runtime.resources.clr.py"))`
	`162`	`+ using (Stream stream = assembly.GetManifestResourceStream("clr.py"))`
`163`	`163`	`using (StreamReader reader = new StreamReader(stream))`
`164`	`164`	`{`
`165`	`165`	`// add the contents of clr.py to the module`