Merge pull request octgn#409 from Gravecorp/master

reverting from .net 4 full to .net 4 client profile
kellyelton · Apr 27, 2012 · 45692f3 · 45692f3
2 parents e2ccc33 + 713f6d8
commit 45692f3
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 44 deletions.
diff --git a/installer/GetDotNet.nsh b/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
 

diff --git a/installer/Install.nsi b/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

diff --git a/octgnFX/Lib/LinqToTwitterCP.dll b/octgnFX/Lib/LinqToTwitterCP.dll
diff --git a/octgnFX/Octgn.LobbyServer/Skylabs.LobbyServer.csproj b/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>

diff --git a/octgnFX/Octgn.LobbyServer/app.config b/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>
diff --git a/octgnFX/Octgn/Octgn.csproj b/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" />

diff --git a/octgnFX/Octgn/Properties/Resources.Designer.cs b/octgnFX/Octgn/Properties/Resources.Designer.cs
diff --git a/octgnFX/Octgn/Properties/Settings.Designer.cs b/octgnFX/Octgn/Properties/Settings.Designer.cs
diff --git a/octgnFX/Octgn/app.config b/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>

diff --git a/octgnFX/Skylabs.Lobby/Resource1.Designer.cs b/octgnFX/Skylabs.Lobby/Resource1.Designer.cs
diff --git a/octgnFX/Skylabs.Lobby/Skylabs.Lobby.csproj b/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>