[genproj] Handle resources properly, add helper scripts to bootstrap

diff --git a/build-libs.bat b/build-libs.bat
new file mode 100644 (file)
index 0000000..df0d978
--- /dev/null
+++ b/build-libs.bat
@@ -0,0 +1,4 @@
+@echo off
+cd mcs\jay
+vcbuild jay.vcxproj
+msbuild net_4_x.sln

diff --git a/build-libs.sh b/build-libs.sh
new file mode 100755 (executable)
index 0000000..17b2e16
--- /dev/null
+++ b/build-libs.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+(cd mcs/jay; make)
+msbuild net_4_x.sln

diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj
index 3b0863d250127098bde4ac814aaa9a8cd7a80ff0..77b7e2ba8a3d69c0b41cec92c595300d6fcbdbfd 100644 (file)
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj
@@ -97,9 +97,11 @@
   -->\r
   <PropertyGroup>\r
     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
 
     </PreBuildEvent>\r
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
+$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
 \r
     </PreBuildEvent>\r
 \r

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj
index 9b5e7d736ab0d0040f4eb5d5c4d6240129125861..a5ea5e1483dbe2fb90905b1cb95fb81e5a734511 100644 (file)
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj
@@ -128,7 +128,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="resources/SR.resources">\r
+    <EmbeddedResource Include="resources/SR.resx">\r
       <LogicalName>SR.resources</LogicalName>\r
     </EmbeddedResource>\r
     <EmbeddedResource Include="resources/SQLiteCommand.bmp">\r

diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj
index 096323d61e7327d62a23dc12797b0fa167827c47..a5ddfedcf19c40211cfe5c9edb631690504058d8 100644 (file)
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj
@@ -304,7 +304,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resources">\r
+    <EmbeddedResource Include="Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resx">\r
       <LogicalName>ResultCodeMessages.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj
index 8ae3cfccffd8ad7aaf56793aa8528ee6490a716b..bf63d7a400bde6bc2651cb8dc4ff8658b6eb2286 100644 (file)
--- a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj
+++ b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj
@@ -263,7 +263,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="Microsoft.Internal.Strings.resources">\r
+    <EmbeddedResource Include="Microsoft.Internal.Strings.resx">\r
       <LogicalName>Microsoft.Internal.Strings.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj
index 3d0f0ea86a53a47c4c7d96a1713b86e9287e80ec..840cebb9105a47ec08497e4471468339da6da5fc 100644 (file)
--- a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj
+++ b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj
@@ -220,7 +220,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="Client/System.Data.Services.Client.resources">\r
+    <EmbeddedResource Include="Client/System.Data.Services.Client.resx">\r
       <LogicalName>System.Data.Services.Client.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj
index 08caf0b68652349aeb8d60b0db49784dc7b68f54..9ae3c0813a12f97e79406e2ed6bfc9fac61f9e46 100644 (file)
--- a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj
+++ b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj
@@ -126,7 +126,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="System.Json.Properties.Resources.resources">\r
+    <EmbeddedResource Include="System.Json.Properties.Resources.resx">\r
       <LogicalName>System.Json.Properties.Resources.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_x.csproj b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_x.csproj
index 78ccedb9aa29d1c884734ae8049d5f1e9cabdeaf..b3e1c9cb5089420cc2662b97ee028b2ab3ed679e 100644 (file)
--- a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_x.csproj
+++ b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_x.csproj
@@ -354,10 +354,10 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="System.Net.Http.Properties.CommonWebApiResources.resources">\r
+    <EmbeddedResource Include="System.Net.Http.Properties.CommonWebApiResources.resx">\r
       <LogicalName>System.Net.Http.Properties.CommonWebApiResources.resources</LogicalName>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Net.Http.Properties.Resources.resources">\r
+    <EmbeddedResource Include="System.Net.Http.Properties.Resources.resx">\r
       <LogicalName>System.Net.Http.Properties.Resources.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj b/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj
index ebdde2de08b82c530025f7b770d7ede01177ca19..270278e73392ad1f38bfd4fa75159efae35a8d1d 100644 (file)
--- a/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj
@@ -177,7 +177,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="Strings_Core.resources">\r
+    <EmbeddedResource Include="Strings_Core.resx">\r
       <LogicalName>System.Reactive.Strings_Core.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj b/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj
index b4ea1eed3cf1eab2db7f5f145e41d05b6f0eb0d5..b13bf98e82b35447d38d666213053dbb57414104 100644 (file)
--- a/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj
@@ -274,7 +274,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="Strings_Linq.resources">\r
+    <EmbeddedResource Include="Strings_Linq.resx">\r
       <LogicalName>System.Reactive.Strings_Linq.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj
index 64ed969e3c7745224246000839aeca28f51f2bc2..5e1435c3dfbff4b1e16f32bb99b9f0157bc1a608 100644 (file)
--- a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj
+++ b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj
@@ -126,7 +126,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="Strings_PlatformServices.resources">\r
+    <EmbeddedResource Include="Strings_PlatformServices.resx">\r
       <LogicalName>System.Reactive.Strings_PlatformServices.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj b/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj
