Skip to content

Commit e68bcb8

Browse files
hazzikhazzik
authored
Merge pull request #670 from ngbrown/NH-3990-VB
NH-3990 - Upgrade VB test project to VS2017 project structure
2 parents 0d70729 + 67227e9 commit e68bcb8

File tree

6 files changed

+68
-151
lines changed

6 files changed

+68
-151
lines changed

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

Lines changed: 39 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,57 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>
7-
</ProductVersion>
8-
<SchemaVersion>
9-
</SchemaVersion>
10-
<ProjectGuid>{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}</ProjectGuid>
11-
<OutputType>Library</OutputType>
12-
<RootNamespace>NHibernate.Test.VisualBasic</RootNamespace>
13-
<AssemblyName>NHibernate.Test.VisualBasic</AssemblyName>
14-
<FileAlignment>512</FileAlignment>
15-
<MyType>Windows</MyType>
16-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
17-
<TargetFrameworkProfile />
18-
<StartAction>Program</StartAction>
19-
<StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>
20-
<StartArguments>NHibernate.Test.VisualBasic.dll</StartArguments>
4+
<TargetFramework>net461</TargetFramework>
5+
<GenerateAssemblyTitleAttribute>False</GenerateAssemblyTitleAttribute>
6+
<GenerateAssemblyProductAttribute>False</GenerateAssemblyProductAttribute>
7+
<GenerateAssemblyCompanyAttribute>False</GenerateAssemblyCompanyAttribute>
8+
<GenerateAssemblyDescriptionAttribute>False</GenerateAssemblyDescriptionAttribute>
9+
<GenerateAssemblyVersionAttribute>False</GenerateAssemblyVersionAttribute>
10+
<GenerateAssemblyFileVersionAttribute>False</GenerateAssemblyFileVersionAttribute>
11+
<GenerateAssemblyInformationalVersionAttribute>False</GenerateAssemblyInformationalVersionAttribute>
12+
<NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
2113
</PropertyGroup>
22-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
23-
<DebugSymbols>true</DebugSymbols>
24-
<DebugType>full</DebugType>
25-
<DefineDebug>true</DefineDebug>
26-
<DefineTrace>true</DefineTrace>
27-
<OutputPath>bin\Debug\</OutputPath>
28-
<DocumentationFile>NHibernate.Test.VisualBasic.xml</DocumentationFile>
29-
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
30-
<Prefer32Bit>false</Prefer32Bit>
31-
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
33-
<DebugType>pdbonly</DebugType>
34-
<DefineDebug>false</DefineDebug>
35-
<DefineTrace>true</DefineTrace>
36-
<Optimize>true</Optimize>
37-
<OutputPath>bin\Release\</OutputPath>
38-
<DocumentationFile>NHibernate.Test.VisualBasic.xml</DocumentationFile>
39-
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
40-
<Prefer32Bit>false</Prefer32Bit>
41-
</PropertyGroup>
42-
<PropertyGroup>
43-
<OptionExplicit>On</OptionExplicit>
44-
</PropertyGroup>
45-
<PropertyGroup>
46-
<OptionCompare>Binary</OptionCompare>
47-
</PropertyGroup>
48-
<PropertyGroup>
49-
<OptionStrict>Off</OptionStrict>
50-
</PropertyGroup>
51-
<PropertyGroup>
52-
<OptionInfer>On</OptionInfer>
53-
</PropertyGroup>
54-
<ItemGroup>
55-
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
56-
<HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
57-
</Reference>
58-
<Reference Include="System" />
59-
<Reference Include="System.Data" />
60-
<Reference Include="System.Xml" />
61-
<Reference Include="System.Core" />
62-
<Reference Include="System.Xml.Linq" />
63-
<Reference Include="System.Data.DataSetExtensions" />
64-
</ItemGroup>
14+
6515
<ItemGroup>
66-
<Import Include="Microsoft.VisualBasic" />
67-
<Import Include="System" />
68-
<Import Include="System.Collections" />
69-
<Import Include="System.Collections.Generic" />
70-
<Import Include="System.Data" />
71-
<Import Include="System.Diagnostics" />
72-
<Import Include="System.Linq" />
73-
<Import Include="System.Xml.Linq" />
16+
<Compile Remove="Issues\NH3302\**" /> <!--"Like" not supported in new dotnet compiler, not implemented anyways in .net framework-->
7417
</ItemGroup>
18+
7519
<ItemGroup>
76-
<Compile Include="..\SharedAssemblyInfo.vb">
77-
<Link>SharedAssemblyInfo.vb</Link>
78-
</Compile>
79-
<Compile Include="AssemblyInfo.vb" />
80-
<Compile Include="Issues\NH2966\Client.vb" />
81-
<Compile Include="Issues\NH2966\Fixture.vb" />
82-
<Compile Include="Issues\NH3302\Entity.vb" />
83-
<Compile Include="Issues\NH3302\Fixture.vb" />
84-
<Compile Include="Issues\NH2963\Entity.vb" />
85-
<Compile Include="Issues\NH2963\Fixture.vb" />
86-
<Compile Include="Issues\NH0000\Entity.vb" />
87-
<Compile Include="Issues\NH0000\Fixture.vb" />
88-
<Compile Include="Issues\IssueTestCase.vb" />
89-
<Compile Include="Issues\NH2545\Fixture.vb" />
90-
<Compile Include="Issues\NH2545\Entity.vb" />
91-
<Compile Include="Issues\NH2966\Order.vb" />
92-
<Compile Include="My Project\AssemblyInfo.vb" />
93-
<Compile Include="My Project\Application.Designer.vb">
94-
<AutoGen>True</AutoGen>
95-
<DependentUpon>Application.myapp</DependentUpon>
96-
</Compile>
97-
<Compile Include="My Project\Resources.Designer.vb">
98-
<AutoGen>True</AutoGen>
99-
<DesignTime>True</DesignTime>
100-
<DependentUpon>Resources.resx</DependentUpon>
101-
</Compile>
102-
<Compile Include="My Project\Settings.Designer.vb">
103-
<AutoGen>True</AutoGen>
104-
<DependentUpon>Settings.settings</DependentUpon>
105-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
106-
</Compile>
20+
<None Remove="**\*.hbm.xml" />
10721
</ItemGroup>
22+
10823
<ItemGroup>
109-
<EmbeddedResource Include="My Project\Resources.resx">
110-
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
111-
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
112-
<CustomToolNamespace>My.Resources</CustomToolNamespace>
113-
<SubType>Designer</SubType>
114-
</EmbeddedResource>
24+
<EmbeddedResource Include="**\*.hbm.xml" Exclude="bin\**\*.*" />
11525
</ItemGroup>
26+
11627
<ItemGroup>
117-
<None Include="..\NHibernate.Test\App.config">
118-
<Link>App.config</Link>
119-
<SubType>Designer</SubType>
120-
</None>
121-
<None Include="My Project\Application.myapp">
122-
<Generator>MyApplicationCodeGenerator</Generator>
123-
<LastGenOutput>Application.Designer.vb</LastGenOutput>
124-
</None>
125-
<None Include="My Project\Settings.settings">
126-
<Generator>SettingsSingleFileGenerator</Generator>
127-
<CustomToolNamespace>My</CustomToolNamespace>
128-
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
129-
</None>
130-
<None Include="packages.config" />
28+
<Compile Include="..\SharedAssemblyInfo.vb" Link="SharedAssemblyInfo.vb" />
13129
</ItemGroup>
30+
13231
<ItemGroup>
133-
<ProjectReference Include="..\NHibernate.Test\NHibernate.Test.csproj">
134-
<Project>{7AEE5B37-C552-4E59-9B6F-88755BCB5070}</Project>
135-
<Name>NHibernate.Test</Name>
136-
</ProjectReference>
137-
<ProjectReference Include="..\NHibernate\NHibernate.csproj">
138-
<Project>{5909BFE7-93CF-4E5F-BE22-6293368AF01D}</Project>
139-
<Name>NHibernate</Name>
140-
</ProjectReference>
32+
<None Include="..\NHibernate.Test\App.config" Link="App.config" />
14133
</ItemGroup>
34+
14235
<ItemGroup>
143-
<EmbeddedResource Include="Issues\NH2545\Issues.NH2545.Mappings.hbm.xml" />
36+
<PackageReference Include="Antlr3.Runtime" Version="3.5.1" />
37+
<PackageReference Include="Iesi.Collections" Version="4.0.2" />
38+
<PackageReference Include="log4net" Version="2.0.8" />
39+
<PackageReference Include="nunit" Version="3.7.1" />
40+
<PackageReference Include="Remotion.Linq" Version="2.1.2" />
41+
<PackageReference Include="Remotion.Linq.EagerFetching" Version="2.1.0" />
42+
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.7.6" />
43+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0" />
44+
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
45+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
14446
</ItemGroup>
47+
14548
<ItemGroup>
146-
<EmbeddedResource Include="Issues\NH0000\Issues.NH0000.Mappings.hbm.xml" />
49+
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />
50+
<ProjectReference Include="..\NHibernate.Test\NHibernate.Test.csproj" ExcludeAssets="ContentFiles" />
14751
</ItemGroup>
52+
14853
<ItemGroup>
149-
<EmbeddedResource Include="Issues\NH2966\Issues.NH2966.Mappings.hbm.xml" />
150-
<EmbeddedResource Include="Issues\NH3302\Issues.NH3302.Mappings.hbm.xml" />
54+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
15155
</ItemGroup>
152-
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
153-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
154-
Other similar extension points exist, see Microsoft.Common.targets.
155-
<Target Name="BeforeBuild">
156-
</Target>
157-
<Target Name="AfterBuild">
158-
</Target>
159-
-->
160-
</Project>
56+
57+
</Project>

