Skip to content

Commit f7be6a2

Browse files
oskarboskarb
authored
Merge pull request #535 from oskarb/net-462
NH-3877 Target Net 4.6.2 and upgrade solution files to VS2015
2 parents 63cbe84 + 107de6c commit f7be6a2

File tree

15 files changed

+55
-33
lines changed

15 files changed

+55
-33
lines changed

‎build-common/common.xml‎

Lines changed: 1 addition & 1 deletion
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.0" />
199+
<property name="referenceassemblies.dir" value="${environment::get-folder-path('ProgramFiles')}\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2" />
200200
</target>
201201

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

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,7 +15,7 @@
1515
<OldToolsVersion>3.5</OldToolsVersion>
1616
<UpgradeBackupLocation>
1717
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1919
<PublishUrl>publish\</PublishUrl>
2020
<Install>true</Install>
2121
<InstallFrom>Disk</InstallFrom>
@@ -44,6 +44,7 @@
4444
<ErrorReport>prompt</ErrorReport>
4545
<WarningLevel>4</WarningLevel>
4646
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
47+
<Prefer32Bit>false</Prefer32Bit>
4748
</PropertyGroup>
4849
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4950
<DebugType>pdbonly</DebugType>
@@ -55,6 +56,7 @@
5556
<ErrorReport>prompt</ErrorReport>
5657
<WarningLevel>4</WarningLevel>
5758
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
59+
<Prefer32Bit>false</Prefer32Bit>
5860
</PropertyGroup>
5961
<ItemGroup>
6062
<Reference Include="System" />

‎src/NHibernate.Everything.sln‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Studio 2010
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25123.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Support", "Support", "{9BDB5C84-14EC-4384-B423-9E319675B3CA}"
57
ProjectSection(FolderStartupServices) = postProject
68
{B4F97281-0DBD-4835-9ED8-7DFB966E87FF} = {B4F97281-0DBD-4835-9ED8-7DFB966E87FF}
@@ -82,6 +84,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "NHibernate.Example.Web", "N
8284
Release.AspNetCompiler.FixedNames = "false"
8385
Release.AspNetCompiler.Debug = "False"
8486
VWDPort = "3041"
87+
SlnRelativePath = "NHibernate.Example.Web\"
8588
DefaultWebSiteLanguage = "Visual C#"
8689
EndProjectSection
8790
EndProject
@@ -168,17 +171,17 @@ Global
168171
HideSolutionNode = FALSE
169172
EndGlobalSection
170173
GlobalSection(NestedProjects) = preSolution
174+
{094F74CD-2DD7-496F-BC48-A6D357BF33FD} = {28EA2C84-8295-49ED-BC67-803B7778513E}
175+
{92509065-DAEA-4457-8300-C7B64CD0E9F4} = {28EA2C84-8295-49ED-BC67-803B7778513E}
171176
{4CE16C2F-EFF6-48A4-99BC-8984DCC143FA} = {9BDB5C84-14EC-4384-B423-9E319675B3CA}
172177
{1631B0BA-59AC-4F0D-B300-3F64CC7579C9} = {9BDB5C84-14EC-4384-B423-9E319675B3CA}
173178
{936E50BD-4027-4864-ADE9-423C3FBF7FFB} = {9BDB5C84-14EC-4384-B423-9E319675B3CA}
174-
{00C03FBC-6720-4917-A203-DEA12FF3C7BF} = {9BDB5C84-14EC-4384-B423-9E319675B3CA}
175-
{92509065-DAEA-4457-8300-C7B64CD0E9F4} = {28EA2C84-8295-49ED-BC67-803B7778513E}
176-
{094F74CD-2DD7-496F-BC48-A6D357BF33FD} = {28EA2C84-8295-49ED-BC67-803B7778513E}
177-
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D} = {92509065-DAEA-4457-8300-C7B64CD0E9F4}
178179
{5909BFE7-93CF-4E5F-BE22-6293368AF01D} = {094F74CD-2DD7-496F-BC48-A6D357BF33FD}
179180
{5C649B55-1B3F-4C38-9998-1B043E94A244} = {094F74CD-2DD7-496F-BC48-A6D357BF33FD}
180181
{7AEE5B37-C552-4E59-9B6F-88755BCB5070} = {094F74CD-2DD7-496F-BC48-A6D357BF33FD}
182+
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D} = {92509065-DAEA-4457-8300-C7B64CD0E9F4}
181183
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C} = {094F74CD-2DD7-496F-BC48-A6D357BF33FD}
184+
{00C03FBC-6720-4917-A203-DEA12FF3C7BF} = {9BDB5C84-14EC-4384-B423-9E319675B3CA}
182185
EndGlobalSection
183186
GlobalSection(TextTemplating) = postSolution
184187
TextTemplating = 1

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

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,7 +13,7 @@
1313
<AssemblyName>NHibernate.Test.VisualBasic</AssemblyName>
1414
<FileAlignment>512</FileAlignment>
1515
<MyType>Windows</MyType>
16-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1717
<TargetFrameworkProfile />
1818
<StartAction>Program</StartAction>
1919
<StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>
@@ -27,6 +27,7 @@
2727
<OutputPath>bin\Debug\</OutputPath>
2828
<DocumentationFile>NHibernate.Test.VisualBasic.xml</DocumentationFile>
2929
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
30+
<Prefer32Bit>false</Prefer32Bit>
3031
</PropertyGroup>
3132
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3233
<DebugType>pdbonly</DebugType>
@@ -36,6 +37,7 @@
3637
<OutputPath>bin\Release\</OutputPath>
3738
<DocumentationFile>NHibernate.Test.VisualBasic.xml</DocumentationFile>
3839
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
40+
<Prefer32Bit>false</Prefer32Bit>
3941
</PropertyGroup>
4042
<PropertyGroup>
4143
<OptionExplicit>On</OptionExplicit>

‎src/NHibernate.Test/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898

9999
</log4net>
100100

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

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,7 +15,7 @@
1515
<OldToolsVersion>3.5</OldToolsVersion>
1616
<UpgradeBackupLocation>
1717
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1919
<PublishUrl>publish\</PublishUrl>
2020
<Install>true</Install>
2121
<InstallFrom>Disk</InstallFrom>
@@ -50,6 +50,7 @@
5050
<NoWarn>3001%3b3002%3b3003%3b3004%3b3005</NoWarn>
5151
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5252
<PlatformTarget>AnyCPU</PlatformTarget>
53+
<Prefer32Bit>false</Prefer32Bit>
5354
</PropertyGroup>
5455
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5556
<DebugType>pdbonly</DebugType>
@@ -63,6 +64,7 @@
6364
<UseVSHostingProcess>false</UseVSHostingProcess>
6465
<NoWarn>3001%3b3002%3b3003%3b3004%3b3005</NoWarn>
6566
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
67+
<Prefer32Bit>false</Prefer32Bit>
6668
</PropertyGroup>
6769
<ItemGroup>
6870
<Reference Include="Antlr3.Runtime, Version=3.1.0.39271, Culture=neutral, PublicKeyToken=3a9cab8f8d22bfb7, processorArchitecture=MSIL" Condition=" '$(Configuration)' == 'Debug' ">

‎src/NHibernate.TestDatabaseSetup/App.config‎

Lines changed: 1 addition & 1 deletion
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.0"/></startup></configuration>
16+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

0 commit comments

Comments
 (0)