128 files changed, 884 insertions, 6 deletions

diff --git a/Makefile.am b/Makefile.am
index 16492d83674..9f89c00e920 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -145,7 +145,7 @@ update-llvm-version:
 
 
 update-solution-files:
-	(pushd msvc/scripts; rm genproj.exe; $(MAKE) genproj.exe; popd)
+	cd msvc/scripts && $(MAKE) genproj.exe || exit $$?;
 	$(MAKE) update-csproj
 	$(MAKE) package-inputs
 	(cd msvc/scripts; mono --debug genproj.exe $(GENPROJ_ARGS))
diff --git a/bcl.sln b/bcl.sln
index 767539bea72..ac6572c79bc 100644
--- a/bcl.sln
+++ b/bcl.sln
@@ -7,9 +7,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "genconsts", "msvc/scripts/genconsts.csproj", "{702AE2C0-71DD-4112-9A06-E4FABCA59986}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "corlib", "mcs/class/corlib/corlib.csproj", "{4627BDAB-CA24-40D0-A627-01692BA51B44}"
-	ProjectSection(ProjectDependencies) = postProject
-		{702AE2C0-71DD-4112-9A06-E4FABCA59986} = {702AE2C0-71DD-4112-9A06-E4FABCA59986}
-	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Security", "mcs/class/Mono.Security/Mono.Security.csproj", "{117140AC-A163-4B86-9E69-A46EA268A9DB}"
 EndProject
diff --git a/mcs/class/Accessibility/Accessibility.csproj b/mcs/class/Accessibility/Accessibility.csproj
index 437e3714b7e..ae727afbc8a 100644
--- a/mcs/class/Accessibility/Accessibility.csproj
+++ b/mcs/class/Accessibility/Accessibility.csproj
@@ -49,6 +49,13 @@
     <Compile Include="Accessibility\IAccessible.cs" />

     <Compile Include="Accessibility\IAccessibleHandler.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj
index b583c3e2d97..98840e0c06b 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj
@@ -87,6 +87,13 @@
     <Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />

     <Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />

     <Compile Include="Commons.Xml\XmlDefaultReader.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Cscompmgd/Cscompmgd.csproj b/mcs/class/Cscompmgd/Cscompmgd.csproj
index 725a6a89f76..c0281ebd3e0 100644
--- a/mcs/class/Cscompmgd/Cscompmgd.csproj
+++ b/mcs/class/Cscompmgd/Cscompmgd.csproj
@@ -52,6 +52,13 @@
     <Compile Include="Microsoft.CSharp\Compiler.cs" />

     <Compile Include="Microsoft.CSharp\CompilerError.cs" />

     <Compile Include="Microsoft.CSharp\ErrorLevel.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/CustomMarshalers/CustomMarshalers.csproj b/mcs/class/CustomMarshalers/CustomMarshalers.csproj
index 10416a6e38d..db866063409 100644
--- a/mcs/class/CustomMarshalers/CustomMarshalers.csproj
+++ b/mcs/class/CustomMarshalers/CustomMarshalers.csproj
@@ -53,6 +53,13 @@
     <Compile Include="System.Runtime.InteropServices.CustomMarshalers\EnumeratorToEnumVariantMarshaler.cs" />

     <Compile Include="System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />

     <Compile Include="System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/I18N/CJK/I18N.CJK.csproj b/mcs/class/I18N/CJK/I18N.CJK.csproj
index 4d4b872b46d..9f3638aefeb 100644
--- a/mcs/class/I18N/CJK/I18N.CJK.csproj
+++ b/mcs/class/I18N/CJK/I18N.CJK.csproj
@@ -120,6 +120,13 @@
     <Compile Include="GB18030Source.cs" />

     <Compile Include="ISO2022JP.cs" />

     <Compile Include="JISConvert.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/I18N/Common/I18N.csproj b/mcs/class/I18N/Common/I18N.csproj
index 5990feda481..4a97f574131 100644
--- a/mcs/class/I18N/Common/I18N.csproj
+++ b/mcs/class/I18N/Common/I18N.csproj
@@ -116,6 +116,13 @@
     <Compile Include="MonoEncoding.cs" />

     <Compile Include="MonoSafeEncoding.cs" />

     <Compile Include="Strings.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/I18N/MidEast/I18N.MidEast.csproj b/mcs/class/I18N/MidEast/I18N.MidEast.csproj
index 73b905c42eb..a0f0951e053 100644
--- a/mcs/class/I18N/MidEast/I18N.MidEast.csproj
+++ b/mcs/class/I18N/MidEast/I18N.MidEast.csproj
@@ -115,6 +115,13 @@
     <Compile Include="CP28598.cs" />

     <Compile Include="CP28599.cs" />

     <Compile Include="CP38598.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/I18N/Other/I18N.Other.csproj b/mcs/class/I18N/Other/I18N.Other.csproj
index fac5f09aa20..d88c7ba569a 100644
--- a/mcs/class/I18N/Other/I18N.Other.csproj
+++ b/mcs/class/I18N/Other/I18N.Other.csproj
@@ -117,6 +117,13 @@
     <Compile Include="CP28595.cs" />

     <Compile Include="CP57002.cs" />

     <Compile Include="CP874.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/I18N/Rare/I18N.Rare.csproj b/mcs/class/I18N/Rare/I18N.Rare.csproj
index 01751b3bcca..bc0e8e8b30b 100644
--- a/mcs/class/I18N/Rare/I18N.Rare.csproj
+++ b/mcs/class/I18N/Rare/I18N.Rare.csproj
@@ -147,6 +147,13 @@
     <Compile Include="CP869.cs" />

     <Compile Include="CP870.cs" />

     <Compile Include="CP875.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/I18N/West/I18N.West.csproj b/mcs/class/I18N/West/I18N.West.csproj
index 86c9068ec08..2946e4562e4 100644
--- a/mcs/class/I18N/West/I18N.West.csproj
+++ b/mcs/class/I18N/West/I18N.West.csproj
@@ -123,6 +123,13 @@
     <Compile Include="CP861.cs" />

     <Compile Include="CP863.cs" />

     <Compile Include="CP865.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.csproj
index c2d40957ccf..8d452a2bc63 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.csproj
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.csproj
@@ -122,6 +122,13 @@
     <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />

     <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />

     <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.csproj b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.csproj
index 12be9e0234a..718ad02f4e2 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.csproj
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.csproj
@@ -107,6 +107,13 @@
     <Compile Include="Microsoft.Build.Framework\TaskPropertyInfo.cs" />

     <Compile Include="Microsoft.Build.Framework\TaskStartedEventArgs.cs" />

     <Compile Include="Microsoft.Build.Framework\TaskStartedEventHandler.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.csproj b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.csproj
index c620773bb5b..7411882c011 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.csproj
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.csproj
@@ -167,6 +167,13 @@
     <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceWriter.cs" />

     <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\TxtResourceReader.cs" />

     <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\TxtResourceWriter.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.csproj b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.csproj
index 8dc4bd0a927..566e0815899 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.csproj
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.csproj
@@ -67,6 +67,13 @@
     <Compile Include="Mono.XBuild.Utilities\MSBuildUtils.cs" />

     <Compile Include="Mono.XBuild.Utilities\MonoLocationHelper.cs" />

     <Compile Include="Mono.XBuild.Utilities\ReservedNameUtils.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.csproj b/mcs/class/Microsoft.Build/Microsoft.Build.csproj
