Merge pull request #188 from pythonnet/revert-181-master

tonyroberts · tonyroberts · commit 3510dd8451a2 · 2016-03-15T11:30:17.000Z
Revert "Fix for #180"
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,16 @@
-sudo: required
 language: python
 python:
   - 2.6
   - 2.7
 before_install:
-  - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"
   - sudo apt-get install software-properties-common
-  - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-  - echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
-  - echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list
-  - sudo apt-get update
-  - sudo DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install mono-devel mono-complete referenceassemblies-pcl ca-certificates-mono nunit-console
-
+  - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"
+  - sudo apt-get -qq update
+  - sudo apt-get -qq install mono-devel mono-gmcs mono-xbuild nunit-console
+  - sudo mozroots --import --machine --sync
+  - yes | sudo certmgr -ssl -m https://go.microsoft.com
+  - yes | sudo certmgr -ssl -m https://nugetgallery.blob.core.windows.net
+  - yes | sudo certmgr -ssl -m https://nuget.org
 install:
   - python setup.py build_ext --inplace
 script:
diff --git a/src/monoclr/pynetinit.c b/src/monoclr/pynetinit.c
@@ -31,7 +31,6 @@ PyNet_Args* PyNet_Init(int ext) {
     pn_args->shutdown_name = "Python.Runtime:Shutdown()";
 
     pn_args->domain = mono_jit_init_version(MONO_DOMAIN, MONO_VERSION);
-    mono_domain_set_config(pn_args->domain, ".", "Python.Runtime.dll.config");
 
     /*
      * Load the default Mono configuration file, this is needed
