Skip to content

Commit bd58b7a

Browse files
oskarboskarb
committed
Update VS and NANT files to target .Net 4.0.
1 parent c9354fe commit bd58b7a

15 files changed

+40
-26
lines changed

‎GaRelease.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -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

‎NHibernate.nunit

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<NUnitProject>
22
<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">
44
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\NHibernate.TestDatabaseSetup.dll" />
55
<assembly path="src\NHibernate.Test\bin\Debug-2.0\NHibernate.Test.dll" />
66
<assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\NHibernate.Test.VisualBasic.dll" />
77
</Config>
8-
<Config name="Release" binpathtype="Auto" runtimeFramework="net-2.0">
8+
<Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
99
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\NHibernate.TestDatabaseSetup.dll" />
1010
<assembly path="src\NHibernate.Test\bin\Release-2.0\NHibernate.Test.dll" />
1111
<assembly path="src\NHibernate.Test.VisualBasic\bin\Release\NHibernate.Test.VisualBasic.dll" />

‎ShowBuildMenu.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@echo off
22
pushd %~dp0
33

4-
set NANT="%~dp0Tools\nant\bin\NAnt.exe" -t:net-3.5
4+
set NANT="%~dp0Tools\nant\bin\NAnt.exe" -t:net-4.0
55
set BUILDTOOL="%~dp0Tools\BuildTool\bin\Release\BuildTool.exe"
66
set AVAILABLE_CONFIGURATIONS=%~dp0available-test-configurations
77
set CURRENT_CONFIGURATION=%~dp0current-test-configuration

‎build-common/common.xml

+9
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,15 @@
199199
<call target="set-${framework::get-target-framework()}-framework-configuration" />
200200
</target>
201201

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+
202211
<target name="set-net-3.5-framework-configuration">
203212
<property name="nant.settings.currentframework" value="net-3.5" />
204213
<property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5" />

‎default.build

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
Supported versions of .NET Framework, separated by spaces.
1717
Used by *-all-frameworks targets.
1818
-->
19-
<property name="supported.frameworks" value="net-3.5" />
19+
<property name="supported.frameworks" value="net-4.0" />
2020

2121
<fileset id="buildfiles.all" basedir="src">
2222
<!-- Files have to be in dependency order -->
@@ -90,7 +90,7 @@
9090

9191
<target name="check-framework-version">
9292
<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'}"/>
9494
</target>
9595

9696
<target name="test-report" if="${nunit2report.installed}">

‎src/NHibernate.DomainModel/NHibernate.DomainModel.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<OldToolsVersion>3.5</OldToolsVersion>
1616
<UpgradeBackupLocation>
1717
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1919
<PublishUrl>publish\</PublishUrl>
2020
<Install>true</Install>
2121
<InstallFrom>Disk</InstallFrom>
@@ -31,6 +31,7 @@
3131
<IsWebBootstrapper>false</IsWebBootstrapper>
3232
<UseApplicationTrust>false</UseApplicationTrust>
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<TargetFrameworkProfile />
3435
</PropertyGroup>
3536
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3637
<DebugSymbols>true</DebugSymbols>

‎src/NHibernate.Test.VisualBasic/My Project/Application.Designer.vb

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/NHibernate.Test.VisualBasic/My Project/Resources.Designer.vb

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/NHibernate.Test.VisualBasic/My Project/Settings.Designer.vb

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AssemblyName>NHibernate.Test.VisualBasic</AssemblyName>
1414
<FileAlignment>512</FileAlignment>
1515
<MyType>Windows</MyType>
16-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1717
<TargetFrameworkProfile />
1818
<StartAction>Program</StartAction>
1919
<StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>

‎src/NHibernate.Test/App.config

+3-1
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,6 @@
103103

104104
</log4net>
105105

106-
</configuration>
106+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
107+
108+
</configuration>

‎src/NHibernate.Test/NHibernate.Test.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<OldToolsVersion>3.5</OldToolsVersion>
1616
<UpgradeBackupLocation>
1717
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1919
<PublishUrl>publish\</PublishUrl>
2020
<Install>true</Install>
2121
<InstallFrom>Disk</InstallFrom>
@@ -34,6 +34,7 @@
3434
<StartAction>Program</StartAction>
3535
<StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>
3636
<StartArguments>NHibernate.Test.dll</StartArguments>
37+
<TargetFrameworkProfile />
3738
</PropertyGroup>
3839
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3940
<DebugSymbols>true</DebugSymbols>
@@ -68,7 +69,7 @@
6869
<SpecificVersion>False</SpecificVersion>
6970
<HintPath>..\..\lib\net\3.5\Antlr3.Runtime.dll</HintPath>
7071
</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">
7273
<SpecificVersion>False</SpecificVersion>
7374
<HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath>
7475
</Reference>

‎src/NHibernate.TestDatabaseSetup/App.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
</property>
1414
</session-factory>
1515
</hibernate-configuration>
16-
</configuration>
16+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

‎src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>NHibernate.TestDatabaseSetup</RootNamespace>
1212
<AssemblyName>NHibernate.TestDatabaseSetup</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<StartupObject>
1616
</StartupObject>
@@ -36,6 +36,7 @@
3636
<StartAction>Program</StartAction>
3737
<StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>
3838
<StartArguments>NHibernate.TestDatabaseSetup.dll</StartArguments>
39+
<TargetFrameworkProfile />
3940
</PropertyGroup>
4041
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4142
<DebugSymbols>true</DebugSymbols>

‎src/NHibernate/NHibernate.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<OldToolsVersion>3.5</OldToolsVersion>
1616
<UpgradeBackupLocation>
1717
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1919
<PublishUrl>publish\</PublishUrl>
2020
<Install>true</Install>
2121
<InstallFrom>Disk</InstallFrom>
@@ -31,6 +31,7 @@
3131
<IsWebBootstrapper>false</IsWebBootstrapper>
3232
<UseApplicationTrust>false</UseApplicationTrust>
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<TargetFrameworkProfile />
3435
</PropertyGroup>
3536
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3637
<DebugSymbols>true</DebugSymbols>
@@ -39,8 +40,7 @@
3940
<OutputPath>bin\Debug-2.0\</OutputPath>
4041
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
4142
<IntermediateOutputPath>obj\Debug-2.0\</IntermediateOutputPath>
42-
<DefineConstants>
43-
</DefineConstants>
43+
<DefineConstants>NET_4_0</DefineConstants>
4444
<ErrorReport>prompt</ErrorReport>
4545
<WarningLevel>4</WarningLevel>
4646
<DocumentationFile>bin\Debug-2.0\NHibernate.XML</DocumentationFile>
@@ -54,7 +54,7 @@
5454
<OutputPath>bin\Release-2.0\</OutputPath>
5555
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
5656
<IntermediateOutputPath>obj\Release-2.0\</IntermediateOutputPath>
57-
<DefineConstants>TRACE;NET_2_0</DefineConstants>
57+
<DefineConstants>TRACE;NET_2_0;NET_4_0</DefineConstants>
5858
<ErrorReport>prompt</ErrorReport>
5959
<WarningLevel>4</WarningLevel>
6060
<NoWarn>3001%3b3002%3b3003%3b3004%3b3005</NoWarn>
@@ -1862,11 +1862,11 @@
18621862
</ItemGroup>
18631863
<ItemGroup />
18641864
<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>
18711871
-->
18721872
</Project>

0 commit comments

Comments
 (0)