Permalink
Browse files

Merge pull request #409 from Gravecorp/master

reverting from .net 4 full to .net 4 client profile
  • Loading branch information...
2 parents e2ccc33 + 713f6d8 commit 45692f3754fdfb35514b98cc92abfb209caf8206 @Gravecorp Gravecorp committed Apr 27, 2012
View
11 installer/GetDotNet.nsh
@@ -1,16 +1,19 @@
!include LogicLib.nsh
!macro GetDotNet
- !define DOTNET_URL "http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe"
+; full 4.0 framework url
+; !define DOTNET_URL "http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe"
+; client framework url
+ !define DOTNET_URL "http://download.microsoft.com/download/5/6/2/562A10F9-C9F4-4313-A044-9C94E0A8FAC8/dotNetFx40_Client_x86_x64.exe"
; DownloadDotNET:
DetailPrint "Beginning download of latest .NET Framework version."
- inetc::get /TIMEOUT=30000 ${DOTNET_URL} "$TEMP\dotNetFx40_Full_x86_x64.exe" /END
+ inetc::get /TIMEOUT=30000 ${DOTNET_URL} "$TEMP\dotNetFx40_Client_x86_x64.exe" /END
Pop $0
DetailPrint "Result: $0"
StrCmp $0 "OK" InstallDotNet
StrCmp $0 "cancelled" GiveUpDotNET
- inetc::get /TIMEOUT=30000 /NOPROXY ${DOTNET_URL} "$TEMP\dotNetFx40_Full_x86_x64.exe" /END
+ inetc::get /TIMEOUT=30000 /NOPROXY ${DOTNET_URL} "$TEMP\dotNetFx40_Client_x86_x64.exe" /END
Pop $0
DetailPrint "Result: $0"
StrCmp $0 "OK" InstallDotNet
@@ -30,7 +33,7 @@
DetailPrint "Installation could take several minutes to complete."
ExecWait '$TEMP\dotNetFx40_Full_x86_x64.exe /q /norestart /c:"install /q"'
DetailPrint "Completed .NET Framework install/update. Removing .NET Framework installer."
- Delete "$TEMP\dotNetFx40_Full_x86_x64.exe"
+ Delete "$TEMP\dotNetFx40_Client_x86_x64.exe"
DetailPrint ".NET Framework installer removed."
goto NewDotNet
View
9 installer/Install.nsi
@@ -43,8 +43,13 @@ Section ""
${If} ${HasDotNet4.0}
DetailPrint "Microsoft .NET Framework 4.0 installed."
${Else}
- DetailPrint "Microsoft .NET Framework 4.0 missing."
- !insertmacro GetDotNet
+ ${If} ${DOTNETVER_4_0} HasDotNetClientProfile 1
+ DetailPrint "Microsoft .NET Framework 4.0 (Client Profile) available."
+ ${Else}
+ DetailPrint "Microsoft .NET Framework 4.0 (Client Profile) missing."
+ !insertmacro GetDotNet
+ ${EndIf}
+
${EndIf}
!insertmacro GetVC++
SectionEnd
View
BIN octgnFX/Lib/LinqToTwitterCP.dll
Binary file not shown.
View
3 octgnFX/Octgn.LobbyServer/Skylabs.LobbyServer.csproj
@@ -11,8 +11,7 @@
<RootNamespace>Skylabs.LobbyServer</RootNamespace>
<AssemblyName>Skylabs.LobbyServer</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <TargetFrameworkProfile>
- </TargetFrameworkProfile>
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
View
5 octgnFX/Octgn.LobbyServer/app.config
@@ -1,8 +1,7 @@
<?xml version="1.0"?>
-
<configuration>
<configSections></configSections>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
</startup>
-</configuration>
+</configuration>
View
8 octgnFX/Octgn/Octgn.csproj
@@ -24,8 +24,7 @@
<ManifestKeyFile>OctgnKey.pfx</ManifestKeyFile>
<GenerateManifests>false</GenerateManifests>
<SignManifests>false</SignManifests>
- <TargetFrameworkProfile>
- </TargetFrameworkProfile>
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>
<ExpressionBlendVersion>4.0.20421.0</ExpressionBlendVersion>
<Utf8Output>true</Utf8Output>
<PublishUrl>C:\OCTGN FX\Publish\</PublishUrl>
@@ -170,8 +169,8 @@
<Reference Include="IronPython.Modules">
<HintPath>..\Lib\IronPython.Modules.dll</HintPath>
</Reference>
- <Reference Include="LinqToTwitter">
- <HintPath>..\Lib\LinqToTwitter.dll</HintPath>
+ <Reference Include="LinqToTwitterCP">
+ <HintPath>..\Lib\LinqToTwitterCP.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -195,7 +194,6 @@
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Numerics" />
- <Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
View
2 octgnFX/Octgn/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
View
2 octgnFX/Octgn/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
View
2 octgnFX/Octgn/app.config
@@ -9,7 +9,7 @@
</sectionGroup>
</configSections>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
</startup>
<userSettings>
<Octgn.lobbysettings>
View
28 octgnFX/Skylabs.Lobby/Resource1.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -136,23 +136,7 @@ internal class Resource1 {
///Marses
///Microsoft
///Multics
- ///Multicses
- ///N
- ///NeWS
- ///NeWSes
- ///OS
- ///OSes
- ///OTOH
- ///PARC
- ///PARCs
- ///PD
- ///PM
- ///PMed
- ///PMing
- ///PMs
- ///Pascal
- ///Pascals
- /// [rest of string was truncated]&quot;;.
+ ///Multicses [rest of string was truncated]&quot;;.
/// </summary>
internal static string jargonlist {
get {
@@ -214,13 +198,7 @@ internal class Resource1 {
///aluminium
///aluminum
///ambulance
- ///america
- ///amount
- ///amusement
- ///anatomy
- ///anethesiologist
- ///anger
- ///ang [rest of string was truncated]&quot;;.
+ ///ameri [rest of string was truncated]&quot;;.
/// </summary>
internal static string nounlist {
get {
View
1 octgnFX/Skylabs.Lobby/Skylabs.Lobby.csproj
@@ -27,6 +27,7 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

0 comments on commit 45692f3

Please sign in to comment.