index 6edf8555781cc195fdd1ab8bf2e2f1813225ad2d..2dee913e1134e6ecadf4a426ea7487fbad370342 100644 (file)
--- a/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj
@@ -119,7 +119,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="Strings_Providers.resources">\r
+    <EmbeddedResource Include="Strings_Providers.resx">\r
       <LogicalName>System.Reactive.Strings_Providers.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj
index 8f7843093771312d715ee553f2a07fa6704523ee..d8eb8de10da4d91c597f913770b3c4f8b3872ae5 100644 (file)
--- a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj
@@ -119,7 +119,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="Strings_WindowsThreading.resources">\r
+    <EmbeddedResource Include="Strings_WindowsThreading.resx">\r
       <LogicalName>System.Reactive.Strings_WindowsThreading.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj b/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj
index 31e60bb0b175dccb9e57e732bc7f044cb7871da6..4cfba6d759e295079f4a192c1bf8976c6ae30158 100644 (file)
--- a/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj
+++ b/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj
@@ -386,10 +386,10 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.Http.Properties.CommonWebApiResources.resources">\r
+    <EmbeddedResource Include="System.Web.Http.Properties.CommonWebApiResources.resx">\r
       <LogicalName>System.Web.Http.Properties.CommonWebApiResources.resources</LogicalName>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Http.Properties.SRResources.resources">\r
+    <EmbeddedResource Include="System.Web.Http.Properties.SRResources.resx">\r
       <LogicalName>System.Web.Http.Properties.SRResources.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj b/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj
index 73d5328f89889d7098f5c1cd053d01167dcd82b7..3bed8a7d326fb33e7d2c5e2f9ae98d038076022b 100644 (file)
--- a/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj
+++ b/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj
@@ -491,7 +491,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="Mvc/Resources/MvcResources.resources">\r
+    <EmbeddedResource Include="Mvc/Resources/MvcResources.resx">\r
       <LogicalName>System.Web.Mvc.Resources.MvcResources.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj b/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj
index fd459922df14da9f76e268815a902093cb905d1f..23422a60b2c4e9ebdda370a42faaaede7642d33a 100644 (file)
--- a/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj
+++ b/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj
@@ -244,10 +244,10 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.Razor.Resources.RazorResources.resources">\r
+    <EmbeddedResource Include="System.Web.Razor.Resources.RazorResources.resx">\r
       <LogicalName>System.Web.Razor.Resources.RazorResources.resources</LogicalName>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Razor.Common.CommonResources.resources">\r
+    <EmbeddedResource Include="System.Web.Razor.Common.CommonResources.resx">\r
       <LogicalName>System.Web.Razor.Common.CommonResources.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj
index 16282251ad42b04695d57660ea952730d9d13a46..0aba08155ed3148ea38f47f329a5a9845b5f7022 100644 (file)
--- a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj
+++ b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj
@@ -124,10 +124,10 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.WebPages.Deployment.Common.CommonResources.resources">\r
+    <EmbeddedResource Include="System.Web.WebPages.Deployment.Common.CommonResources.resx">\r
       <LogicalName>System.Web.WebPages.Deployment.Common.CommonResources.resources</LogicalName>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources">\r
+    <EmbeddedResource Include="System.Web.WebPages.Deployment.Resources.ConfigurationResources.resx">\r
       <LogicalName>System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj
index 6df147742b1dcbf6d98c3574feafbeae524a9a2e..72b548bd2189a2aac937b533cdb5e7a77eeef71d 100644 (file)
--- a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj
+++ b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj
@@ -131,10 +131,10 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.WebPages.Razor.Resources.RazorWebResources.resources">\r
+    <EmbeddedResource Include="System.Web.WebPages.Razor.Resources.RazorWebResources.resx">\r
       <LogicalName>System.Web.WebPages.Razor.Resources.RazorWebResources.resources</LogicalName>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.WebPages.Razor.Common.CommonResources.resources">\r
+    <EmbeddedResource Include="System.Web.WebPages.Razor.Common.CommonResources.resx">\r
       <LogicalName>System.Web.WebPages.Razor.Common.CommonResources.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj b/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj
index 6bb28d4513fa8413a8b17c41a96ac9d6d3669ea5..05b00144488613f0ce51aeb6258c64411a8db6f4 100644 (file)
--- a/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj
+++ b/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj
@@ -279,10 +279,10 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.WebPages.Resources.WebPageResources.resources">\r
+    <EmbeddedResource Include="System.Web.WebPages.Resources.WebPageResources.resx">\r
       <LogicalName>System.Web.WebPages.Resources.WebPageResources.resources</LogicalName>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.WebPages.Common.CommonResources.resources">\r