‎src/NHibernate.Test.VisualBasic/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/NHibernate.Test/NHSpecificTest/DtcFailures/DtcFailuresFixture.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,11 @@ public ForceEscalationToDistributedTx() : this(false) {}
331331

332332
public void Prepare(PreparingEnlistment preparingEnlistment)
333333
{
334-
Assert.AreNotEqual(thread, Thread.CurrentThread.ManagedThreadId);
334+
if (thread == Thread.CurrentThread.ManagedThreadId)
335+
{
336+
log.Warn("Thread.CurrentThread.ManagedThreadId ({0}) is same as creation thread");
337+
}
338+
335339
if (shouldRollBack)
336340
{
337341
log.Debug(">>>>Force Rollback<<<<<");

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@
4242
<PackageReference Include="Antlr3.Runtime" Version="3.5.1" />
4343
<PackageReference Include="Iesi.Collections" Version="4.0.2" />
4444
<PackageReference Include="log4net" Version="2.0.8" />
45-
<PackageReference Include="nunit" Version="3.6.0" />
45+
<PackageReference Include="nunit" Version="3.7.1" />
4646
<PackageReference Include="Remotion.Linq" Version="2.1.2" />
4747
<PackageReference Include="Remotion.Linq.EagerFetching" Version="2.1.0" />
4848
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.7.6" />
4949
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0" />
50+
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
51+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
5052
</ItemGroup>
5153

5254
<ItemGroup>
@@ -60,4 +62,8 @@
6062
<Reference Include="System.Transactions" />
6163
</ItemGroup>
6264

65+
<ItemGroup>
66+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
67+
</ItemGroup>
68+
6369
</Project>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="nunit" Version="3.6.0" />
16+
<PackageReference Include="nunit" Version="3.7.1" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
1719
</ItemGroup>
1820

1921
<ItemGroup>
@@ -32,4 +34,8 @@
3234
</Reference>
3335
</ItemGroup>
3436

37+
<ItemGroup>
38+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
39+
</ItemGroup>
40+
3541
</Project>

‎src/NHibernate/Linq/Functions/CompareGenerator.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,17 @@ internal static bool IsCompareMethod(MethodInfo methodInfo)
4444
return true;
4545

4646
// This is .Net 4 only, and in the System.Data.Services assembly, which we don't depend directly on.
47-
return methodInfo != null && methodInfo.Name == "Compare" &&
47+
if (methodInfo != null && methodInfo.Name == "Compare" &&
4848
methodInfo.DeclaringType != null &&
49-
methodInfo.DeclaringType.FullName == "System.Data.Services.Providers.DataServiceProviderMethods";
49+
methodInfo.DeclaringType.FullName == "System.Data.Services.Providers.DataServiceProviderMethods")
50+
return true;
51+
52+
if (methodInfo != null && methodInfo.Name == "CompareString" &&
53+
methodInfo.DeclaringType != null &&
54+
(methodInfo.DeclaringType.FullName == "Microsoft.VisualBasic.CompilerServices.EmbeddedOperators"))
55+
return true;
56+
57+
return false;
5058
}
5159

5260

0 commit comments

Comments
 (0)