Skip to content

Commit b5ce0a3

Browse files
jpennimanjpenniman
committed
NHE-165 Mult-target net461 and netstandard2.0.
1 parent 0f77cbc commit b5ce0a3

26 files changed

+120
-1500
lines changed

‎Src/Build/NHibernate.Envers.nuspec

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

‎Src/Build/buildDoc.bat

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ set msbuild="%windir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe"
77
set configuration=Release
88
set msbuildtasksVersion=1.4.0.65
99

10-
echo Installing msbuildtasks to %PackageFolder%. Please wait...
11-
%nugetFolder%\NuGet install MsBuildTasks -o %PackageFolder% -Version %msbuildtasksVersion%
12-
1310
%msbuild% default.msbuild /v:n /t:BuildDocs
1411
echo -------------------------------
1512
pause

‎Src/Build/buildRelease.bat

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,28 @@ SET SRCDIR=%~dp0
33
set SRCDIR=%SRCDIR:~0,-7%
44
set nugetfolder="%SRCDIR%\.nuget"
55
set packageFolder="%SRCDIR%\packages"
6-
set msbuild="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe"
76
set configuration=Release
8-
set msbuildtasksVersion=1.4.0.65
97

108
echo Before creating a release, remember to...
119
echo * Update release notes
12-
echo * Update nuspec file to point to correct NH Core version
1310
echo.
1411
pause
1512
echo.
1613

17-
echo Installing msbuildtasks to %PackageFolder%. Please wait...
18-
%nugetFolder%\NuGet install MsBuildTasks -o %PackageFolder% -Version %msbuildtasksVersion%
19-
2014
echo.
21-
set /p Version=Please enter version number, eg 1.2.0.0:
22-
set /p NugetVersion=Please enter nuget version number, eg 1.2.0:
23-
24-
%msbuild% default.msbuild /v:q /t:BuildRelease
25-
26-
hg revert -C %SRCDIR%\NHibernate.Envers\Properties\AssemblyInfo.cs
15+
set /p AssemblyFileVersion=Please enter version number, eg 1.2.0.0:
16+
set /p Version=Please enter nuget version number, eg 1.2.0:
17+
18+
dotnet msbuild default.msbuild /t:BuildRelease
2719

2820
echo -------------------------------
2921
echo.
30-
echo Created a new nuget package with version %nugetversion% to output folder.
31-
echo Assembly versions set to %Version%.
22+
echo Created a new nuget package with version %Version% to output folder.
23+
echo Assembly versions set to %AssemblyFileVersion%.
3224
echo Created html docs to output folder
3325
echo.
3426
echo Remember to...
35-
echo * Tag current changeset with version %nugetversion%
27+
echo * Tag current changeset with version %Version%
3628
echo * Push changes (tag) to server repo
3729
echo * Close and create a new release on JIRA
3830
echo * Push nuget package to nuget server (and symbol server)

‎Src/Build/default.msbuild

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,46 +11,34 @@
1111
<OutputDoc>$(DeployFolder)\EnversUserDoc.pdf</OutputDoc>
1212
<DeployHtmlFolder>$(DeployFolder)\html</DeployHtmlFolder>
1313
<PackageFolder>$(SourceDir)\Packages</PackageFolder>
14-
<MSBuildCommunityTasksPath>$(PackageFolder)\MSBuildTasks.$(msbuildtasksVersion)\tools</MSBuildCommunityTasksPath>
1514
</PropertyGroup>
16-
<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.targets" />
17-
18-
<ItemGroup>
19-
<AssemblyVersionFiles Include="$(SourceDir)\NHibernate.Envers\Properties\AssemblyInfo.cs"/>
20-
</ItemGroup>
15+
16+
<Target Name="MakeBuildDirectory">
17+
<RemoveDir Directories="$(DeployHtmlFolder)"/>
18+
<RemoveDir Directories="$(DeployFolder)" />
19+
<MakeDir Directories="$(DeployFolder)" />
20+
<MakeDir Directories="$(TempDirectory)"/>
21+
</Target>
2122

2223
<Target Name="BuildRelease" DependsOnTargets="RunBuild;nuget;CopyNuget">
2324
<RemoveDir Directories="$(TempDirectory)"/>
2425
</Target>
2526

2627
<Target Name="nuget" DependsOnTargets="MakeBuildDirectory;RunBuild">
27-
<Exec Command="$(NugetFolder)\NuGet pack NHibernate.Envers.nuspec -o $(DeployFolder) -symbols -Prop Configuration=Release -Version $(NugetVersion)"
28-
WorkingDirectory="$(MSBuildProjectDirectory)"/>
28+
<Exec Command="dotnet pack $(SourceDir)/NHibernate.Envers/NHibernate.Envers.csproj --no-build -c Release -o $(DeployFolder) /p:Version=$(Version)" />
2929
</Target>
3030

