Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Update VS and NANT files to target .Net 4.0.

  • Loading branch information...
commit bd58b7a1c166983275eb151d54b227109345caff 1 parent c9354fe
Oskar Berggren oskarb authored
2  GaRelease.bat
... ... @@ -1 +1 @@
1   -.\Tools\nant\bin\NAnt.exe -t:net-3.5 -D:project.config=release clean package
  1 +.\Tools\nant\bin\NAnt.exe -t:net-4.0 -D:project.config=release clean package
4 NHibernate.nunit
... ... @@ -1,11 +1,11 @@
1 1 <NUnitProject>
2 2 <Settings activeconfig="Debug" processModel="Multiple" />
3   - <Config name="Debug" binpathtype="Auto" runtimeFramework="net-2.0">
  3 + <Config name="Debug" binpathtype="Auto" runtimeFramework="net-4.0">
4 4 <assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\NHibernate.TestDatabaseSetup.dll" />
5 5 <assembly path="src\NHibernate.Test\bin\Debug-2.0\NHibernate.Test.dll" />
6 6 <assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\NHibernate.Test.VisualBasic.dll" />
7 7 </Config>
8   - <Config name="Release" binpathtype="Auto" runtimeFramework="net-2.0">
  8 + <Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
9 9 <assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\NHibernate.TestDatabaseSetup.dll" />
10 10 <assembly path="src\NHibernate.Test\bin\Release-2.0\NHibernate.Test.dll" />
11 11 <assembly path="src\NHibernate.Test.VisualBasic\bin\Release\NHibernate.Test.VisualBasic.dll" />
2  ShowBuildMenu.bat
... ... @@ -1,7 +1,7 @@
1 1 @echo off
2 2 pushd %~dp0
3 3
4   -set NANT="%~dp0Tools\nant\bin\NAnt.exe" -t:net-3.5
  4 +set NANT="%~dp0Tools\nant\bin\NAnt.exe" -t:net-4.0
5 5 set BUILDTOOL="%~dp0Tools\BuildTool\bin\Release\BuildTool.exe"
6 6 set AVAILABLE_CONFIGURATIONS=%~dp0available-test-configurations
7 7 set CURRENT_CONFIGURATION=%~dp0current-test-configuration
9 build-common/common.xml
@@ -199,6 +199,15 @@
199 199 <call target="set-${framework::get-target-framework()}-framework-configuration" />
200 200 </target>
201 201
  202 + <target name="set-net-4.0-framework-configuration">
  203 + <property name="nant.settings.currentframework" value="net-4.0" />
  204 + <property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5,NET_4_0" />
  205 + <!-- not using SDK_v2_0 because ndoc throws an exception -->
  206 + <property name="link.sdkdoc.version" value="SDK_v1_1" />
  207 + <!-- merge should work with 4.0 when compiling for 4.0 -->
  208 + <property name="merge.targetplatform" value="v4" />
  209 + </target>
  210 +
202 211 <target name="set-net-3.5-framework-configuration">
203 212 <property name="nant.settings.currentframework" value="net-3.5" />
204 213 <property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5" />
4 default.build
@@ -16,7 +16,7 @@
16 16 Supported versions of .NET Framework, separated by spaces.
17 17 Used by *-all-frameworks targets.
18 18 -->
19   - <property name="supported.frameworks" value="net-3.5" />
  19 + <property name="supported.frameworks" value="net-4.0" />
20 20
21 21 <fileset id="buildfiles.all" basedir="src">
22 22 <!-- Files have to be in dependency order -->
@@ -90,7 +90,7 @@
90 90
91 91 <target name="check-framework-version">
92 92 <echo>Running with ${framework::get-target-framework()}</echo>
93   - <fail message="ERROR: NHibernate requires .Net 3.5." if="${framework::get-target-framework()!='net-3.5'}"/>
  93 + <fail message="ERROR: NHibernate requires .Net 4.0." if="${framework::get-target-framework()!='net-4.0'}"/>
94 94 </target>
95 95
96 96 <target name="test-report" if="${nunit2report.installed}">
3  src/NHibernate.DomainModel/NHibernate.DomainModel.csproj
@@ -15,7 +15,7 @@
15 15 <OldToolsVersion>3.5</OldToolsVersion>
16 16 <UpgradeBackupLocation>
17 17 </UpgradeBackupLocation>
18   - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
  18 + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
19 19 <PublishUrl>publish\</PublishUrl>
20 20 <Install>true</Install>
21 21 <InstallFrom>Disk</InstallFrom>
@@ -31,6 +31,7 @@
31 31 <IsWebBootstrapper>false</IsWebBootstrapper>
32 32 <UseApplicationTrust>false</UseApplicationTrust>
33 33 <BootstrapperEnabled>true</BootstrapperEnabled>
  34 + <TargetFrameworkProfile />
34 35 </PropertyGroup>
35 36 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
36 37 <DebugSymbols>true</DebugSymbols>
2  src/NHibernate.Test.VisualBasic/My Project/Application.Designer.vb
... ... @@ -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.235
  4 +' Runtime Version:4.0.30319.269
5 5 '
6 6 ' Changes to this file may cause incorrect behavior and will be lost if
7 7 ' the code is regenerated.
2  src/NHibernate.Test.VisualBasic/My Project/Resources.Designer.vb
... ... @@ -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.235
  4 +' Runtime Version:4.0.30319.269
5 5 '
6 6 ' Changes to this file may cause incorrect behavior and will be lost if
7 7 ' the code is regenerated.
2  src/NHibernate.Test.VisualBasic/My Project/Settings.Designer.vb
... ... @@ -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.235
  4 +' Runtime Version:4.0.30319.269