+    <EmbeddedResource Include="System.Web.WebPages.Common.CommonResources.resx">\r
       <LogicalName>System.Web.WebPages.Common.CommonResources.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/mcs/class/System.Web/System.Web-net_4_x.csproj b/mcs/class/System.Web/System.Web-net_4_x.csproj
index 1c4ef9bb5bf6c4f34a26ed2a04943558763ef7a7..0b2f0ba3ea7c1e9e12091f34646cabbf94273f31 100644 (file)
--- a/mcs/class/System.Web/System.Web-net_4_x.csproj
+++ b/mcs/class/System.Web/System.Web-net_4_x.csproj
@@ -1563,7 +1563,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="resources/TranslationResources.resources">\r
+    <EmbeddedResource Include="resources/TranslationResources.resx">\r
       <LogicalName>TranslationResources.resources</LogicalName>\r
     </EmbeddedResource>\r
     <EmbeddedResource Include="resources/WebUIValidation.js">\r

diff --git a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
index 52bfd6d852c655d1b4546896475619cf393ef8bf..6d65c01cc378bbd0ec0b79b4a8a8311e76988f83 100644 (file)
--- a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
+++ b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
@@ -1555,7 +1555,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="resources/TranslationResources.resources">\r
+    <EmbeddedResource Include="resources/TranslationResources.resx">\r
       <LogicalName>TranslationResources.resources</LogicalName>\r
     </EmbeddedResource>\r
     <EmbeddedResource Include="resources/WebUIValidation.js">\r

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj b/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj
index c3ca632b42c9c75b5022255e99e282910c6748bb..9e5f97d26276b74d20c3c77c217f01d1faf33e09 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj
@@ -1050,7 +1050,7 @@
     <EmbeddedResource Include="resources/DnDMove.cur">\r
       <LogicalName>System.Windows.Forms.DnDMove.cur</LogicalName>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/keyboards.resources">\r
+    <EmbeddedResource Include="resources/keyboards.resx">\r
       <LogicalName>keyboards.resources</LogicalName>\r
     </EmbeddedResource>\r
     <EmbeddedResource Include="resources/16_computer.png">\r

diff --git a/mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj b/mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj
index 92c8f57f6f221950a8892cad3244819fc2aa6369..c56737e4394a42767e16c8815bec8e03e304a2ca 100644 (file)
--- a/mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj
+++ b/mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj
@@ -159,7 +159,7 @@
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <EmbeddedResource Include="Transform.resources">\r
+    <EmbeddedResource Include="Transform.resx">\r
       <LogicalName>NUnit.Util.Transform.resources</LogicalName>\r
     </EmbeddedResource>\r
   </ItemGroup>\r

diff --git a/msvc/scripts/Commons.Xml.Relaxng.pre b/msvc/scripts/Commons.Xml.Relaxng.pre
new file mode 100644 (file)
index 0000000..55520b7
--- /dev/null
+++ b/msvc/scripts/Commons.Xml.Relaxng.pre
@@ -0,0 +1 @@
+$(ProjectDir)\..\..\jay\jay.exe -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs

diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs
index 49a862a2110c3ee0a441372ab86760fd3c59a19c..ccaa3b3149c9059691926e96e6a17433c2ee84b8 100644 (file)
--- a/msvc/scripts/genproj.cs
+++ b/msvc/scripts/genproj.cs
@@ -811,7 +811,8 @@ class MsbuildGenerator {
                        foreach (var dk in embedded_resources) {
                                var source = dk.Key;
                                if (source.EndsWith (".resources"))
-                                       source.Replace (".resources", ".resx");
+                                       source = source.Replace (".resources", ".resx");
+                               Console.WriteLine ("Got {0} -> {1}", dk.Key, source);
                                resources.AppendFormat ("    <EmbeddedResource Include=\"{0}\">" + NewLine, source);
                                resources.AppendFormat ("      <LogicalName>{0}</LogicalName>" + NewLine, dk.Value);
                                resources.AppendFormat ("    </EmbeddedResource>" + NewLine);

diff --git a/msvc/scripts/prepare.cs b/msvc/scripts/prepare.cs
index 1d220e23fac778114dc662ab284b6103385f7bbe..fba952f0701f56e37bebc921a4bd5de1510f0c88 100644 (file)
--- a/msvc/scripts/prepare.cs
+++ b/msvc/scripts/prepare.cs
@@ -28,12 +28,6 @@ class Prepare {
                }
 
                switch (args [1]){
-               case "xml":
-                       Filter (bdir + "/class/System.XML/System.Xml.XPath/Parser.jay",
-                               bdir + "/class/System.XML/Mono.Xml.Xsl/PatternParser.jay",
-                               (i, o) => o.Write (i.ReadToEnd ().Replace ("%start Expr", "%start Pattern")));
-                       break;
-
                case "core":
                        Filter (bdir + "/build/common/Consts.cs.in",
                                bdir + "/build/common/Consts.cs",