31-
<Target Name="CopyNuget">
32-
<!-- copying nuget.exe to deplayfolder - to make easier manual push to nuget server -->
31+
<Target Name="CopyNuget" DependsOnTargets="MakeBuildDirectory">
32+
<!-- copying nuget.exe to deployfolder - to make easier manual push to nuget server -->
3333
<Copy SourceFiles="$(NugetFolder)\NuGet.exe"
3434
DestinationFolder="$(DeployFolder)"/>
3535
</Target>
3636

37-
<Target Name="RunBuild" DependsOnTargets="UpdateAssemblyInfos">
37+
<Target Name="RunBuild" DependsOnTargets="MakeBuildDirectory">
3838
<MSBuild Projects="$(SourceDir)\NHibernate.Envers\NHibernate.Envers.csproj" Targets="Clean;Build" />
3939
</Target>
4040

41-
<Target Name="MakeBuildDirectory">
42-
<RemoveDir Directories="$(DeployHtmlFolder)"/>
43-
<RemoveDir Directories="$(DeployFolder)" />
44-
<MakeDir Directories="$(DeployFolder)" />
45-
<MakeDir Directories="$(TempDirectory)"/>
46-
</Target>
47-
48-
<Target Name="UpdateAssemblyInfos">
49-
<FileUpdate Files="%(AssemblyVersionFiles.FullPath)"
50-
Regex="(\d+)\.(\d+)\.(\d+)\.(\d+)"
51-
ReplacementText="$(Version)"/>
52-
</Target>
53-
41+
<!-- Documentation build steps/targets-->
5442
<Target Name="BuildDocs" DependsOnTargets="RunPdfBuild;RunHtmlBuild">
5543
<Copy SourceFiles="$(OutputDoc)" DestinationFolder="$(DeployFolder)" />
5644
<RemoveDir Directories="$(TempDirectory)" />

