Skip to content

Replace remaining SetOptions with WithOptions #1434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 15, 2017
Merged

Replace remaining SetOptions with WithOptions #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ indent_size = 2
indent_style = space
indent_size = 2

[*.csproj]
indent_style = space
indent_size = 2

[*.vbproj]
indent_style = space
indent_size = 2

[*.cshtml]
indent_style = space
Expand Down
2 changes: 1 addition & 1 deletion src/NHibernate.Test/Async/Futures/LinqFutureFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ public async Task UsingManyParametersAndQueries_DoesNotCauseParameterNameCollisi
{
query = query.Where(x => x.Age > j);
}
list.Add(query.SetOptions(x => x.SetCacheable(true)).ToFuture());
list.Add(query.WithOptions(x => x.SetCacheable(true)).ToFuture());
}
foreach (var query in list)
{
Expand Down
2 changes: 1 addition & 1 deletion src/NHibernate.Test/Futures/LinqFutureFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ public void UsingManyParametersAndQueries_DoesNotCauseParameterNameCollisions()
{
query = query.Where(x => x.Age > j);
}
list.Add(query.SetOptions(x => x.SetCacheable(true)).ToFuture());
list.Add(query.WithOptions(x => x.SetCacheable(true)).ToFuture());
}
foreach (var query in list)
{
Expand Down
7 changes: 2 additions & 5 deletions src/NHibernate/NHibernate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,11 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<AssemblyOriginatorKeyFile>..\NHibernate.snk</AssemblyOriginatorKeyFile>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<TreatSpecificWarningsAsErrors />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the trouble was in the test project, changing it only in the main project will not avoid it to happen again in tests.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hahaha. True:)


<PackageDescription>NHibernate is a mature, open source object-relational mapper for the .NET framework. It is actively developed, fully featured and used in thousands of successful projects.</PackageDescription>
<PackageTags>ORM; O/RM; DataBase; DAL; ObjectRelationalMapping; NHibernate; ADO.Net; Core</PackageTags>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<TreatSpecificWarningsAsErrors />
</PropertyGroup>

<ItemGroup>
Expand Down