index 59c6902d26e..4e3b629890f 100644
--- a/mcs/class/Microsoft.Build/Microsoft.Build.csproj
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.csproj
@@ -157,6 +157,13 @@
     <Compile Include="Microsoft.Build.Logging\ConfigurableForwardingLogger.cs" />

     <Compile Include="Microsoft.Build.Logging\ForwardingLoggerRecord.cs" />

     <Compile Include="Microsoft.Build.Logging\LoggerDescription.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.csproj b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.csproj
index aff29de57cf..f1dbce3fc6c 100644
--- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.csproj
+++ b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.csproj
@@ -252,6 +252,13 @@
     <Compile Include="..\..\build\common\SR.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="corefx\SR.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Microsoft.VisualC/Microsoft.VisualC.csproj b/mcs/class/Microsoft.VisualC/Microsoft.VisualC.csproj
index 3f9cb2a4b5d..684c4584504 100644
--- a/mcs/class/Microsoft.VisualC/Microsoft.VisualC.csproj
+++ b/mcs/class/Microsoft.VisualC/Microsoft.VisualC.csproj
@@ -58,6 +58,13 @@
     <Compile Include="Microsoft.VisualC\MiscellaneousBitsAttribute.cs" />

     <Compile Include="Microsoft.VisualC\NeedsCopyConstructorModifier.cs" />

     <Compile Include="Microsoft.VisualC\NoSignSpecifiedModifier.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj
index 04116374236..f1bf9f1141f 100644
--- a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj
+++ b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj
@@ -54,6 +54,13 @@
     <Compile Include="Microsoft.Web.Infrastructure.DynamicValidationHelper\ValidationUtility.cs" />

     <Compile Include="Microsoft.Web.Infrastructure\HttpContextHelper.cs" />

     <Compile Include="Microsoft.Web.Infrastructure\InfrastructureHelper.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj b/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj
index ae8866c60ce..3a0738731f9 100644
--- a/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj
+++ b/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj
@@ -73,6 +73,13 @@
     <Compile Include="Mono.Btls.Interface\BtlsX509VerifyParam.cs" />

     <Compile Include="Mono.Btls.Interface\VersionInfo.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.CSharp/Mono.CSharp.csproj b/mcs/class/Mono.CSharp/Mono.CSharp.csproj
index 4f2e980374b..d593419a780 100644
--- a/mcs/class/Mono.CSharp/Mono.CSharp.csproj
+++ b/mcs/class/Mono.CSharp/Mono.CSharp.csproj
@@ -219,6 +219,13 @@
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="aot.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Cairo/Mono.Cairo.csproj b/mcs/class/Mono.Cairo/Mono.Cairo.csproj
index 642dfbd1cf1..16352433961 100644
--- a/mcs/class/Mono.Cairo/Mono.Cairo.csproj
+++ b/mcs/class/Mono.Cairo/Mono.Cairo.csproj
@@ -106,6 +106,13 @@
     <Compile Include="Mono.Cairo\Win32Surface.cs" />

     <Compile Include="Mono.Cairo\XcbSurface.cs" />

     <Compile Include="Mono.Cairo\XlibSurface.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj b/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj
index 458e885bae6..d905e8e890a 100644
--- a/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj
+++ b/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj
@@ -422,6 +422,13 @@
     <Compile Include="Mono.CodeContracts.Static\Checker.cs" />

     <Compile Include="Mono.CodeContracts.Static\DebugOptions.cs" />

     <Compile Include="Mono.CodeContracts.Static\ProofOutcome.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
index 02eac3bcee6..7df0a199176 100644
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
@@ -68,6 +68,13 @@
     <Compile Include="MonoSymbolWriter.cs" />

     <Compile Include="SourceMethodBuilder.cs" />

     <Compile Include="SymbolWriterImpl.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
index 14e19d19c5e..6ef7d27a6c5 100644
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
@@ -131,6 +131,13 @@
     <Compile Include="Mono.Data.Sqlite_2.0\SR.Designer.cs" />

     <Compile Include="Mono.Data.Sqlite_2.0\SqliteDataSourceEnumerator.cs" />

     <Compile Include="Mono.Data.Sqlite_2.0\UnsafeNativeMethods.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.csproj b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.csproj
index f8ff81555de..669e4f0ac4d 100644
--- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.csproj
+++ b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.csproj
@@ -138,6 +138,13 @@
     <Compile Include="Mono.Data.Tds\TdsMetaParameter.cs" />

     <Compile Include="Mono.Data.Tds\TdsMetaParameterCollection.cs" />

     <Compile Include="Mono.Data.Tds\TdsParameterDirection.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
index 5aabb8e7470..60d05ccd4f1 100644
--- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
+++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
@@ -123,6 +123,13 @@
     <Compile Include="Mono.Debugger.Soft\Value.cs" />

     <Compile Include="Mono.Debugger.Soft\VirtualMachine.cs" />

     <Compile Include="Mono.Debugger.Soft\VirtualMachineManager.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Http/Mono.Http.csproj b/mcs/class/Mono.Http/Mono.Http.csproj
index 54de5c97517..f5d0662d506 100644
--- a/mcs/class/Mono.Http/Mono.Http.csproj
+++ b/mcs/class/Mono.Http/Mono.Http.csproj
@@ -58,6 +58,13 @@
     <Compile Include="Mono.Http\GZipWebResponse.cs" />

     <Compile Include="Mono.Http\GZipWriteFilter.cs" />

     <Compile Include="Mono.Http\NtlmClient.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Management/Mono.Management.csproj b/mcs/class/Mono.Management/Mono.Management.csproj
index b9dac625560..03180fcbaac 100644
--- a/mcs/class/Mono.Management/Mono.Management.csproj
+++ b/mcs/class/Mono.Management/Mono.Management.csproj
@@ -49,6 +49,13 @@
     <Compile Include="..\..\build\common\Locale.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="Mono.Attach\VirtualMachine.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj
index 0ce5d724ac6..83747c6ed47 100644
--- a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj
+++ b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj
@@ -56,6 +56,13 @@
     <Compile Include="Mono.Messaging.RabbitMQ\RabbitMQMessageQueue.cs" />

     <Compile Include="Mono.Messaging.RabbitMQ\RabbitMQMessageQueueTransaction.cs" />

     <Compile Include="Mono.Messaging.RabbitMQ\RabbitMQMessagingProvider.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Messaging/Mono.Messaging.csproj b/mcs/class/Mono.Messaging/Mono.Messaging.csproj
index a4c69938dee..b4b861b47aa 100644
--- a/mcs/class/Mono.Messaging/Mono.Messaging.csproj
+++ b/mcs/class/Mono.Messaging/Mono.Messaging.csproj
@@ -78,6 +78,13 @@
     <Compile Include="Mono.Messaging\MessagingProviderLocator.cs" />

     <Compile Include="Mono.Messaging\MonoMessagingException.cs" />

     <Compile Include="Mono.Messaging\QueueReference.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Options/Mono.Options.csproj b/mcs/class/Mono.Options/Mono.Options.csproj
