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.

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

Fix ASP.NET #1482

Merged
merged 30 commits into from
Apr 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
fa84ef7
Install mono and xsp from official packages
pdonald Dec 22, 2014
7472757
Update ASP.NET dependencies
pdonald Dec 22, 2014
b0b6529
Fix nginx for ASP.NET
pdonald Dec 22, 2014
9a1c67c
Upgrade to ASP.NET MVC 5.2.2
pdonald Dec 22, 2014
da542e8
Install mono from snapshot packages and fix nginx
pdonald Dec 22, 2014
fec6a0c
Travis was using old mono
pdonald Dec 22, 2014
42029a7
Try to fix mono install from snapshots
pdonald Dec 22, 2014
0037eca
Don't trim response in travis logs
pdonald Dec 22, 2014
d669d92
Fix setup_nginx for ASP.NET
pdonald Dec 22, 2014
d1bd788
Trim response
pdonald Dec 22, 2014
8a79781
Remove meta charset from fortunes in ASP.NET
pdonald Dec 22, 2014
197d492
Remove bash_profile.sh from ASP.NET
pdonald Dec 23, 2014
85169bc
Refactor ASP.NET msbuild
pdonald Dec 23, 2014
04ae558
Install mono from snapshot packages without sudo
pdonald Dec 26, 2014
9e68ea0
Fix mono install
pdonald Dec 26, 2014
8fc98a5
Debug travis mono ssl
pdonald Dec 26, 2014
03ef821
Debug travis mono ssl
pdonald Dec 26, 2014
15f0ddc
Do we need certmgr?
pdonald Dec 26, 2014
a41af8e
Merge branch 'aspnet' of https://github.com/pdonald/FrameworkBenchmar…
hamiltont Apr 2, 2015
9ec86a3
Split mono's installing from installed
hamiltont Apr 2, 2015
b3d3011
Try other snapdate
hamiltont Apr 2, 2015
b3000a3
Try another snapdate
hamiltont Apr 2, 2015
ce5220f
Enable chown on installs directory inside vagrant
hamiltont Apr 2, 2015
66235b6
Update mailmap
hamiltont Apr 3, 2015
153200f
Implement no sudo apt-to-IROOT function
hamiltont Apr 3, 2015
6eb1036
Fix #1480
hamiltont Apr 3, 2015
61cfecd
Download from debian repository instead of wget
hamiltont Apr 3, 2015
5f772b7
Use apt repo to find latest snapshot
hamiltont Apr 3, 2015
fd3d2db
Add a comment to interesting discussion
hamiltont Apr 3, 2015
2409e01
Fix MongoDB in Travis-CI
hamiltont Apr 3, 2015
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
18 changes: 17 additions & 1 deletion .mailmap
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,27 @@ Adam Chlipala <adam@chlipala.net> <adamc@csail.mit.edu>
Alex Schneider <aschneider@techempower.com> <aschneider@techempower> Alexander Schneider
Alex Schneider <aschneider@techempower.com> Alexander Schneider <aschneider@techempower.com>

Aoyama Kazuharu <a.kazuharu@gmail.com> AOYAMA Kazuharu <a.kazuharu@gmail.com>
Aoyama Kazuharu <a.kazuharu@gmail.com> AOYAMA Kazuharu <aoyama@ideeinc.co.jp>

Brian Clozel <bclozel@pivotal.io> Brian Clozel <bclozel@gopivotal.com>

Christian Knuth <ikkez0n3@gmail.com> <c.knuth@Christian-Knuth-2.local>

Donovan Muller <donovan.muller@gmail.com> donovanmuller <donovan.muller@gmail.com>

Eduardo Silva <edsiper@gmail.com> <eduardo@monkey.io>

Finn Bock <bock.finn@gmail.com> bckfnn <bock.finn@gmail.com>

Gerard Roche <bullfrogblues@live.com> <gerardroche@users.noreply.github.com>

Gjero Krsteski <gjero@krsteski.de> gjerokrsteski <gjero@krsteski.de>
Gjero Krsteski <gjero@krsteski.de> g.krsteski <g.krsteski@controlexpert.com>