‎Src/Envers.sln

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27428.2015
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{34BA8295-3EBE-47B0-ABBF-0A7E9A8E6B35}"
57
ProjectSection(SolutionItems) = preProject
68
Build\buildDoc.bat = Build\buildDoc.bat
@@ -10,10 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1012
ReleaseNotes.txt = ReleaseNotes.txt
1113
EndProjectSection
1214
EndProject
13-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Envers", "NHibernate.Envers\NHibernate.Envers.csproj", "{16492F52-0C2E-4847-9CBF-696907808FD6}"
14-
EndProject
15-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Envers.Tests", "NHibernate.Envers.Tests\NHibernate.Envers.Tests.csproj", "{D03CBC3B-37CF-4C06-BACE-3B2674399BEE}"
16-
EndProject
1715
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{C9C74EFE-506E-41A8-8359-88AB303E60DA}"
1816
ProjectSection(SolutionItems) = preProject
1917
doc\Reference\modules\configuration.xml = doc\Reference\modules\configuration.xml
@@ -36,25 +34,32 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D559C7
3634
.nuget\NuGet.targets = .nuget\NuGet.targets
3735
EndProjectSection
3836
EndProject
37+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Envers", "NHibernate.Envers\NHibernate.Envers.csproj", "{D6E2814A-1512-4185-93B5-15D4213EC0AD}"
38+
EndProject
39+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Envers.Tests", "NHibernate.Envers.Tests\NHibernate.Envers.Tests.csproj", "{896EEE6A-40C5-4CC5-BB34-8D63795B30DC}"
40+
EndProject
3941
Global
4042
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4143
Debug|Any CPU = Debug|Any CPU
4244
Release|Any CPU = Release|Any CPU
4345
EndGlobalSection
4446
GlobalSection(ProjectConfigurationPlatforms) = postSolution
45-
{16492F52-0C2E-4847-9CBF-696907808FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46-
{16492F52-0C2E-4847-9CBF-696907808FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
47-
{16492F52-0C2E-4847-9CBF-696907808FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{16492F52-0C2E-4847-9CBF-696907808FD6}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{D03CBC3B-37CF-4C06-BACE-3B2674399BEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{D03CBC3B-37CF-4C06-BACE-3B2674399BEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{D03CBC3B-37CF-4C06-BACE-3B2674399BEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{D03CBC3B-37CF-4C06-BACE-3B2674399BEE}.Release|Any CPU.Build.0 = Release|Any CPU
47+
{D6E2814A-1512-4185-93B5-15D4213EC0AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48+
{D6E2814A-1512-4185-93B5-15D4213EC0AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
49+
{D6E2814A-1512-4185-93B5-15D4213EC0AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
50+
{D6E2814A-1512-4185-93B5-15D4213EC0AD}.Release|Any CPU.Build.0 = Release|Any CPU
51+
{896EEE6A-40C5-4CC5-BB34-8D63795B30DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52+
{896EEE6A-40C5-4CC5-BB34-8D63795B30DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
53+
{896EEE6A-40C5-4CC5-BB34-8D63795B30DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
54+
{896EEE6A-40C5-4CC5-BB34-8D63795B30DC}.Release|Any CPU.Build.0 = Release|Any CPU
5355
EndGlobalSection
5456
GlobalSection(SolutionProperties) = preSolution
5557
HideSolutionNode = FALSE
5658
EndGlobalSection
5759
GlobalSection(NestedProjects) = preSolution
5860
{C9C74EFE-506E-41A8-8359-88AB303E60DA} = {34BA8295-3EBE-47B0-ABBF-0A7E9A8E6B35}
5961
EndGlobalSection
62+
GlobalSection(ExtensibilityGlobals) = postSolution
63+
SolutionGuid = {3C6F75BA-ECC8-4F58-A758-095FD2A2411F}
64+
EndGlobalSection
6065
EndGlobal

‎Src/NHibernate.Envers.Tests/Integration/Basic/OutsideTransactionTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ public void ShouldThrowIfCollectionRemovalOutsideActiveTransaction()
100100
});
101101
}
102102

103+
#if NETCOREAPP2_0
104+
[Ignore("System.Transactions is not supported in Core. See https://github.com/dotnet/corefx/issues/19894")]
105+
#endif
103106
[Test]
104107
public void ShouldThrowIfOutsideDistributedTransaction()
105108
{

‎Src/NHibernate.Envers.Tests/Integration/RevEntity/CustomColumnMappingTest.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@ protected override void Initialize()
4949
timestamp3 = DateTime.UtcNow;
5050
}
5151

52-
[Test, ExpectedException(typeof(RevisionDoesNotExistException))]
52+
[Test]
5353
public void TooEarlyTimeStampShouldFireException()
5454
{
55-
AuditReader().GetRevisionNumberForDate(timestamp1);
55+
Assert.That(()=>
56+
AuditReader().GetRevisionNumberForDate(timestamp1),
57+
Throws.TypeOf<RevisionDoesNotExistException>());
5658
}
5759

5860
[Test]

‎Src/NHibernate.Envers.Tests/Integration/RevEntity/CustomDateTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ protected override void Initialize()
4949
timestamp3 = DateTime.UtcNow;
5050
}
5151

52-
[Test, ExpectedException(typeof(RevisionDoesNotExistException))]
52+
[Test]
5353
public void TooEarlyTimeStampShouldFireException()
5454
{
55-
AuditReader().GetRevisionNumberForDate(timestamp1);
55+
Assert.That(()=>AuditReader().GetRevisionNumberForDate(timestamp1), Throws.TypeOf<RevisionDoesNotExistException>());
5656
}
5757

5858
[Test]

‎Src/NHibernate.Envers.Tests/Integration/RevEntity/CustomFieldAccessTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ protected override void Initialize()
4949
timestamp3 = DateTime.UtcNow;
5050
}
5151

52-
[Test, ExpectedException(typeof(RevisionDoesNotExistException))]
52+
[Test]
5353
public void TooEarlyTimeStampShouldFireException()
5454
{
55-
AuditReader().GetRevisionNumberForDate(timestamp1);
55+
Assert.That(() => AuditReader().GetRevisionNumberForDate(timestamp1), Throws.TypeOf<RevisionDoesNotExistException>());
5656
}
5757

5858
[Test]

‎Src/NHibernate.Envers.Tests/Integration/RevEntity/CustomFieldCamelcaseAccessTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ protected override void Initialize()
4949
timestamp3 = DateTime.UtcNow;
5050
}
5151

52-
[Test, ExpectedException(typeof(RevisionDoesNotExistException))]
52+
[Test]
5353
public void TooEarlyTimeStampShouldFireException()
5454
{
55-
AuditReader().GetRevisionNumberForDate(timestamp1);
55+
Assert.That(() => AuditReader().GetRevisionNumberForDate(timestamp1), Throws.TypeOf<RevisionDoesNotExistException>());
5656
}
5757

5858
[Test]

0 commit comments

Comments
 (0)