index 0211283cc2c..b2af154c2db 100644
--- a/mcs/class/Mono.Options/Mono.Options.csproj
+++ b/mcs/class/Mono.Options/Mono.Options.csproj
@@ -49,6 +49,13 @@
     <Compile Include="..\..\build\common\Locale.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="Mono.Options\Options.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Parallel/Mono.Parallel.csproj b/mcs/class/Mono.Parallel/Mono.Parallel.csproj
index c218010c179..3a91cdc30a1 100644
--- a/mcs/class/Mono.Parallel/Mono.Parallel.csproj
+++ b/mcs/class/Mono.Parallel/Mono.Parallel.csproj
@@ -58,6 +58,13 @@
     <Compile Include="Mono.Threading\ReaderWriterLockSlimmer.cs" />

     <Compile Include="Mono.Threading\Snzi.cs" />

     <Compile Include="Mono.Threading\SpinLockWrapper.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Posix/Mono.Posix.csproj b/mcs/class/Mono.Posix/Mono.Posix.csproj
index 9fc8e1fcdb7..65df3d00a34 100644
--- a/mcs/class/Mono.Posix/Mono.Posix.csproj
+++ b/mcs/class/Mono.Posix/Mono.Posix.csproj
@@ -113,6 +113,13 @@
     <Compile Include="Mono.Unix\UnixStream.cs" />

     <Compile Include="Mono.Unix\UnixSymbolicLinkInfo.cs" />

     <Compile Include="Mono.Unix\UnixUserInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">

     <Compile Include="Mono.Unix.Android\AndroidUtils.cs" />

diff --git a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log.csproj b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log.csproj
index 3e27b811dca..5e4c043ad9b 100644
--- a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log.csproj
+++ b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log.csproj
@@ -60,6 +60,13 @@
     <Compile Include="Mono.Profiler.Log\LogReader.cs" />

     <Compile Include="Mono.Profiler.Log\LogStream.cs" />

     <Compile Include="Mono.Profiler.Log\LogStreamHeader.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Security.Win32/Mono.Security.Win32.csproj b/mcs/class/Mono.Security.Win32/Mono.Security.Win32.csproj
index 5370dfb462b..27a63cd8e0f 100644
--- a/mcs/class/Mono.Security.Win32/Mono.Security.Win32.csproj
+++ b/mcs/class/Mono.Security.Win32/Mono.Security.Win32.csproj
@@ -60,6 +60,13 @@
     <Compile Include="Mono.Security.Cryptography\MD5CryptoServiceProvider.cs" />

     <Compile Include="Mono.Security.Cryptography\RNGCryptoServiceProvider.cs" />

     <Compile Include="Mono.Security.Cryptography\SHA1CryptoServiceProvider.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Security/Mono.Security.csproj b/mcs/class/Mono.Security/Mono.Security.csproj
index 7cf569ddfb2..81df4b9ba8f 100644
--- a/mcs/class/Mono.Security/Mono.Security.csproj
+++ b/mcs/class/Mono.Security/Mono.Security.csproj
@@ -288,6 +288,13 @@
     <Compile Include="Mono.Security\StrongName.cs" />

     <Compile Include="Mono.Xml\MiniParser.cs" />

     <Compile Include="Mono.Xml\SecurityParser.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' "></ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">

diff --git a/mcs/class/Mono.Simd/Mono.Simd.csproj b/mcs/class/Mono.Simd/Mono.Simd.csproj
index e463c0575e8..55a1653d672 100644
--- a/mcs/class/Mono.Simd/Mono.Simd.csproj
+++ b/mcs/class/Mono.Simd/Mono.Simd.csproj
@@ -89,6 +89,13 @@
     <Compile Include="Mono.Simd\Vector8s.cs" />

     <Compile Include="Mono.Simd\Vector8us.cs" />

     <Compile Include="Mono.Simd\VectorOperations.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.Tasklets/Mono.Tasklets.csproj b/mcs/class/Mono.Tasklets/Mono.Tasklets.csproj
index aa021918d80..9dedc938d54 100644
--- a/mcs/class/Mono.Tasklets/Mono.Tasklets.csproj
+++ b/mcs/class/Mono.Tasklets/Mono.Tasklets.csproj
@@ -49,6 +49,13 @@
     <Compile Include="..\..\build\common\Locale.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="Mono.Tasklets\Continuation.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.WebBrowser/Mono.WebBrowser.csproj b/mcs/class/Mono.WebBrowser/Mono.WebBrowser.csproj
index fe30af21fc5..7a65443426f 100644
--- a/mcs/class/Mono.WebBrowser/Mono.WebBrowser.csproj
+++ b/mcs/class/Mono.WebBrowser/Mono.WebBrowser.csproj
@@ -202,6 +202,13 @@
     <Compile Include="Mono.WebBrowser\Exception.cs" />

     <Compile Include="Mono.WebBrowser\IWebBrowser.cs" />

     <Compile Include="Mono.WebBrowser\Manager.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks.csproj b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks.csproj
index 179c095825e..06afd612efe 100644
--- a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks.csproj
+++ b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks.csproj
@@ -52,6 +52,13 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="Mono.XBuild.Tasks\LibraryPcFileCache.cs" />

     <Compile Include="Mono.XBuild.Tasks\PcFileCache.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.csproj
index 1e6083f97ae..3b623ae9377 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.csproj
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.csproj
@@ -261,6 +261,13 @@
     <Compile Include="Novell.Directory.Ldap\MessageAgent.cs" />

     <Compile Include="Novell.Directory.Ldap\MessageVector.cs" />

     <Compile Include="Novell.Directory.Ldap\SupportClass.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/PEAPI/PEAPI.csproj b/mcs/class/PEAPI/PEAPI.csproj
index 9c0d0dbb2aa..e4233bbc594 100644
--- a/mcs/class/PEAPI/PEAPI.csproj
+++ b/mcs/class/PEAPI/PEAPI.csproj
@@ -51,6 +51,13 @@
     <Compile Include="Code.cs" />

     <Compile Include="Metadata.cs" />

     <Compile Include="PEAPI.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj
index 8e55d86fa34..ae4559a5db7 100644
--- a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj
+++ b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj
@@ -175,6 +175,13 @@
     <Compile Include="messagepatterns\SimpleRpcClient.cs" />

     <Compile Include="messagepatterns\SimpleRpcServer.cs" />

     <Compile Include="messagepatterns\Subscription.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj
index e2fe750c3fd..272256b2bda 100644
--- a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj
+++ b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj
@@ -280,6 +280,13 @@
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionType.cs" />

     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionWritableMember.cs" />

     <Compile Include="src\ComponentModel\System\LazyOfTTMetadata.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj
index 0aa2e514e26..c5752b2fb9f 100644
--- a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj
+++ b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj
@@ -157,6 +157,13 @@
     <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Validator.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="ReferenceSources\SR.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install.csproj b/mcs/class/System.Configuration.Install/System.Configuration.Install.csproj
index f1662d20590..ac8dd1657cb 100644
--- a/mcs/class/System.Configuration.Install/System.Configuration.Install.csproj
+++ b/mcs/class/System.Configuration.Install/System.Configuration.Install.csproj
@@ -68,6 +68,13 @@
     <Compile Include="System.Configuration.Install\UninstallAction.cs" />

     <Compile Include="System.Diagnostics\EventLogInstaller.cs" />

     <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Configuration/System.Configuration.csproj b/mcs/class/System.Configuration/System.Configuration.csproj
