Browse Source

Fix mono installation and aspnet on mono

Pēteris Ņikiforovs 12 years ago
parent
commit
659e324f8c
2 changed files with 4 additions and 2 deletions
  1. 1 1
      aspnet/lib/.nuget/NuGet.targets
  2. 3 1
      installer.py

+ 1 - 1
aspnet/lib/.nuget/NuGet.targets

@@ -45,7 +45,7 @@
         <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
         <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
         
         
         <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
         <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mozroots --import &amp;&amp; mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
 
 
         <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
         <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
         
         

+ 3 - 1
installer.py

@@ -144,11 +144,13 @@ class Installer:
     # Mono
     # Mono
     #
     #
     self.__run_command("git clone git://github.com/mono/mono")
     self.__run_command("git clone git://github.com/mono/mono")
-    self.__run_command("git checkout mono-3.10", cwd="mono")
+    self.__run_command("git checkout mono-3.0.10", cwd="mono")
     self.__run_command("./autogen.sh --prefix=/usr/local", cwd="mono")
     self.__run_command("./autogen.sh --prefix=/usr/local", cwd="mono")
     self.__run_command("make get-monolite-latest", cwd="mono")
     self.__run_command("make get-monolite-latest", cwd="mono")
     self.__run_command("make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/gmcs.exe", cwd="mono")
     self.__run_command("make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/gmcs.exe", cwd="mono")
     self.__run_command("sudo make install", cwd="mono")
     self.__run_command("sudo make install", cwd="mono")
+    
+    self.__run_command("mozroots --import --sync")
 
 
     self.__run_command("git clone git://github.com/mono/xsp")
     self.__run_command("git clone git://github.com/mono/xsp")
     self.__run_command("git checkout 3.0", cwd="xsp")
     self.__run_command("git checkout 3.0", cwd="xsp")