conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
=======
doc.Root.SetAttributeValue("TraitorsEnabled", TraitorsEnabled.ToString());
doc.Root.SetAttributeValue("MaxFileTransferDuration", FileStreamSender.MaxTransferDuration.TotalSeconds);
if (GameMain.NetLobbyScreen != null && GameMain.NetLobbyS... |
<<<<<<<
=======
//public static Action<LoginCancelledEvent> OnLoginCancelled = delegate {};
>>>>>>>
//public static Action<LoginCancelledEvent> OnLoginCancelled = delegate {};
<<<<<<<
public static Action<Provider> OnLogoutFinished = delegate {};
=======
//public static Action<LogoutFailedEvent> OnL... |
<<<<<<<
public void GetMemPoolEntryThrows()
{
using (var builder = NodeBuilderEx.Create())
{
var node = builder.CreateNode();
var rpc = node.CreateRPCClient();
builder.StartAll();
Assert.Throws<RPCException>(() => rpc.GetMempoolEntry(uint256.One, throwIfNotFound: true));
}
}
[Fact]
... |
<<<<<<<
[TestMethod]
public void TestTerm1Parser()
{
BuildMLParser();
var r = Term1.Parse("fred");
Assert.IsTrue(!r.IsFaulted);
Assert.IsTrue(r.Value.First().Item1.GetType().Name.Contains("VarTerm"));
}
[TestMethod]
public... |
<<<<<<<
public virtual IList<WidgetCategory> Categories { get; set; }
=======
public const string CategorizableItemKeyForWidgets = "Widgets";
public virtual Category Category { get; set; }
>>>>>>>
public virtual IList<WidgetCategory> Categories { get; set; }
public const strin... |
<<<<<<<
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// Licensed under the MIT license.
using Microsoft.Azure.Mobile.Unity.Analytics;
=======
using System.Collections;
>>>>>>>
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// Licensed under the MIT license.
using System.Collec... |
<<<<<<<
using Autofac;
=======
using BetterCms.Api;
>>>>>>>
using Autofac;
using BetterCms.Api;
<<<<<<<
using BetterCms.Core.Modules.Registration;
=======
using BetterCms.Core.Exceptions;
using BetterCms.Core.Modules.Projections;
using BetterCms.Module.Root.Projections;
using Common.Logging;
>>>>>>>
using Bet... |
<<<<<<<
using System.Collections.Generic;
using System.Linq;
using BetterCms.Module.MediaManager.Models;
=======
using BetterCms.Core.Mvc.Commands;
using BetterCms.Module.MediaManager.Services;
>>>>>>>
using BetterCms.Module.MediaManager.Services; |
<<<<<<<
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// Licensed under the MIT license.
=======
using System.Collections;
>>>>>>>
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// Licensed under the MIT license.
using System.Collections; |
<<<<<<<
/// Looks up a localized string similar to Create redirects.
/// </summary>
public static string ImportBlogPosts_CreateRedirects_Title {
get {
return ResourceManager.GetString("ImportBlogPosts_CreateRedirects_Title", resourceCulture);
}
}... |
<<<<<<<
=======
using BetterCms.Core.DataAccess;
using BetterCms.Core.Mvc.Commands;
using BetterCms.Module.Root.Accessors;
>>>>>>>
using BetterCms.Module.Root.Accessors;
<<<<<<<
using BetterModules.Core.Web.Mvc.Commands;
=======
using NHibernate;
>>>>>>>
using BetterModules.Core.DataAccess;
using BetterModules.... |
<<<<<<<
public virtual IList<MediaTag> MediaTags { get; set; }
=======
public virtual MediaImage Image { get; set; }
>>>>>>>
public virtual IList<MediaTag> MediaTags { get; set; }
public virtual MediaImage Image { get; set; } |
<<<<<<<
WrapperTransmissionTarget transmissionTarget = Analytics.GetTransmissionTarget();
transmissionTarget.IsEnabledAsync().ContinueWith(task =>
{
TransmissionEnabled.isOn = task.Result;
});
=======
WrapperTransmissionTarget transmissionTarget = Analytics.GetTr... |
<<<<<<<
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// Licensed under the MIT license.
using Microsoft.Azure.Mobile.Unity;
=======
using System.Collections;
using Microsoft.Azure.Mobile.Unity;
>>>>>>>
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// Licensed under the MIT lic... |
<<<<<<<
private static string MobileCenterResourcesFolderPath = "Assets/Plugins/Android/mobile-center/res/values/";
private static string MobileCenterResourcesPath = MobileCenterResourcesFolderPath + "mobile-center-settings.xml";
private static string MobileCenterManifestPath = "Assets/Plugins/Android/mobil... |
<<<<<<<
using BetterCms.Module.Pages.ViewModels.Option;
using BetterCms.Module.Root.ViewModels.Option;
=======
using BetterCms.Module.Root.ViewModels.Security;
>>>>>>>
using BetterCms.Module.Pages.ViewModels.Option;
using BetterCms.Module.Root.ViewModels.Security;
using BetterCms.Module.Root.ViewModels.Option;
<<<... |
<<<<<<<
var request = new GetPagesRequest(page => page.PageUrl == Urls.Page404, includeUnpublished: true);
=======
var request = new GetPagesRequest(page => page.PageUrl.TrimEnd('/') == Urls.Page404.TrimEnd('/'), includeUnpublished: true, includePrivate: true);
>>>>>>>
... |
<<<<<<<
=======
using System.Linq;
using BetterCms.Core.DataContracts;
using BetterCms.Core.Models;
>>>>>>> |
<<<<<<<
=======
using BetterCms.Core.Exceptions.DataTier;
using BetterCms.Core.Models;
using BetterCms.Core.Security;
using BetterCms.Core.Services;
using BetterCms.Module.Root.Helpers;
>>>>>>>
using BetterCms.Core.Services; |
<<<<<<<
WriteLiteral("></span>\r\n </span>\r\n <!-- /ko -->\r\n" +
" </div>\r\n </div>\r\n\r\n <div");
=======
WriteLiteral("></span>\r\n </span>\r\n <!-- /ko -->\r\n" +
" ... |
<<<<<<<
using BetterModules.Core.DataAccess.DataContext;
=======
using BetterCms.Core.DataAccess.DataContext;
using BetterCms.Core.Services;
>>>>>>>
using BetterModules.Core.DataAccess.DataContext;
using BetterCms.Core.Services; |
<<<<<<<
Filter isPublishedFilter = null;
if (!RetrieveUnpublishedPages())
{
var isPublishedQuery = new TermQuery(new Term(LuceneIndexDocumentKeys.IsPublished, "true"));
isPublishedFilter = new QueryWrapperFilter(isPublishedQuery);
}
... |
<<<<<<<
public AppBackendService(IConfiguration configuration, IBasicAuthenticationConfig basicAuthConfig)
=======
public AppBackendService(IConfiguration configuration, IBasicAuthenticationConfig basicAuthConfig)
>>>>>>>
public AppBackendService(IConfiguration configuration, IBasicAuthentic... |
<<<<<<<
private static readonly DateTimeZone testZone = new FixedDateTimeZone("tmp", Offset.Zero);
=======
private static readonly IDateTimeZone TestZone = new FixedDateTimeZone("tmp", Offset.Zero);
>>>>>>>
private static readonly DateTimeZone TestZone = new FixedDateTimeZone("tmp", Offset.Ze... |
<<<<<<<
[Test]
public void TestToString_InvalidFormat()
{
Assert.Throws<FormatException>(() => Offset.Zero.ToString("A"));
}
[Test]
public void TestToString_MinValue()
{
TestToStringBase(Offset.MinValue, "-PT23H59M59.999S", "-PT23H59M59.9... |
<<<<<<<
=======
private static readonly Offset StandardOffset = Offset.ForHours(1);
private static readonly Offset DaylightOffset = Offset.ForHours(2);
private static readonly Transition Fall2009Transition = new Transition
(Instant.FromUtc(2009, 10, 25, 1, 0), DaylightOffset, Stan... |
<<<<<<<
/*
if ((parseInfo.fAllowTrailingWhite && pattern.HasMoreCharacters) && ParseByFormat(str, pattern, formatInfo, false, parseResult))
{
return true;
}
... |
<<<<<<<
Assert.AreEqual(TestObjects.CreatePositiveOffset(3, 0, 0), ThreeHours + Offset.Zero, "1 + 0");
Assert.AreEqual(TestObjects.CreatePositiveOffset(3, 0, 0), Offset.Zero + ThreeHours, "0 + 1");
=======
Assert.AreEqual(TestObjects.CreatePositiveOffset(3, 0, 0, 0), ThreeHours + O... |
<<<<<<<
[Test]
public void RotationalSpeedTimesTimeSpanEqualsAngle()
{
var angle = RotationalSpeed.FromRadiansPerSecond(10.0) * TimeSpan.FromSeconds(9.0);
Assert.AreEqual(angle, Angle.FromRadians(90.0));
}
[Test]
public void TimeSpanTimesRotationa... |
<<<<<<<
private const string MinimalFormat = "M";
private const string ShortFormat = "S";
private const string LongFormat = "L";
public static readonly Offset Zero = Offset.FromMilliseconds(0);
public static readonly Offset MinValue = Offset.FromMilliseconds(-NodaConstants.Milli... |
<<<<<<<
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static float exact_power_of_ten(long power)
{
#if NET5_0
Debug.Assert(power < Constants.powers_of_ten_float.Length);
ref float tableRef = ref MemoryMarshal.GetArrayDataReference(Constants.powers_of_ten_float);
return Unsafe.... |
<<<<<<<
for (; i < value.Length; i++) { var c = value.GetChar(i); if (c >= WhiteSpaceFlags.Length || !WhiteSpaceFlags[c]) break; } //Whitespace inline
=======
for (; i < value.Length; i++) { var c = value[i]; if (!JsonUtils.IsWhiteSpace(c)) break; } //Whitespace inline
>>>>>>>
for... |
<<<<<<<
string cutomerId = null;
#if !(PCL || NETSTANDARD)
=======
string subId = null;
#if !PCL
>>>>>>>
string subId = null;
#if !(PCL || NETSTANDARD) |
<<<<<<<
for (; index < strType.Length; index++) { var c = strType.GetChar(index); if (c >= JsonTypeSerializer.WhiteSpaceFlags.Length || !JsonTypeSerializer.WhiteSpaceFlags[c]) break; } //Whitespace inline
if (strType.GetChar(index++) != JsWriter.MapStartChar)
throw DeserializeTyp... |
<<<<<<<
using NUnit.Framework;
using System;
=======
using System;
>>>>>>>
using System;
using NUnit.Framework;
using System; |
<<<<<<<
}
", @"Private Sub Test()
Dim o As Object = New List(Of Integer)()
Dim l As List(Of Integer) = CType(o, List(Of Integer))
End Sub
");
=======
}", @"Private Sub Test()
Dim o As Object = New System.Collections.Generic.List(Of Integer)()
Dim l As List(Of Integer) = CType(o, System.Collections.Gen... |
<<<<<<<
Dim s = CStr(o)
End Sub");
=======
Dim s As String = CStr(o)
End Sub
");
>>>>>>>
Dim s As String = CStr(o)
End Sub");
<<<<<<<
Dim l = CType(o, System.Collections.Generic.List(Of Integer))
End Sub");
=======
Dim l As List(Of Integer) = CType(o, System.Collections.Generic.List(Of Integer... |
<<<<<<<
=======
internal const double searchEps = 1e-5;
>>>>>>>
internal const double searchEps = 1e-5;
<<<<<<<
Dictionary<VisibilityEdge, VisibilityVertex> GetEdgeSnapAtVertexMap(LgNodeInfo nodeInfo) {
=======
static void SortPointByAngles(LgNodeInfo nodeInfo, Point[] polySplitAr... |
<<<<<<<
private Type? GetCustomPlugInPointType(Type interfaceType)
=======
/// <summary>
/// Configures the plug in.
/// </summary>
/// <param name="plugInId">The plug in identifier.</param>
/// <param name="configuration">The configuration.</param>
public void ... |
<<<<<<<
using MUnique.OpenMU.DataModel.Configuration.Quests;
=======
using MUnique.OpenMU.DataModel.Composition;
>>>>>>>
using MUnique.OpenMU.DataModel.Configuration.Quests;
using MUnique.OpenMU.DataModel.Composition; |
<<<<<<<
var mapInitializer = new GameServerMapInitializer(gameServerDefinition, this.Id);
this.gameContext = new GameServerContext(gameServerDefinition, guildServer, loginServer, friendServer, persistenceContextProvider, mapInitializer);
this.gameContext.GameMapCreated +=... |
<<<<<<<
Concentus.Celt.Pitch.pitch_search(pitch_buf.GetPointer(CeltConstants.COMBFILTER_MAXPERIOD >> 1), pitch_buf, N,
CeltConstants.COMBFILTER_MAXPERIOD - 3 * CeltConstants.COMBFILTER_MINPERIOD, out pitch_index);
pitch_index = CeltConstants.COMBFILTER_MAXPERIOD - p... |
<<<<<<<
Tools.ForceKick(e.Msg.whoAmI, "You are banned: " + ban.Reason);
e.Handled = true;
return;
=======
Tools.Kick(e.Msg.whoAmI, "You are banned: " + ban.Reason);
return true;
>>>>>>>
Tools.Force... |
<<<<<<<
internal Handlers.EmojiHandler EmojiHandler { get; set; }
=======
internal Handlers.NetModules.NetModulePacketHandler NetModuleHandler { get; set; }
>>>>>>>
internal Handlers.NetModules.NetModulePacketHandler NetModuleHandler { get; set; }
internal Handlers.EmojiHandler EmojiHandler { get; set; } |
<<<<<<<
Groups = new GroupManager(DB);
Groups.LoadPermisions();
=======
>>>>>>> |
<<<<<<<
{ PacketTypes.TileKill, HandlePlaceChest },
=======
{ PacketTypes.PlaceChest, HandleTileKill },
{ PacketTypes.PlayerKillMe, HandlePlayerKillMe },
>>>>>>>
{ PacketTypes.PlaceChest, HandlePlaceChest }, |
<<<<<<<
public int LoginAttempts { get; set; }
=======
public TSPlayer LastWhisper;
>>>>>>>
public TSPlayer LastWhisper;
public int LoginAttempts { get; set; } |
<<<<<<<
{ PacketTypes.SyncTilePicking, HandleSyncTilePicking },
{ PacketTypes.SyncRevengeMarker, HandleSyncRevengeMarker },
=======
{ PacketTypes.Emoji, HandleEmoji },
{ PacketTypes.SyncRevengeMarker, HandleSyncRevengeMarker },
{ PacketTypes.LandGolfBallInCup, HandleLandGolfBallInCup },
>>>>... |
<<<<<<<
if (Tools.activePlayers() + 1 > ConfigurationManager.maxSlots)
=======
int count = 1;
for (int i = 0; i < Main.player.Length; i++)
count += Main.player[i].active ? 1 : 0;
string ip = Tools.GetRealIP((Convert.ToString(Netplay.serverSock[ply].tcpC... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
RevertKillTile((int)i);
=======
if (ConfigurationManager.banTnt)
Ban(i, "Kill Tile Abuse");
else
Tools.Kick(i, "Kill tile... |
<<<<<<<
{ PacketTypes.FishOutNPC, HandleFishOutNPC },
{ PacketTypes.FoodPlatterTryPlacing, HandleFoodPlatterTryPlacing }
=======
{ PacketTypes.FoodPlatterTryPlacing, HandleFoodPlatterTryPlacing },
{ PacketTypes.SyncRevengeMarker, HandleSyncRevengeMarker }
>>>>>>>
{ PacketTypes.FishOutNPC, Ha... |
<<<<<<<
{PacketTypes.PlayerSlot, HandlePlayerSlot},
=======
{PacketTypes.ChestGetContents, HandleChest},
{PacketTypes.SignNew, HandleSign}
>>>>>>>
{PacketTypes.ChestGetContents, HandleChest},
{PacketTypes.SignNew, HandleSign}
... |
<<<<<<<
internal Handlers.LandGolfBallInCupHandler LandGolfBallInCupHandler { get; set; }
=======
internal Handlers.EmojiHandler EmojiHandler { get; set; }
>>>>>>>
internal Handlers.EmojiHandler EmojiHandler { get; set; }
internal Handlers.LandGolfBallInCupHandler LandGolfBallInCupHandler { get; set;... |
<<<<<<<
public static IMigrationRunnerBuilder SetServer(this IMigrationRunnerBuilder builder, DataSettings dataSettings)
=======
#region Methods
/// <summary>
/// Configure the database server
/// </summary>
/// <param name="builder">Configuring migration runner servic... |
<<<<<<<
if (stateProvince == null)
throw new ArgumentNullException(nameof(stateProvince));
await _stateProvinceRepository.Delete(stateProvince);
//event notification
await _eventPublisher.EntityDeleted(stateProvince);
=======
_stateProvince... |
<<<<<<<
if (urlRecord == null)
throw new ArgumentNullException(nameof(urlRecord));
await _urlRecordRepository.Delete(urlRecord);
//event notification
await _eventPublisher.EntityDeleted(urlRecord);
=======
_urlRecordRepository.Delete(urlRec... |
<<<<<<<
if (!await mappings.AnyAsync())
return;
await _discountManufacturerMappingRepository.Delete(mappings);
=======
_discountManufacturerMappingRepository.Delete(mappings.ToList());
>>>>>>>
await _discountManufacturerMappingRepository.Delete(mapping... |
<<<<<<<
public virtual Task<ShippingProviderListModel> PrepareShippingProviderListModelAsync(ShippingProviderSearchModel searchModel)
=======
public virtual async Task<ShippingProviderListModel> PrepareShippingProviderListModel(ShippingProviderSearchModel searchModel)
>>>>>>>
public virtual a... |
<<<<<<<
await _emailAccountRepository.Insert(emailAccount);
//event notification
await _eventPublisher.EntityInserted(emailAccount);
=======
_emailAccountRepository.Insert(emailAccount);
>>>>>>>
await _emailAccountRepository.Insert(emailAccount);
<<<<<<<
... |
<<<<<<<
using System.Threading.Tasks;
=======
using LinqToDB;
>>>>>>>
using System.Threading.Tasks;
using LinqToDB;
<<<<<<<
public virtual async Task DeleteProductProductTagMappingAsync(int productId, int productTagId)
=======
protected virtual void DeleteProductProductTagMapping(int productId, in... |
<<<<<<<
await _forumRepository.Update(forum);
=======
// if the forum group is changed then clear cache for the previous group
// (we can't use the event consumer because it will work after saving the changes in DB)
var forumToUpdate = _forumRepository.LoadOriginalCopy... |
<<<<<<<
await _taxCategoryRepository.Delete(taxCategory => categoriesIds.Contains(taxCategory.Id));
await _cacheManager.Remove(NopTaxDefaults.TaxCategoriesAllCacheKey);
=======
_taxCategoryRepository.Delete(taxCategory => categoriesIds.Contains(taxCategory.Id));
... |
<<<<<<<
var cacheKey = _cacheKeyService.PrepareKeyForShortTermCache(NopModelCacheDefaults.WidgetModelKey,
roles, await _storeContext.GetCurrentStore(), widgetZone, await _themeContext.GetWorkingThemeName());
=======
var cacheKey = _staticCacheManager.PrepareKeyForShortTermCache... |
<<<<<<<
using FluentAssertions;
=======
using System.Collections.Generic;
using System.Linq;
using Moq;
using Nop.Data;
>>>>>>>
using FluentAssertions;
using System.Collections.Generic;
using System.Linq;
using Moq;
using Nop.Data;
<<<<<<<
var product = new Product
{
ManageIn... |
<<<<<<<
if (topic == null)
throw new ArgumentNullException(nameof(topic));
await _topicRepository.Delete(topic);
//event notification
await _eventPublisher.EntityDeleted(topic);
=======
_topicRepository.Delete(topic);
>>>>>>>
a... |
<<<<<<<
using Nop.Services;
using Nop.Services.Caching;
using Nop.Services.Caching.Extensions;
=======
>>>>>>>
<<<<<<<
return await query.ToCachedList(key);
=======
return _staticCacheManager.Get(key, query.ToList);
>>>>>>>
return await _staticCacheManager.Get(key, async () =>... |
<<<<<<<
using System.Threading.Tasks;
=======
using Nop.Core.Events;
>>>>>>>
using System.Threading.Tasks;
using Nop.Core.Events; |
<<<<<<<
protected virtual async Task PrepareDefaultItem(IList<SelectListItem> items, bool withSpecialDefaultItem, string defaultItemText = null)
=======
/// <param name="defaultItemValue">Default item value; defaults 0</param>
protected virtual void PrepareDefaultItem(IList<SelectListItem> ite... |
<<<<<<<
.ForMember(dest => dest.ExportImportProductAttributes_OverrideForStore, mo => mo.Ignore())
.ForMember(dest => dest.ExportImportProductSpecificationAttributes_OverrideForStore, mo => mo.Ignore())
.ForMember(dest => dest.ExportImportProductCategoryBreadcrumb_Overrid... |
<<<<<<<
/// <param name="id">Identifier</param>
/// <returns>Entity</returns>
Task<TEntity> GetById(object id);
=======
/// <param name="id">Entity entry identifier</param>
/// <param name="getCacheKey">Function to get a cache key; pass null to don't cache; return null from thi... |
<<<<<<<
await _discountCategoryMappingRepository.DeleteAsync(mappings.ToList());
=======
_discountCategoryMappingRepository.Delete(mappings.ToList());
>>>>>>>
await _discountCategoryMappingRepository.DeleteAsync(mappings.ToList());
<<<<<<<
... |
<<<<<<<
int billingAddressId;
int.TryParse(model.Form["billing_address_id"], out billingAddressId);
=======
int.TryParse(form["billing_address_id"], out int billingAddressId);
>>>>>>>
int.TryParse(model.Form["billing_address_id"], out int billingAddress... |
<<<<<<<
var cacheKey = _cacheKeyService.PrepareKeyForDefaultCache(NopModelCacheDefaults.BlogMonthsModelKey, await _workContext.GetWorkingLanguage(), await _storeContext.GetCurrentStore());
var cachedModel = await _staticCacheManager.Get(cacheKey, async () =>
=======
var cacheKey = ... |
<<<<<<<
if (activityLogType == null)
throw new ArgumentNullException(nameof(activityLogType));
await _activityLogTypeRepository.Insert(activityLogType);
//event notification
await _eventPublisher.EntityInserted(activityLogType);
=======
_ac... |
<<<<<<<
protected override async Task ClearCache(NewsItem entity)
=======
/// <param name="entityEventType">Entity event type</param>
protected override void ClearCache(NewsItem entity, EntityEventType entityEventType)
>>>>>>>
/// <param name="entityEventType">Entity event type</param... |
<<<<<<<
if (storeMapping == null)
throw new ArgumentNullException(nameof(storeMapping));
await _storeMappingRepository.Delete(storeMapping);
//event notification
await _eventPublisher.EntityDeleted(storeMapping);
=======
_storeMappingReposi... |
<<<<<<<
using System.Collections.Generic;
using System.Threading.Tasks;
=======
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
>>>>>>>
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Linq.Expressions; |
<<<<<<<
=======
//redis connection wrapper
if (appSettings.RedisConfig.Enabled)
{
services.AddSingleton<ILocker, RedisConnectionWrapper>();
services.AddSingleton<IRedisConnectionWrapper, RedisConnectionWrapper>();
}
>>>>>>>
<<<<<<<
... |
<<<<<<<
var rez = await _staticCacheManager.Get(_cacheKeyService.PrepareKeyForShortTermCache(_carriersCacheKey), async () =>
=======
var rez = _staticCacheManager.Get(_staticCacheManager.PrepareKeyForShortTermCache(_carriersCacheKey), () =>
>>>>>>>
var rez = await _staticCacheMana... |
<<<<<<<
return AsBaseUnit().Equals(((Energy) obj).AsBaseUnit());
=======
var objQuantity = (Energy)obj;
return _value.Equals(objQuantity.AsBaseNumericType(this.Unit));
}
/// <summary>
/// <para>
/// Compare equality to another Energy within ... |
<<<<<<<
await Remove(NopForumDefaults.ForumGroupAllCacheKey);
var cacheKey = _cacheKeyService.PrepareKey(NopForumDefaults.ForumAllByForumGroupIdCacheKey, entity);
await Remove(cacheKey);
=======
Remove(NopForumDefaults.ForumByForumGroupCacheKey, entity);
>>>>>>>
... |
<<<<<<<
if (productAttribute == null)
throw new ArgumentNullException(nameof(productAttribute));
await _productAttributeRepository.Delete(productAttribute);
//event notification
await _eventPublisher.EntityDeleted(productAttribute);
=======
... |
<<<<<<<
if (country == null)
throw new ArgumentNullException(nameof(country));
await _countryRepository.Delete(country);
//event notification
await _eventPublisher.EntityDeleted(country);
=======
_countryRepository.Delete(country);
>>>>>>>... |
<<<<<<<
await Remove(NopCustomerServicesDefaults.CustomerAttributesAllCacheKey);
await Remove(_cacheKeyService.PrepareKey(NopCustomerServicesDefaults.CustomerAttributeValuesAllCacheKey, entity.CustomerAttributeId));
=======
Remove(NopCustomerServicesDefaults.CustomerAttributeValues... |
<<<<<<<
public async Task<TEntity> InsertEntityAsync<TEntity>(TEntity entity) where TEntity : BaseEntity
=======
public virtual TEntity InsertEntity<TEntity>(TEntity entity) where TEntity : BaseEntity
>>>>>>>
public virtual async Task<TEntity> InsertEntityAsync<TEntity>(TEntity entity) where ... |
<<<<<<<
var key = _cacheKeyService.PrepareKeyForDefaultCache(NopCatalogDefaults.ProductTagCountCacheKey, storeId,
await _customerService.GetCustomerRoleIds(await _workContext.GetCurrentCustomer()),
=======
var key = _staticCacheManager.PrepareKeyForDefaultCache(NopCatalogDefa... |
<<<<<<<
if (aclRecord == null)
throw new ArgumentNullException(nameof(aclRecord));
await _aclRecordRepository.Delete(aclRecord);
//event notification
await _eventPublisher.EntityDeleted(aclRecord);
=======
_aclRecordRepository.Delete(aclRec... |
<<<<<<<
if (categoryTemplate == null)
throw new ArgumentNullException(nameof(categoryTemplate));
await _categoryTemplateRepository.Delete(categoryTemplate);
//event notification
await _eventPublisher.EntityDeleted(categoryTemplate);
=======
... |
<<<<<<<
private readonly IEventPublisher _eventPublisher;
=======
>>>>>>>
<<<<<<<
if (downloadId == 0)
return null;
return await _downloadRepository.GetById(downloadId);
=======
return _downloadRepository.GetById(downloadId);
>>>>>>>
return... |
<<<<<<<
StateProvince = _stateProvinceService.GetStateProvinceById(model.TestAddress?.StateProvinceId ?? 0)
}, _workContext.CurrentCustomer.Id.ToString(), "", "");
=======
StateProvinceId = model.TestAddress?.StateProvinceId
}, _workContext.CurrentCustomer.Id.To... |
<<<<<<<
using System.Threading.Tasks;
=======
using Nop.Core.Caching;
>>>>>>>
using System.Threading.Tasks;
using Nop.Core.Caching;
<<<<<<<
if (addressAttribute == null)
throw new ArgumentNullException(nameof(addressAttribute));
await _addressAttributeRepository.Delete(addre... |
<<<<<<<
if (returnRequest == null)
throw new ArgumentNullException(nameof(returnRequest));
await _returnRequestRepository.Delete(returnRequest);
//event notification
await _eventPublisher.EntityDeleted(returnRequest);
=======
_returnRequest... |
<<<<<<<
var productAttributePictureCacheKey = _cacheKeyService.PrepareKeyForDefaultCache(NopModelCacheDefaults.ProductAttributePictureModelKey,
pictureId, await _webHelper.IsCurrentConnectionSecured(), await _storeContext.GetCurrentStore());
var pictureMo... |
<<<<<<<
_typeMapping = new Dictionary<Type, Action<ICreateTableColumnAsTypeSyntax>>
=======
_versionLoader = new Lazy<IVersionLoader>(() => EngineContext.Current.Resolve<IVersionLoader>());
_typeMapping = new Dictionary<Type, Action<ICreateTableColumnAsTypeSyntax>>()
... |
<<<<<<<
protected virtual async Task<string> ParseCustomCustomerAttributes(IFormCollection form)
=======
protected virtual string ParseSelectedProvider(IFormCollection form)
{
if (form == null)
throw new ArgumentNullException(nameof(form));
var multiFac... |
<<<<<<<
if (pollId == 0)
return null;
return await _pollRepository.ToCachedGetById(pollId);
=======
return _pollRepository.GetById(pollId, cache => default);
>>>>>>>
return await _pollRepository.GetById(pollId, cache => default);
<<<<<<<
i... |
<<<<<<<
var query = from lp in _localizedPropertyRepository.Table
select lp;
return await query.ToCachedList(_cacheKeyService.PrepareKeyForDefaultCache(NopLocalizationDefaults.LocalizedPropertyAllCacheKey));
=======
return _localizedPropertyRepository.GetAll(query ... |
<<<<<<<
using System.Threading.Tasks;
=======
using System.Linq.Expressions;
>>>>>>>
using System.Threading.Tasks;
using System.Linq.Expressions; |
<<<<<<<
["Plugins.Tax.FixedOrByCountryStateZip.Tax.Categories.Manage"] = "Manage tax categories",
//#5209
["Admin.ShoppingCartType.StartDate.Hint"] = "The start date for the search (when a product was added to the cart).",
["Admin.ShoppingCartType.EndDate.... |
<<<<<<<
if (newsItem == null)
throw new ArgumentNullException(nameof(newsItem));
await _newsItemRepository.Delete(newsItem);
//event notification
await _eventPublisher.EntityDeleted(newsItem);
=======
_newsItemRepository.Delete(newsItem);
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.