index d215a35d295..2e1fe540af9 100644
--- a/mcs/class/System.Configuration/System.Configuration.csproj
+++ b/mcs/class/System.Configuration/System.Configuration.csproj
@@ -171,6 +171,13 @@
     <Compile Include="System.Configuration\TypeNameConverter.cs" />

     <Compile Include="System.Configuration\ValidatorCallback.cs" />

     <Compile Include="System.Configuration\WhiteSpaceTrimStringConverter.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Core/System.Core.csproj b/mcs/class/System.Core/System.Core.csproj
index e7c6d703fa8..cdcc176fd86 100644
--- a/mcs/class/System.Core/System.Core.csproj
+++ b/mcs/class/System.Core/System.Core.csproj
@@ -530,6 +530,13 @@
     <Compile Include="corefx\LambdaExpression.cs" />

     <Compile Include="corefx\SR.cs" />

     <Compile Include="corefx\SR.missing.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">

     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\ReferenceEqualityComparer.cs" />

diff --git a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj
index ae99559ac4a..e146075b415 100644
--- a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj
+++ b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj
@@ -58,6 +58,13 @@
     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="corefx\SR.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Data.Entity/System.Data.Entity.csproj b/mcs/class/System.Data.Entity/System.Data.Entity.csproj
index 14fd2bde90f..762b6c6c50f 100644
--- a/mcs/class/System.Data.Entity/System.Data.Entity.csproj
+++ b/mcs/class/System.Data.Entity/System.Data.Entity.csproj
@@ -771,6 +771,13 @@
     <Compile Include="Error.cs" />

     <Compile Include="ReferenceSources\SR.cs" />

     <Compile Include="ReferenceSources\Strings.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Data.Linq/System.Data.Linq.csproj b/mcs/class/System.Data.Linq/System.Data.Linq.csproj
index 74e75cadfa5..419a3cdb980 100644
--- a/mcs/class/System.Data.Linq/System.Data.Linq.csproj
+++ b/mcs/class/System.Data.Linq/System.Data.Linq.csproj
@@ -374,6 +374,13 @@
     <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.ProcedureResult.cs" />

     <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.cs" />

     <Compile Include="src\DbLinq\Vendor\VendorAttribute.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.csproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.csproj
index 925617a8ccb..caeb16cfaef 100644
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.csproj
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.csproj
@@ -115,6 +115,13 @@
     <Compile Include="System.Data.OracleClient\OracleTimeSpan.cs" />

     <Compile Include="System.Data.OracleClient\OracleTransaction.cs" />

     <Compile Include="System.Data.OracleClient\OracleType.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Data.Services.Client/System.Data.Services.Client.csproj b/mcs/class/System.Data.Services.Client/System.Data.Services.Client.csproj
index 77faeef931d..383e771acc0 100644
--- a/mcs/class/System.Data.Services.Client/System.Data.Services.Client.csproj
+++ b/mcs/class/System.Data.Services.Client/System.Data.Services.Client.csproj
@@ -221,6 +221,13 @@
     <Compile Include="Server\System\Data\Services\Parsing\WebConvert.cs" />

     <Compile Include="Server\System\Data\Services\Providers\EntityPropertyMappingInfo.cs" />

     <Compile Include="Server\System\Data\Services\XmlConstants.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Data.Services/System.Data.Services.csproj b/mcs/class/System.Data.Services/System.Data.Services.csproj
index 3d0bb8794b3..2e5f71bef0b 100644
--- a/mcs/class/System.Data.Services/System.Data.Services.csproj
+++ b/mcs/class/System.Data.Services/System.Data.Services.csproj
@@ -120,6 +120,13 @@
     <Compile Include="System.Data.Services\ServiceOperationRights.cs" />

     <Compile Include="System.Data.Services\SingleResultAttribute.cs" />

     <Compile Include="System.Data.Services\UpdateOperations.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Data/System.Data.csproj b/mcs/class/System.Data/System.Data.csproj
index c6413e5f05d..98f17c2cc91 100644
--- a/mcs/class/System.Data/System.Data.csproj
+++ b/mcs/class/System.Data/System.Data.csproj
@@ -536,6 +536,13 @@
     <Compile Include="corefx\SqlParameterCollection.cs" />

     <Compile Include="corefx\TdsEnums.cs" />

     <Compile Include="corefx\ThisAssembly.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">

     <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />

diff --git a/mcs/class/System.Deployment/System.Deployment.csproj b/mcs/class/System.Deployment/System.Deployment.csproj
index 5255a0ca8d1..ee2d1ac9908 100644
--- a/mcs/class/System.Deployment/System.Deployment.csproj
+++ b/mcs/class/System.Deployment/System.Deployment.csproj
@@ -48,6 +48,13 @@
   <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.csproj b/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.csproj
index a7312b2ae7a..7701e0aa169 100644
--- a/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.csproj
+++ b/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.csproj
@@ -147,6 +147,13 @@
     <Compile Include="System.DirectoryServices.Protocols\VerifyServerCertificateCallback.cs" />

     <Compile Include="System.DirectoryServices.Protocols\VlvRequestControl.cs" />

     <Compile Include="System.DirectoryServices.Protocols\VlvResponseControl.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices.csproj b/mcs/class/System.DirectoryServices/System.DirectoryServices.csproj
index 7ab854b91a0..2175ec6e1a7 100644
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices.csproj
+++ b/mcs/class/System.DirectoryServices/System.DirectoryServices.csproj
@@ -180,6 +180,13 @@
     <Compile Include="System.DirectoryServices\SearchScope.cs" />

     <Compile Include="System.DirectoryServices\SortDirection.cs" />

     <Compile Include="System.DirectoryServices\SortOption.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design.csproj b/mcs/class/System.Drawing.Design/System.Drawing.Design.csproj
index 9f19f644ba2..bc00fe34b03 100644
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design.csproj
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design.csproj
@@ -61,6 +61,13 @@
     <Compile Include="System.Drawing.Design\ToolboxItemContainer.cs" />

     <Compile Include="System.Drawing.Design\ToolboxItemCreator.cs" />

     <Compile Include="System.Drawing.Design\ToolboxService.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Drawing/System.Drawing.csproj b/mcs/class/System.Drawing/System.Drawing.csproj
index 4b481337474..017ce8a5d9c 100644
--- a/mcs/class/System.Drawing/System.Drawing.csproj
+++ b/mcs/class/System.Drawing/System.Drawing.csproj
@@ -77,6 +77,13 @@
     <Compile Include="System.Drawing\RectangleF.cs" />

     <Compile Include="System.Drawing\Size.cs" />

     <Compile Include="System.Drawing\SizeF.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">

     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorTable.cs" />

diff --git a/mcs/class/System.Dynamic/System.Dynamic.csproj b/mcs/class/System.Dynamic/System.Dynamic.csproj
index 71b78dee0d1..b07a68e0bb0 100644
--- a/mcs/class/System.Dynamic/System.Dynamic.csproj
+++ b/mcs/class/System.Dynamic/System.Dynamic.csproj
@@ -101,6 +101,13 @@
     <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\VariantArray.cs" />

     <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\VariantBuilder.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.csproj b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.csproj
