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

22 files changed, 29 insertions, 27 deletions

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 3b0863d2501..77b7e2ba8a3 100644
--- 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 @@
   -->

   <PropertyGroup>

     <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>

     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">

+$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
 

     </PreBuildEvent>

 

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 9b5e7d736ab..a5ea5e1483d 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="resources/SR.resources">

+    <EmbeddedResource Include="resources/SR.resx">

       <LogicalName>SR.resources</LogicalName>

     </EmbeddedResource>

     <EmbeddedResource Include="resources/SQLiteCommand.bmp">

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 096323d61e7..a5ddfedcf19 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resources">

+    <EmbeddedResource Include="Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resx">

       <LogicalName>ResultCodeMessages.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 8ae3cfccffd..bf63d7a400b 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="Microsoft.Internal.Strings.resources">

+    <EmbeddedResource Include="Microsoft.Internal.Strings.resx">

       <LogicalName>Microsoft.Internal.Strings.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 3d0f0ea86a5..840cebb9105 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="Client/System.Data.Services.Client.resources">

+    <EmbeddedResource Include="Client/System.Data.Services.Client.resx">

       <LogicalName>System.Data.Services.Client.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 08caf0b6865..9ae3c0813a1 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="System.Json.Properties.Resources.resources">

+    <EmbeddedResource Include="System.Json.Properties.Resources.resx">

       <LogicalName>System.Json.Properties.Resources.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 78ccedb9aa2..b3e1c9cb508 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="System.Net.Http.Properties.CommonWebApiResources.resources">

+    <EmbeddedResource Include="System.Net.Http.Properties.CommonWebApiResources.resx">

       <LogicalName>System.Net.Http.Properties.CommonWebApiResources.resources</LogicalName>

     </EmbeddedResource>

-    <EmbeddedResource Include="System.Net.Http.Properties.Resources.resources">

+    <EmbeddedResource Include="System.Net.Http.Properties.Resources.resx">

       <LogicalName>System.Net.Http.Properties.Resources.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 ebdde2de08b..270278e7339 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="Strings_Core.resources">

+    <EmbeddedResource Include="Strings_Core.resx">

       <LogicalName>System.Reactive.Strings_Core.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 b4ea1eed3cf..b13bf98e82b 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="Strings_Linq.resources">

+    <EmbeddedResource Include="Strings_Linq.resx">

       <LogicalName>System.Reactive.Strings_Linq.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 64ed969e3c7..5e1435c3dfb 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="Strings_PlatformServices.resources">

+    <EmbeddedResource Include="Strings_PlatformServices.resx">

       <LogicalName>System.Reactive.Strings_PlatformServices.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 6edf8555781..2dee913e113 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="Strings_Providers.resources">

+    <EmbeddedResource Include="Strings_Providers.resx">

       <LogicalName>System.Reactive.Strings_Providers.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 8f784309377..d8eb8de10da 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="Strings_WindowsThreading.resources">

+    <EmbeddedResource Include="Strings_WindowsThreading.resx">

       <LogicalName>System.Reactive.Strings_WindowsThreading.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 31e60bb0b17..4cfba6d759e 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="System.Web.Http.Properties.CommonWebApiResources.resources">

+    <EmbeddedResource Include="System.Web.Http.Properties.CommonWebApiResources.resx">

       <LogicalName>System.Web.Http.Properties.CommonWebApiResources.resources</LogicalName>

     </EmbeddedResource>

-    <EmbeddedResource Include="System.Web.Http.Properties.SRResources.resources">

+    <EmbeddedResource Include="System.Web.Http.Properties.SRResources.resx">

       <LogicalName>System.Web.Http.Properties.SRResources.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 73d5328f898..3bed8a7d326 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="Mvc/Resources/MvcResources.resources">

+    <EmbeddedResource Include="Mvc/Resources/MvcResources.resx">

       <LogicalName>System.Web.Mvc.Resources.MvcResources.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 fd459922df1..23422a60b2c 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="System.Web.Razor.Resources.RazorResources.resources">

+    <EmbeddedResource Include="System.Web.Razor.Resources.RazorResources.resx">

       <LogicalName>System.Web.Razor.Resources.RazorResources.resources</LogicalName>

     </EmbeddedResource>

-    <EmbeddedResource Include="System.Web.Razor.Common.CommonResources.resources">

+    <EmbeddedResource Include="System.Web.Razor.Common.CommonResources.resx">

       <LogicalName>System.Web.Razor.Common.CommonResources.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 16282251ad4..0aba08155ed 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="System.Web.WebPages.Deployment.Common.CommonResources.resources">

+    <EmbeddedResource Include="System.Web.WebPages.Deployment.Common.CommonResources.resx">

       <LogicalName>System.Web.WebPages.Deployment.Common.CommonResources.resources</LogicalName>

     </EmbeddedResource>

-    <EmbeddedResource Include="System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources">

+    <EmbeddedResource Include="System.Web.WebPages.Deployment.Resources.ConfigurationResources.resx">

       <LogicalName>System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 6df147742b1..72b548bd218 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="System.Web.WebPages.Razor.Resources.RazorWebResources.resources">

+    <EmbeddedResource Include="System.Web.WebPages.Razor.Resources.RazorWebResources.resx">

       <LogicalName>System.Web.WebPages.Razor.Resources.RazorWebResources.resources</LogicalName>

     </EmbeddedResource>

-    <EmbeddedResource Include="System.Web.WebPages.Razor.Common.CommonResources.resources">

+    <EmbeddedResource Include="System.Web.WebPages.Razor.Common.CommonResources.resx">

       <LogicalName>System.Web.WebPages.Razor.Common.CommonResources.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 6bb28d4513f..05b00144488 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="System.Web.WebPages.Resources.WebPageResources.resources">

+    <EmbeddedResource Include="System.Web.WebPages.Resources.WebPageResources.resx">

       <LogicalName>System.Web.WebPages.Resources.WebPageResources.resources</LogicalName>

     </EmbeddedResource>

-    <EmbeddedResource Include="System.Web.WebPages.Common.CommonResources.resources">

+    <EmbeddedResource Include="System.Web.WebPages.Common.CommonResources.resx">

       <LogicalName>System.Web.WebPages.Common.CommonResources.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

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 1c4ef9bb5bf..0b2f0ba3ea7 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="resources/TranslationResources.resources">

+    <EmbeddedResource Include="resources/TranslationResources.resx">

       <LogicalName>TranslationResources.resources</LogicalName>

     </EmbeddedResource>

     <EmbeddedResource Include="resources/WebUIValidation.js">

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 52bfd6d852c..6d65c01cc37 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="resources/TranslationResources.resources">

+    <EmbeddedResource Include="resources/TranslationResources.resx">

       <LogicalName>TranslationResources.resources</LogicalName>

     </EmbeddedResource>

     <EmbeddedResource Include="resources/WebUIValidation.js">

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 c3ca632b42c..9e5f97d2627 100644
--- 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">

       <LogicalName>System.Windows.Forms.DnDMove.cur</LogicalName>

     </EmbeddedResource>

-    <EmbeddedResource Include="resources/keyboards.resources">

+    <EmbeddedResource Include="resources/keyboards.resx">

       <LogicalName>keyboards.resources</LogicalName>

     </EmbeddedResource>

     <EmbeddedResource Include="resources/16_computer.png">

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 92c8f57f6f2..c56737e4394 100644
--- 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\" />

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="Transform.resources">

+    <EmbeddedResource Include="Transform.resx">

       <LogicalName>NUnit.Util.Transform.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>