Skip to content

Commit

Permalink
Fixed an issue in corlib Makefile that would make a resource test cas…
Browse files Browse the repository at this point in the history
…e fail which relies on satellite assemblies.

The satellite assembly generated by the Makefile was suffixed with '.Resources.dll', but the assembly loader looks for '.resources.dll', thus the satellite assembly wasn't found.
  • Loading branch information
akoeplinger committed Nov 1, 2013
1 parent 53c777d commit 9550e4c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mcs/class/corlib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE): %.resources: %.resx

TEST_RESOURCES = $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE)

satellite_assembly1 = es-ES/$(patsubst %.dll,%.Resources.dll,$(test_lib))
satellite_assembly2 = nn-NO/$(patsubst %.dll,%.Resources.dll,$(test_lib))
satellite_assembly1 = es-ES/$(patsubst %.dll,%.resources.dll,$(test_lib))
satellite_assembly2 = nn-NO/$(patsubst %.dll,%.resources.dll,$(test_lib))

$(test_lib): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2)

Expand Down

0 comments on commit 9550e4c

Please sign in to comment.