Skip to content
This repository
Browse code

Merge pull request #409 from Gravecorp/master

reverting from .net 4 full to .net 4 client profile
  • Loading branch information...
commit 45692f3754fdfb35514b98cc92abfb209caf8206 2 parents e2ccc33 + 713f6d8
Gravecorp Gravecorp authored
11 installer/GetDotNet.nsh
... ... @@ -1,16 +1,19 @@
1 1 !include LogicLib.nsh
2 2
3 3 !macro GetDotNet
4   - !define DOTNET_URL "http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe"
  4 +; full 4.0 framework url
  5 +; !define DOTNET_URL "http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe"
  6 +; client framework url
  7 + !define DOTNET_URL "http://download.microsoft.com/download/5/6/2/562A10F9-C9F4-4313-A044-9C94E0A8FAC8/dotNetFx40_Client_x86_x64.exe"
5 8
6 9 ; DownloadDotNET:
7 10 DetailPrint "Beginning download of latest .NET Framework version."
8   - inetc::get /TIMEOUT=30000 ${DOTNET_URL} "$TEMP\dotNetFx40_Full_x86_x64.exe" /END
  11 + inetc::get /TIMEOUT=30000 ${DOTNET_URL} "$TEMP\dotNetFx40_Client_x86_x64.exe" /END
9 12 Pop $0
10 13 DetailPrint "Result: $0"
11 14 StrCmp $0 "OK" InstallDotNet
12 15 StrCmp $0 "cancelled" GiveUpDotNET
13   - inetc::get /TIMEOUT=30000 /NOPROXY ${DOTNET_URL} "$TEMP\dotNetFx40_Full_x86_x64.exe" /END
  16 + inetc::get /TIMEOUT=30000 /NOPROXY ${DOTNET_URL} "$TEMP\dotNetFx40_Client_x86_x64.exe" /END
14 17 Pop $0
15 18 DetailPrint "Result: $0"
16 19 StrCmp $0 "OK" InstallDotNet
@@ -30,7 +33,7 @@
30 33 DetailPrint "Installation could take several minutes to complete."
31 34 ExecWait '$TEMP\dotNetFx40_Full_x86_x64.exe /q /norestart /c:"install /q"'
32 35 DetailPrint "Completed .NET Framework install/update. Removing .NET Framework installer."
33   - Delete "$TEMP\dotNetFx40_Full_x86_x64.exe"
  36 + Delete "$TEMP\dotNetFx40_Client_x86_x64.exe"
34 37 DetailPrint ".NET Framework installer removed."
35 38 goto NewDotNet
36 39
9 installer/Install.nsi
@@ -43,8 +43,13 @@ Section ""
43 43 ${If} ${HasDotNet4.0}
44 44 DetailPrint "Microsoft .NET Framework 4.0 installed."
45 45 ${Else}
46   - DetailPrint "Microsoft .NET Framework 4.0 missing."
47   - !insertmacro GetDotNet
  46 + ${If} ${DOTNETVER_4_0} HasDotNetClientProfile 1
  47 + DetailPrint "Microsoft .NET Framework 4.0 (Client Profile) available."
  48 + ${Else}
  49 + DetailPrint "Microsoft .NET Framework 4.0 (Client Profile) missing."
  50 + !insertmacro GetDotNet
  51 + ${EndIf}
  52 +
48 53 ${EndIf}
49 54 !insertmacro GetVC++
50 55 SectionEnd
BIN  octgnFX/Lib/LinqToTwitterCP.dll
Binary file not shown
3  octgnFX/Octgn.LobbyServer/Skylabs.LobbyServer.csproj
@@ -11,8 +11,7 @@
11 11 <RootNamespace>Skylabs.LobbyServer</RootNamespace>
12 12 <AssemblyName>Skylabs.LobbyServer</AssemblyName>
13 13 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14   - <TargetFrameworkProfile>
15   - </TargetFrameworkProfile>
  14 + <TargetFrameworkProfile>Client</TargetFrameworkProfile>
16 15 <FileAlignment>512</FileAlignment>
17 16 <IsWebBootstrapper>false</IsWebBootstrapper>
18 17 <PublishUrl>publish\</PublishUrl>
5 octgnFX/Octgn.LobbyServer/app.config
... ... @@ -1,8 +1,7 @@
1 1 <?xml version="1.0"?>
2   -
3 2 <configuration>
4 3 <configSections></configSections>
5 4 <startup>
6   - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
  5 + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
7 6 </startup>
8   -</configuration>
  7 +</configuration>
8 octgnFX/Octgn/Octgn.csproj
@@ -24,8 +24,7 @@
24 24 <ManifestKeyFile>OctgnKey.pfx</ManifestKeyFile>
25 25 <GenerateManifests>false</GenerateManifests>
26 26 <SignManifests>false</SignManifests>
27   - <TargetFrameworkProfile>
28   - </TargetFrameworkProfile>
  27 + <TargetFrameworkProfile>Client</TargetFrameworkProfile>