index f3ac6a895a6..e57f612c087 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.csproj
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.csproj
@@ -163,6 +163,13 @@
     <Compile Include="System.EnterpriseServices\TransactionStatus.cs" />

     <Compile Include="System.EnterpriseServices\TransactionVote.cs" />

     <Compile Include="System.EnterpriseServices\XACTTRANSINFO.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj
index 3aa59c92d1a..1e1fb3aab68 100644
--- a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj
+++ b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj
@@ -112,6 +112,13 @@
     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="AssemblyInfo.cs" />

     <Compile Include="corefx\SR.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.IO.Compression/System.IO.Compression.csproj b/mcs/class/System.IO.Compression/System.IO.Compression.csproj
index 74a003ea462..8e748cfc758 100644
--- a/mcs/class/System.IO.Compression/System.IO.Compression.csproj
+++ b/mcs/class/System.IO.Compression/System.IO.Compression.csproj
@@ -138,6 +138,13 @@
     <Compile Include="corefx\Crc32Helper.cs" />

     <Compile Include="corefx\SR.cs" />

     <Compile Include="corefx\ZipArchiveEntry.Mono.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors.csproj b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors.csproj
index 9691ab72eab..2737bdc1861 100644
--- a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors.csproj
+++ b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors.csproj
@@ -65,6 +65,13 @@
     <Compile Include="System.IdentityModel.Selectors\UnsupportedPolicyOptionsException.cs" />

     <Compile Include="System.IdentityModel.Selectors\UntrustedRecipientException.cs" />

     <Compile Include="System.IdentityModel.Selectors\UserCancellationException.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.csproj b/mcs/class/System.IdentityModel/System.IdentityModel.csproj
index 59ee0483e75..9307e619b25 100644
--- a/mcs/class/System.IdentityModel/System.IdentityModel.csproj
+++ b/mcs/class/System.IdentityModel/System.IdentityModel.csproj
@@ -110,6 +110,13 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="System.IdentityModel.Selectors\X509CertificateValidator.cs" />

     <Compile Include="System.ServiceModel.Security\X509CertificateValidationMode.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' "></ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monotouch' "></ItemGroup>

diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj
index ac4ee7f19ac..31d8df2f728 100644
--- a/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj
+++ b/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj
@@ -66,6 +66,13 @@
     <Compile Include="System.Json\NGenWrapper.cs" />

     <Compile Include="System.Json\Properties\AssemblyInfo.cs" />

     <Compile Include="System.Json\Properties\Resources.Designer.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Json/System.Json.csproj b/mcs/class/System.Json/System.Json.csproj
index 3c7dcb989a6..6e05e03feb7 100644
--- a/mcs/class/System.Json/System.Json.csproj
+++ b/mcs/class/System.Json/System.Json.csproj
@@ -115,6 +115,13 @@
     <Compile Include="..\..\build\common\SR.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="corefx\SR.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Management/System.Management.csproj b/mcs/class/System.Management/System.Management.csproj
index 3aef6e9bd81..5e09741afc1 100644
--- a/mcs/class/System.Management/System.Management.csproj
+++ b/mcs/class/System.Management/System.Management.csproj
@@ -116,6 +116,13 @@
     <Compile Include="System.Management\TextFormat.cs" />

     <Compile Include="System.Management\WqlEventQuery.cs" />

     <Compile Include="System.Management\WqlObjectQuery.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Messaging/System.Messaging.csproj b/mcs/class/System.Messaging/System.Messaging.csproj
index 7a30c1e4280..e06c5e42372 100644
--- a/mcs/class/System.Messaging/System.Messaging.csproj
+++ b/mcs/class/System.Messaging/System.Messaging.csproj
@@ -104,6 +104,13 @@
     <Compile Include="System.Messaging\Trustee.cs" />

     <Compile Include="System.Messaging\TrusteeType.cs" />

     <Compile Include="System.Messaging\XmlMessageFormatter.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.csproj b/mcs/class/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.csproj
index 9361bea3c43..3897df63126 100644
--- a/mcs/class/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.csproj
+++ b/mcs/class/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.csproj
@@ -107,6 +107,13 @@
     <Compile Include="System.Net.Http\CookieUsePolicy.cs" />

     <Compile Include="System.Net.Http\WinHttpHandler.cs" />

     <Compile Include="System.Net.Http\WindowsProxyUsePolicy.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Net.Http/System.Net.Http.csproj b/mcs/class/System.Net.Http/System.Net.Http.csproj
index e033c7c3f93..7df464379d7 100644
--- a/mcs/class/System.Net.Http/System.Net.Http.csproj
+++ b/mcs/class/System.Net.Http/System.Net.Http.csproj
@@ -158,6 +158,13 @@
     <Compile Include="System.Net.Http\MultipartFormDataContent.cs" />

     <Compile Include="System.Net.Http\StreamContent.cs" />

     <Compile Include="System.Net.Http\StringContent.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">

     <Compile Include="System.Net.Http\HttpClient.android.cs" />

diff --git a/mcs/class/System.Net/System.Net.csproj b/mcs/class/System.Net/System.Net.csproj
index 2027f04b2a8..2b726fbeff6 100644
--- a/mcs/class/System.Net/System.Net.csproj
+++ b/mcs/class/System.Net/System.Net.csproj
@@ -109,6 +109,13 @@
     <Compile Include="..\referencesource\System.Net\net\IPEndPointCollection.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="Assembly\TypeForwarders.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.csproj b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.csproj
index 7c978042f1b..f957b979b57 100644
--- a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.csproj
+++ b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.csproj
@@ -109,6 +109,13 @@
     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="Assembly\TypeForwarders.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Numerics/System.Numerics.csproj b/mcs/class/System.Numerics/System.Numerics.csproj
index f1419400020..078c3502e38 100644
--- a/mcs/class/System.Numerics/System.Numerics.csproj
+++ b/mcs/class/System.Numerics/System.Numerics.csproj
@@ -137,6 +137,13 @@
     <Compile Include="..\..\build\common\SR.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="corefx\SR.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Reflection.Context/System.Reflection.Context.csproj b/mcs/class/System.Reflection.Context/System.Reflection.Context.csproj
index 335075d93f6..5549d3d2284 100644
--- a/mcs/class/System.Reflection.Context/System.Reflection.Context.csproj
+++ b/mcs/class/System.Reflection.Context/System.Reflection.Context.csproj
@@ -110,6 +110,13 @@
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="System.Reflection.Context\CustomReflectionContext.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Runtime.Caching/System.Runtime.Caching.csproj b/mcs/class/System.Runtime.Caching/System.Runtime.Caching.csproj
index 54a511e76cb..7dfbc436283 100644
--- a/mcs/class/System.Runtime.Caching/System.Runtime.Caching.csproj
+++ b/mcs/class/System.Runtime.Caching/System.Runtime.Caching.csproj
@@ -97,6 +97,13 @@
     <Compile Include="ReferenceSources\CacheExpires.cs" />

     <Compile Include="ReferenceSources\CacheUsage.cs" />

     <Compile Include="ReferenceSources\R.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.csproj b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.csproj
