Merge branch 'ngbrown-NH-3890' (updates many of the support projects to net-4.0).

oskarb · oskarb · commit c3b6e6322506 · 2016-07-31T13:23:36.000+02:00
diff --git a/Tools/Antlr/Antlr3.exe.config b/Tools/Antlr/Antlr3.exe.config
@@ -1,3 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
-	<startup><supportedRuntime version="v2.0.50727" sku="Client"/></startup></configuration>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
+		<supportedRuntime version="v2.0.50727" sku="Client"/>
+	</startup>
+</configuration>
diff --git a/Tools/BuildTool/.gitignore b/Tools/BuildTool/.gitignore
@@ -0,0 +1,8 @@
+# Ignore file for Visual Studio 2015
+
+*.user
+*.suo
+.vs/
+bin/Debug/
+obj/
+*.vshost.*
diff --git a/Tools/BuildTool/BuildTool.csproj b/Tools/BuildTool/BuildTool.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BuildTool</RootNamespace>
     <AssemblyName>BuildTool</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
diff --git a/Tools/BuildTool/app.config b/Tools/BuildTool/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v2.0.50727" sku="Client"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
diff --git a/Tools/BuildTool/bin/Release/BuildTool.exe b/Tools/BuildTool/bin/Release/BuildTool.exe
diff --git a/Tools/BuildTool/bin/Release/BuildTool.exe.config b/Tools/BuildTool/bin/Release/BuildTool.exe.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v2.0.50727" sku="Client"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
diff --git a/Tools/BuildTool/bin/Release/BuildTool.pdb b/Tools/BuildTool/bin/Release/BuildTool.pdb
diff --git a/Tools/ilrepack/ILRepack.exe b/Tools/ilrepack/ILRepack.exe
diff --git a/Tools/ilrepack/ILRepack.pdb b/Tools/ilrepack/ILRepack.pdb
diff --git a/src/.gitignore b/src/.gitignore
@@ -1,4 +1,4 @@
-# Ignore file for Visual Studio 2008/2010
+# Ignore file for Visual Studio 2008/2010/2015
 
 *.obj
 *.exe
@@ -32,3 +32,4 @@ _ReSharper*/
 *.[Pp]ublish.xml
 SharedAssemblyInfo.*
 hibernate.cfg.xml
+.vs/
diff --git 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>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -31,6 +31,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -77,6 +79,9 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </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.
diff --git a/src/NHibernate.Tool.HbmXsd/app.config b/src/NHibernate.Tool.HbmXsd/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?xml version="1.0" encoding="utf-8"?>`
	`2`	`+<configuration>`
	`3`	`+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>`