510 Commits
Author SHA1 Message Date
Maxim Lipnin 55fbd14763 Remove nunit24 from mono build and tree (#13415)
* Remove nunit24 from mono build and tree

* More cleanup

* Fix build

* [csproj] Update project files
2019-03-13 23:47:39 +01:00
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 f5d42d2d55 [bcl] Start replacing gensources.sh with gensources.cs (#8619)
This PR introduces a new tool, gensources.cs, which replaces gensources.sh. It is able to parse the whole set of .sources files for a library in one go so that genproj can use that information to encode all our platform and profile specific files into one csproj file.

For now this PR just introduces it and switches libraries to using it instead of gensources.sh.
2018-05-22 12:22:53 +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
Bernhard Urban 30fd079c90 [mcs make] introduce TEST_RUNTIME_FLAGS, analogously to TEST_RUNTIME vs. RUNTIME 2017-11-06 15:50:32 +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
Ludovic Henry 5250b855e5 [mcs] Add platform specific files (#4837)
* [mcs] Rework %-recursive target to explicitely list subdirectories

* [mcs] Rename PLATFORM to BUILD_PLATFORM

* [mcs] Add platform specific files

This is to support adding corefx platform specific files. To do that, we now support `mcs/class/corlib/linux_net_4_x_corlib.dll.sources` for example, on top of `mcs/class/corlib/net_4_x_corlib.dll.sources` and `mcs/class/corlib/corlib.dll.sources`.

The 3 platforms that are supported are: `linux`, `darwin` and `win32`.

* [mcs] Build cross-platform bcl in separate folder
2017-05-11 19:19:09 -04:00
Alexander Köplinger f95b3f433c [bcl] Cleanup outdated csproj/sln files (#4806)
They were either replaced by the autogenerated csproj files
or just completely broken for years.
2017-05-09 00:07:45 +02:00
monojenkins 000e598f31 [msvc] Update csproj files (#4711) 2017-04-18 19:20:51 +02:00
Alexander Köplinger a9c402ffda [System.Web] Fix standalone-runner to return non-zero exit code on failure (#4562)
* [System.Web] Fix standalone-runner to return non-zero exit code on failure

We didn't notice that test runs with standalone-runner.exe failed
because it still exited with 0 in those cases.

Fixed that and the standalone tests that showed up as failed in
System.Web.Extensions (some differences likely from referencesource
code import).

* Fix replacement logic for Consts.cs.in to use Windows paths
2017-03-21 13:04:19 +01:00
Alexander Köplinger 00dac826ca [System.Web.Extensions] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger d61e7aca9a [bcl] Update tests that failed when .cs file contained CRLF
Most of them used multiline C# string literals which
means they contained the line ending character of the file.
Updated to make the tests resilient to having CRLF instead of LF.

Some of the mcs tests used a checksum to compare files,
ensured those are checked out using LF.
2017-01-28 02:25:55 +01:00
monojenkins 6c97220ddc [msvc] Update csproj files (#4221) 2017-01-10 19:33:39 +01:00
Alexander Köplinger 8027e0bb39 [bcl] Clean up old run-test.bat and *.csproj files
They .bat files haven't been used for a long time and don't work anymore.
The csproj files for the facades have a different name now.
2016-12-22 01:09:38 +01:00
monojenkins 36d4145426 [msvc] Update csproj files (#4074) 2016-12-01 22:04:12 +01:00
Marek Safar 47a6f56439 [bcl] Clean up some warnings 2016-11-29 19:16:02 +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 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 670c746e7e [System.Web.Extensions] Add test for last fix 2016-04-01 14:11:03 +02:00
Jussi Sainio 5c8d6e96c1 [System.Web.Extensions] Use CultureInfo.InvariantCulture for number parsing
Fixes #4242, see bug comments. JsonSerializer seems to have been already
fixed in abe9dc62. The JsonDeserializer number conversion is now much
stricter, allowing only integer number style for integers and float number
style for floats.
2016-04-01 14:10:33 +02:00
Alexander Köplinger b03e606287 Remove ChangeLog files from the repo
They weren't updated in the last 6 years and aren't helpful anymore (e.g. by causing unrelated matches during git grep searches).
2016-01-29 19:17:06 +01:00
Alexander Köplinger 180e745cce [bcl] Fix dll names and InternalsVisibleTo for test assemblies
The format of the test assembly name changed in 860334ff45
from System.Web_test_net_4_x.dll to net_4_x_System.Web_test.dll.

This fixes all the places where the old name was used.
2016-01-27 23:39:00 +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
João Matos a373c3d989 [build] Generated up-to-date net_4_x MSBuild projects. 2015-09-14 00:16:41 +01:00
Alexander Köplinger 98cf04084a [bcl] Remove NET_4_0 defines from class libs
NET_4_0 is always defined now, so the ifdefs are redundant.
I verified the libs are exactly the same after this change, so this is effectively a no-op.
2015-07-26 15:01:49 +02:00
Marek Safar d1c5a3e90b [System.Web.Extensions] Update default profile and remove old profiles files 2015-07-22 10:20:49 +02:00
Marcos Henrich 0ac4c24116 [System.Web.Extension] Fixes js deserialization.
Fixes JavaScriptSerializer.Deserialize of values with trailing spaces.
Fixes #4148.
2015-04-16 19:12:29 +01:00
Marcos Henrich d8e2ec1832 [System.Web.Extension] Added tests.
Tests JavaScriptSerializer.Deserialize with trailing white spaces.
Covers #4148
2015-04-16 19:11:33 +01:00
João Matos 8ac788afb3 [genproj] Re-generated the class library projects. 2015-03-17 18:15:58 +00:00
Alexander Kyte 2d0a5da8b4 Fixed early termination of string parsing on non-space whitespace. 2015-03-09 12:41:02 -04:00
Zoltan Varga ef380e3712 Rename Managed.Windows.Forms to System.Windows.Forms for consistency. 2015-03-03 15:59:16 -05:00