index 609efa0a7a0..c648876876f 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.csproj
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.csproj
@@ -112,6 +112,13 @@
     <Compile Include="System.Runtime.Remoting.MetadataServices\ServiceType.cs" />

     <Compile Include="System.Runtime.Remoting.Services\RemotingClientProxy.cs" />

     <Compile Include="System.Runtime.Remoting.Services\RemotingService.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' "></ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monotouch' "></ItemGroup>

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.csproj b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.csproj
index 89432e1b04d..019d9f8ff69 100644
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.csproj
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.csproj
@@ -58,6 +58,13 @@
     <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapReader.cs" />

     <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapTypeMapper.cs" />

     <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapWriter.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.csproj b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.csproj
index bd481e8342b..21ae48319b1 100644
--- a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.csproj
+++ b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.csproj
@@ -50,6 +50,13 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="System.ServiceModel.Activation\ServiceHostFactory.cs" />

     <Compile Include="System.ServiceModel\ServiceHostingEnvironment.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.csproj b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.csproj
index 88b69be54f7..8bd0a5228ae 100644
--- a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.csproj
+++ b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.csproj
@@ -183,6 +183,13 @@
     <Compile Include="EventLogEntryType.cs" />

     <Compile Include="InternalSR.cs" />

     <Compile Include="ReferenceSources\LocalAppContextSwitches.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">

     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\SafeEventLogWriteHandle.cs" />

diff --git a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.csproj b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.csproj
index 4115386c2b4..3eb0058a7dc 100644
--- a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.csproj
+++ b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.csproj
@@ -74,6 +74,13 @@
     <Compile Include="System.ServiceModel.Routing\RoutingExtension.cs" />

     <Compile Include="System.ServiceModel.Routing\RoutingService.cs" />

     <Compile Include="System.ServiceModel.Routing\SoapProcessingBehavior.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.csproj b/mcs/class/System.ServiceModel/System.ServiceModel.csproj
index 8f80eca3073..f957a133a1a 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.csproj
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.csproj
@@ -394,6 +394,13 @@
     <Compile Include="System.ServiceModel\UpnEndpointIdentity.cs" />

     <Compile Include="System.ServiceModel\UriSchemeKeyedCollection.cs" />

     <Compile Include="System.ServiceModel\XmlSerializerFormatAttribute.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">

     <Compile Include="Dummy_2_1.cs" />

diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess.csproj b/mcs/class/System.ServiceProcess/System.ServiceProcess.csproj
index 6337bdb9317..6c6f7376e8b 100644
--- a/mcs/class/System.ServiceProcess/System.ServiceProcess.csproj
+++ b/mcs/class/System.ServiceProcess/System.ServiceProcess.csproj
@@ -73,6 +73,13 @@
     <Compile Include="System.ServiceProcess\TimeoutException.cs" />

     <Compile Include="System.ServiceProcess\UnixServiceController.cs" />

     <Compile Include="System.ServiceProcess\Win32ServiceController.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.csproj b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.csproj
index 002001fbe38..92f76be1f4d 100644
--- a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.csproj
+++ b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.csproj
@@ -87,6 +87,13 @@
     <Compile Include="..\..\build\common\SR.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="corefx\SR.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Transactions/System.Transactions.csproj b/mcs/class/System.Transactions/System.Transactions.csproj
index 739f8752a2d..56e57ff3ce5 100644
--- a/mcs/class/System.Transactions/System.Transactions.csproj
+++ b/mcs/class/System.Transactions/System.Transactions.csproj
@@ -144,6 +144,13 @@
     <Compile Include="System.Transactions\TransactionScopeAsyncFlowOption.cs" />

     <Compile Include="System.Transactions\TransactionScopeOption.cs" />

     <Compile Include="System.Transactions\TransactionStatus.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Web.Abstractions/System.Web.Abstractions.csproj b/mcs/class/System.Web.Abstractions/System.Web.Abstractions.csproj
index 5ec63a46460..16d9af6c9e5 100644
--- a/mcs/class/System.Web.Abstractions/System.Web.Abstractions.csproj
+++ b/mcs/class/System.Web.Abstractions/System.Web.Abstractions.csproj
@@ -47,6 +47,13 @@
   <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj
index 055d6f82bd3..60ab470dea6 100644
--- a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj
+++ b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj
@@ -65,6 +65,13 @@
     <Compile Include="System.Web.Security\RoleProvider.cs" />

     <Compile Include="System.Web.UI\KeyedList.cs" />

     <Compile Include="System.Web.UI\KeyedListEnumerator.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Web.DynamicData/System.Web.DynamicData.csproj b/mcs/class/System.Web.DynamicData/System.Web.DynamicData.csproj
index c56c237180a..aa76e4843da 100644
--- a/mcs/class/System.Web.DynamicData/System.Web.DynamicData.csproj
+++ b/mcs/class/System.Web.DynamicData/System.Web.DynamicData.csproj
@@ -85,6 +85,13 @@
     <Compile Include="System.Web.DynamicData\MetaTable.cs" />

     <Compile Include="System.Web.DynamicData\PageAction.cs" />

     <Compile Include="System.Web.DynamicData\TableNameAttribute.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design.csproj b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design.csproj
index 33cf253d25d..170a7adfdd2 100644
--- a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design.csproj
+++ b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design.csproj
@@ -61,6 +61,13 @@
     <Compile Include="System.Web.Extensions.Design\UpdatePanelTriggerCollectionEditor.cs" />

     <Compile Include="System.Web.Extensions.Design\UpdateProgressAssociatedUpdatePanelIDConverter.cs" />

     <Compile Include="System.Web.Extensions.Design\UpdateProgressDesigner.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Web.Mobile/System.Web.Mobile.csproj b/mcs/class/System.Web.Mobile/System.Web.Mobile.csproj
index d75fa631fff..32663f16a5d 100644
--- a/mcs/class/System.Web.Mobile/System.Web.Mobile.csproj
+++ b/mcs/class/System.Web.Mobile/System.Web.Mobile.csproj
@@ -48,6 +48,13 @@
   <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Web.Razor/System.Web.Razor.csproj b/mcs/class/System.Web.Razor/System.Web.Razor.csproj
index fa60beb2d74..087f4bb6e32 100644
--- a/mcs/class/System.Web.Razor/System.Web.Razor.csproj
+++ b/mcs/class/System.Web.Razor/System.Web.Razor.csproj
@@ -196,6 +196,13 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions.csproj b/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions.csproj
index 9f03e6391f1..26e957edcc8 100644
--- a/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions.csproj
+++ b/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions.csproj
@@ -48,6 +48,13 @@
   <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Web.Routing/System.Web.Routing.csproj b/mcs/class/System.Web.Routing/System.Web.Routing.csproj
index a8bf1da1903..7c15108400c 100644
--- a/mcs/class/System.Web.Routing/System.Web.Routing.csproj
+++ b/mcs/class/System.Web.Routing/System.Web.Routing.csproj
@@ -47,6 +47,13 @@
   <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Web.Services/System.Web.Services.csproj b/mcs/class/System.Web.Services/System.Web.Services.csproj
index d7baf65aa4f..9c98b2de89a 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.csproj
+++ b/mcs/class/System.Web.Services/System.Web.Services.csproj
@@ -107,6 +107,13 @@
   <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">

     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />

