conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
using System.Collections.Generic;
=======
using System.Linq;
>>>>>>>
<<<<<<<
using Moq;
using Nop.Core;
using Nop.Core.Domain.Customers;
using Nop.Core.Domain.Logging;
using Nop.Core.Events;
=======
using Nop.Services.Customers;
>>>>>>>
using System.Linq;
using Nop.Services.Customers;
<<<<<<<
... |
<<<<<<<
_eventPublisher.ModelReceivedAsync(model, context.ModelState).Wait();
=======
await _eventPublisher.ModelReceived(model, context.ModelState);
>>>>>>>
await _eventPublisher.ModelReceivedAsync(model, context.ModelState);
<<<<<<<
... |
<<<<<<<
var storeId = (await _storeContext.GetCurrentStore()).Id;
//parse
if (tmp.Length == 1)
{
//"email" only
email = tmp[0].Trim();
}
else if (tmp.Le... |
<<<<<<<
/// <summary>
/// Gets or sets a value indicating whether to enable markup minification
/// </summary>
public bool MinificationEnabled { get; set; }
=======
/// <summary>
/// The length of time, in milliseconds, before the running schedule task times out. Set ... |
<<<<<<<
return await LoginUser(associatedUser, returnUrl);
=======
return _customerRegistrationService.SignInCustomer(associatedUser, returnUrl);
>>>>>>>
return await _customerRegistrationService.SignInCustomer(associatedUser, returnUrl);
<<<<<<<
/// Login pas... |
<<<<<<<
await _languageRepository.Delete(language);
//event notification
await _eventPublisher.EntityDeleted(language);
=======
_languageRepository.Delete(language);
>>>>>>>
await _languageRepository.Delete(language);
<<<<<<<
v... |
<<<<<<<
categoryModel.Breadcrumb = _categoryService.GetFormattedBreadCrumbAsync(category).Result;
categoryModel.SeName = _urlRecordService.GetSeNameAsync(category, 0, true, false).Result;
=======
categoryModel.Breadcrumb = await _categoryService.GetFormatted... |
<<<<<<<
if (discountId == 0)
return null;
return await _discountRepository.ToCachedGetById(discountId);
=======
return _discountRepository.GetById(discountId, cache => default);
>>>>>>>
return await _discountRepository.GetById(discountId, cache => defa... |
<<<<<<<
if (pictureId == 0)
return null;
return await _pictureRepository.ToCachedGetById(pictureId);
=======
return _pictureRepository.GetById(pictureId, cache => default);
>>>>>>>
return await _pictureRepository.GetById(pictureId, cache => default);
... |
<<<<<<<
if (deliveryDateId == 0)
return null;
return await _deliveryDateRepository.ToCachedGetById(deliveryDateId);
=======
return _deliveryDateRepository.GetById(deliveryDateId, cache => default);
>>>>>>>
return await _deliveryDateRepository.GetById(d... |
<<<<<<<
var cacheKey = _cacheKeyService.PrepareKey(NopOrderDefaults.CheckoutAttributeValuesAllCacheKey, entity.CheckoutAttributeId);
await Remove(cacheKey);
=======
Remove(NopOrderDefaults.CheckoutAttributeValuesAllCacheKey, entity.CheckoutAttributeId);
>>>>>>>
await R... |
<<<<<<<
if (blogPost == null)
throw new ArgumentNullException(nameof(blogPost));
await _blogPostRepository.Delete(blogPost);
//event notification
await _eventPublisher.EntityDeleted(blogPost);
=======
_blogPostRepository.Delete(blogPost);
... |
<<<<<<<
//event notification
await _eventPublisher.EntityDeleted(shoppingCartItem);
=======
>>>>>>>
<<<<<<<
await _sciRepository.Update(shoppingCartItem);
//event notification
await _eventPublisher.EntityUpdated(shoppingCartIt... |
<<<<<<<
/// <param name="filteredSpecs">Filtered product specification identifiers</param>
/// <param name="orderBy">Order by</param>
/// <param name="showHidden">A value indicating whether to show hidden records</param>
/// <param name="overridePublished">
/// null - process "Pu... |
<<<<<<<
using Nop.Services.Events;
using Nop.Services.ExportImport;
=======
>>>>>>>
using Nop.Services.ExportImport;
<<<<<<<
if (resources == null)
throw new ArgumentNullException(nameof(resources));
//insert
await _lsrRepository.Insert(resources);
/... |
<<<<<<<
await RemoveByPrefix(NopDiscountDefaults.DiscountManufacturerIdsPrefixCacheKey);
=======
RemoveByPrefix(NopDiscountDefaults.ManufacturerIdsPrefix);
>>>>>>>
await RemoveByPrefix(NopDiscountDefaults.ManufacturerIdsPrefix); |
<<<<<<<
if (shippingMethod == null)
throw new ArgumentNullException(nameof(shippingMethod));
await _shippingMethodRepository.Delete(shippingMethod);
//event notification
await _eventPublisher.EntityDeleted(shippingMethod);
=======
... |
<<<<<<<
using Nop.Services.Infrastructure;
using Nop.Services.Security.Permissions;
=======
using Nop.Core.Infrastructure.AutoFac;
using Nop.Web.MVC.Infrastructure;
>>>>>>>
using Nop.Services.Infrastructure;
using Nop.Services.Security.Permissions;
using Nop.Core.Infrastructure.AutoFac;
using Nop.Web.MVC.Infrastruct... |
<<<<<<<
using System.Threading.Tasks;
=======
using Autofac;
>>>>>>>
using System.Threading.Tasks;
using Autofac;
<<<<<<<
Text = $"{await _localizationService.GetResource("Admin.System.Warnings.PluginNotEnabled")}: {string.Join(", ", notEnabled)} (<a href=\"{urlHelper.Action("UninstallAndDeleteU... |
<<<<<<<
using System.Threading.Tasks;
=======
using Nop.Core.Caching;
>>>>>>>
using System.Threading.Tasks;
using Nop.Core.Caching;
<<<<<<<
return await _reviewTypeRepository.Table
.OrderBy(reviewType => reviewType.DisplayOrder).ThenBy(reviewType => reviewType.Id)
.ToCach... |
<<<<<<<
if (shipment == null)
throw new ArgumentNullException(nameof(shipment));
await _shipmentRepository.Delete(shipment);
//event notification
await _eventPublisher.EntityDeleted(shipment);
=======
_shipmentRepository.Delete(shipment);
... |
<<<<<<<
AvailableAttributes = (await _specificationAttributeService.GetSpecificationAttributesWithOptions())
.Select(attributeWithOption => new SelectListItem(attributeWithOption.Name, attributeWithOption.Id.ToString()))
=======
AvailableAttributes = _sp... |
<<<<<<<
if (giftCard == null)
throw new ArgumentNullException(nameof(giftCard));
await _giftCardRepository.Delete(giftCard);
//event notification
await _eventPublisher.EntityDeleted(giftCard);
=======
_giftCardRepository.Delete(giftCard);
... |
<<<<<<<
private readonly IGenericAttributeService _genericAttributeService;
=======
private readonly ILocalizedModelFactory _localizedModelFactory;
>>>>>>>
private readonly ILocalizedModelFactory _localizedModelFactory;
private readonly IGenericAttributeService _genericAttributeServic... |
<<<<<<<
if (newsLetterSubscription.Active)
await PublishSubscriptionEvent(newsLetterSubscription, true, publishSubscriptionEvents);
//Publish event
await _eventPublisher.EntityInserted(newsLetterSubscription);
=======
if (newsLetterSubscription.Active)... |
<<<<<<<
if (checkoutAttribute == null)
throw new ArgumentNullException(nameof(checkoutAttribute));
await _checkoutAttributeRepository.Delete(checkoutAttribute);
//event notification
await _eventPublisher.EntityDeleted(checkoutAttribute);
=======
... |
<<<<<<<
model.ExportImportProductSpecificationAttributes_OverrideForStore = _settingService.SettingExists(catalogSettings, x => x.ExportImportProductSpecificationAttributes, storeScope);
model.ExportImportProductCategoryBreadcrumb_OverrideForStore = _settingService.SettingExists(catalogS... |
<<<<<<<
if (measureDimension == null)
throw new ArgumentNullException(nameof(measureDimension));
await _measureDimensionRepository.Delete(measureDimension);
//event notification
await _eventPublisher.EntityDeleted(measureDimension);
=======
... |
<<<<<<<
var storeId = await _storeContext.GetActiveStoreScopeConfigurationAsync();
var customerSettings = await _settingService.LoadSettingAsync<CustomerSettings>(storeId);
=======
var storeId = _storeContext.ActiveStoreScopeConfiguration;
var customerSettings = _settin... |
<<<<<<<
await Remove(NopCustomerServicesDefaults.CustomerAttributesAllCacheKey);
await Remove(_cacheKeyService.PrepareKey(NopCustomerServicesDefaults.CustomerAttributeValuesAllCacheKey, entity));
=======
Remove(NopCustomerServicesDefaults.CustomerAttributeValuesByAttributeCacheKey,... |
<<<<<<<
model.AddSms.AvailableMessages = (await _messageTemplateService.GetAllMessageTemplatesAsync(storeId)).Select(messageTemplate =>
=======
var stores = await _storeService.GetAllStores();
var messageTemplates = await _messageTemplateService.GetAllMessageTemplates(storeId);
... |
<<<<<<<
await installationService.InstallRequiredDataAsync(model.AdminEmail, model.AdminPassword);
=======
installationService.InstallRequiredData(model.AdminEmail, model.AdminPassword, downloadUrl, regionInfo, cultureInfo);
>>>>>>>
await installationService.InstallReq... |
<<<<<<<
if (subscription == null)
throw new ArgumentNullException(nameof(subscription));
await _backInStockSubscriptionRepository.Delete(subscription);
//event notification
await _eventPublisher.EntityDeleted(subscription);
=======
_backInS... |
<<<<<<<
/// <param name="config"></param>
private static async Task LoadPluginsInfo(NopConfig config)
=======
/// <param name="appSettings">App settings</param>
private static void LoadPluginsInfo(AppSettings appSettings)
>>>>>>>
/// <param name="appSettings">App settings</par... |
<<<<<<<
var categoryPictureCacheKey = _cacheKeyService.PrepareKeyForDefaultCache(NopModelCacheDefaults.CategoryPictureModelKey, curCategory,
pictureSize, true, _workContext.GetWorkingLanguage().Result, _webHelper.IsCurrentConnectionSecured(),
... |
<<<<<<<
pictureFullSizeUrl = pictureFullSizeUrl,
pictureDefaultSizeUrl = pictureDefaultSizeUrl,
isFreeShipping = isFreeShipping,
=======
pictureFullSizeUrl,
pictureDefaultSizeUrl,
>>>>>>>
pictureFullSizeUrl,
... |
<<<<<<<
var customers = await query.ToPagedList(pageIndex, pageSize, getOnlyTotalCount);
=======
return query;
}, pageIndex, pageSize, getOnlyTotalCount);
>>>>>>>
return query;
}, pageIndex, pageSize, getOnlyTotalCount);
<<<<<<<
await U... |
<<<<<<<
var configurations = await _facebookPixelService.GetPagedConfigurationsAsync(searchModel.StoreId, searchModel.Page - 1, searchModel.PageSize);
var model = new FacebookPixelListModel().PrepareToGrid(searchModel, configurations, () =>
=======
var configurations = await _faceb... |
<<<<<<<
if (!await mappings.AnyAsync())
return;
await _discountCategoryMappingRepository.Delete(mappings);
=======
_discountCategoryMappingRepository.Delete(mappings.ToList());
>>>>>>>
await _discountCategoryMappingRepository... |
<<<<<<<
var cart = _shoppingCartService.GetShoppingCart(_workContext.CurrentCustomer, ShoppingCartType.ShoppingCart, _storeContext.CurrentStore.Id);
var amount = _orderTotalCalculationService.IsFreeShipping(cart) ? 0 : point.PickupFee;
... |
<<<<<<<
return _topicRepository.GetAll(query =>
{
query = query.OrderBy(t => t.DisplayOrder).ThenBy(t => t.SystemName);
=======
var key = ignorAcl
? _cacheKeyService.PrepareKeyForDefaultCache(NopTopicDefaults.TopicsAllCacheKey, storeId, showHidden,
... |
<<<<<<<
await Remove(NopCommonDefaults.AddressAttributesAllCacheKey);
var cacheKey = _cacheKeyService.PrepareKey(NopCommonDefaults.AddressAttributeValuesAllCacheKey, entity.AddressAttributeId);
await Remove(cacheKey);
=======
Remove(NopCommonDefaults.AddressAttributeVa... |
<<<<<<<
using Moq;
using Nop.Core;
=======
>>>>>>>
<<<<<<<
using Nop.Services.Localization;
using Nop.Tests;
=======
>>>>>>>
<<<<<<<
private readonly Mock<ILocalizationService> _localizationService = new Mock<ILocalizationService>();
=======
>>>>>>>
<<<<<<<
private FakeRepository<Discount> ... |
<<<<<<<
//create indexes
ExecuteSqlScriptFromFile(fileProvider, NopDataDefaults.SqlServerIndexesFilePath);
=======
if (DataSettingsManager.DatabaseIsInstalled)
{
ApplyMigrations();
}
else
{
var fileProv... |
<<<<<<<
var cacheKey = _cacheKeyService.PrepareKeyForDefaultCache(AvalaraTaxDefaults.TaxCodeTypesCacheKey);
var taxCodeTypes = await _cacheManager.Get(cacheKey, async () => await _avalaraTaxManager.GetTaxCodeTypes());
=======
var cacheKey = _cacheManager.PrepareKeyForDefaultCache(A... |
<<<<<<<
using Nop.Core;
using Nop.Core.Data;
=======
>>>>>>>
using Nop.Core; |
<<<<<<<
if (orderId == 0)
return null;
return await _orderRepository.ToCachedGetById(orderId, _cachingSettings.ShortTermCacheTime);
=======
return _orderRepository.GetById(orderId,
cache => cache.PrepareKeyForShortTermCache(NopEntityCacheDefaults<Or... |
<<<<<<<
var cacheKey = _cacheKeyService.PrepareKey(NopCatalogDefaults.ProductTierPricesCacheKey, entity.ProductId);
await Remove(cacheKey);
var prefix = _cacheKeyService.PrepareKeyPrefix(NopCatalogDefaults.ProductPricePrefixCacheKey, entity.ProductId);
await RemoveByPref... |
<<<<<<<
if (forumGroup == null)
throw new ArgumentNullException(nameof(forumGroup));
await _forumGroupRepository.Delete(forumGroup);
//event notification
await _eventPublisher.EntityDeleted(forumGroup);
=======
_forumGroupRepository.Delete... |
<<<<<<<
logModel.LogLevel = _localizationService.GetLocalizedEnumAsync(logItem.LogLevel).Result;
=======
logModel.LogLevel = await _localizationService.GetLocalizedEnum(logItem.LogLevel);
>>>>>>>
logModel.LogLevel = await _localizationService.GetLocalizedEn... |
<<<<<<<
/// <param name="key">Key of cached item</param>
Task Remove(CacheKey key);
=======
/// <param name="cacheKey">Cache key</param>
/// <param name="cacheKeyParameters">Parameters to create cache key</param>
void Remove(CacheKey cacheKey, params object[] cacheKeyParameters... |
<<<<<<<
discountModel.DiscountTypeName = _localizationService.GetLocalizedEnumAsync(discount.DiscountType).Result;
discountModel.PrimaryStoreCurrencyCode = _currencyService
.GetCurrencyByIdAsync(_currencySettings.PrimaryStoreCurrencyId).Result?.CurrencyCod... |
<<<<<<<
await _storeRepository.Delete(store);
//event notification
await _eventPublisher.EntityDeleted(store);
=======
_storeRepository.Delete(store);
>>>>>>>
await _storeRepository.Delete(store);
<<<<<<<
var query = from s in _storeRepository... |
<<<<<<<
Task<CustomerInfoModel> PrepareCustomerInfoModelAsync(CustomerInfoModel model, Customer customer,
=======
CustomerInfoModel PrepareCustomerInfoModel(CustomerInfoModel model, Customer customer,
>>>>>>>
Task<CustomerInfoModel> PrepareCustomerInfoModelAsync(CustomerInfoModel model, Cust... |
<<<<<<<
using System.Threading.Tasks;
=======
using Nop.Core.Caching;
>>>>>>>
using System.Threading.Tasks;
using Nop.Core.Caching;
<<<<<<<
return await _vendorAttributeRepository.Table
.OrderBy(vendorAttribute => vendorAttribute.DisplayOrder).ThenBy(vendorAttribute => vendorAttribute.Id... |
<<<<<<<
if (attribute == null)
throw new ArgumentNullException(nameof(attribute));
await _genericAttributeRepository.Delete(attribute);
//event notification
await _eventPublisher.EntityDeleted(attribute);
=======
_genericAttribu... |
<<<<<<<
[Test]
public void AngleDividedByTimeEqualsRotationalSpeed()
{
var rotationalSpeed = Angle.FromRadians(10)/TimeSpan.FromSeconds(5);
Assert.AreEqual(rotationalSpeed, RotationalSpeed.FromRadiansPerSecond(2));
}
=======
protected override double Ar... |
<<<<<<<
if (manufacturerTemplate == null)
throw new ArgumentNullException(nameof(manufacturerTemplate));
await _manufacturerTemplateRepository.Delete(manufacturerTemplate);
//event notification
await _eventPublisher.EntityDeleted(manufacturerTemplate);
... |
<<<<<<<
model.ProductReviewsPageSizeOnAccountPage_OverrideForStore = _settingService.SettingExists(catalogSettings, x=> x.ProductReviewsPageSizeOnAccountPage, storeScope);
model.ProductReviewsSortByCreatedDateAscending_OverrideForStore = _settingService.SettingExists(catalogSettings, x =... |
<<<<<<<
if (logItemId == 0)
return null;
return await _taxTransactionLogRepository.GetById(logItemId);
=======
return _taxTransactionLogRepository.GetById(logItemId);
>>>>>>>
return await _taxTransactionLogRepository.GetById(logItemId);
<<<<<<<
... |
<<<<<<<
using System;
using System.Linq;
using System.Threading.Tasks;
using LinqToDB;
=======
using System.Linq;
>>>>>>>
using System.Linq;
using System.Threading.Tasks;
using LinqToDB;
<<<<<<<
if (searchTerm == null)
throw new ArgumentNullException(nameof(searchTerm));
... |
<<<<<<<
[NopResourceDisplayName("Admin.Configuration.Settings.Catalog.RemoveRequiredProducts")]
public bool RemoveRequiredProducts { get; set; }
public bool RemoveRequiredProducts_OverrideForStore { get; set; }
=======
[NopResourceDisplayName("Admin.Configuration.Settings.Catalog.Expo... |
<<<<<<<
var prefix = _cacheKeyService.PrepareKeyPrefix(NopCatalogDefaults.CategoriesByParentCategoryPrefixCacheKey, category.ParentCategoryId);
await _staticCacheManager.RemoveByPrefix(prefix);
prefix = _cacheKeyService.PrepareKeyPrefix(NopCatalogDefaults.Cate... |
<<<<<<<
if (affiliateId == 0)
return null;
return await _affiliateRepository.ToCachedGetById(affiliateId);
=======
return _affiliateRepository.GetById(affiliateId, cache => default);
>>>>>>>
return await _affiliateRepository.GetById(affiliateId, cache ... |
<<<<<<<
//we can not use ICacheKeyService because it'll cause circular references.
//that's why we use the default cache time
return await _staticCacheManager.Get(NopConfigurationDefaults.SettingsAllAsDictionaryCacheKey, async () =>
=======
return _staticCacheManager.Ge... |
<<<<<<<
using System.Threading.Tasks;
using Nop.Core.Domain.Catalog;
=======
using Nop.Core.Caching;
using Nop.Core.Domain.Catalog;
>>>>>>>
using System.Threading.Tasks;
using Nop.Core.Caching;
using Nop.Core.Domain.Catalog;
<<<<<<<
protected override async Task ClearCache(ProductTag entity)
=======
... |
<<<<<<<
var prefix = _cacheKeyService.PrepareKeyPrefix(NopCatalogDefaults.ProductsRelatedPrefixCacheKey, entity.ProductId1);
await RemoveByPrefix(prefix);
=======
RemoveByPrefix(NopCatalogDefaults.RelatedProductsPrefix, entity.ProductId1);
>>>>>>>
await RemoveByPrefix(... |
<<<<<<<
await _logRepository.Delete(log);
=======
_logRepository.Delete(log, false);
>>>>>>>
await _logRepository.Delete(log, false);
<<<<<<<
if (logs == null)
throw new ArgumentNullException(nameof(logs));
await _logRepository.Delete(logs... |
<<<<<<<
return await _staticCacheManager.GetAsync(cacheKey, () => query.CountAsync());
=======
return await _staticCacheManager.Get(cacheKey, async () => await query.ToAsyncEnumerable().CountAsync());
>>>>>>>
return await _staticCacheManager.GetAsync(cacheKey, async () => await qu... |
<<<<<<<
if (specificationAttributeId == 0)
return null;
return await _specificationAttributeRepository.ToCachedGetById(specificationAttributeId);
=======
return _specificationAttributeRepository.GetById(specificationAttributeId, cache => default);
>>>>>>>
... |
<<<<<<<
[HttpsRequirement]
public virtual async Task<IActionResult> CustomerOrders()
=======
public virtual IActionResult CustomerOrders()
>>>>>>>
public virtual async Task<IActionResult> CustomerOrders()
<<<<<<<
[HttpsRequirement]
public virtual async Task<IActionRes... |
<<<<<<<
await RemoveByPrefix(NopDiscountDefaults.DiscountAllPrefixCacheKey);
var cacheKey = _cacheKeyService.PrepareKey(NopDiscountDefaults.DiscountRequirementModelCacheKey, entity);
await Remove(cacheKey);
var prefix = _cacheKeyService.PrepareKeyPrefix(NopDiscountDefaul... |
<<<<<<<
await Remove(NopLocalizationDefaults.LocalizedPropertyAllCacheKey);
var cacheKey = _cacheKeyService.PrepareKey(NopLocalizationDefaults.LocalizedPropertyCacheKey,
entity.LanguageId, entity.EntityId, entity.LocaleKeyGroup, entity.LocaleKey);
await Remove(cache... |
<<<<<<<
var cacheKey = _cacheKeyService.PrepareKeyForDefaultCache(NopModelCacheDefaults.HomepageNewsModelKey, await _workContext.GetWorkingLanguage(), await _storeContext.GetCurrentStore());
var cachedModel = await _staticCacheManager.Get(cacheKey, async () =>
=======
var cacheKey ... |
<<<<<<<
if (vendorId == 0)
return null;
return await _vendorRepository.ToCachedGetById(vendorId);
=======
return _vendorRepository.GetById(vendorId, cache => default);
>>>>>>>
return await _vendorRepository.GetById(vendorId, cache => default);
<<<<<<<... |
<<<<<<<
}).Wait();
=======
["Admin.Configuration.Plugins.ChangesApplyAfterReboot"] = "Changes will be applied after restart application",
["Admin.Configuration.Plugins.Fields.IsEnabled"] = "Enabled",
});
>>>>>>>
["Admin.Configuration.Plugins.Ch... |
<<<<<<<
if (topicTemplate == null)
throw new ArgumentNullException(nameof(topicTemplate));
await _topicTemplateRepository.Delete(topicTemplate);
//event notification
await _eventPublisher.EntityDeleted(topicTemplate);
=======
_topicTemplate... |
<<<<<<<
case Languages.GermanGermany:
newContent = new GermanViews.Diacritics1 { DataContext = Keyboard };
break;
=======
default:
newContent = new CommonViews.Diacritics1 { DataContext = Keyboard };
... |
<<<<<<<
Log.Error("Keyboard doesn't have backaction, going back to initial keyboard instead");
InitialiseKeyboard(this.mainWindowManipulationService);
=======
if (Settings.Default.EnableCommuniKateKeyboardLayout)
{
... |
<<<<<<<
case Languages.EnglishUS:
case Languages.EnglishUK:
case Languages.EnglishCanada:
case Languages.DutchNetherlands:
newContent = new EnglishViews.Alpha {DataContext = Keyboard};
break;
... |
<<<<<<<
using CatalanViews = JuliusSweetland.OptiKey.UI.Views.Keyboards.Catalan;
=======
using CroatianViews = JuliusSweetland.OptiKey.UI.Views.Keyboards.Croatian;
using DanishViews = JuliusSweetland.OptiKey.UI.Views.Keyboards.Danish;
>>>>>>>
using CatalanViews = JuliusSweetland.OptiKey.UI.Views.Keyboards.Catalan;
u... |
<<<<<<<
ConversationAlpha1Keyboard,
ConversationAlpha2Keyboard,
=======
CommuniKate,
CommuniKateKeyboard,
ConversationAlphaKeyboard,
ConversationConfirmKeyboard,
ConversationConfirmYes,
ConversationConfirmNo,
>>>>>>>
CommuniKate,
Communi... |
<<<<<<<
using log4net;
using Microsoft.Practices.Prism.Interactivity.InteractionRequest;
=======
using Prism.Interactivity.InteractionRequest;
>>>>>>>
using log4net;
using Prism.Interactivity.InteractionRequest; |
<<<<<<<
new KeyValuePair<string, Languages>(Resources.GERMAN_GERMANY, Enums.Languages.GermanGermany),
new KeyValuePair<string, Languages>(Resources.DUTCH_BELGIUM, Enums.Languages.DutchBelgium),
new KeyValuePair<string, Languages>(Resources.DUTCH_NETHERLANDS, E... |
<<<<<<<
StoreLastProcessedText(null);
GenerateAutoCompleteSuggestions();
=======
StoreLastTextChange(null);
GenerateSuggestions(true);
>>>>>>>
StoreLastProcessedText(null);
... |
<<<<<<<
new KeyValueAndTimeSpan(Resources.SPANISH_SPAIN, KeyValues.SpanishSpainKey, dictionary.ContainsKey(KeyValues.SpanishSpainKey) ? dictionary[KeyValues.SpanishSpainKey] : (TimeSpan?)null),
=======
new KeyValueAndTimeSpan(Resources.TURKISH_TURKEY, KeyValues.TurkishTurkeyKey... |
<<<<<<<
CatalanSpain,
DutchBelgium,
=======
CroatianCroatia,
DanishDenmark,
DutchBelgium,
>>>>>>>
CatalanSpain,
CroatianCroatia,
DanishDenmark,
DutchBelgium,
<<<<<<<
RussianRussia,
SpanishSpain,
TurkishTurkey
=======
... |
<<<<<<<
Log.DebugFormat("GetAutoCompleteSuggestions called with root:'{0}'.", root);
=======
Log.DebugFormat("GetEntries called with hash '{0}'", hash);
>>>>>>>
Log.DebugFormat("GetAutoCompleteSuggestions called with root '{0}'", root);
<<<<<<<
Log.Debug(string.Format... |
<<<<<<<
//Spanish specific rules
if (Settings.Default.KeyboardAndDictionaryLanguage == Languages.SpanishSpain)
{
//Acute accent: Áá éÉ íÍ óÓ úÚ
if (keyStateService.KeyDownStates[KeyValues.CombiningAcuteAccentKey].Value.IsDownOrL... |
<<<<<<<
new KeyValueAndTimeSpan(Resources.CATALAN_SPAIN, KeyValues.CatalanSpainKey, dictionary.ContainsKey(KeyValues.CatalanSpainKey) ? dictionary[KeyValues.CatalanSpainKey] : (TimeSpan?)null),
=======
new KeyValueAndTimeSpan(Resources.CROATIAN_CROATIA, KeyValues.CroatianCroati... |
<<<<<<<
result &= await this.ExtractNodeAsync(selectedItem, path);
=======
await this.ExtractNodeAsync(selectedItem, path, extractMode);
>>>>>>>
result &= await this.ExtractNodeAsync(selectedItem, path, extractMode);
<<<<<<<
private async Task<Boolean> ExtractNodeAsync(ITreeItem node, String outputRoo... |
<<<<<<<
case ExtractModeEnum.New: return;
case ExtractModeEnum.NewOrLatest: if (target.LastWriteTimeUtc >= node.LastModifiedUtc) return; break;
=======
case ExtractModeEnum.New: return false;
case ExtractModeEnum.NewOrLatest: if (target.LastWriteTimeUtc >= node.LastWriteTimeUtc) return false; ... |
<<<<<<<
.WithVisibleFrom(Graph.Class.Type)));
// TODO: Consider if this is necessary
AddSuggestionsWithCategory("This Variables", App.ReflectionProvider.GetVariables(
new ReflectionProviderVariableQuery()
... |
<<<<<<<
public void FieldsTest()
{
Mapper.Register<Brand, BrandViewModel>();
Mapper.Register<Table, TableViewModel>();
Mapper.Register<Size, SizeViewModel>();
Mapper.Register<Country, CountryViewModel>();
Mapper.Compile();
var srcA... |
<<<<<<<
else
{
// for Unix, skip everything else and just wire up the event handler
AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
}
// Assembly.ReflectionOnlyLoadFrom doesn't automatically load deps, this stops it from throwing when called
AppDomain.CurrentDomain.R... |
<<<<<<<
=======
ForceDeterminism = s.ForceDeterminism,
CropSGBFrame = s.CropSGBFrame,
Profile = ss.Profile
>>>>>>>
CropSGBFrame = s.CropSGBFrame
<<<<<<<
=======
s.ForceDeterminism = dlg.ForceDeterminism;
s.CropSGBFrame = dlg.CropSGBFrame;
ss.Profile = dlg.Profile;
>>>>>>>
s.CropSG... |
<<<<<<<
// C64SubMenu
//
this.C64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.C64SettingsMenuItem});
this.C64SubMenu.Name = "C64SubMenu";
this.C64SubMenu.Size = new System.Drawing.Size(39, 19);
this.C64SubMenu.Text = "&C64";
//
// C64SettingsMenuIt... |
<<<<<<<
var length = 0;
var disasm = Disassembler.Disassemble(MemoryDomains.SystemBus, pc & 0xFFFFFF, out length);
=======
var disasm = Disassembler.Disassemble(MemoryDomains.SystemBus, pc, out int length);
>>>>>>>
var disasm = Disassembler.Disassemble(MemoryDomains.SystemBus, pc & 0xFFFFFF, out int ... |
<<<<<<<
using (Api.EnterExit())
=======
byte* buf = Api.QUERY_get_memory_data(LibsnesApi.SNES_MEMORY.CARTRIDGE_RAM);
var size = Api.QUERY_get_memory_size(LibsnesApi.SNES_MEMORY.CARTRIDGE_RAM);
if (buf == null && Api.QUERY_get_memory_size(LibsnesApi.SNES_MEMORY.SGB_CARTRAM)>0)
>>>>>>>
using (Api.Enter... |
<<<<<<<
using System;
using System.IO;
namespace BizHawk.Common
{
/// <summary>
/// Starts a thread which cleans any filenames in %temp% beginning with bizhawk.bizdelete.
/// Files shouldn't be named that unless they're safe to delete, but notably, they may stil be in use. That won't hurt this component.
/// When ... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.