5 5 '
6 6 ' Changes to this file may cause incorrect behavior and will be lost if
7 7 ' the code is regenerated.
2  src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj
@@ -13,7 +13,7 @@
13 13 <AssemblyName>NHibernate.Test.VisualBasic</AssemblyName>
14 14 <FileAlignment>512</FileAlignment>
15 15 <MyType>Windows</MyType>
16   - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
  16 + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
17 17 <TargetFrameworkProfile />
18 18 <StartAction>Program</StartAction>
19 19 <StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>
4 src/NHibernate.Test/App.config
@@ -103,4 +103,6 @@
103 103
104 104 </log4net>
105 105
106   -</configuration>
  106 +<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
  107 +
  108 +</configuration>
5 src/NHibernate.Test/NHibernate.Test.csproj
@@ -15,7 +15,7 @@
15 15 <OldToolsVersion>3.5</OldToolsVersion>
16 16 <UpgradeBackupLocation>
17 17 </UpgradeBackupLocation>
18   - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
  18 + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
19 19 <PublishUrl>publish\</PublishUrl>
20 20 <Install>true</Install>
21 21 <InstallFrom>Disk</InstallFrom>
@@ -34,6 +34,7 @@
34 34 <StartAction>Program</StartAction>
35 35 <StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>
36 36 <StartArguments>NHibernate.Test.dll</StartArguments>
  37 + <TargetFrameworkProfile />
37 38 </PropertyGroup>
38 39 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
39 40 <DebugSymbols>true</DebugSymbols>
@@ -68,7 +69,7 @@
68 69 <SpecificVersion>False</SpecificVersion>
69 70 <HintPath>..\..\lib\net\3.5\Antlr3.Runtime.dll</HintPath>
70 71 </Reference>
71   - <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
  72 + <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
72 73 <SpecificVersion>False</SpecificVersion>
73 74 <HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath>
74 75 </Reference>
2  src/NHibernate.TestDatabaseSetup/App.config
@@ -13,4 +13,4 @@
13 13 </property>
14 14 </session-factory>
15 15 </hibernate-configuration>
16   -</configuration>
  16 +<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
3  src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj
@@ -10,7 +10,7 @@
10 10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 11 <RootNamespace>NHibernate.TestDatabaseSetup</RootNamespace>
12 12 <AssemblyName>NHibernate.TestDatabaseSetup</AssemblyName>
13   - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
  13 + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14 14 <FileAlignment>512</FileAlignment>
15 15 <StartupObject>
16 16 </StartupObject>
@@ -36,6 +36,7 @@
36 36 <StartAction>Program</StartAction>
37 37 <StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>
38 38 <StartArguments>NHibernate.TestDatabaseSetup.dll</StartArguments>
  39 + <TargetFrameworkProfile />
39 40 </PropertyGroup>
40 41 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
41 42 <DebugSymbols>true</DebugSymbols>
20 src/NHibernate/NHibernate.csproj
@@ -15,7 +15,7 @@
15 15 <OldToolsVersion>3.5</OldToolsVersion>
16 16 <UpgradeBackupLocation>
17 17 </UpgradeBackupLocation>
18   - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
  18 + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
19 19 <PublishUrl>publish\</PublishUrl>
20 20 <Install>true</Install>
21 21 <InstallFrom>Disk</InstallFrom>
@@ -31,6 +31,7 @@
31 31 <IsWebBootstrapper>false</IsWebBootstrapper>
32 32 <UseApplicationTrust>false</UseApplicationTrust>
33 33 <BootstrapperEnabled>true</BootstrapperEnabled>
  34 + <TargetFrameworkProfile />
34 35 </PropertyGroup>
35 36 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
36 37 <DebugSymbols>true</DebugSymbols>
@@ -39,8 +40,7 @@
39 40 <OutputPath>bin\Debug-2.0\</OutputPath>
40 41 <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
41 42 <IntermediateOutputPath>obj\Debug-2.0\</IntermediateOutputPath>
42   - <DefineConstants>
43   - </DefineConstants>
  43 + <DefineConstants>NET_4_0</DefineConstants>
44 44 <ErrorReport>prompt</ErrorReport>
45 45 <WarningLevel>4</WarningLevel>
46 46 <DocumentationFile>bin\Debug-2.0\NHibernate.XML</DocumentationFile>
@@ -54,7 +54,7 @@
54 54 <OutputPath>bin\Release-2.0\</OutputPath>
55 55 <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
56 56 <IntermediateOutputPath>obj\Release-2.0\</IntermediateOutputPath>
57   - <DefineConstants>TRACE;NET_2_0</DefineConstants>
  57 + <DefineConstants>TRACE;NET_2_0;NET_4_0</DefineConstants>
58 58 <ErrorReport>prompt</ErrorReport>
59 59 <WarningLevel>4</WarningLevel>
60 60 <NoWarn>3001%3b3002%3b3003%3b3004%3b3005</NoWarn>
@@ -1862,11 +1862,11 @@
1862 1862 </ItemGroup>
1863 1863 <ItemGroup />
1864 1864 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
1865   - <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
1866   - Other similar extension points exist, see Microsoft.Common.targets.
1867   - <Target Name="BeforeBuild">
1868   - </Target>
1869   - <Target Name="AfterBuild">
1870   - </Target>
  1865 + <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  1866 + Other similar extension points exist, see Microsoft.Common.targets.
  1867 + <Target Name="BeforeBuild">
  1868 + </Target>
  1869 + <Target Name="AfterBuild">
  1870 + </Target>
1871 1871 -->
1872 1872 </Project>

0 comments on commit bd58b7a

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