Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable Mono build in CI #1934

Merged
merged 56 commits into from
Jan 22, 2020
Merged

Enable Mono build in CI #1934

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
dda0e24
Enable Mono in default build
akoeplinger Jan 20, 2020
9dd624a
Install Mono build dependencies
akoeplinger Jan 20, 2020
b38c606
Integrate Mono into the build system
ViktorHofer Jan 20, 2020
b71b56d
Fix yml syntax
ViktorHofer Jan 20, 2020
3fc55c6
Fix yml #2
ViktorHofer Jan 20, 2020
8c1e766
Try another syntax
ViktorHofer Jan 20, 2020
fc15f62
Revert "Try another syntax"
ViktorHofer Jan 20, 2020
516c74e
RuntimeFlavor and yml
ViktorHofer Jan 21, 2020
b299e14
Merge branch 'master' into enable-mono-ci
akoeplinger Jan 21, 2020
20eca7c
Update build container images
ViktorHofer Jan 21, 2020
1cda2e3
Merge branch 'enable-mono-ci' of https://github.com/dotnet/runtime in…
ViktorHofer Jan 21, 2020
4e7474e
Fix yml
ViktorHofer Jan 21, 2020
d3622c4
Add libraries release test run on mono
ViktorHofer Jan 21, 2020
876a802
Installer yml fixes
ViktorHofer Jan 21, 2020
579cac8
Fix yml
ViktorHofer Jan 21, 2020
d38acee
Move yml block
ViktorHofer Jan 21, 2020
87dc59e
Yml fixes
ViktorHofer Jan 21, 2020
7c49749
Yml fix
ViktorHofer Jan 21, 2020
3e02bac
yml fix juhu
ViktorHofer Jan 21, 2020
00d3770
Yml fixes
ViktorHofer Jan 21, 2020
d05dd74
yml fixes
ViktorHofer Jan 21, 2020
015f2dc
yml again
ViktorHofer Jan 21, 2020
6b83c47
Build release only
ViktorHofer Jan 21, 2020
df16fe3
Fix yml
akoeplinger Jan 21, 2020
ec4268e
Revert "Build release only"
akoeplinger Jan 21, 2020
79a41ad
Merge remote-tracking branch 'upstream/master' into enable-mono-ci
akoeplinger Jan 22, 2020
4451143
Fix script args
akoeplinger Jan 22, 2020
23437a8
Remove corecrl specific args
akoeplinger Jan 22, 2020
d362d64
configure.ac fix
akoeplinger Jan 22, 2020
f5ad7f5
Disable not needed Windows builds
akoeplinger Jan 22, 2020
f2efbac
Update linux musl x64 container
ViktorHofer Jan 22, 2020
380795e
Change container back
ViktorHofer Jan 22, 2020
bc95ce3
Merge remote-tracking branch 'upstream/master' into enable-mono-ci
akoeplinger Jan 22, 2020
86419c6
Fix System.Private.CoreLib build in Mono
akoeplinger Jan 22, 2020
a70cb85
Fix mono configuration properties
ViktorHofer Jan 22, 2020
9fe3655
Merge branch 'enable-mono-ci' of https://github.com/dotnet/runtime in…
ViktorHofer Jan 22, 2020
ebb5853
Update container for linux arm64
ViktorHofer Jan 22, 2020
695feb4
Disable failing mono configurations in yml
ViktorHofer Jan 22, 2020
be29630
Revert alpine image update
ViktorHofer Jan 22, 2020
77207be
Foce clang for mono unix build
akoeplinger Jan 22, 2020
fd6d599
Use alpine image based on runtime flavor
ViktorHofer Jan 22, 2020
691837d
Merge branch 'enable-mono-ci' of https://github.com/dotnet/runtime in…
ViktorHofer Jan 22, 2020
b453b07
Fix yml
ViktorHofer Jan 22, 2020
e46af53
Yml updates
ViktorHofer Jan 22, 2020
614de00
Another yml display name approach
ViktorHofer Jan 22, 2020
1e97f40
Honor RuntimeArtifactsPath
ViktorHofer Jan 22, 2020
8374713
Update MonoConfiguration in Subsets
ViktorHofer Jan 22, 2020
7beff64
Fix installer build
ViktorHofer Jan 22, 2020
5d0de8d
Fix installer RuntimeArtifactsPath
ViktorHofer Jan 22, 2020
58fe4e7
Use clang differently
akoeplinger Jan 22, 2020
90788fc
Disable Windows runs
akoeplinger Jan 22, 2020
cfd3e79
Disable more tests
akoeplinger Jan 22, 2020
73bae92
Disable mono windows test runs
ViktorHofer Jan 22, 2020
b6df298
Fix doc about RuntimeFlavor
akoeplinger Jan 22, 2020
480e7cb
Disable more tests
akoeplinger Jan 22, 2020
060c3d8
Fix Windows build
akoeplinger Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix Windows build
  • Loading branch information
