Skip to content

Commit 2b36766

Browse files
hazzikhazzik
committed
Merge branch 'master' into nh3565
2 parents 59a532b + 2e24925 commit 2b36766

File tree

70 files changed

+1763
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1763
-170
lines changed

‎.deepsource.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ version = 1
22

33
test_patterns = ["src/NHibernate.Test/**"]
44

5+
exclude_patterns = [
6+
"src/NHibernate/Async/**/*.cs",
7+
"src/NHibernate.DomainModel/Async/**/*.cs",
8+
"src/NHibernate.Test/Async/**/*.cs"
9+
]
10+
511
[[analyzers]]
612
name = "csharp"
713
enabled = true
14+
15+
[[transformers]]
16+
name = "dotnet-format"
17+
enabled = true

‎.github/renovate.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"pruneStaleBranches": false,
88
"automerge": true,
99
"platformAutomerge": true,
10+
"rebaseWhen": "never",
1011
"labels": [
1112
"dependencies",
1213
"p: Lowest",

‎.github/workflows/GenerateAsyncCode.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Generate Async code
2+
3+
on:
4+
pull_request_target:
5+
paths:
6+
- '**.cs'
7+
8+
permissions: {}
9+
10+
jobs:
11+
generate-async:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v3
16+
with:
17+
ref: ${{ github.event.pull_request.head.ref }}
18+
repository: ${{ github.event.pull_request.head.repo.full_name }}
19+
token: ${{ secrets.NHIBERNATE_BOT_TOKEN }}
20+
21+
- name: Setup .NET
22+
uses: actions/setup-dotnet@v2
23+
with:
24+
dotnet-version: 6.0.x
25+
26+
- name: Generate Async code
27+
run: |
28+
pushd src
29+
dotnet tool restore
30+
dotnet restore ./NHibernate.sln
31+
dotnet async-generator
32+
popd
33+
34+
- name: Push changes
35+
run: |
36+
git config user.name github-actions[bot]
37+
git config user.email github-actions[bot]@users.noreply.github.com
38+
if [[ -z "$(git status --porcelain)" ]]; then
39+
echo "No changes to commit"
40+
exit 0
41+
fi
42+
git add -A
43+
git commit -am "Generate async files"
44+
git push

‎.github/workflows/NetCoreTests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ jobs:
5252
run: |
5353
docker run -d -p 1521:1521 -e APP_USER=nhibernate -e APP_USER_PASSWORD=nhibernate -e ORACLE_PASSWORD=nhibernate gvenzl/oracle-xe:18-slim
5454
55-
- uses: actions/checkout@v2
55+
- uses: actions/checkout@v3
5656
- name: Setup .NET
57-
uses: actions/setup-dotnet@v1
57+
uses: actions/setup-dotnet@v2
5858
with:
5959
dotnet-version: 6.0.x
6060

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ TestResult.xml
1919
.vs/
2020
/build-common/NHibernate.dev.props
2121
/doc/reference/master.xml
22+
/doc/bin/
23+
/doc/obj/
24+
/Tools/bin/
25+
/Tools/obj/

‎Tools/actual_msbuild.cmd

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

‎Tools/packages.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="vswhere" Version="2.1.4" />
1514
<PackageReference Include="NUnit.Console" Version="3.10.0" />
1615
</ItemGroup>
1716

‎build-common/NHibernate.props

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
<TreatSpecificWarningsAsErrors />
3333

3434
<DisableImplicitPackageTargetFallback>True</DisableImplicitPackageTargetFallback>
35-
</PropertyGroup>
36-
<PropertyGroup Condition="'$(IsPackable)' == 'True'">
35+
3736
<PackageProjectUrl>https://nhibernate.info</PackageProjectUrl>
3837
<PackageIconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</PackageIconUrl>
3938
<PackageIcon>NHibernate-NuGet.png</PackageIcon>
@@ -46,6 +45,6 @@
4645
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
4746
</PropertyGroup>
4847
<ItemGroup>
49-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" />
48+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
5049
</ItemGroup>
5150
</Project>

‎doc/.gitignore

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

‎doc/NHibernate.shfbproj.template renamed to ‎doc/NHibernate.shfbproj

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
1+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
2+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
23
<PropertyGroup>
34
<!-- The configuration and platform will be used to determine which
45
assemblies to include from solution and project documentation
@@ -7,26 +8,27 @@
78
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
89
<SchemaVersion>2.0</SchemaVersion>
910
<ProjectGuid>{91f431cd-23fb-4ed4-a690-0344073c65f0}</ProjectGuid>
10-
<SHFBSchemaVersion>1.8.0.0</SHFBSchemaVersion>
11+
<SHFBSchemaVersion>2017.9.26.0</SHFBSchemaVersion>
1112
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
1213
Studio adds them anyway -->
1314
<AssemblyName>Documentation</AssemblyName>
1415
<RootNamespace>Documentation</RootNamespace>
1516
<Name>Documentation</Name>
1617
<!-- SHFB properties -->
17-
<OutputPath>${doc.out.dir}</OutputPath>
18+
<FrameworkVersion>.NET Framework 4.6.1</FrameworkVersion>
19+
<OutputPath></OutputPath>
1820
<HtmlHelpName>NHibernateAPI</HtmlHelpName>
19-
<HelpFileFormat>HtmlHelp1x</HelpFileFormat>
21+
<HelpFileFormat>HtmlHelp1</HelpFileFormat>
2022
<CopyrightText>NHibernate</CopyrightText>
2123
<CopyrightHref>https://nhibernate.info</CopyrightHref>
2224
<FeedbackEMailAddress>https://groups.google.com/group/nhibernate-development</FeedbackEMailAddress>
2325
<FeedbackEMailLinkText>nhibernate team</FeedbackEMailLinkText>
2426
<HelpTitle>NHibernate API Reference</HelpTitle>
2527
<IndentHtml>False</IndentHtml>
26-
<HelpFileVersion>${project.version}</HelpFileVersion>
28+
<HelpFileVersion>1.0.0.0</HelpFileVersion>
2729
<DocumentationSources>
28-
<DocumentationSource sourceFile="${root.dir}/src/NHibernate/bin/${build.config}/net461/NHibernate.dll" />
29-
<DocumentationSource sourceFile="${root.dir}/src/NHibernate/bin/${build.config}/net461/Nhibernate.xml" />
30+
<DocumentationSource sourceFile="../src/NHibernate/bin/$(Configuration)/net461/NHibernate.dll" />
31+
<DocumentationSource sourceFile="../src/NHibernate/bin/$(Configuration)/net461/Nhibernate.xml" />
3032
</DocumentationSources>
3133
</PropertyGroup>
3234
<!-- There are no properties for these two groups but they need to appear in
@@ -35,6 +37,10 @@
3537
</PropertyGroup>
3638
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3739
</PropertyGroup>
40+
<ItemGroup>
41+
<PackageReference Include="EWSoftware.SHFB.NETFramework" Version="4.8.0.2" />
42+
</ItemGroup>
43+
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="'$(MSBuildRestoreSessionId)' != ''" />
3844
<!-- Import the SHFB build targets -->
39-
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
45+
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" Condition="'$(MSBuildRestoreSessionId)' == ''" />
4046
</Project>

0 commit comments

Comments
 (0)