diff options
| author | Lluis Sanchez Gual <lluis@novell.com> | 2011-02-02 15:51:46 +0300 |
|---|---|---|
| committer | Lluis Sanchez Gual <lluis@novell.com> | 2011-02-02 15:51:46 +0300 |
| commit | 953b84c03d25ff4b52cab23a795ea45865a69818 (patch) | |
| tree | 044cd0e3500cfac93c5dded4434059fb62e137f1 /setup | |
| parent | 42a475376e5f85b191e3d1e0e66ac01e3a66aa40 (diff) | |
More .net 4.0 migration work
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/MonoLibraries/MonoLibraries.sln | 4 | ||||
| -rw-r--r-- | setup/MonoLibraries/MonoLibraries/MonoLibraries.wixproj | 6 | ||||
| -rw-r--r-- | setup/WixSetup/Product.wxs | 8 | ||||
| -rw-r--r-- | setup/WixSetup/WixSetup.sln | 4 | ||||
| -rw-r--r-- | setup/WixSetup/WixSetup.wixproj | 4 | ||||
| -rw-r--r-- | setup/WixSetup/build.js | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/setup/MonoLibraries/MonoLibraries.sln b/setup/MonoLibraries/MonoLibraries.sln index 6f052a774f..3cd4b69465 100644 --- a/setup/MonoLibraries/MonoLibraries.sln +++ b/setup/MonoLibraries/MonoLibraries.sln @@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MonoLibraries", "MonoLibraries\MonoLibraries.wixproj", "{C3F60294-806C-467E-8FD8-94D0F89755EF}"
EndProject
Global
diff --git a/setup/MonoLibraries/MonoLibraries/MonoLibraries.wixproj b/setup/MonoLibraries/MonoLibraries/MonoLibraries.wixproj index 91c49202eb..28bec429e5 100644 --- a/setup/MonoLibraries/MonoLibraries/MonoLibraries.wixproj +++ b/setup/MonoLibraries/MonoLibraries/MonoLibraries.wixproj @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> @@ -7,8 +7,8 @@ <SchemaVersion>2.0</SchemaVersion> <OutputName>MonoLibraries</OutputName> <OutputType>Package</OutputType> - <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath> - <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath> + <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> + <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <OutputPath>bin\$(Configuration)\</OutputPath> diff --git a/setup/WixSetup/Product.wxs b/setup/WixSetup/Product.wxs index 95724692d3..4da158e5a5 100644 --- a/setup/WixSetup/Product.wxs +++ b/setup/WixSetup/Product.wxs @@ -20,10 +20,10 @@ <![CDATA[GTKSHARPVERSION >= "2.12" OR REMOVE ~= "ALL"]]>
</Condition>
- <!-- Ensure .Net 3.5 is installed -->
- <PropertyRef Id="NETFRAMEWORK35" />
- <Condition Message="This setup requires the .NET Framework 3.5 to be installed.">
- Installed OR NETFRAMEWORK35
+ <!-- Ensure .Net 4.0 is installed -->
+ <PropertyRef Id="NETFRAMEWORK40FULL" />
+ <Condition Message="This setup requires the .NET Framework 4.0 to be installed.">
+ Installed OR NETFRAMEWORK40FULL
</Condition>
<!-- Get the GTK# install directory -->
diff --git a/setup/WixSetup/WixSetup.sln b/setup/WixSetup/WixSetup.sln index c40faa1e4b..de46c8ec1a 100644 --- a/setup/WixSetup/WixSetup.sln +++ b/setup/WixSetup/WixSetup.sln @@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixSetup", "WixSetup.wixproj", "{33F58FFC-956E-4079-B27A-160A57FFEA7A}"
EndProject
Global
diff --git a/setup/WixSetup/WixSetup.wixproj b/setup/WixSetup/WixSetup.wixproj index 371dde9825..6891627d3a 100644 --- a/setup/WixSetup/WixSetup.wixproj +++ b/setup/WixSetup/WixSetup.wixproj @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> @@ -7,7 +7,7 @@ <SchemaVersion>2.0</SchemaVersion> <OutputName>Setup</OutputName> <OutputType>Package</OutputType> - <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath> + <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <OutputPath>bin\$(Configuration)\</OutputPath> diff --git a/setup/WixSetup/build.js b/setup/WixSetup/build.js index fe59461f0f..34ce882977 100644 --- a/setup/WixSetup/build.js +++ b/setup/WixSetup/build.js @@ -64,7 +64,7 @@ WScript.Echo ("Setup successfully generated"); function build (file)
{
- if (sh.run ("C:\\Windows\\Microsoft.NET\\Framework\\v3.5\\msbuild.exe " + MD_DIR + "\\" + file, 5, true) != 0) {
+ if (sh.run ("C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\msbuild.exe " + MD_DIR + "\\" + file, 5, true) != 0) {
WScript.Echo ("Build failed");
return 1;
}
|