@akoeplinger
akoeplinger committed Jan 22, 2020
commit 060c3d82993d3b9684588d19a38b1bee21f11474
7 changes: 5 additions & 2 deletions src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,17 @@
<PropertyGroup>
<_MonoBuildParams>/p:MONO_BUILD_DIR_PREFIX=&quot;&quot;$(MonoObjDir)&quot;&quot; /p:MONO_ENABLE_NETCORE=true /p:CL_MPCount=8 /v:minimal</_MonoBuildParams>
<_MonoBuildParams Condition="$(MonoEnableLLVM) == true">/p:MONO_ENABLE_LLVM=true $(_MonoBuildParams)</_MonoBuildParams>
<_MonoBuildPlatform Condition="'$(Platform)' == 'x64'">x64</_MonoBuildPlatform>
<_MonoBuildPlatform Condition="'$(Platform)' == 'x86'">win32</_MonoBuildPlatform>
</PropertyGroup>
<Exec Command="msvc\run-msbuild.bat build $(Platform) $(Configuration) sgen &quot;$(_MonoBuildParams)&quot; msvc\mono-netcore.sln" IgnoreStandardErrorWarningFormat="true" />
<Exec Command="msvc\run-msbuild.bat build $(_MonoBuildPlatform) $(Configuration) sgen &quot;$(_MonoBuildParams)&quot; msvc\mono-netcore.sln" IgnoreStandardErrorWarningFormat="true" />
</Target>

<!-- General targets -->
<Target Name="Build" DependsOnTargets="BuildMonoRuntimeUnix;BuildMonoRuntimeWindows">
<PropertyGroup>
<_MonoRuntimeFilePath Condition="'$(TargetsWindows)' == 'true'">$(MonoObjDir)$(Platform)\Bin\$(Configuration)\mono-2.0-sgen.dll</_MonoRuntimeFilePath>
<_MonoRuntimeFilePath Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'">$(MonoObjDir)x64\Bin\$(Configuration)\mono-2.0-sgen.dll</_MonoRuntimeFilePath>
<_MonoRuntimeFilePath Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x86'">$(MonoObjDir)Win32\Bin\$(Configuration)\mono-2.0-sgen.dll</_MonoRuntimeFilePath>
<_MonoRuntimeFilePath Condition="'$(TargetsOSX)' == 'true'">$(MonoObjDir)mono\mini\.libs\libmonosgen-2.0.dylib</_MonoRuntimeFilePath>
<_MonoRuntimeFilePath Condition="'$(_MonoRuntimeFilePath)' == ''">$(MonoObjDir)mono\mini\.libs\libmonosgen-2.0.so</_MonoRuntimeFilePath>

Expand Down
3 changes: 3 additions & 0 deletions src/mono/msvc/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<!-- Ignore Directory.Build.props from root for msvc build -->
</Project>
3 changes: 3 additions & 0 deletions src/mono/msvc/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<!-- Ignore Directory.Build.targets from root for msvc build -->
</Project>