152 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 feaf8ee391 Use msbuild project reference to establish dependency on genconsts instead 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
2018-08-02 00:30:54 +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
Alexander Köplinger bb7a6f2b1b [csproj] Fix mixed line endings 2018-04-27 03:01:28 +02:00
Egor Bogatov bce083b1dc CoreFX: System.Json, System.ServiceModel.Syndication, System.Threading.Tasks.Dataflow (#8246)
Use corefx sources and tests for:
- System.Json
- System.ServiceModel.Syndication
- System.Threading.Tasks.Dataflow
2018-04-26 19:38:03 +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
Marek Safar e6de24c2d1 [build] Unify DEFAULT_REFERENCE handling so I can override it with TARGET_NET_REFERENCE for individual tools 2018-03-07 22:48:05 +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 1a89bfde05 [System.Xml/System.ServiceModel/Dataflow] Use more specific type in assert
Apparently nunitlite is more strict here so we need to allow subclasses as well
and test for the more specific type.
2016-10-29 14:09:39 +02:00
Marcos Henrich 863dc73d19 [bcl] Add NUnitHelper.cs with API not in nunit-lite
NUnitHelper.cs adds CollectionAssert, FileAssert, StringAssert.

Also adds AssertHelper class with methods that are not part of nunitlite
Assert class.
2016-10-29 14:09:33 +02: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
Alexander Köplinger 9d40383ca9 [Dataflow] Bump timeouts in TransformBlockTest.DeferredUsage
It failed a couple of times according to the babysitter logs with the following error:

```
MESSAGE:
Expected and actual are both <System.Int32[10]>
  Values differ at index [1]
  Expected: -1
  But was:  0
```

Bump timeouts a little bit to see if this helps.
2016-09-04 20:11:36 +02: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 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 bed9bc56d8 [bcl] Ensure all .sources files have newline at the end
It causes an issue with gensources.sh when using #include on Linux otherwise.
2016-03-04 21:48:09 +01:00
Alexander Köplinger 173add3aee [csproj] Update order.xml and csproj files 2015-12-01 22:19:36 +01: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
Alexander Köplinger d17c5407a4 [System.Threading.Tasks.Dataflow] Replace implementation with CoreFx version
We were seeing some random test failures on Jenkins with our Dataflow implementation.
Replacing it with Microsoft's CoreFx version fixed those and makes us more compatible.

While we'd ideally not ship this assembly at all with Mono (it doesn't ship with .NET),
we shipped it in the past and as such people might rely on it so we can't remove it.

The CoreFx commit this version was taken is 905a1940bcda0afdca2f14ceb2b0161ebc4d1d02.
2015-11-16 17:17:02 +01:00
Alexander Köplinger 0f6b85f08b [Dataflow] Fix flaky tests by bumping timeouts
We were seeing random Dataflow tests fail on Jenkins from time to time.
I managed to reproduce the BroadcastBlockTest.CloningTest and WriteOnceBlockTest.CloningTest
fail on my machine by generating CPU load and running those test in a while(true).

Bumping the timeouts from 100ms -> 1s fixed the flakiness for me, so I went ahead and
opportunistically bumped all such small timeouts throughout the testsuite.
2015-11-11 22:40:28 +01:00
Ludovic Henry f8ea020356 [tests] Increase timeout before failing 2015-10-26 15:50:25 +00:00
João Matos a373c3d989 [build] Generated up-to-date net_4_x MSBuild projects. 2015-09-14 00:16:41 +01:00
João Matos 8ac788afb3 [genproj] Re-generated the class library projects. 2015-03-17 18:15:58 +00:00
Alexander Köplinger 2b5da76670 [Dataflow] Disable flaky FaultExecutingConsume () test
It fails randomly on Jenkins and my own CI. To reproduce, just wrap the body of the test in while(true) and run for a few minutes.
I tested on MS.NET as well and it fails the same way there, so it's not Mono's implementation of Dataflow.

Filed https://bugzilla.xamarin.com/show_bug.cgi?id=27757 for tracking.
2015-03-08 21:51:48 +01: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
João Matos 32db079545 [build] Updated the class library MSBuild projects. 2015-01-29 17:02:08 +00:00
Zoltan Varga 43a9f2af11 [bcl] Fix System.Threading.Tasks.Dataflow tests. 2015-01-16 19:49:00 -05:00
Marek Safar 014e3493b1 [System.Threading.Tasks.Dataflow] update atomicboolen location 2015-01-16 19:20:48 +01:00
Marcos Henrich 80cd1c8a0f [build] Updated csproj files. 2015-01-13 17:47:48 +00:00
Alex Rønne Petersen bc876c2427 [bcl] Remove all uses of Thread.Volatile{Read,Write}.
These methods are broken, misleading, and generally harmful. Always prefer the
`Volatile` class over these to make intent clear and to get sensible semantics.

http://blog.alexrp.com/2014/03/30/dot-net-atomics-and-memory-model-semantics/
2014-12-03 19:19:51 +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