diff --git a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment.csproj b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment.csproj
index 3ab2b026f13..3ffd618aa04 100644
--- a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment.csproj
+++ b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment.csproj
@@ -64,6 +64,13 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj
index b8dc346f1b3..5769c543375 100644
--- a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj
+++ b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj
@@ -67,6 +67,13 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Web.WebPages/System.Web.WebPages.csproj b/mcs/class/System.Web.WebPages/System.Web.WebPages.csproj
index c31f0f27202..9b75cffedf9 100644
--- a/mcs/class/System.Web.WebPages/System.Web.WebPages.csproj
+++ b/mcs/class/System.Web.WebPages/System.Web.WebPages.csproj
@@ -191,6 +191,13 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\VirtualPathUtilityWrapper.cs" />

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Web/System.Web.csproj b/mcs/class/System.Web/System.Web.csproj
index e921498bbc5..cc8a0ad0d54 100644
--- a/mcs/class/System.Web/System.Web.csproj
+++ b/mcs/class/System.Web/System.Web.csproj
@@ -1484,6 +1484,13 @@
     <Compile Include="System.Web\WebPageTraceListener.cs" />

     <Compile Include="System.Web\WebROCollection.cs" />

     <Compile Include="System.Web\XmlSiteMapProvider.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.csproj b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.csproj
index f3d9d9353f3..89c7267dfe1 100644
--- a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.csproj
+++ b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.csproj
@@ -184,6 +184,13 @@
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\VerticalLineAnnotation.cs" />

     <Compile Include="System.Windows.Forms.DataVisualization.Charting\ViewEventArgs.cs" />

     <Compile Include="System.Windows.Forms.DataVisualization.Charting\ZTestResult.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.csproj b/mcs/class/System.Windows.Forms/System.Windows.Forms.csproj
index 69aef31454a..615580ffd46 100644
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms.csproj
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.csproj
@@ -958,6 +958,13 @@
     <Compile Include="System.Windows.Forms\XplatUIStructs.cs" />

     <Compile Include="System.Windows.Forms\XplatUIWin32.cs" />

     <Compile Include="System.Windows.Forms\XplatUIX11.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Windows/System.Windows.csproj b/mcs/class/System.Windows/System.Windows.csproj
index e0ef3a3d4c4..e0f63fac9d2 100644
--- a/mcs/class/System.Windows/System.Windows.csproj
+++ b/mcs/class/System.Windows/System.Windows.csproj
@@ -108,6 +108,13 @@
     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="AssemblyInfo.cs" />

     <Compile Include="TypeForwarders.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Workflow.Activities/System.Workflow.Activities.csproj b/mcs/class/System.Workflow.Activities/System.Workflow.Activities.csproj
index f49b0fa467c..9101595df1b 100644
--- a/mcs/class/System.Workflow.Activities/System.Workflow.Activities.csproj
+++ b/mcs/class/System.Workflow.Activities/System.Workflow.Activities.csproj
@@ -48,6 +48,13 @@
   <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel.csproj b/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel.csproj
index 128351a9ab8..6a53725a3e8 100644
--- a/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel.csproj
+++ b/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel.csproj
@@ -48,6 +48,13 @@
   <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime.csproj b/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime.csproj
index 803e552c0c1..7e512a4fecd 100644
--- a/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime.csproj
+++ b/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime.csproj
@@ -48,6 +48,13 @@
   <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.XML/System.Xml.csproj b/mcs/class/System.XML/System.Xml.csproj
index ff175a22d66..86ddaa30982 100644
--- a/mcs/class/System.XML/System.Xml.csproj
+++ b/mcs/class/System.XML/System.Xml.csproj
@@ -607,6 +607,13 @@
     <Compile Include="ReferenceSources\Res.cs" />

     <Compile Include="ReferenceSources\ThisAssembly.cs" />

     <Compile Include="corefx\SR.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">

     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />

diff --git a/mcs/class/System.Xaml/System.Xaml.csproj b/mcs/class/System.Xaml/System.Xaml.csproj
index bef534d07c2..daed0e88939 100644
--- a/mcs/class/System.Xaml/System.Xaml.csproj
+++ b/mcs/class/System.Xaml/System.Xaml.csproj
@@ -166,6 +166,13 @@
     <Compile Include="System.Xaml\XamlXmlWriter.cs" />

     <Compile Include="System.Xaml\XamlXmlWriterException.cs" />

     <Compile Include="System.Xaml\XamlXmlWriterSettings.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/System.Xml.Serialization/System.Xml.Serialization.csproj b/mcs/class/System.Xml.Serialization/System.Xml.Serialization.csproj
index b404396434e..0e3a6aaf7e8 100644
--- a/mcs/class/System.Xml.Serialization/System.Xml.Serialization.csproj
+++ b/mcs/class/System.Xml.Serialization/System.Xml.Serialization.csproj
@@ -108,6 +108,13 @@
     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="AssemblyInfo.cs" />

     <Compile Include="TypeForwarders.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj b/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj
index d03cd0e5f4b..e0b43018c55 100644
--- a/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj
+++ b/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj
@@ -52,6 +52,13 @@
     <Compile Include="SystemWebTestShim\HttpCapabilitiesBase.cs" />

     <Compile Include="SystemWebTestShim\Page.cs" />

     <Compile Include="SystemWebTestShim\UrlUtils.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/WebMatrix.Data/WebMatrix.Data.csproj b/mcs/class/WebMatrix.Data/WebMatrix.Data.csproj
index 497f1d8da9f..1ad0b150e14 100644
--- a/mcs/class/WebMatrix.Data/WebMatrix.Data.csproj
+++ b/mcs/class/WebMatrix.Data/WebMatrix.Data.csproj
@@ -51,6 +51,13 @@
     <Compile Include="WebMatrix.Data\ConnectionEventArgs.cs" />

     <Compile Include="WebMatrix.Data\Database.cs" />

     <Compile Include="WebMatrix.Data\DynamicRecord.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/WindowsBase/WindowsBase.csproj b/mcs/class/WindowsBase/WindowsBase.csproj
index c6a9c650929..3ab0d8fcdd5 100644
--- a/mcs/class/WindowsBase/WindowsBase.csproj
+++ b/mcs/class/WindowsBase/WindowsBase.csproj
@@ -247,6 +247,13 @@
     <Compile Include="ZipSharp\ZipStream.cs" />

     <Compile Include="ZipSharp\ZipTime.cs" />

     <Compile Include="ZipSharp\ZipWriteStream.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/class/corlib/corlib.csproj b/mcs/class/corlib/corlib.csproj
index d2b371c563d..d614073a092 100644
--- a/mcs/class/corlib/corlib.csproj
+++ b/mcs/class/corlib/corlib.csproj
@@ -2012,6 +2012,13 @@
     <Compile Include="corert\Stream.cs" />

     <Compile Include="corert\Task.cs" />

     <Compile Include="corert\ThreadPool.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">

     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.X509Certificates\src\Microsoft\Win32\SafeHandles\SafePasswordHandle.Unix.cs" />