Haley Young <hyoung4@lion.lmu.edu> haleyyoung <haleyyoung88@gmail.com>
Haley Young <hyoung4@lion.lmu.edu> haleyyoung <hyoung4@lion.lmu.edu>

INADA Naoki <inada-n@klab.com> <methane@users.noreply.github.com>
INADA Naoki <inada-n@klab.com> <songofacandy@gmail.com>

Expand All @@ -23,7 +33,8 @@ Juan José Aguililla <juanjoaguililla@gmail.com> jamming <juanjoaguililla@gmail.

Karol Buček <self@kares.org> kares <self@kares.org>

Lari Hotari <lari.hotari@sagire.fi> <lhotari@gopivotal.com>
Lari Hotari <lhotari@pivotal.io> Lari Hotari <lari.hotari@sagire.fi>
Lari Hotari <lhotari@pivotal.io> Lari Hotari <lhotari@gopivotal.com>

Leandro Pereira <leandro@hardinfo.org> <leandro@tia.mat.br>

Expand All @@ -41,6 +52,7 @@ mcocciaTE <mcoccia@techempower.com> mcoccia <mcoccia@techempower.com>

Mike Smith <msmith@techempower.com> Mike Smith <msmith@techempower.com>
Mike Smith <msmith@techempower.com> msmith-techempower <msmith@techempower.com>
Mike Smith <msmith@techempower.com> msmith <msmith@techempower.com>

Raphael Andre Bauer <raphael.andre.bauer@gmail.com> reyez <raphael.andre.bauer@gmail.com>

Expand All @@ -50,6 +62,10 @@ Stefan Geneshky <stefanguen@gmail.com> Stefan G <stefanguen@gmail.com>

Stefano Casazza <stefano.casazza@gmail.com> stefanocasazza <stefano.casazza@gmail.com>
Stefano Casazza <stefano.casazza@gmail.com> stefanocasazza <stefanocasazza@gmail.com>
Stefano Casazza <stefano.casazza@gmail.com> stefano casazza <stefanocasazza@users.noreply.github.com>

Shengjun Yu <apieceofredcloth@gmail.com> shengjun yu <apieceofredcloth@users.noreply.github.com>
Shengjun Yu <apieceofredcloth@gmail.com> yushengjun <apieceofredcloth@gmail.com>

Skamander <sam@sksamuel.com> sksamuel <sam@sksamuel.com>

Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,3 @@ install:
script:
# Pick one test in this directory and verify
- time ./toolset/run-ci.py verify "$TESTDIR"

11 changes: 10 additions & 1 deletion deployment/vagrant-common/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,17 @@ if [ ! -e "~/.firstboot" ]; then
# If they didn't sync, we need to clone it
if [ -d "/FrameworkBenchmarks" ]; then
ln -s /FrameworkBenchmarks $FWROOT
echo "Removing installs/ and results/ folders so they do not interfere"
echo "Removing your current results folder to avoid interference"
rm -rf $FWROOT/installs $FWROOT/results

# vboxfs does not support chown or chmod, which we need.
# We therefore bind-mount a normal linux directory so we can
# use these operations. This enables us to
# use `chown -R testrunner:testrunner $FWROOT/installs` later
echo "Mounting over your installs folder"
mkdir -p /tmp/TFB_installs
mkdir -p /FrameworkBenchmarks/installs
sudo mount -o bind /tmp/TFB_installs $FWROOT/installs
else
# If there is no synced folder, clone the project
echo "Cloning project from $GH_REPO $GH_BRANCH"
Expand Down
15 changes: 13 additions & 2 deletions deployment/vagrant-common/core.rb
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,19 @@ def provider_virtualbox(config, role, ip_address='172.16.0.16')
vb.memory = ENV.fetch('TFB_VB_MEM', 3022)
vb.cpus = ENV.fetch('TFB_VB_CPU', 2)

