Permalink
Browse files

Update VS and NANT files to target .Net 4.0.

  • Loading branch information...
1 parent c9354fe commit bd58b7a1c166983275eb151d54b227109345caff @oskarb oskarb committed Jun 18, 2012
View
@@ -1 +1 @@
-.\Tools\nant\bin\NAnt.exe -t:net-3.5 -D:project.config=release clean package
+.\Tools\nant\bin\NAnt.exe -t:net-4.0 -D:project.config=release clean package
View
@@ -1,11 +1,11 @@
<NUnitProject>
<Settings activeconfig="Debug" processModel="Multiple" />
- <Config name="Debug" binpathtype="Auto" runtimeFramework="net-2.0">
+ <Config name="Debug" binpathtype="Auto" runtimeFramework="net-4.0">
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\NHibernate.TestDatabaseSetup.dll" />
<assembly path="src\NHibernate.Test\bin\Debug-2.0\NHibernate.Test.dll" />
<assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\NHibernate.Test.VisualBasic.dll" />
</Config>
- <Config name="Release" binpathtype="Auto" runtimeFramework="net-2.0">
+ <Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\NHibernate.TestDatabaseSetup.dll" />
<assembly path="src\NHibernate.Test\bin\Release-2.0\NHibernate.Test.dll" />
<assembly path="src\NHibernate.Test.VisualBasic\bin\Release\NHibernate.Test.VisualBasic.dll" />
View
@@ -1,7 +1,7 @@
@echo off
pushd %~dp0
-set NANT="%~dp0Tools\nant\bin\NAnt.exe" -t:net-3.5
+set NANT="%~dp0Tools\nant\bin\NAnt.exe" -t:net-4.0
set BUILDTOOL="%~dp0Tools\BuildTool\bin\Release\BuildTool.exe"
set AVAILABLE_CONFIGURATIONS=%~dp0available-test-configurations
set CURRENT_CONFIGURATION=%~dp0current-test-configuration
@@ -199,6 +199,15 @@
<call target="set-${framework::get-target-framework()}-framework-configuration" />
</target>
+ <target name="set-net-4.0-framework-configuration">
+ <property name="nant.settings.currentframework" value="net-4.0" />
+ <property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5,NET_4_0" />
+ <!-- not using SDK_v2_0 because ndoc throws an exception -->
+ <property name="link.sdkdoc.version" value="SDK_v1_1" />
+ <!-- merge should work with 4.0 when compiling for 4.0 -->
+ <property name="merge.targetplatform" value="v4" />
+ </target>
+
<target name="set-net-3.5-framework-configuration">
<property name="nant.settings.currentframework" value="net-3.5" />
<property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5" />
View
@@ -16,7 +16,7 @@
Supported versions of .NET Framework, separated by spaces.
Used by *-all-frameworks targets.
-->
- <property name="supported.frameworks" value="net-3.5" />
+ <property name="supported.frameworks" value="net-4.0" />
<fileset id="buildfiles.all" basedir="src">
<!-- Files have to be in dependency order -->
@@ -90,7 +90,7 @@
<target name="check-framework-version">
<echo>Running with ${framework::get-target-framework()}</echo>
- <fail message="ERROR: NHibernate requires .Net 3.5." if="${framework::get-target-framework()!='net-3.5'}"/>
+ <fail message="ERROR: NHibernate requires .Net 4.0." if="${framework::get-target-framework()!='net-4.0'}"/>
</target>
<target name="test-report" if="${nunit2report.installed}">
@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -31,6 +31,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
-' Runtime Version:4.0.30319.235
+' Runtime Version:4.0.30319.269
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
-' Runtime Version:4.0.30319.235
+' Runtime Version:4.0.30319.269
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
-' Runtime Version:4.0.30319.235
+' Runtime Version:4.0.30319.269
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -13,7 +13,7 @@
<AssemblyName>NHibernate.Test.VisualBasic</AssemblyName>
<FileAlignment>512</FileAlignment>
<MyType>Windows</MyType>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile />
<StartAction>Program</StartAction>
<StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>
@@ -103,4 +103,6 @@
</log4net>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
+
+</configuration>
@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -34,6 +34,7 @@
<StartAction>Program</StartAction>
<StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>
<StartArguments>NHibernate.Test.dll</StartArguments>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -68,7 +69,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\Antlr3.Runtime.dll</HintPath>
</Reference>
- <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+ <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath>
</Reference>
@@ -13,4 +13,4 @@
</property>
</session-factory>
</hibernate-configuration>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NHibernate.TestDatabaseSetup</RootNamespace>
<AssemblyName>NHibernate.TestDatabaseSetup</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
@@ -36,6 +36,7 @@
<StartAction>Program</StartAction>
<StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>
<StartArguments>NHibernate.TestDatabaseSetup.dll</StartArguments>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -31,6 +31,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -39,8 +40,7 @@
<OutputPath>bin\Debug-2.0\</OutputPath>
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
<IntermediateOutputPath>obj\Debug-2.0\</IntermediateOutputPath>
- <DefineConstants>
- </DefineConstants>
+ <DefineConstants>NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug-2.0\NHibernate.XML</DocumentationFile>
@@ -54,7 +54,7 @@
<OutputPath>bin\Release-2.0\</OutputPath>
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
<IntermediateOutputPath>obj\Release-2.0\</IntermediateOutputPath>
- <DefineConstants>TRACE;NET_2_0</DefineConstants>
+ <DefineConstants>TRACE;NET_2_0;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>3001%3b3002%3b3003%3b3004%3b3005</NoWarn>
@@ -1862,11 +1862,11 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
-->
</Project>

0 comments on commit bd58b7a

Please sign in to comment.