diff --git a/mcs/ilasm/ilasm.csproj b/mcs/ilasm/ilasm.csproj
index 24222b23dc1..9c28eb289f4 100644
--- a/mcs/ilasm/ilasm.csproj
+++ b/mcs/ilasm/ilasm.csproj
@@ -132,6 +132,13 @@
     <Compile Include="scanner\NumberHelper.cs" />

     <Compile Include="scanner\StringHelper.cs" />

     <Compile Include="scanner\StringHelperBase.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/mcs/mcs.csproj b/mcs/mcs/mcs.csproj
index 5c21cf4ef04..e43ab2a288f 100644
--- a/mcs/mcs/mcs.csproj
+++ b/mcs/mcs/mcs.csproj
@@ -193,6 +193,13 @@
     <Compile Include="typemanager.cs" />

     <Compile Include="typespec.cs" />

     <Compile Include="visit.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/tools/al/al.csproj b/mcs/tools/al/al.csproj
index b3813c98d35..d742945cd48 100644
--- a/mcs/tools/al/al.csproj
+++ b/mcs/tools/al/al.csproj
@@ -136,6 +136,13 @@
     <Compile Include="..\..\..\external\ikvm\reflect\coreclr.cs" />

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Al.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/tools/cccheck/cccheck.csproj b/mcs/tools/cccheck/cccheck.csproj
index 125582a9bd9..c232ffe1202 100644
--- a/mcs/tools/cccheck/cccheck.csproj
+++ b/mcs/tools/cccheck/cccheck.csproj
@@ -46,6 +46,13 @@
     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />

     <Compile Include="Program.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/tools/ccrewrite/ccrewrite.csproj b/mcs/tools/ccrewrite/ccrewrite.csproj
index 3496f8b11fe..357b3a0a505 100644
--- a/mcs/tools/ccrewrite/ccrewrite.csproj
+++ b/mcs/tools/ccrewrite/ccrewrite.csproj
@@ -46,6 +46,13 @@
     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />

     <Compile Include="Program.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/tools/disco/disco.csproj b/mcs/tools/disco/disco.csproj
index d3796c7d9b7..8e95e35b9f8 100644
--- a/mcs/tools/disco/disco.csproj
+++ b/mcs/tools/disco/disco.csproj
@@ -45,6 +45,13 @@
   <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="disco.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/tools/macpack/macpack.csproj b/mcs/tools/macpack/macpack.csproj
index 72106ff534e..e33b38f7a34 100644
--- a/mcs/tools/macpack/macpack.csproj
+++ b/mcs/tools/macpack/macpack.csproj
@@ -46,6 +46,13 @@
     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="AssemblyInfo.cs" />

     <Compile Include="MacPack.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/tools/mdoc/mdoc.csproj b/mcs/tools/mdoc/mdoc.csproj
index 48b03015e98..f46e530fcc0 100644
--- a/mcs/tools/mdoc/mdoc.csproj
+++ b/mcs/tools/mdoc/mdoc.csproj
@@ -74,6 +74,13 @@
     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />

     <Compile Include="cecil.mixin.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/tools/mono-configuration-crypto/cli/mono-configuration-crypto.csproj b/mcs/tools/mono-configuration-crypto/cli/mono-configuration-crypto.csproj
index f9461569bb5..d0b5ef25a29 100644
--- a/mcs/tools/mono-configuration-crypto/cli/mono-configuration-crypto.csproj
+++ b/mcs/tools/mono-configuration-crypto/cli/mono-configuration-crypto.csproj
@@ -47,6 +47,13 @@
     <Compile Include="..\..\..\class\Mono.Options\Mono.Options\Options.cs" />

     <Compile Include="config.cs" />

     <Compile Include="main.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto.csproj b/mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto.csproj
index df476247bd6..683cdfa7513 100644
--- a/mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto.csproj
+++ b/mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto.csproj
@@ -49,6 +49,13 @@
     <Compile Include="Mono.Configuration.Crypto\Key.cs" />

     <Compile Include="Mono.Configuration.Crypto\KeyContainer.cs" />

     <Compile Include="Mono.Configuration.Crypto\KeyContainerCollection.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/tools/mono-service/mono-service.csproj b/mcs/tools/mono-service/mono-service.csproj
index 93c590b83e4..b04e0c6a0c2 100644
--- a/mcs/tools/mono-service/mono-service.csproj
+++ b/mcs/tools/mono-service/mono-service.csproj
@@ -49,6 +49,13 @@
     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="AssemblyInfo.cs" />

     <Compile Include="mono-service.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/mcs/tools/resgen/resgen.csproj b/mcs/tools/resgen/resgen.csproj
index 94a2981916b..4e6e074b8ee 100644
--- a/mcs/tools/resgen/resgen.csproj
+++ b/mcs/tools/resgen/resgen.csproj
@@ -67,6 +67,13 @@
     <Compile Include="..\..\class\System.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="monoresgen.cs" />

+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

+      <Name>genconsts</Name>

+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+      <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

diff --git a/msvc/scripts/Makefile b/msvc/scripts/Makefile
index 49b7329bb6c..aae608c6f95 100644
--- a/msvc/scripts/Makefile
+++ b/msvc/scripts/Makefile
@@ -2,7 +2,8 @@ all: genproj.exe prepare.exe
 	mono --debug genproj.exe
 
 genproj.exe: genproj.cs ../../mcs/build/gensources.cs
-	csc -debug:portable genproj.cs ../../mcs/build/gensources.cs -main:Driver -r:System.dll -r:System.Core.dll 
+	-rm $@
+	csc -debug:portable genproj.cs ../../mcs/build/gensources.cs -main:Driver -r:System.dll -r:System.Core.dll -out:$@
 
 prepare.exe: prepare.cs
 	csc prepare.cs
diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs
index 86794ed0ef5..84e256e1550 100755
--- a/msvc/scripts/genproj.cs
+++ b/msvc/scripts/genproj.cs
@@ -229,7 +229,6 @@ public class MsbuildGenerator {
 	};
 
 	public static readonly (string, string[])[] fixed_dependencies = new [] {
-		("corlib/corlib.csproj", new [] { SlnGenerator.genconsts_csproj_guid }),
 		("class/System.Web/System.Web.csproj", new [] { culevel_guid })
 	};
 
@@ -884,9 +883,22 @@ public class MsbuildGenerator {
 			}
 		).ToList ();
 
+
 		result.Append ($"  <ItemGroup>{NewLine}");
 		foreach (var file in commonFiles.OrderBy (f => f, StringComparer.Ordinal))
 			result.Append ($"    <Compile Include=\"{file}\" />{NewLine}");
+
+		if (commonFiles.Any (f => f.EndsWith("build\\common\\Consts.cs"))) {
+			var genconstsRelativePath = "$(SolutionDir)\\msvc\\scripts\\genconsts.csproj";
+			result.Append ($"    <ProjectReference Include=\"{genconstsRelativePath}\">{NewLine}");
+			result.Append ($"      <Name>genconsts</Name>");
+			result.Append ($"      <Project>{SlnGenerator.genconsts_csproj_guid}</Project>");
+			result.Append ($"      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>");
+			result.Append ($"      <CopyToOutputDirectory>Never</CopyToOutputDirectory>");
+			result.Append ($"      <Private>False</Private>");
+			result.Append ($"    </ProjectReference>{NewLine}");			
+  		}
+  		
 		result.Append ($"  </ItemGroup>{NewLine}");
 
 		foreach (var set in targetFileSets) {