Skip to content
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

Jump to bottom

ContainerBuilder : Adds public Constructor to create ContainerBuilder instance. #2241

Merged
merged 7 commits into from
Mar 22, 2021
Merged

ContainerBuilder : Adds public Constructor to create ContainerBuilder instance. #2241

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7c31b94
Make methods virtual and Expose ContainerBuilder constructor.
kr-santosh Feb 18, 2021
cfbd69b
Update ContainerBuilder.cs
kr-santosh Feb 18, 2021
e7f62dc
Fixes.
kr-santosh Feb 19, 2021
e3c9abd
Update ContainerBuilder.cs
kr-santosh Feb 19, 2021
0b8841e
Merge branch 'master' into users/sakulk/makevirtualbuilder
kr-santosh Feb 19, 2021
ee038b0
Merge branch 'master' into users/sakulk/makevirtualbuilder
kr-santosh Mar 5, 2021
43dbc19
Merge branch 'master' into users/sakulk/makevirtualbuilder
j82w Mar 22, 2021
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
Prev Previous commit
Next Next commit
Update ContainerBuilder.cs
  • Loading branch information
@kr-santosh
kr-santosh committed Feb 19, 2021
commit e3c9abd352459232ff6bdaf6de24b206b2e75976
6 changes: 1 addition & 5 deletions Microsoft.Azure.Cosmos/src/Fluent/Settings/ContainerBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,7 @@ private void AddConflictResolution(ConflictResolutionPolicy conflictResolutionPo
if (conflictResolutionPolicy.Mode == ConflictResolutionMode.Custom
&& !string.IsNullOrEmpty(conflictResolutionPolicy.ResolutionProcedure))
{
if (this.clientContext != null)
{
this.clientContext.ValidateResource(conflictResolutionPolicy.ResolutionProcedure);
}

this.clientContext.ValidateResource(conflictResolutionPolicy.ResolutionProcedure);
conflictResolutionPolicy.ResolutionProcedure = UriFactory.CreateStoredProcedureUri(this.containerUri.ToString(), conflictResolutionPolicy.ResolutionProcedure).ToString();
}

Expand Down