From 342c3ff2043e5610b6cfaf8d301901602338639f Mon Sep 17 00:00:00 2001
From: Oskar Berggren <oskar.berggren@gmail.com>
Date: Sun, 4 Dec 2016 13:24:25 +0100
Subject: [PATCH] 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.
---
 build-common/common.xml                                     | 2 +-
 src/NHibernate.DomainModel/NHibernate.DomainModel.csproj    | 2 +-
 src/NHibernate.Everything.sln                               | 2 +-
 src/NHibernate.Example.Web/Web.Config                       | 6 ++++--
 .../NHibernate.Test.VisualBasic.vbproj                      | 2 +-
 src/NHibernate.Test/App.config                              | 4 ++--
 src/NHibernate.Test/NHibernate.Test.csproj                  | 2 +-
 src/NHibernate.TestDatabaseSetup/App.config                 | 2 +-
 .../NHibernate.TestDatabaseSetup.csproj                     | 2 +-
 src/NHibernate.Tool.HbmXsd/NHibernate.Tool.HbmXsd.csproj    | 2 +-
 src/NHibernate.Tool.HbmXsd/app.config                       | 2 +-
 src/NHibernate/NHibernate.csproj                            | 4 ++--
 12 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/build-common/common.xml b/build-common/common.xml
index 776a6cccfe8..4bab4d39c22 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -196,7 +196,7 @@
 		<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" />
-		<property name="referenceassemblies.dir" value="${environment::get-folder-path('ProgramFiles')}\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2" />
+		<property name="referenceassemblies.dir" value="${environment::get-folder-path('ProgramFiles')}\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1" />
 	</target>
 	
 	<target name="set-net-3.5-framework-configuration">
diff --git a/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj b/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj
index 2991692c9ce..b18f9837dec 100644
--- a/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj
+++ b/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
diff --git a/src/NHibernate.Everything.sln b/src/NHibernate.Everything.sln
index 79e8b6767c1..efa754ea293 100644
--- a/src/NHibernate.Everything.sln
+++ b/src/NHibernate.Everything.sln
@@ -67,7 +67,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Test", "NHiberna
 EndProject
 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "NHibernate.Example.Web", "NHibernate.Example.Web\", "{C5D6EE68-1760-4F97-AD31-42343593D8C1}"
 	ProjectSection(WebsiteProperties) = preProject
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6.1"
 		ProjectReferences = "{5909BFE7-93CF-4E5F-BE22-6293368AF01D}|NHibernate.dll;"
 		Debug.AspNetCompiler.VirtualPath = "/NHibernate.Example.Web"
 		Debug.AspNetCompiler.PhysicalPath = "NHibernate.Example.Web\"
diff --git a/src/NHibernate.Example.Web/Web.Config b/src/NHibernate.Example.Web/Web.Config
index f24c08ec316..dfa072b6b63 100644
--- a/src/NHibernate.Example.Web/Web.Config
+++ b/src/NHibernate.Example.Web/Web.Config
@@ -23,7 +23,7 @@
             affects performance, set this value to true only 
             during development.
         -->
-    <compilation debug="true" targetFramework="4.0"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <!--
             The <authentication> section enables configuration 
             of the security authentication mode used by 
@@ -49,7 +49,9 @@
     </httpModules>
   </system.web>
   <hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
-    <bytecode-provider type="null"/><!-- Important under Medium Trust -->
+    <!-- Important under Medium Trust -->
+    <bytecode-provider type="null"/>
+
     <session-factory>
       <property name="connection.provider">NHibernate.Connection.DriverConnectionProvider, NHibernate</property>
       <property name="connection.connection_string">
diff --git a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj
index 4706a65d86d..7c03ef4625c 100644
--- a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj
+++ b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj
@@ -13,7 +13,7 @@
     <AssemblyName>NHibernate.Test.VisualBasic</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <StartAction>Program</StartAction>
     <StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>
diff --git a/src/NHibernate.Test/App.config b/src/NHibernate.Test/App.config
index 2ebd4faf57c..83a2785b7d4 100644
--- a/src/NHibernate.Test/App.config
+++ b/src/NHibernate.Test/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	
 	<configSections>
@@ -98,7 +98,7 @@
 
 	</log4net>
 
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<dependentAssembly>
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
index 8d35b4c0a1e..a78ed691ba9 100644
--- a/src/NHibernate.Test/NHibernate.Test.csproj
+++ b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
diff --git a/src/NHibernate.TestDatabaseSetup/App.config b/src/NHibernate.TestDatabaseSetup/App.config
index 5abefa5c02a..12027f3e8e8 100644
--- a/src/NHibernate.TestDatabaseSetup/App.config
+++ b/src/NHibernate.TestDatabaseSetup/App.config
@@ -13,4 +13,4 @@
       </property>
     </session-factory>
   </hibernate-configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj
index f4c416a81fd..d8da235780f 100644
--- a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj
+++ b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NHibernate.TestDatabaseSetup</RootNamespace>
     <AssemblyName>NHibernate.TestDatabaseSetup</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>
     </StartupObject>
diff --git a/src/NHibernate.Tool.HbmXsd/NHibernate.Tool.HbmXsd.csproj b/src/NHibernate.Tool.HbmXsd/NHibernate.Tool.HbmXsd.csproj
index 6e47b232924..22a16a7bd63 100644
--- a/src/NHibernate.Tool.HbmXsd/NHibernate.Tool.HbmXsd.csproj
+++ b/src/NHibernate.Tool.HbmXsd/NHibernate.Tool.HbmXsd.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
diff --git a/src/NHibernate.Tool.HbmXsd/app.config b/src/NHibernate.Tool.HbmXsd/app.config
index 2a0024f75ec..3dbff35f484 100644
--- a/src/NHibernate.Tool.HbmXsd/app.config
+++ b/src/NHibernate.Tool.HbmXsd/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
index 4c07150826f..e3bf774776a 100644
--- a/src/NHibernate/NHibernate.csproj
+++ b/src/NHibernate/NHibernate.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -1823,4 +1823,4 @@
     </GetReferenceAssemblyPaths>
     <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" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file