209 Commits
Author SHA1 Message Date
Johan Lorensson 4f8a82c9fd Upgrade build scripts to support VS2019. (#17269)
Changes will default Windows SDK version as well as Platform Toolset to
the default versions used in the targeted VS version. If the projects are
opened up in VS2015, it should default to Windows SDK 8.1 and v140, but if
the same projects are opened in VS2019, it will default to latest Windows SDK 10
and v142. This way the project files should adapt to used VS version, meaning
that we could still build them using VS2015 (what's currently used on CI) but also
using VS2017 and VS2019. There should not be a need to install any previous versions
of build tools, unless an older version is targeted. It is also possible to set
PlatformToolset when calling msbuild and that should adapt to corresponding default
Windows SDK version for targeted toolset version.

Commit makes many changes and adjustments, aligning all vcxproj files but changes
should not affect build output.
2019-10-17 08:55:50 +02:00
Katelyn Gadd add2a211b3 Infrastructure support / fixes for making compiler server the default (#14279)
* Fix enabling the compiler server using autogen, and force it off if mcs is being used

* autogen updates

* Formatting fixes

* Fix vbcs getting turned on if unspecified even if mcs was selected

* Dynamically evaluate ENABLE_COMPILER_SERVER each time we compile instead of evaluating it once at some arbitrary point during makefile evaluation

* More detailed comment based on testing

* Handle the /shared option in genproj so it doesn't fail

* Raise basic profile check requirement to 6.2 and hopefully assert that named pipes work

* Default compiler server to off for now.
2019-05-28 23:54:44 -07:00
Johan Lorensson d3a2841e93 Adjust genconst to changes in winsetup.bat. (#13554)
When logic moved from winsetup.bat into an msbuild task that changed the
console output of winsetup.bat causing problems for genconst to find
MONO_VERSION and MONO_CORLIB_VERSION. There was also a potential problem
where winsetup.bat couldn't find msbuild.exe if not included in PATH.

This fix makes sure winsetup.bat detect and setup a full msbuild environment
before running msbuild.exe. It also change genconsts to look at the generated
config.h for the correct values of MONO_VERSION and MONO_CORLIB_VERSION that
will be used by the runtime builds.
2019-03-20 18:48:20 -04:00
Alexander Köplinger 362eface2c Remove more unnecessary nunit24 cruft 2019-03-18 11:31:06 +01:00
lateralusX dab3cc35c0 Windows full AOT build scripts update.
* Only do clean/rebuild when an assembly changed.
* Add wrappers for different full AOT build configurations.
* Make scripts callable from different working directory.
2019-03-15 15:58:50 +01:00
Alexander Köplinger 92b435d6fe Move drawing types for XI/XM/wasm/orbis/unreal to System.Drawing.Common (#13414)
* Move drawing types for XI/XM/wasm/orbis/unreal to System.Drawing.Common

For XI/XM they were in Xamarin.iOS.dll/OpenTK-1.0.dll before.

For wasm/orbis/unreal we remove System.Drawing.dll from the profiles and
add the types to System.Drawing.Common.dll instead to align with the other
mobile profiles (only "net_4_x" and "build" still have System.Drawing.dll).

* Bump API snapshot submodule

* [csproj] Update project files
2019-03-12 18:07:19 +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
Alexander Köplinger 311d1952af [bcl] Embed Source Link information (#12403)
Source Link allows IDEs/debuggers to retrieve a source file from a remote location like GitHub when the local file isn't available.

Specification: https://github.com/dotnet/designs/blob/e55c517a1e7f8dc35b092397058029531209d610/accepted/diagnostics/source-link.md

For now we only embed info about mono, cecil, corefx and corert since that covers 99% of what you usually want to debug and doesn't need fancy logic that reads git submodules and figures out their URLs.

Should enable use cases like https://twitter.com/jlaban/status/1084248087802060801
2019-01-14 15:16:31 +01:00
Leonardo Galli 1746f09efe [build] Fixed csproj.tmpl for macos: Conflict in naming of HostPlatform.
macOS was used for checking HostPlatform for OSX, but darwin is what the value was set to. This fixes the solution and csproj files for OSX.
2019-01-02 13:54:08 +01:00
Martin Baulig e72f0a8a03 [gensources]: Add platform/project logic to tests.
The gensources tool now supports platform/specific .sources for nunit and xunit tests.
2018-12-18 13:14:07 +01:00
lateralusX 8548b21a92 Make used environment variables local to test scripts. 2018-11-26 17:24:35 +01:00
Marek Safar 8d8fd97dbf [build] Unify bootstrap profiles (#11024)
* [build] Unify bootstrap profiles

We can now rely on build only as we have reliable monolite and package
compilers

* Fixes genproj dependencies

* [csproj] Update project files
2018-10-10 08:49:38 -07:00
Katelyn Gadd 2abb347ffa Fix forceBuild not working for projects with unknown platform names (i.e. jay) (#10485)
* Fix forceBuild not working for projects with unknown platform names (i.e. jay)

* Clean up error messages
2018-09-12 13:58:34 -04: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 b97b890334 Update corlib post-build event to run ilasm for Unsafe.il, then pass it to cil-stringreplacer (#10381)
This ensures that System.CompilerServices.Unsafe has implemented method bodies, necessary for Span and similar use cases.
2018-08-31 17:48:07 +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 7639f98983 Ensure cil-stringreplacer is built and used to post-process mscorlib when building using msbuild (#9859)
* Manually add a csproj file for cil-stringreplacer
Adjust trace level for genproj

* Manually add cil-stringreplacer to bcl.sln and set it as a dependency of corlib

* Fix typo

* Add post-build event to corlib that runs cil-stringreplacer on it in mscorlib mode

* [csproj] Update project files
2018-08-03 13:58:44 -07: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
Jay Krell c6b8cecb9d Change corlib version to a string, so that you can use uuidgen (or a git hash or github PR). (#9787) 2018-07-30 01:25:35 -07:00
Alexander Köplinger 2f5bfcd48c [genconsts] Fix PostBuildEvent
The Microsoft.CSharp.targets import needs to come before the PostBuildEvent,
otherwise TargetPath won't be set.
2018-07-18 21:58:44 +02:00
Katelyn Gadd 5ff02dd3bf Auto-generate Consts.cs on Windows when building from Visual Studio (#9598)
This adds a simple script for generating Consts.cs that can run on Windows, and makes it a dependency of corlib.csproj in the BCL solution file. From my initial testing this will autogenerate Consts.cs if it's missing and then corlib will successfully build.
This (mostly?) addresses issue https://github.com/mono/mono/issues/6886.

This currently has an awkward dependency on ```winsetup.bat``` and I modified it slightly to make it clearer whether the batch file succeeded.
2018-07-18 02:04:42 +02:00
lateralusX 8dd6baee6e Enable SIMD optimization on Windows x64.
When implementing Windows x64 valuetype ABI mono’s SIMD optimization didn’t
handle the case when passed arguments uses ArgValuetypeAddrInIReg/
ArgValuetypeAddrOnStack so optimization was disabled on Windows x64.

This commit fixes mono SIMD support for ABI’s passing value types using
ArgValuetypeAddrInIReg/ArgValuetypeAddrOnStack on Windows x64. It does this
as part of regular value type decomposition, including a pass decomposing SIMD
intrinsic ending up as arguments of type OP_ARG into correct load/store of the
value type reference before argument can be used by SIMD instructions.

All JIT and full AOT regression tests pass with enabled SIMD optimization
on Windows x64. Running this optimization on some vector intensive applications
showed some great performance increase. Just running this on basic-simd.exe
regression shows:

Elapsed time: 0.040471 secs (no optimizations at all)
Elapsed time: 0.015756 secs (only simd and intrins optimization)

So in this small, isolated test, the optimization indicates a 2.5x performance increase.
2018-07-09 13:52:28 +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
Johan Lorensson 622a1b6f55 Helper scripts running mini regression tests in JIT/Full AOT on Windows. (#9252)
* Helper scripts running mini regression tests in JIT/Full AOT on Windows.

A set of helper scripts running all mini regression tests, supporting both
JIT and full AOT (including building full AOT assemblies) using local build
Visual Studio mono runtime (can be switched in setp.env.bat). Includes logic
to pick correct Visual Studio toolchain and support to setup command prompt
targeting x64 full AOT build and running tests. NOTE, the scripts are not limited
to the mini regression tests, only includes a set of predefined assemblies making
it easier to execute regression tests.

Full AOT scripts includes capabilities to build dynamic library, static linked objects
or assembler output, it also supports switches to use LLVM when building full AOT
assemblies if supported by local build mono runtime.

By default, scripts follow default build configurations used by mono BCL builds and
Visual Studio x64 Release build mono runtime.

Examples to run all JIT regression tests:

run-jit-regression.bat all

To run individual programs using JIT (doesn’t need to be a regression test):

run-jit.bat [full path to assembly]

NOTE, for regression tests there is a shortcut making them easier to locate,
so then just the assembly name can be used, not the full path is needed.

run-jit.bat basic.exe

Examples to build all regression tests using full AOT:

build-full-aot-regression-tests.bat all

Builds all regression tests in full AOT including all needed support and
BCL assemblies. All build assemblies will end up in msvc\build\fullaot\winaot
folder by default. It is possible to build individual assemblies as well using:

build-full-aot-regression-tests.bat [full path to assembly]

NOTE, for regression tests there is a shortcut making them easier to locate,
so then just the assembly name can be used, not the full path is needed.

build-full-aot-regression-tests.bat basic.exe

Examples to run all regression tests using full AOT:

run-full-aot-regression-tests.bat all

Runs all regression tests in full AOT. It is possible to run individual assemblies
as well using:

run-full-aot-regression-tests.bat [full path to assembly]

NOTE, for regression tests there is a shortcut making them easier to locate,
so then just the assembly name can be used, not the full path is needed.

run-full-aot-regression-tests.bat basic.exe

There are some more features included in the scripts as well, but above shows
basic usage. It could also be possible to reuse the scripts in Visual Studio
build targets going forward to at least run the JIT regression tests
as part of Visual Studio build.

* Fixed some review feedback.

* Switching to 1 instead of -1 in case of errors.
* Used case insensetiv compare for some if's.
* Dropped use of ECHO OFF/ON in nested scripts.
* Removed clear of PATH (was not intended).
2018-06-22 18:23:08 +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
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
Alexander Köplinger b5bcec428e [ci] Update csproj files during PRs (#8052)
* [ci] Update csproj files during PRs

Similar to how API diff is done.

Replace EXTERNAL_DRAWING_FACADE in csproj in genproj
It'd embed the absolute path in the csproj, but we want the variable instead.

* [csproj] Update project files
2018-04-10 00:32:08 +02:00
Alexander Köplinger e1eaedb6e8 [genproj] Sort embedded resources by name 2018-04-05 23:01:47 +02:00
Marek Safar c583d4e1fa [build] Rename VS managed solution (#8050) 2018-04-05 18:58:06 +02:00
Alexander Köplinger f9475164d9 [genproj] Add Mono.CSharp.pre and fix genproj postbuild bug (#7991)
We weren't emitting the postbuild script.
2018-04-03 23:52:43 +02:00
Katelyn Gadd 4d78aaf7b4 [genproj] When using fallback profile selection don't build the projects that were missing a profile (#7926)
Fixes #7903.
2018-03-31 01:06:07 +02: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
Alexander Köplinger ab62d30edb [genproj] Move obj to common folder and remove unnecessary properties (#7870)
* [genproj] Move obj to common folder and remove unnecessary properties

We now default to mcs/class/obj instead of writing to the assembly folder.

* [genproj] Fix jay path on Unix

* [genproj] Fix IntermediateOutputPath for Facades
2018-03-28 17:51:47 +02:00
Alexander Köplinger 5e1acb47f5 [genproj] Deduplication of project references (#7844) 2018-03-27 02:47:19 +02:00
Alexander Köplinger 506fc0b522 [genproj] Deduplication of sources (#7810)
This implements a simple deduplication of source files in the .csproj's.

A postprocessing step opens the files and grabs all ItemGroups with sources
and then does an intersection. It then moves files that are common
across all platforms into a separate ItemGroup.
2018-03-23 23:56:02 +01:00
Katelyn Gadd 954911d3f1 Genproj updates for BCL build in Windows Visual Studio (#7755)
This batch of commits makes further updates to our support for building the BCL using msbuild (Visual Studio, to be specific).

* Generates a single sln and set of csproj files with support for all of our build profiles (orbis, monodroid, net_4_x, etc)
* Project configuration selector (in VS or as parameter to msbuild) can be used to select which profile to build
* Includes partial dependency information so that culevel and jay are compiled before the rest of the sln (this keeps pre/post events from from failing on first build)

As of this rev things are working pretty good, but a lot of the measures I took here are temporary so I'd appreciate thoughts on how to go about them. The hard-coded System.Web -> Culevel dependency feels gross, for example - I kind of want to go through and build an automatic solution for it but I'm not sure it's necessary.

Implements #6858

---

* Checkpoint: Generate single .csproj file with conditional item/property groups

* Checkpoint: Updates to csproj and sln generation to support building specific profiles

* Move targets file in csproj template so that it isn't evaluated before all properties are set

* Checkpoint profile fallback (use net_4_x if project does not have appropriate profile)

* Use in-process cache for project guids to fix bug where many guids were being generated. Fix profile fallback.

* Clean up unnecessary debug writelines

* genproj error fixes

* Remove duplicate gacutil entry from makefile to fix order.xml corruption. Cleaner project names in msbuild sln. Compile genproj before generating inputs.

* Delete genproj.exe at beginning of update-solution-files because otherwise syntax errors will cause an old version to be used silently
Cleaner messages from genproj

* Hard-code the guid for culevel and add it as a dependency for system.web

* Bug fixes

* sln files are sensitive to whitespace format

* Don't generate pointless solution configurations if we have no information for them

* Updates based on PR feedback
2018-03-23 23:35:21 +01:00
Katelyn Gadd f0b7825189 Updates to support building the BCL using Visual Studio 2017 on windows (#6877) 2018-02-22 23:48:37 +01:00
Mikhail Filippov 2f6005cc21 Fix NUnit reference generation 2018-01-23 14:40:00 +01:00
Egor Bogatov 50b6a2e823 Fix genproj.cs (make update-solution-files) (#6162)
make update-solution-files works but actually throws an ArgumentOutOfRangeException and as a result - corrupted csproj (fails on System.Runtime.CompilerServices.Unsafe -
System.Runtime.CompilerServices.Unsafe.dll.sources is empty)
2017-12-05 11:37:15 -05:00
Alexander Köplinger e8e92e5323 [genproj] Support setting /langversion in csproj (#6096) 2017-11-24 23:45:23 +01:00
Mikhail Filippov 05fae5f1fa Add ignoring features option into genproj 2017-11-13 06:51:50 -08:00
Egor Bogatov be99d5f32c Add test projects (optional) to net_4_x.sln (#5633)
* add tests to net_4_x.sln

* remove redundant string.Format
2017-09-25 16:02:36 +02:00
Alexander Köplinger 83dde0759f [genproj] Simplify strong name key handling
It doesn't need to be in a separate PropertyGroup.
2017-08-07 22:10:58 +02:00
Alexander Köplinger b41b5928ec [msvc] Remove order.xml (#4867)
It's a build artifact anyway since we check in the generated csproj's
so you don't really need the order.xml.

After the new platform-specific BCL changes went in it also started
containing stuff like `-r:./../../class/lib/net_4_x-linux/mscorlib.dll`
which makes it even less useful to have checked in as it'd get
changed when you build on OSX for example.
2017-05-16 12:10:34 +02:00
monojenkins 79cc1aeccd [msvc] Update csproj files (#4846) 2017-05-15 14:23:05 +02:00
Alexander Köplinger 291a32febc [csproj] Update generator to handle platform-specific assemblies (#4847)
After https://github.com/mono/mono/pull/4837 was merged the
csproj update bot started sending PRs which hardcoded net_4_x-linux
as the OutputPath.

Updated the csproj generator to detect this and use a variable
in the OutputPath instead. It'll autodetect based on the current OS
and can be overriden by passing /p:HostPlatform=foobar to msbuild.

Ideally we'd have configurations for each platform in the csproj since
in the future the file lists will be different but this is a first step.
2017-05-13 17:26:35 +02:00
monojenkins 5d33eca131 [msvc] Update csproj files (#4813) 2017-05-09 18:58:10 +02:00
monojenkins 3e46fb402b [msvc] Update csproj files (#4776) 2017-04-29 18:35:42 +02:00