Skip to content

Commit 342c3ff

Browse files
committed
Backtrack to target .Net 4.6.1 since we don't need any 4.6.2 API. (NH-3877).
With .Net 4.6.2 being very new, .Net 4.6.1 currently has greater adoption. Since we don't actually plan to use any of the new API in .Net 4.6.2, we might as well target the older version.
1 parent 16c1459 commit 342c3ff

File tree

12 files changed

+17
-15
lines changed

12 files changed

+17
-15
lines changed

build-common/common.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<property name="link.sdkdoc.version" value="SDK_v1_1" />
197197
<!-- merge should work with 4.0 when compiling for 4.0 -->
198198
<property name="merge.targetplatform" value="v4" />
199-
<property name="referenceassemblies.dir" value="${environment::get-folder-path('ProgramFiles')}\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2" />
199+
<property name="referenceassemblies.dir" value="${environment::get-folder-path('ProgramFiles')}\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1" />
200200
</target>
201201

202202
<target name="set-net-3.5-framework-configuration">

src/NHibernate.DomainModel/NHibernate.DomainModel.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<OldToolsVersion>3.5</OldToolsVersion>
1616
<UpgradeBackupLocation>
1717
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1919
<PublishUrl>publish\</PublishUrl>
2020
<Install>true</Install>
2121
<InstallFrom>Disk</InstallFrom>

src/NHibernate.Everything.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Test", "NHiberna
6767
EndProject
6868
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "NHibernate.Example.Web", "NHibernate.Example.Web\", "{C5D6EE68-1760-4F97-AD31-42343593D8C1}"
6969
ProjectSection(WebsiteProperties) = preProject
70-
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
70+
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6.1"
7171
ProjectReferences = "{5909BFE7-93CF-4E5F-BE22-6293368AF01D}|NHibernate.dll;"
7272
Debug.AspNetCompiler.VirtualPath = "/NHibernate.Example.Web"
7373
Debug.AspNetCompiler.PhysicalPath = "NHibernate.Example.Web\"

src/NHibernate.Example.Web/Web.Config

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
affects performance, set this value to true only
2424
during development.
2525
-->
26-
<compilation debug="true" targetFramework="4.0"/>
26+
<compilation debug="true" targetFramework="4.6.1"/>
2727
<!--
2828
The <authentication> section enables configuration
2929
of the security authentication mode used by
@@ -49,7 +49,9 @@
4949
</httpModules>
5050
</system.web>
5151
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
52-
<bytecode-provider type="null"/><!-- Important under Medium Trust -->
52+
<!-- Important under Medium Trust -->
53+
<bytecode-provider type="null"/>
54+
5355
<session-factory>
5456
<property name="connection.provider">NHibernate.Connection.DriverConnectionProvider, NHibernate</property>
5557
<property name="connection.connection_string">

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>v4.6.2</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1717
<TargetFrameworkProfile />
1818
<StartAction>Program</StartAction>
1919
<StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>

src/NHibernate.Test/App.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33

44
<configSections>
@@ -98,7 +98,7 @@
9898

9999
</log4net>
100100

101-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
101+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
102102
<runtime>
103103
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
104104
<dependentAssembly>

src/NHibernate.Test/NHibernate.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<OldToolsVersion>3.5</OldToolsVersion>
1616
<UpgradeBackupLocation>
1717
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1919
<PublishUrl>publish\</PublishUrl>
2020
<Install>true</Install>
2121
<InstallFrom>Disk</InstallFrom>

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-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
16+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj

+1-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>v4.6.2</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<StartupObject>
1616
</StartupObject>

src/NHibernate.Tool.HbmXsd/NHibernate.Tool.HbmXsd.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<OldToolsVersion>3.5</OldToolsVersion>
1616
<UpgradeBackupLocation>
1717
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1919
<PublishUrl>publish\</PublishUrl>
2020
<Install>true</Install>
2121
<InstallFrom>Disk</InstallFrom>

src/NHibernate.Tool.HbmXsd/app.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

src/NHibernate/NHibernate.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<OldToolsVersion>3.5</OldToolsVersion>
1616
<UpgradeBackupLocation>
1717
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1919
<PublishUrl>publish\</PublishUrl>
2020
<Install>true</Install>
2121
<InstallFrom>Disk</InstallFrom>
@@ -1823,4 +1823,4 @@
18231823
</GetReferenceAssemblyPaths>
18241824
<Exec Command="$(SolutionDir)..\Tools\ilrepack\ilrepack.exe /verbose /t:library /targetplatform:v4,&quot;$(_ReferenceAssembliesPath).&quot; /keyfile:$(AssemblyOriginatorKeyFile) /internalize:internalize.exclude /out:$(OutputPath)\NHibernate.dll $(IntermediateOutputPath)\NHibernate.dll $(OutputPath)\Remotion.Linq.dll $(OutputPath)\Antlr3.Runtime.dll" />
18251825
</Target>
1826-
</Project>
1826+
</Project>

0 commit comments

Comments
 (0)