projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b078895
)
[genproj] support for using prebuilt resources
author
Miguel de Icaza
<miguel@gnome.org>
Tue, 31 May 2016 20:50:55 +0000
(16:50 -0400)
committer
Miguel de Icaza
<miguel@gnome.org>
Tue, 31 May 2016 20:50:55 +0000
(16:50 -0400)
16 files changed:
mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj
patch
|
blob
|
history
mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj
patch
|
blob
|
history
mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj
patch
|
blob
|
history
mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj
patch
|
blob
|
history
mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj
patch
|
blob
|
history
mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj
patch
|
blob
|
history
mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj
patch
|
blob
|
history
mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj
patch
|
blob
|
history
mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj
patch
|
blob
|
history
mcs/class/System.Web/System.Web-net_4_x.csproj
patch
|
blob
|
history
mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
patch
|
blob
|
history
mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj
patch
|
blob
|
history
mcs/class/monodoc/monodoc-net_4_x.csproj
patch
|
blob
|
history
mcs/ilasm/ilasm-net_4_x.csproj
patch
|
blob
|
history
mcs/mcs/mcs-net_4_x.csproj
patch
|
blob
|
history
msvc/scripts/genproj.cs
patch
|
blob
|
history
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 3d8430294067191c48a165e460c4435327689cc3..2539a5b4b18c3ab5907432eedf73d113a3b8b53d 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
@@
-101,7
+101,7
@@
$(ProjectDir)\..\..\jay\jay -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(Proje
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
-$(ProjectDir)\..\..\jay\jay
.exe
-ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
+$(ProjectDir)\..\..\jay\jay -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
\r
</PreBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
diff --git
a/mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj
b/mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj
index 2c795c8230348fde6b74c4b51aa60491e23b19ba..24dd6dd3751303edd192404062260cb9e7a61500 100644
(file)
--- a/
mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj
+++ b/
mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj
@@
-171,7
+171,7
@@
$(ProjectDir)\..\..\jay\jay -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(Proje
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
-$(ProjectDir)\..\..\jay\jay
.exe -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Microsoft.Build.Internal\ExpressionParser.jay > $(ProjectDir)\Microsoft.Build.Internal\ExpressionParser.cs
\r
+$(ProjectDir)\..\..\jay\jay
-ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Microsoft.Build.Internal\ExpressionParser.jay > $(ProjectDir)\Microsoft.Build.Internal\ExpressionParser.cs
\r
</PreBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
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 2b722aaff49d9c9feaa9a84a9495827c537e3655..7a1ee0ced12a4d53865db6a531fc8e46ddc87f7b 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
@@
-127,7
+127,7
@@
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
- <EmbeddedResource Include="resources/SR.res
x
">
\r
+ <EmbeddedResource Include="resources/SR.res
ources.prebuilt
">
\r
<LogicalName>SR.resources</LogicalName>
\r
</EmbeddedResource>
\r
<EmbeddedResource Include="resources/SQLiteCommand.bmp">
\r
<LogicalName>SR.resources</LogicalName>
\r
</EmbeddedResource>
\r
<EmbeddedResource Include="resources/SQLiteCommand.bmp">
\r
diff --git
a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj
b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj
index 774bd89e35cbaf42a517229146f7243dde3e5038..21fe03503f4fba1d875c8834f261957f834cef81 100644
(file)
--- a/
mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj
+++ b/
mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj
@@
-92,9
+92,9
@@
mono RabbitMQ.Client.Apigen.exe /n:v0_8qpid "/apiName:AMQP_0_8_QPID" $(ProjectDi
</PostBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
</PostBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
- RabbitMQ.Client.Apigen.exe /n:v0_9 "/apiName:AMQP_0_9" $(ProjectDir)..\..\docs\specs\amqp0-9.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-9.cs
- RabbitMQ.Client.Apigen.exe /n:v0_8 "/apiName:AMQP_0_8" $(ProjectDir)..\..\docs\specs\amqp0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-8.cs
- RabbitMQ.Client.Apigen.exe /n:v0_8qpid "/apiName:AMQP_0_8_QPID" $(ProjectDir)..\..\docs\specs\qpid-amqp.0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-qpid-0-8.cs
+
mono
RabbitMQ.Client.Apigen.exe /n:v0_9 "/apiName:AMQP_0_9" $(ProjectDir)..\..\docs\specs\amqp0-9.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-9.cs
+
mono
RabbitMQ.Client.Apigen.exe /n:v0_8 "/apiName:AMQP_0_8" $(ProjectDir)..\..\docs\specs\amqp0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-8.cs
+
mono
RabbitMQ.Client.Apigen.exe /n:v0_8qpid "/apiName:AMQP_0_8_QPID" $(ProjectDir)..\..\docs\specs\qpid-amqp.0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-qpid-0-8.cs
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 0a372455e9cdebcadb0ec219c9349e5b4d47263c..7b3dfa248deb2b63a1acb932b86e6159e12da601 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
@@
-176,7
+176,7
@@
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
- <EmbeddedResource Include="Strings_Core.res
x
">
\r
+ <EmbeddedResource Include="Strings_Core.res
ources.prebuilt
">
\r
<LogicalName>System.Reactive.Strings_Core.resources</LogicalName>
\r
</EmbeddedResource>
\r
</ItemGroup>
\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 cd90704cc90c9fc098e3b348e57b6ffdd5f7e291..67b2b8a8844cc12c1ecf09fdb1ff9da5ae8edbae 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
@@
-273,7
+273,7
@@
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
- <EmbeddedResource Include="Strings_Linq.res
x
">
\r
+ <EmbeddedResource Include="Strings_Linq.res
ources.prebuilt
">
\r
<LogicalName>System.Reactive.Strings_Linq.resources</LogicalName>
\r
</EmbeddedResource>
\r
</ItemGroup>
\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 6b5d1cfbe8318344512ef82ab964bea5e98e9596..538ff9529d94ea3bd5a2ad3e223c27f652e82fa0 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
@@
-125,7
+125,7
@@
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
- <EmbeddedResource Include="Strings_PlatformServices.res
x
">
\r
+ <EmbeddedResource Include="Strings_PlatformServices.res
ources.prebuilt
">
\r
<LogicalName>System.Reactive.Strings_PlatformServices.resources</LogicalName>
\r
</EmbeddedResource>
\r
</ItemGroup>
\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 3fd5344a43b50e3714e68197661d0640f50bcc9a..0099448bd54ccb6132e7b2184164293adc9b2ec2 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
@@
-118,7
+118,7
@@
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
- <EmbeddedResource Include="Strings_Providers.res
x
">
\r
+ <EmbeddedResource Include="Strings_Providers.res
ources.prebuilt
">
\r
<LogicalName>System.Reactive.Strings_Providers.resources</LogicalName>
\r
</EmbeddedResource>
\r
</ItemGroup>
\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 abb30575708aa4226193b6ba5477e9344a96feb7..2399dc270ca57124a3c099787d3a8175fd4cd871 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
@@
-118,7
+118,7
@@
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
- <EmbeddedResource Include="Strings_WindowsThreading.res
x
">
\r
+ <EmbeddedResource Include="Strings_WindowsThreading.res
ources.prebuilt
">
\r
<LogicalName>System.Reactive.Strings_WindowsThreading.resources</LogicalName>
\r
</EmbeddedResource>
\r
</ItemGroup>
\r
<LogicalName>System.Reactive.Strings_WindowsThreading.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 c3cd7cc5262760c37a0f5f22aeed89da1c81bf3c..109abe9ccc9d0ee5af11640349a3cd946d75ac43 100644
(file)
--- a/
mcs/class/System.Web/System.Web-net_4_x.csproj
+++ b/
mcs/class/System.Web/System.Web-net_4_x.csproj
@@
-1488,9
+1488,13
@@
-->
\r
<PropertyGroup>
\r
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-->
\r
<PropertyGroup>
\r
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\UplevelHelper.cs $(ProjectDir)\UplevelHelperDefinitions.xml
+
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
+mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\UplevelHelper.cs $(ProjectDir)\UplevelHelperDefinitions.xml
+
\r
</PreBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
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 1cff71822308af45d45c170da6acfc5aa0d7bff6..9d01a0e639843788b1b0d95aed5c7435b61d9849 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
@@
-1488,9
+1488,13
@@
-->
\r
<PropertyGroup>
\r
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-->
\r
<PropertyGroup>
\r
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\UplevelHelper.cs $(ProjectDir)\UplevelHelperDefinitions.xml
+
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
+mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\UplevelHelper.cs $(ProjectDir)\UplevelHelperDefinitions.xml
+
\r
</PreBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
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 52e2326bdce8362c55bf0f232c115db28e5b1c18..c1e931e0a9b631f15f767dc754ddaefec8e4bd9b 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
@@
-1049,7
+1049,7
@@
<EmbeddedResource Include="resources/DnDMove.cur">
\r
<LogicalName>System.Windows.Forms.DnDMove.cur</LogicalName>
\r
</EmbeddedResource>
\r
<EmbeddedResource Include="resources/DnDMove.cur">
\r
<LogicalName>System.Windows.Forms.DnDMove.cur</LogicalName>
\r
</EmbeddedResource>
\r
- <EmbeddedResource Include="resources/keyboards.res
x
">
\r
+ <EmbeddedResource Include="resources/keyboards.res
ources.prebuilt
">
\r
<LogicalName>keyboards.resources</LogicalName>
\r
</EmbeddedResource>
\r
<EmbeddedResource Include="resources/16_computer.png">
\r
<LogicalName>keyboards.resources</LogicalName>
\r
</EmbeddedResource>
\r
<EmbeddedResource Include="resources/16_computer.png">
\r
diff --git
a/mcs/class/monodoc/monodoc-net_4_x.csproj
b/mcs/class/monodoc/monodoc-net_4_x.csproj
index 4413f8ae0f791e302a3d0722932ee24dd4019c9c..92b54f9ccdb4f42dd2102b9cba39fa0f54387372 100644
(file)
--- a/
mcs/class/monodoc/monodoc-net_4_x.csproj
+++ b/
mcs/class/monodoc/monodoc-net_4_x.csproj
@@
-530,9
+530,13
@@
-->
\r
<PropertyGroup>
\r
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-->
\r
<PropertyGroup>
\r
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+$(ProjectDir)\..\..\jay\jay -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Monodoc.Ecma\EcmaUrlParser.jay > $(ProjectDir)\Monodoc.Ecma\EcmaUrlParser.cs
+
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
+$(ProjectDir)\..\..\jay\jay -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Monodoc.Ecma\EcmaUrlParser.jay > $(ProjectDir)\Monodoc.Ecma\EcmaUrlParser.cs
\r
+
\r
\r
</PreBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
diff --git
a/mcs/ilasm/ilasm-net_4_x.csproj
b/mcs/ilasm/ilasm-net_4_x.csproj
index 338a2ea7c56f8741c57e79cbbb26c8de1eb46d9c..cf8834c52c7388a4c1206e7cbc210442c2126415 100644
(file)
--- a/
mcs/ilasm/ilasm-net_4_x.csproj
+++ b/
mcs/ilasm/ilasm-net_4_x.csproj
@@
-149,8
+149,8
@@
$(ProjectDir)\..\jay\jay -ct < $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
-$(ProjectDir)\..\jay\jay
.exe -ct < $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\parser\ILParser.jay > $(ProjectDir)\ILParser.cs
\r
-
\r
+$(ProjectDir)\..\jay\jay
-ct < $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\parser\ILParser.jay > $(ProjectDir)\ILParser.cs
+
\r
</PreBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
diff --git
a/mcs/mcs/mcs-net_4_x.csproj
b/mcs/mcs/mcs-net_4_x.csproj
index 5e67322f296b7f526b700db2d29ff174c4032624..46bedb4861240da0ed221219b55b8388781c1602 100644
(file)
--- a/
mcs/mcs/mcs-net_4_x.csproj
+++ b/
mcs/mcs/mcs-net_4_x.csproj
@@
-128,7
+128,7
@@
$(ProjectDir)\..\jay\jay -ct < $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
-$(ProjectDir)\..\jay\jay
.exe
-ct < $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\cs-parser.jay > $(ProjectDir)\cs-parser.cs
\r
+$(ProjectDir)\..\jay\jay -ct < $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\cs-parser.jay > $(ProjectDir)\cs-parser.cs
\r
\r
\r
</PreBuildEvent>
\r
\r
\r
</PreBuildEvent>
\r
diff --git
a/msvc/scripts/genproj.cs
b/msvc/scripts/genproj.cs
index 5205c6ed6ad592585ccabed5594ed2239e32f386..d442697c3ce92389f3396c4cd502b66b0bc57126 100644
(file)
--- a/
msvc/scripts/genproj.cs
+++ b/
msvc/scripts/genproj.cs
@@
-795,6
+795,15
@@
class MsbuildGenerator {
var source = dk.Key;
if (source.EndsWith (".resources"))
source = source.Replace (".resources", ".resx");
var source = dk.Key;
if (source.EndsWith (".resources"))
source = source.Replace (".resources", ".resx");
+
+ // try to find a pre-built resource, and use that instead of trying to build it
+ if (source.EndsWith (".resx")) {
+ var probe_prebuilt = Path.Combine (base_dir, source.Replace (".resx", ".resources.prebuilt"));
+ if (File.Exists (probe_prebuilt)) {
+
+ source = GetRelativePath (base_dir + "/", probe_prebuilt);
+ }
+ }
resources.AppendFormat (" <EmbeddedResource Include=\"{0}\">" + NewLine, source);
resources.AppendFormat (" <LogicalName>{0}</LogicalName>" + NewLine, dk.Value);
resources.AppendFormat (" </EmbeddedResource>" + NewLine);
resources.AppendFormat (" <EmbeddedResource Include=\"{0}\">" + NewLine, source);
resources.AppendFormat (" <LogicalName>{0}</LogicalName>" + NewLine, dk.Value);
resources.AppendFormat (" </EmbeddedResource>" + NewLine);