From 869a23e2234ce9b565249c5850324ca2de2f06ba Mon Sep 17 00:00:00 2001 From: justincc Date: Wed, 13 Nov 2013 01:07:14 +0000 Subject: [PATCH] Update OpenSim.32BitLaunch.exe and Robust.32BitLaunch.exe to .NET 4 versions. Also fixes some issues in associated solution files --- .../OpenSim.32BitLaunch.csproj | 141 +++++++++++------ .../Robust.32BitLaunch.csproj | 147 +++++++++++------- .../Robust.32BitLaunch/Robust.32BitLaunch.sln | 40 ++--- bin/OpenSim.32BitLaunch.exe | Bin 5632 -> 5632 bytes bin/Robust.32BitLaunch.exe | Bin 5632 -> 5632 bytes 5 files changed, 202 insertions(+), 126 deletions(-) mode change 100644 => 100755 bin/Robust.32BitLaunch.exe diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj index d829e693e8..4625c330e0 100644 --- a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj +++ b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj @@ -1,58 +1,97 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {595D67F3-B413-4A43-8568-5B5930E3B31D} - Exe - Properties - OpenSim._32BitLaunch - OpenSim.32BitLaunch - v2.0 - 512 - - - true - full - false - ..\..\..\bin\ - DEBUG;TRACE - prompt - 4 - x86 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - {438A9556-0000-0000-0000-000000000000} - OpenSim - - - + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {595D67F3-B413-4A43-8568-5B5930E3B31D} + Exe + Properties + OpenSim._32BitLaunch + OpenSim.32BitLaunch + v4.0 + 512 + + + + + 3.5 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + true + full + false + ..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + x86 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + False + .exe + ..\..\..\bin\OpenSim.exe + + + + + + + + + + False + Microsoft .NET Framework 4 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 3.1 + true + + + + --> \ No newline at end of file diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj index 481b3f8486..9618c08500 100644 --- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj +++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj @@ -1,62 +1,99 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {595D67F3-B413-4A43-8568-5B5930E3B31D} - Exe - Properties - Robust._32BitLaunch - Robust.32BitLaunch - v3.5 - 512 - - - true - full - false - ..\..\..\bin\ - DEBUG;TRACE - prompt - 4 - x86 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - False - ..\..\..\bin\log4net.dll - - - False - ..\..\..\bin\Robust.exe - - - - 3.5 - - - - - - - - - + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {595D67F3-B413-4A43-8568-5B5930E3B31D} + Exe + Properties + Robust._32BitLaunch + Robust.32BitLaunch + v4.0 + 512 + + + + + 3.5 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + true + full + false + ..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + x86 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\..\..\bin\log4net.dll + + + False + ..\..\..\bin\Robust.exe + + + + + + + + + + False + Microsoft .NET Framework 4 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 3.1 + true + + + + --> \ No newline at end of file diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln index c7c97b1d93..a48a2d34fc 100644 --- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln +++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln @@ -1,20 +1,20 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C# Express 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C# Express 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe index cc73c8bc981264031193f9d8f48d083ff8801d0d..62c14af416b823e435f976ca503ed51974f3c899 100755 GIT binary patch delta 1303 zcmZ9MUu@G=6vw~!_Rm|qQSK8ko zjfq`mLKI1)Tw^qm5u!0+@-S?C&}gy{cruX}jrgF(7ekDRlLr%h0KdN8f}D2Z}Tmx*s#u-VHUmp-yk8c2SSr z2=E7)qT6d^fb8~}{m=WDd9ogD*IH;^n`M2Zk0I~ZLyC{g>Mz;0sf`QWD!W^i+tO0$ z3xz|GaHRKnE*~~z$w3JOUI(tT@8-4walM$yr%Oh}cQ)WI7Zf-a$MpulO+Lj8_BMEiaD zt8}5k@{pExVNpk{dc}tcoWK)El0IZio;Fz~x8f~wJF29c>$)v><0^iTdvFc^$N}8I zIPa?wUdte9#DvgN-^3qs6L2xbizB8;afiah_?uuqgg>14s!l~TG7=PX4?^EA9wzYQ% zJU*lAh5nu%t&qx>GP${IQrC(ht(aE#9p{b%#>+LfW^8eRZ7-kbUcS|%@o4;;bMGEn ze0Cys{@x$UuLRz!TIoN~pO`ME&t~$887-GeOeagJ@~K4j)O2EPhG)_lU479MYre-! z>+(P~JGY3{+SAT1pttoMI9Jp zMG4-oh8zm4tvt#YVV^_F%rXO=UjhB-;ipkcF{Z@&%VCa>GfA(8A`8M`+8i^=`V=_G zm@K2CY^B;en|~54y(Xo3y1ZeA?_rCu_2N0~Mx^$U$1WTFkN)1=12vEDPf-mw{0CUp B17ZLG delta 1011 zcmZ9LT}YEr7{~wTxJ}*W+?p#zGuO11iM-9yR1CjpEyJRvCVAmUABr|@S{Oo`7G+T6 zIz$Fh2ofm~#V(3&6oevD=t8Qi=%NelCL(Xjf}V5K2|X|G?>x`{{lCw9-g7wNyl~#g zux>c3*cZ8x!E19Pll2zl0yUs02S)V~r`_BPn5pjD0b~d#&l8PoJ3nR=Lu?xx6%(w1 zX@YU`B>-_`WPm|9lQeOJTS8XAh#*NlZktMXt*0&PY1?{gU@`ByAuEqsxHrfS;BLDb zKbKMG=9t^iokH^JSJvK4A&u1zA^ib+^(egI;G| z2S=hTezO9|k5fv6e1;?mDL7;yp2s;u{WuK+ZYe%de5d$T@vmYklb!;_PIibH5K_FU zlt+pm*bFPhH)?J`8vjL}Vxkd4yq6p3=MIoQ#h-Eu=J_lsi=b34UIT~6tpOI zD4ru`Vvv}P>qILexXnGdhjCtrF}&ubm_R-4QzE|ba-#I)!vr7Ej#gs2qDyh7(hJZ| zdZ|)s6#WQ$NNU3*u@f(dy_hBr;4P}53$H8~V$ncr$i-#7GqqE$=6^9uns}w}i?$f9 z@#td0M`mq&bFgxJetCb`KUcf#y%QAgjV@LumW$WDriWS66y=E0!FuHCd&T68Y? lCyU#Q1TkaF5zlPa=pUP&Q}5%6Su02PNJ-R|@|{Jr_IvB(yzXrc$Z8Ri`j-}ayt=HKh}LpPl`u+`BOaIA)#7exZddN4MvQD1 z2kZ;LI(ZLW%kImhqKQaaL3~jITSUk{=EF-ZV5FSAf9!G(`S-N;i&?3ml1`wv`KJU% z6{##Xq-fh`_J(Po<@@X+juAwILEgwUm?o>kbN+1&}G?}0Wfj^jvgfo4qU_3mZ zOkFEPw1cehtZa)J?dOBqN%Jf3`sttT+m1U0v8uDPOX9Vzkxh!Px_blt3`bozicU%dZOu>STH+8#~778)?&r#5h;D^m@>`^YlVG|)Jt>gr2!uG_4uax zmV3W#uMaOC_wC)iVvZ@_(S0ru%0}j+iNMulJRArG)8XuNAT}KeBxk~jbTob{63sj? zbes37(V@u7+*|XuYSvVkGaO+BS$-igy?AG8(YE0%JV4>MNzb{pqhPY^vbzs>f?rki#l;>RM_S~e#-QUqzEETqJ>YOp}DQ3F%i)SEz8c9A6I z*SS&BN|3<1NxrVC3q=Tmh%SN(qM&ZND69)Bkbd4Te+C_R{~n(6{+#pXgZbdZ<)X>K zy=~ff1>Fp2caJ+`0pJAqv;bcfO)a%|0(Oq)b^#SqrJziTYMQgki(hWh>Pe{OBT?JBt41=lRLxCKI0kW=_ej0_-uDchZR z*UXtax7g-B55pT(Hg9^EGPy;`uEX*hl^2(Bqm|_MN|(vo9<#2gX>t zpy3*YF@;%bz$})j3G+C{zqbuvNII1x>POVzJU-(vit=2VbDHohYIs0`8zVWYsN2sP zE&g|&GNwONo(uhvWuMSji(d&>n=Mqm5MOPb|5I{fX6V!h`PS+a&DU)Kk(9e_SLAP7 z!%1VKj8sO-QI0lXd%mAa9WxN