Use msbuild project reference to establish dependency on genconsts in…

…stead of solution dependencies (#9670) Using solution dependencies in ```bcl.sln``` seems flaky and seems like it might not establish the full ordering we need to ensure that ```Consts.cs``` exists before we build things that require it. Let's try using project references (where ```corlib.dll``` 'depends' on ```genconsts.exe```) instead. This should also insert the dependency for any project that includes Consts.cs instead of just corlib. This PR also makes update-solution-files actually fail if ```genconsts.exe``` fails to build because it was driving me mad. Part of #6886
mono · Aug 1, 2018 · feaf8ee · feaf8ee
1 parent 09c0cc5
commit feaf8ee
Show file tree

Hide file tree

Showing 128 changed files with 884 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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@ -->