Permalink
Browse files

Use .NET 4 RTM (v4.0.30319) in .bat files and version check.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5695 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
  • Loading branch information...
1 parent c5b862e commit 639c6c9e3936eba2ee87b8b57cef321d4b768566 @dgrunwald dgrunwald committed Apr 12, 2010
Showing with 14 additions and 11 deletions.
  1. +1 −1 buildSetupAndRunTests.bat
  2. +2 −2 clean.bat
  3. +1 −1 debugbuild.bat
  4. +1 −1 releasebuild.bat
  5. +1 −1 src/Automated.proj
  6. +4 −2 src/Main/StartUp/Project/SharpDevelopMain.cs
  7. +4 −3 src/Setup/Setup.wxs
@@ -1,6 +1,6 @@
@echo This script simulates what the build server is doing
@rem /p:AdditionalBuildProperties="/v:d /p:MSBuildTargetsVerbose=true"
-%windir%\microsoft.net\framework\v4.0.30128\msbuild src\Automated.proj /p:ArtefactsOutputDir="%CD%\build" /p:TestReportsDir="%CD%\build"
+%windir%\microsoft.net\framework\v4.0.30319\msbuild src\Automated.proj /p:ArtefactsOutputDir="%CD%\build" /p:TestReportsDir="%CD%\build"
@IF %ERRORLEVEL% NEQ 0 GOTO err
@exit /B 0
:err
View
@@ -1,4 +1,4 @@
-%windir%\microsoft.net\framework\v4.0.30128\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug
+%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug
@IF %ERRORLEVEL% NEQ 0 PAUSE
-%windir%\microsoft.net\framework\v4.0.30128\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release
+%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release
@IF %ERRORLEVEL% NEQ 0 PAUSE
View
@@ -1,4 +1,4 @@
-%windir%\microsoft.net\framework\v4.0.30128\msbuild /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU"
+%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU"
@IF %ERRORLEVEL% NEQ 0 GOTO err
@exit /B 0
:err
View
@@ -1,4 +1,4 @@
-%windir%\microsoft.net\framework\v4.0.30128\msbuild /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU"
+%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU"
@IF %ERRORLEVEL% NEQ 0 GOTO err
@exit /B 0
:err
View
@@ -22,7 +22,7 @@
(but this works using the command line) -->
<!-- B) The Wix task assembly is locked if we do not use a separate MSBuild process -->
<!-- C) We need to use MSBuild 4.0, but the build server uses MSBuild 2.0 -->
- <MSBuildExecutable>&quot;$(MSBuildBinPath)\..\v4.0.30128\msbuild.exe&quot;</MSBuildExecutable>
+ <MSBuildExecutable>&quot;$(MSBuildBinPath)\..\v4.0.30319\msbuild.exe&quot;</MSBuildExecutable>
<BuildProperties>/p:Configuration=Release</BuildProperties>
<BuildProperties>$(BuildProperties) &quot;/p:SharpDevelopBinPath=$(SharpDevelopBin)&quot;</BuildProperties>
<BuildProperties>$(BuildProperties) &quot;/p:BooBinPath=$(SharpDevelopSrc)\AddIns\BackendBindings\Boo\RequiredLibraries&quot;</BuildProperties>
@@ -118,8 +118,10 @@ static void Run()
static bool CheckEnvironment()
{
- if (Environment.Version < new Version(4, 0, 30128)) {
- MessageBox.Show("This version of SharpDevelop requires .NET 4 RC. You are using: " + Environment.Version);
+ // Safety check: our setup already checks that .NET 4 is installed, but we manually check the .NET version in case SharpDevelop is
+ // used on another machine than it was installed on (e.g. "SharpDevelop on USB stick")
+ if (Environment.Version < new Version(4, 0, 30319)) {
+ MessageBox.Show("This version of SharpDevelop requires .NET 4.0. You are using: " + Environment.Version, "SharpDevelop");
return false;
}
return true;
View
@@ -55,16 +55,17 @@
<Property Id="NETFRAMEWORK40FULLVERSION" Secure="yes">
<RegistrySearch Id="NetFramework40FullVersion" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full" Name="Version" Type="raw" />
</Property>
- <Condition Message="This setup requires the .NET 4.0 Full Framework RC to be installed.">
- Installed OR (NETFRAMEWORK40FULL AND NETFRAMEWORK40FULLVERSION = "4.0.30128")
+ <!-- we could check NETFRAMEWORK40FULLVERSION optionally if we want to force the user to install a specific version -->
+ <Condition Message="This setup requires the .NET 4.0 Full Framework to be installed.">
+ Installed OR NETFRAMEWORK40FULL
</Condition>
<!--
Check for C++ 2008 Runtime (we accept any 2008 runtime version).
We only need the VC9 CRT, but unfortunately I couldn't find any way to detect if that is installed.
So instead, we conservatively check that the whole C++ runtime is installed.
However, we know that .NET 3.5 installs the C++ runtime parts we need (.NET 4.0 doesn't), so we'll check for
- VCPP2008RUNTIME OR DOTNET35.
+ VCPP2008RUNTIME OR NETFRAMEWORK35.
-->
<Property Id="VCPP2008RUNTIME" Secure="yes">
<RegistrySearch Id="VCpp2008Runtime" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VC\Servicing\9.0" Name="SP" Type="raw" />

0 comments on commit 639c6c9

Please sign in to comment.