# mount_options addresses issue mitchellh/vagrant#4997
override.vm.synced_folder "../..", "/FrameworkBenchmarks", mount_options: ['fmode=777', 'dmode=777']
# The VirtualBox file system for shared folders (vboxfs)
# does not support posix's chown/chmod - these can only
# be set at mount time, and they are uniform for the entire
# shared directory. We require chown, because we have the
# testrunner user account, so this is a problem. To mitigate
# the effects, we set the folders and files to 777 permissions.
# Even though we cannot chown them to testrunner, with 777 and
# owner vagrant *most* of the software works ok. Occasional
# issues are still possible.
#
# See mitchellh/vagrant#4997
# See http://superuser.com/a/640028/136050
override.vm.synced_folder "../..", "/FrameworkBenchmarks", :mount_options => ["dmode=777", "fmode=777"]

if role.eql? "all" or role.eql? "app"
override.vm.network :forwarded_port, guest: 8080, host: 28080
Expand Down
4 changes: 2 additions & 2 deletions frameworks/CSharp/aspnet/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
*.suo
*/bin/*
*/obj/*
lib/*
!lib/.nuget
*/packages/*
nginx.upstream.conf
35 changes: 7 additions & 28 deletions frameworks/CSharp/aspnet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
**Platforms**

* .NET Framework 4.5 (Windows)
* Mono 3.2.8 (Linux)
* Mono 3.99.0 (Linux)

**Web Servers**

Expand All @@ -29,37 +29,16 @@
**Web Stack**

* ASP.NET 4.5
* ASP.NET MVC Framework 5.1.0
* ASP.NET MVC Framework 5.2.2
* ASP.NET Razor 3.2.2

**Databases**

* MySQL Connector/Net 6.8.3
* Npgsql 2.0.14.3
* Entity Framework 6.0.2
* Mongo C# Driver 1.8.3
* MySQL Connector/Net 6.9.5
* Npgsql 2.2.3
* Entity Framework 6.1.1
* Mongo C# Driver 1.9.2

**Developer Tools**

* Visual Studio 2012

## Mono Installation

sudo apt-get install git-core build-essential autoconf automake libtool zlib1g-dev pkg-config gettext

git clone git://github.com/mono/mono
cd mono
git checkout mono-3.2.8
./autogen.sh --prefix=/usr/local
make get-monolite-latest
make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/gmcs.exe
sudo make install

cd ..

git clone git://github.com/mono/xsp
cd xsp
./autogen.sh --prefix=/usr/local
make
sudo make install

mozroots --import --sync
8 changes: 0 additions & 8 deletions frameworks/CSharp/aspnet/bash_profile.sh

This file was deleted.

Binary file removed frameworks/CSharp/aspnet/lib/.nuget/NuGet.exe
Binary file not shown.
135 changes: 0 additions & 135 deletions frameworks/CSharp/aspnet/lib/.nuget/NuGet.targets

This file was deleted.

18 changes: 17 additions & 1 deletion frameworks/CSharp/aspnet/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,23 @@ http {

location / {
fastcgi_pass mono;
include /usr/local/nginx/conf/fastcgi_params;
fastcgi_param QUERY_STRING $query_string;
fastcgi_param REQUEST_METHOD $request_method;
fastcgi_param CONTENT_TYPE $content_type;
fastcgi_param CONTENT_LENGTH $content_length;
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_param REQUEST_URI $request_uri;
fastcgi_param DOCUMENT_URI $document_uri;
fastcgi_param DOCUMENT_ROOT $document_root;
fastcgi_param SERVER_PROTOCOL $server_protocol;
fastcgi_param HTTPS $https if_not_empty;
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
fastcgi_param REMOTE_ADDR $remote_addr;
fastcgi_param REMOTE_PORT $remote_port;
fastcgi_param SERVER_ADDR $server_addr;
fastcgi_param SERVER_PORT $server_port;
fastcgi_param SERVER_NAME $server_name;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
}
}
Expand Down
45 changes: 0 additions & 45 deletions frameworks/CSharp/aspnet/setup_nginx.py

This file was deleted.

Loading