487 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
Alexander Köplinger 23b1249cc4 [bcl] Fix nunitlite app.config file custom logic for tests
Makes it possible to precompute these config without actually running the tests.

Allows System.Configuration tests to use a different file.
2018-09-27 22:46:49 +02: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
Egor Bogatov 51935465ae Delete unused files in BCL (#9288)
The following files in `mcs/class/*.cs` are not used anywhere (*.csproj/*.source).
2018-06-25 11:15:20 +02:00
Ludovic Henry 927ae95702 [build] Rename darwin platform to macos + Add unix host platform (#9022)
* [mcs] Rename darwin paltform to macos

Darwin is common to both macOS and iOS/tvOS/watchOS, while we use the darwin platform only for macOS.

* [mcs] Add Unix platform for other Unixes than Linux

* [mcs] Remove PLATFORMS from xammac_net_4_5 since it only make sense on macos

* [bcl] Bump corlib version

* [csproj] Update project files
2018-06-13 20:39:56 -04: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 d2998f5089 [msvc] Update csproj files 2018-02-09 11:24:46 -05:00
Marek Safar 71ad99f720 [build] Narrow recursive dependencies 2018-02-08 23:49:44 -05:00
monojenkins e51565c7e5 [msvc] Update csproj files (#6100) 2017-11-25 23:34:52 +01:00
Alexander Köplinger 5ef930b5f8 [bcl] Build some assemblies with -warnaserror (#5295)
* [bcl] Build some assemblies with -warnaserror

This ensures that we keep the build warning free.

We'll only opt-in a few assemblies that already have zero warnings.
We also only apply this when using csc as mcs might raise different warnings.

For now just opt-in assemblies in the net_4_x profile.
2017-11-24 14:05:39 +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
Marek Safar 6393dc1926 [System.Configuration] Refactor InitForConfiguration to be readable 2017-03-23 07:54:01 +01:00
Alexander Köplinger 44f06623bd [System.Configuration] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 7ad842c95c [bcl] Rename variables to avoid conflict with later renames 2017-03-16 13:02:09 +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
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 2550144e79 [corlib/System/System.Configuration] Fix tests relying on the current directory to be the test folder
nunitlite runs tests shadow-copied in a temp folder, so looking up the resource based on the current dir doesn't work.
2016-10-29 14:09:35 +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 01c9543e08 [bcl] Add patching of nunit-lite-console.exe.config file
Because nunit-lite runs everything in the same AppDomain, we can't use dll.config files for settings anymore.
Since a few test suites rely on being able to read those settings we need to patch them into the main
nunit-lite-console.exe.config file instead before the test.

Remove all _test.dll.config files and replace with nunit-lite patcher equivalent
2016-10-29 14:09:32 +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
Henric Müller 154e729860 Removing symlink to make Configuration tests run on Windows 2016-09-21 15:32:05 +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 79fa40e7f2 Remove referencesource submodule and move sources to mcs/class/referencesource
This simplified PR workflow and makes branching easier
2016-05-03 13:34:32 +02:00
Marek Safar 26b4a3d856 Merge pull request #2891 from xmcclure/bug-39669
Allow xml configuration sections to reference System.dll (bug#39669)
2016-04-20 08:09:32 +02:00
Marek Safar 39d63219ee [System.Configuration] Fail tests on standalone error 2016-04-19 23:24:12 +02:00
Andi McClure fee605ccc5 Add xml configuration section test (bug#39669) 2016-04-19 17:13:31 -04:00
Marek Safar 11059591da [System.Configuration] re-enable standalone tests 2016-04-19 23:10:21 +02:00
Andi McClure a2e91efda8 Allow xml configuration sections to reference System.dll (bug#39669)
<configuration><configSections><section> in a .config file takes a
type name as argument. Some of the allowed types are in System.dll.
The type lookup is done in System.Configuration.dll and does not find
these types. Check System.dll as a fallback to fix this.
2016-04-14 18:14:10 -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
Marcos Henrich 355d2c5eca Merge pull request #2400 from esdrubal/extrahead
[System] Fix extra head in config bug.
2016-02-15 12:21:29 +00: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