29 28 <ExpressionBlendVersion>4.0.20421.0</ExpressionBlendVersion>
30 29 <Utf8Output>true</Utf8Output>
31 30 <PublishUrl>C:\OCTGN FX\Publish\</PublishUrl>
@@ -170,8 +169,8 @@
170 169 <Reference Include="IronPython.Modules">
171 170 <HintPath>..\Lib\IronPython.Modules.dll</HintPath>
172 171 </Reference>
173   - <Reference Include="LinqToTwitter">
174   - <HintPath>..\Lib\LinqToTwitter.dll</HintPath>
  172 + <Reference Include="LinqToTwitterCP">
  173 + <HintPath>..\Lib\LinqToTwitterCP.dll</HintPath>
175 174 </Reference>
176 175 <Reference Include="Microsoft.CSharp" />
177 176 <Reference Include="Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -195,7 +194,6 @@
195 194 <Reference Include="System.Data" />
196 195 <Reference Include="System.Drawing" />
197 196 <Reference Include="System.Numerics" />
198   - <Reference Include="System.Web" />
199 197 <Reference Include="System.Windows.Forms" />
200 198 <Reference Include="System.Xaml" />
201 199 <Reference Include="System.Xml" />
2  octgnFX/Octgn/Properties/Resources.Designer.cs
... ... @@ -1,7 +1,7 @@
1 1 //------------------------------------------------------------------------------
2 2 // <auto-generated>
3 3 // This code was generated by a tool.
4   -// Runtime Version:4.0.30319.239
  4 +// Runtime Version:4.0.30319.1
5 5 //
6 6 // Changes to this file may cause incorrect behavior and will be lost if
7 7 // the code is regenerated.
2  octgnFX/Octgn/Properties/Settings.Designer.cs
... ... @@ -1,7 +1,7 @@
1 1 //------------------------------------------------------------------------------
2 2 // <auto-generated>
3 3 // This code was generated by a tool.
4   -// Runtime Version:4.0.30319.239
  4 +// Runtime Version:4.0.30319.1
5 5 //
6 6 // Changes to this file may cause incorrect behavior and will be lost if
7 7 // the code is regenerated.
2  octgnFX/Octgn/app.config
@@ -9,7 +9,7 @@
9 9 </sectionGroup>
10 10 </configSections>
11 11 <startup>
12   - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
  12 + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
13 13 </startup>
14 14 <userSettings>
15 15 <Octgn.lobbysettings>
28 octgnFX/Skylabs.Lobby/Resource1.Designer.cs
... ... @@ -1,7 +1,7 @@
1 1 //------------------------------------------------------------------------------
2 2 // <auto-generated>
3 3 // This code was generated by a tool.
4   -// Runtime Version:4.0.30319.239
  4 +// Runtime Version:4.0.30319.1
5 5 //
6 6 // Changes to this file may cause incorrect behavior and will be lost if
7 7 // the code is regenerated.
@@ -136,23 +136,7 @@ internal class Resource1 {
136 136 ///Marses
137 137 ///Microsoft
138 138 ///Multics
139   - ///Multicses
140   - ///N
141   - ///NeWS
142   - ///NeWSes
143   - ///OS
144   - ///OSes
145   - ///OTOH
146   - ///PARC
147   - ///PARCs
148   - ///PD
149   - ///PM
150   - ///PMed
151   - ///PMing
152   - ///PMs
153   - ///Pascal
154   - ///Pascals
155   - /// [rest of string was truncated]&quot;;.
  139 + ///Multicses [rest of string was truncated]&quot;;.
156 140 /// </summary>
157 141 internal static string jargonlist {
158 142 get {
@@ -214,13 +198,7 @@ internal class Resource1 {
214 198 ///aluminium
215 199 ///aluminum
216 200 ///ambulance
217   - ///america
218   - ///amount
219   - ///amusement
220   - ///anatomy
221   - ///anethesiologist
222   - ///anger
223   - ///ang [rest of string was truncated]&quot;;.
  201 + ///ameri [rest of string was truncated]&quot;;.
224 202 /// </summary>
225 203 internal static string nounlist {
226 204 get {
1  octgnFX/Skylabs.Lobby/Skylabs.Lobby.csproj
@@ -27,6 +27,7 @@
27 27 <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
28 28 <UseApplicationTrust>false</UseApplicationTrust>
29 29 <BootstrapperEnabled>true</BootstrapperEnabled>
  30 + <TargetFrameworkProfile>Client</TargetFrameworkProfile>
30 31 </PropertyGroup>
31 32 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
32 33 <DebugSymbols>true</DebugSymbols>

0 comments on commit 45692f3

Please sign in to comment.
Something went wrong with that request. Please try again.