56 Commits
Author SHA1 Message Date
Alexander Köplinger b31a445e85 [gitattributes] Do CRLF normalization on sln/proj files
They can be used with native line endings.

We now have a shared folder with the dotnet repos and they have CRLF normalization enabled.
This difference leads to conflicts while applying changes from the dotnet repos to mono.
2019-03-06 08:34:01 +01:00
monojenkins caf22d5f0b [csproj] Update project files 2019-01-02 13:54:08 +01:00
Katelyn Gadd 84af5b235e Move the PreBuild dependency property later in the file so targets can't override it (#10429)
* Move the PreBuild dependency property later in the file so targets can't override it

* [csproj] Update project files
2018-09-02 17:54:01 +02:00
Katelyn Gadd a6a8abde09 Kill sln dependencies (#10406)
* Remove use of sln dependencies and use csproj project references instead

* Rewrite jay.vcxproj so it builds correctly even without help from the sln file

* Force pre-build event to run after references are resolved. Change how culevel.exe path is computed to be more resilient.

* [csproj] Update project files
2018-08-31 17:44:27 +02:00
Katelyn Gadd 14d20074ff Move to generating msbuild choose elements to get if-else selection behavior for sources in projects so that we don't get erroneous duplicate files in cases where there are both profile and host platform criteria (#9952)
A recent commit revealed that in cases where we select based on a mix of host platform and profile, genproj csproj files can end up with duplicate sources because the existing <ItemGroup Condition= approach could make multiple groups match for a given compile when we really just want one.

This PR changes to generating a cascade of msbuild <Choose> elements, which give if-else selection to ensure that we only ever build a single set of files.
2018-08-09 02:52:37 +02:00
Katelyn Gadd e271c293ee Rework genproj to use gensources to build sources list for each profile and host platform (#8985)
* Update genproj makefile to include gensources
Update genproj argument parser to be more generous about displaying help

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Fix rebase issue

* Checkpoint

* Checkpoint

* Fix built sources only being added to one profile

* Fix typo

* Checkpoint

* Fix indentation

* Use csc instead of mcs

* Checkpoint

* Fix BUILT_SOURCES only being handled for the first profile processed

* Checkpoint

* Checkpoint

* Strip double slashes from paths to fix spurious csproj change

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint: Fix genproj compilation

* Checkpoint

* Checkpoint

* Checkpoint

* Fix crash when no targets were loaded (due to an error)

* Checkpoint

* Checkpoint

* Checkpoint

* Fix TryParseTargetInto bug

* Checkpoint

* Shuffle exclude logic around so that it works correctly during genproj diffing

* Remove gensources tracing

* Checkpoint

* Fix handling of oddball sources paths from executable.make

* Fix jay not being set to build

* Fix wrong slashes being used for embedded resource paths

* [csproj] Update project files
2018-06-29 08:01:31 +02:00
monojenkins ab4d81e794 [csproj] Update project files 2018-05-31 23:34:33 +02:00
Katelyn Gadd 7eff6686fd Default platform to net_4_x if none is specified, to fix tools that build without setting a platform (#8223)
* Default platform to net_4_x if none is specified, to fix tools that build without setting a platform

* [csproj] Update project files
2018-04-16 09:54:53 -04:00
monojenkins 2f66873ab2 [msvc] Update csproj files (#7811)
* [msvc] Update csproj files

* [msvc] Delete old net_4_x.csproj and xbuild_12.csproj files
2018-03-28 19:29:28 +02:00
monojenkins 3e8f4f7db8 [msvc] Update csproj files (#7497) 2018-03-08 17:14:32 +01:00
monojenkins 12cbe9a7bd [msvc] Update csproj files (#7238) 2018-02-23 17:00:46 +01:00
monojenkins e51565c7e5 [msvc] Update csproj files (#6100) 2017-11-25 23:34:52 +01:00
Alexander Köplinger f1ff42789b [msvc] Update csproj files 2017-08-07 22:14:00 +02:00
Zoltan Varga 33d2d52644 [bcl] Specify the name of the key file on the command line instead of using the AssemblyKeyFile attribute for consistency and to make it easier to do path name manipulation on the file name. (#5316) 2017-08-07 14:03:48 +02:00
monojenkins 79cc1aeccd [msvc] Update csproj files (#4846) 2017-05-15 14:23:05 +02:00
monojenkins 000e598f31 [msvc] Update csproj files (#4711) 2017-04-18 19:20:51 +02:00
monojenkins 6c97220ddc [msvc] Update csproj files (#4221) 2017-01-10 19:33:39 +01:00
Alexander Köplinger 25e52ae81c [msvc] Update .csproj files 2016-11-14 15:34:27 +01:00
Alexander Köplinger 03ea8b5a62 [build] Regenerate .csproj files
Note: DISABLE_CAS_USE was removed in ed989a8e9e
2016-10-17 16:34:16 +02:00
Miguel de Icaza dd0b8f31d9 [genproj] support for using prebuilt resources 2016-05-31 16:50:55 -04:00
Miguel de Icaza 5515e33fb7 [genproj] Do not use \r on the Unix parts of the build hook, add RabbitMQ hooks 2016-05-27 13:24:16 -04:00
Miguel de Icaza 2f21472994 [genproj] Handle resources properly, add helper scripts to bootstrap 2016-05-24 17:44:11 -04:00
Miguel de Icaza 5100a64596 [msbuild projects] Use newlines without a carriage return for Unix targets to appease MS msbuild 2016-05-19 12:50:55 -04:00
Miguel de Icaza 33ed1e451f [genproj] Use an explicit IntermediateOutputPath to prevent rebuilds on cyclic assemblies 2016-05-18 17:59:25 -04:00
Miguel de Icaza 6cf2c991e9 genproj: Improve handling of executables and projects with build dependencies 2016-05-18 15:19:27 -04:00
Miguel de Icaza d57d91565b [genproj] Updates to project generator and csproj files.
* Adds support for a handful of new command line arguments that we now use in the build.

* Always attempts to match to a project name, to get the proper project dependency.

* Update to support .exe and .dll in the generation.

* Remove warnings and some dead code

* Update the resulting csproj files based on running:

make update-csproj
make package-inputs
mono genproj.exe
2016-05-17 21:31:14 -04:00
Marek Safar aeccd22792 [build] Change the way how mcs references are passed to compiler to always use full path.
One of csc prerequisites because csc uses -lib as path which is considered after
RuntimeEnvironment.GetRuntimeDirectory which makes -lib useless
2016-04-04 13:48:44 +02:00
Alexander Köplinger 9d24fb1564 [csproj] Remove *net_4_5.csproj files from the class libs
We only use the net_4_x profile now so those csproj's don't make sense anymore.
2015-12-01 22:19:36 +01:00
João Matos a373c3d989 [build] Generated up-to-date net_4_x MSBuild projects. 2015-09-14 00:16:41 +01:00
Marek Safar d44898a230 [build] Switch to 4.6 profile as default profile 2015-07-15 16:10:19 +02:00
João Matos 8ac788afb3 [genproj] Re-generated the class library projects. 2015-03-17 18:15:58 +00:00
Zoltan Varga 13685c2326 [build] Add the assemblies in LIB_REFS to LIB_MCS_FLAGS automatically to reduce duplication. 2015-03-02 14:03:56 -05:00
Zoltan Varga 37983f7fc3 [build] Add dependency information for class libraries using a LIB_REFS variable which lists the assemblies a given assembly depends on to build. 2015-02-26 22:27:27 -05:00
Alex Rønne Petersen 351e94964c Remove obsolete profiles and profile checks from the build system.
* Removed all old profiles from VALID_PROFILE checks.
* Removed most logic under checks like ifeq (net_2_0), $(PROFILE)) as
  it is dead code now that those old profiles are gone.
* Simplified the list of assemblies in mcs/class/Makefile now that we
  only have one profile.
* LIBRARY_NEEDS_POSTPROCESSING has been removed as it was only used by
  old 1.x assemblies that no longer exist.
* Build logic that sets MONO_PATH now points to mcs/class/lib/net_4_5
  instead of mcs/class/lib/net_2_0.
2015-02-03 03:41:14 +01:00
Marcos Henrich 80cd1c8a0f [build] Updated csproj files. 2015-01-13 17:47:48 +00:00
Marek Safar a1aced8ab2 Remove 4.0 profile 2014-12-04 15:16:31 +01:00
Miguel de Icaza 60fa2525fb [build] the csproj files can now do a full class libraries build 2014-05-25 00:47:09 -04:00
Miguel de Icaza 3599b97b57 [build] Fresh new csproj files based on the updated build system. 2014-05-23 17:15:53 -04:00
Miguel de Icaza d79280674b Refreshed the CSProj files to use the new output build directory 2014-04-18 18:15:35 -04:00
Atsushi Eno d4afca2276 Updated Rx to 2.2 release. 2013-12-17 03:30:39 +09:00
Marek Safar b888cf5f04 Update csproj files 2013-07-02 13:45:15 +02:00
Atsushi Eno 2edeeb60e7 rx: Add -d:HAS_AWAIT options to 4.5 and 2.1 builds. 2013-04-05 00:02:29 +09:00
Atsushi Eno 7890e1e824 [rx] Add missing AssemblyInfos. 2013-03-06 00:56:35 +09:00
Atsushi Eno cd6dc32e0b Add Assembly version attributes to hopefully fix bug #10002. 2013-03-05 23:57:39 +09:00
Marek Safar cf650fb3fb Update 4.5 bcl solution files 2013-02-21 17:25:06 +01:00
Atsushi Eno ba26046224 Revert previous revert to old rx.
Desktop rx should be up to date. mcs and runtime needs to be fixed for mobile.
2013-02-06 18:44:59 +09:00
Atsushi Eno f6093bbb3b Revert "update rx to the latest rx-oss-v1.1 build."
This reverts commit 924ab25739.

Conflicts:
	external/rx
	mcs/class/build-rx-dll-sources.sh
	mcs/class/project_template_android.txt
	mcs/class/project_template_ios.txt
2013-01-24 16:41:44 +09:00
Atsushi Eno 924ab25739 update rx to the latest rx-oss-v1.1 build. 2013-01-22 19:21:48 +09:00
Atsushi Eno 3330034e6e Add Reactive Extensions as installed libs, take 2 (with fixed rpmspec this time). 2012-12-11 15:34:19 +09:00
Atsushi Eno bdfc0f36c0 set NO_INSTALL = yes until we decide how to deal with them and fix dist. 2012-11-15 14:36:29 +09:00