conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
=======
Editor.MouseMove += new MouseEventHandler((s, e) => e.Handled = true);
>>>>>>>
Editor.MouseMove += new MouseEventHandler((s, e) => e.Handled = true); |
<<<<<<<
public string channelId;
public FetchCommentsResponse commentsResponse;
=======
public Dictionary<string, List<string>> channelMessageList;
public Dictionary<string, Dictionary<string, Message>> channelMessageDict;
public string channelId;
public string currOldestMessageId;
public bool hasMore;
>>>>>>>
public string channelId;
public FetchCommentsResponse commentsResponse;
public string currOldestMessageId;
public bool hasMore; |
<<<<<<<
var request =
UnityWebRequest.Get(Config.apiAddress + "/api/p?orderBy=latest&projectType=article&t=projects&page=" + pageNumber);
request.SetRequestHeader("X-Requested-With", "XmlHttpRequest");
=======
var request = HttpManager.GET(Config.apiAddress + "/api/p?projectType=article&t=projects&page=" + pageNumber);
>>>>>>>
var request = HttpManager.GET(Config.apiAddress + "/api/p?orderBy=latest&projectType=article&t=projects&page=" + pageNumber); |
<<<<<<<
public class FetchChannelMentionQuerySuccessAction : BaseAction {
public string channelId;
public List<ChannelMember> members;
}
public class FetchChannelMentionQueryFailureAction : BaseAction {
}
public class ChannelUpdateMentionQueryAction : BaseAction {
public string mentionQuery;
}
public class ChannelClearMentionQueryAction : BaseAction {
}
=======
public class AddLocalMessageAction : BaseAction {
public ChannelMessageView message;
}
>>>>>>>
public class AddLocalMessageAction : BaseAction {
public ChannelMessageView message;
}
public class FetchChannelMentionQuerySuccessAction : BaseAction {
public string channelId;
public List<ChannelMember> members;
}
public class FetchChannelMentionQueryFailureAction : BaseAction {
}
public class ChannelUpdateMentionQueryAction : BaseAction {
public string mentionQuery;
}
public class ChannelClearMentionQueryAction : BaseAction {
} |
<<<<<<<
public override Widget build(BuildContext context) {
return new SafeArea(
top: false,
child: new CustomTabBar(
new List<Widget> {
new ArticleScreen(),
new EventsScreen(),
new NotificationScreen(),
new PersonalScreen()
},
new List<CustomTabBarItem> {
new CustomTabBarItem(
0,
Icons.Description,
"文章"
),
new CustomTabBarItem(
1,
Icons.ievent,
"活动"
),
new CustomTabBarItem(
2,
Icons.Notification,
"通知"
),
new CustomTabBarItem(
3,
Icons.Mood,
"我的"
)
},
CColors.White,
index => { Debug.Log($"index == {index}"); }
));
=======
public override Widget build(BuildContext context)
{
return new Container(
color: CColors.White,
child: new SafeArea(
top: false,
child: new CustomTabBar(
new List<Widget> {
new ArticleScreen(),
new EventsScreen(),
new NotificationScreen(),
new PersonalScreen()
},
new List<CustomTabBarItem> {
new CustomTabBarItem(
0,
Icons.Description,
"文章",
CColors.PrimaryBlue,
CColors.BrownGrey,
24
),
new CustomTabBarItem(
1,
Icons.ievent,
"活动",
CColors.PrimaryBlue,
CColors.BrownGrey,
24
),
new CustomTabBarItem(
2,
Icons.Notification,
"通知",
CColors.PrimaryBlue,
CColors.BrownGrey,
24
),
new CustomTabBarItem(
3,
Icons.Mood,
"我的",
CColors.PrimaryBlue,
CColors.BrownGrey,
24
),
},
CColors.White,
tapCallBack: (index) => { Debug.Log($"index == {index}"); }
))
);
>>>>>>>
public override Widget build(BuildContext context) {
return new Container(
color: CColors.White,
child: new SafeArea(
top: false,
child: new CustomTabBar(
new List<Widget> {
new ArticleScreen(),
new EventsScreen(),
new NotificationScreen(),
new PersonalScreen()
},
new List<CustomTabBarItem> {
new CustomTabBarItem(
0,
Icons.Description,
"文章"
),
new CustomTabBarItem(
1,
Icons.ievent,
"活动"
),
new CustomTabBarItem(
2,
Icons.Notification,
"通知"
),
new CustomTabBarItem(
3,
Icons.Mood,
"我的"
),
},
CColors.White,
index => { Debug.Log($"index == {index}"); }
)
)
); |
<<<<<<<
public static readonly IconData error_outline = new IconData(0xe001, "Material Icons");
public static readonly IconData mode = new IconData(0xe7f2, "Material Icons");
public static readonly IconData mode_bad = new IconData(0xe7f3, "Material Icons");
public static readonly IconData check = new IconData(0xe5ca, "Material Icons");
public static readonly IconData check_circle_outline = new IconData(0xe92d, "Material Icons");
public static readonly IconData insert_link = new IconData(0xe250, "Material Icons");
public static readonly IconData delete_outline = new IconData(0xe92e, "Material Icons");
public static readonly IconData clear = new IconData(0xe14c, "Material Icons");
public static readonly IconData block = new IconData(0xe14b, "Material Icons");
public static readonly IconData report = new IconData(0xe160, "Material Icons");
=======
public static readonly IconData error_outline = new IconData(0xe609, "iconfont");
public static readonly IconData Mood = new IconData(0xe60f, "iconfont");
public static readonly IconData sentiment_satisfied = new IconData(0xe617, "iconfont");
public static readonly IconData sentiment_dissatisfied = new IconData(0xe619, "iconfont");
public static readonly IconData cancel = new IconData(0xe602, "iconfont");
public static readonly IconData check_box = new IconData(0xe604, "iconfont");
public static readonly IconData check_circle_outline = new IconData(0xe606, "iconfont");
public static readonly IconData insert_link = new IconData(0xe60d, "iconfont");
public static readonly IconData delete_outline = new IconData(0xe608, "iconfont");
public static readonly IconData complaints = new IconData(0xe616, "iconfont");//投诉
public static readonly IconData block = new IconData(0xe60e, "iconfont");
>>>>>>>
public static readonly IconData error_outline = new IconData(0xe609, "iconfont");
public static readonly IconData Mood = new IconData(0xe60f, "iconfont");
public static readonly IconData sentiment_satisfied = new IconData(0xe617, "iconfont");
public static readonly IconData sentiment_dissatisfied = new IconData(0xe619, "iconfont");
public static readonly IconData cancel = new IconData(0xe602, "iconfont");
public static readonly IconData check_box = new IconData(0xe604, "iconfont");
public static readonly IconData check_circle_outline = new IconData(0xe606, "iconfont");
public static readonly IconData insert_link = new IconData(0xe60d, "iconfont");
public static readonly IconData delete_outline = new IconData(0xe608, "iconfont");
public static readonly IconData complaints = new IconData(0xe616, "iconfont");//投诉
public static readonly IconData block = new IconData(0xe60e, "iconfont");
public static readonly IconData report = new IconData(0xe616, "iconfont"); |
<<<<<<<
public ChannelMembersScreenConnector(
string channelId,
Key key = null
) : base(key : key) {
=======
public ChannelMembersScreenConnector(string channelId, Key key = null) : base(key: key) {
>>>>>>>
public ChannelMembersScreenConnector(
string channelId,
Key key = null
) : base(key : key) {
<<<<<<<
readonly string channelId;
=======
public readonly string channelId;
int _compareMember(ChannelMember m1, ChannelMember m2) {
if (m1.role == m2.role) return 0;
if (m1.role == "admin") return 1;
if (m2.role == "admin") return -1;
if (m1.role == "moderator") return -1;
if (m2.role == "moderator") return 1;
return 0;
}
>>>>>>>
readonly string channelId;
static int _compareMember(ChannelMember m1, ChannelMember m2) {
if (m1.role == m2.role) return 0;
if (m1.role == "admin") return 1;
if (m2.role == "admin") return -1;
if (m1.role == "moderator") return -1;
if (m2.role == "moderator") return 1;
return 0;
}
<<<<<<<
List<ChannelMember> normalMembers = members.Where(member => member.role == "member").ToList();
specialMembers.Sort((m1, m2) => {
if (m1.role == m2.role) return 0;
if (m1.role == "admin") return 1;
if (m2.role == "admin") return -1;
if (m1.role == "moderator") return -1;
if (m2.role == "moderator") return 1;
return 0;
});
=======
members = members.Where(member => member.role == "member").ToList();
specialMembers.Sort(this._compareMember);
if (state.loginState.isLoggedIn) {
state.followState.followDict.TryGetValue(state.loginState.loginInfo.userId, out followDict);
}
>>>>>>>
List<ChannelMember> normalMembers = members.Where(member => member.role == "member").ToList();
specialMembers.Sort(comparison: _compareMember);
if (state.loginState.isLoggedIn) {
state.followState.followDict.TryGetValue(key: state.loginState.loginInfo.userId, value: out followDict);
}
<<<<<<<
channel = state.channelState.channelDict[key: this.channelId],
followed = state.loginState.isLoggedIn
? state.followState.followDict.TryGetValue(key: state.loginState.loginInfo.userId, out var followDict)
? followDict
: new Dictionary<string, bool>()
: new Dictionary<string, bool>(),
userDict = state.userState.userDict,
normalMembers = normalMembers,
=======
channel = state.channelState.channelDict[this.channelId],
followed = followDict,
members = members,
>>>>>>>
channel = state.channelState.channelDict[key: this.channelId],
followed = followDict,
userDict = state.userState.userDict,
normalMembers = normalMembers, |
<<<<<<<
toMiNiProgram(title, description, url, imageBytes, Config.miniId, path, Config.miniProgramType);
=======
toMiNiProgram(title: title, description: description, url: url, imageBytes: imageBytes,
ysId: Config.MINIID, path: path, miniProgramType: Config.miniProgramType);
>>>>>>>
toMiNiProgram(title: title, description: description, url: url, imageBytes: imageBytes,
ysId: Config.miniId, path: path, miniProgramType: Config.miniProgramType);
<<<<<<<
openMiNi(Config.miniId, path, Config.miniProgramType);
=======
openMiNi(ysId: Config.MINIID, path: path, miniProgramType: Config.miniProgramType);
>>>>>>>
openMiNi(ysId: Config.miniId, path: path, miniProgramType: Config.miniProgramType); |
<<<<<<<
public const string ImageBrowser = "/image-browser";
=======
public const string UserDetail = "/user-detail";
public const string UserFollowing = "/user-following";
public const string UserFollower = "/user-follower";
public const string EditPersonalInfo = "/edit-personalInfo";
public const string PersonalRole = "/personal-role";
public const string TeamDetail = "/team-detail";
public const string TeamFollower = "/team-follower";
>>>>>>>
public const string ImageBrowser = "/image-browser";
public const string UserDetail = "/user-detail";
public const string UserFollowing = "/user-following";
public const string UserFollower = "/user-follower";
public const string EditPersonalInfo = "/edit-personalInfo";
public const string PersonalRole = "/personal-role";
public const string TeamDetail = "/team-detail";
public const string TeamFollower = "/team-follower";
<<<<<<<
{MainNavigatorRoutes.ImageBrowser, context => new ImageBrowser()}
=======
{MainNavigatorRoutes.UserDetail, context => new UserDetailScreenConnector("")},
{MainNavigatorRoutes.UserFollowing, context => new UserFollowingScreenConnector("")},
{MainNavigatorRoutes.UserFollower, context => new UserFollowerScreenConnector("")},
{MainNavigatorRoutes.EditPersonalInfo, context => new EditPersonalInfoScreenConnector("")},
{MainNavigatorRoutes.PersonalRole, context => new PersonalJobRoleScreenConnector()},
{MainNavigatorRoutes.TeamDetail, context => new TeamDetailScreenConnector("")},
{MainNavigatorRoutes.TeamFollower, context => new TeamFollowerScreenConnector("")}
>>>>>>>
{MainNavigatorRoutes.ImageBrowser, context => new ImageBrowser()},
{MainNavigatorRoutes.UserDetail, context => new UserDetailScreenConnector("")},
{MainNavigatorRoutes.UserFollowing, context => new UserFollowingScreenConnector("")},
{MainNavigatorRoutes.UserFollower, context => new UserFollowerScreenConnector("")},
{MainNavigatorRoutes.EditPersonalInfo, context => new EditPersonalInfoScreenConnector("")},
{MainNavigatorRoutes.PersonalRole, context => new PersonalJobRoleScreenConnector()},
{MainNavigatorRoutes.TeamDetail, context => new TeamDetailScreenConnector("")},
{MainNavigatorRoutes.TeamFollower, context => new TeamFollowerScreenConnector("")} |
<<<<<<<
.Then(responseComments => {
state.articleState.articleDetail.comments = responseComments;
=======
.Then((responseComments) => {
// state.articleState.articleDetail.comments = responseComments;
>>>>>>>
.Then(responseComments => {
<<<<<<<
var channelMessageList = new Dictionary<string, List<string>>();
var channelMessageDict = new Dictionary<string, Dictionary<string, Message>>();
var itemIds = new List<string>();
var messageItem = new Dictionary<string, Message>();
var userMap = new Dictionary<string, User>();
action.commentsResponse.items.ForEach(message => {
itemIds.Add(message.id);
messageItem[message.id] = message;
if (userMap.ContainsKey(message.author.id)) {
userMap[message.author.id] = message.author;
} else {
userMap.Add(message.author.id, message.author);
}
});
// action.commentsResponse.parents.ForEach(message => { messageItem[message.id] = message; });
channelMessageList.Add(action.channelId, itemIds);
channelMessageDict.Add(action.channelId, messageItem);
StoreProvider.store.Dispatch(new UserMapAction {
userMap = userMap
});
foreach (var keyValuePair in channelMessageList)
=======
if (action.channelId.isNotEmpty())
{
foreach (var dict in state.articleState.articleDict)
{
if (dict.Value.channelId== action.channelId)
{
dict.Value.hasMore = action.hasMore;
dict.Value.currOldestMessageId = action.currOldestMessageId;
}
}
}
foreach (var keyValuePair in action.channelMessageList)
>>>>>>>
var channelMessageList = new Dictionary<string, List<string>>();
var channelMessageDict = new Dictionary<string, Dictionary<string, Message>>();
var itemIds = new List<string>();
var messageItem = new Dictionary<string, Message>();
var userMap = new Dictionary<string, User>();
action.commentsResponse.items.ForEach(message => {
itemIds.Add(message.id);
messageItem[message.id] = message;
if (userMap.ContainsKey(message.author.id)) {
userMap[message.author.id] = message.author;
} else {
userMap.Add(message.author.id, message.author);
}
});
// action.commentsResponse.parents.ForEach(message => { messageItem[message.id] = message; });
channelMessageList.Add(action.channelId, itemIds);
channelMessageDict.Add(action.channelId, messageItem);
StoreProvider.store.Dispatch(new UserMapAction {
userMap = userMap
});
if (action.channelId.isNotEmpty()) {
foreach (var dict in state.articleState.articleDict) {
if (dict.Value.channelId== action.channelId) {
dict.Value.hasMore = action.hasMore;
dict.Value.currOldestMessageId = action.currOldestMessageId;
}
}
}
foreach (var keyValuePair in channelMessageList) |
<<<<<<<
public class _EventOngoingScreenState : AutomaticKeepAliveClientMixin<EventOngoingScreen> {
=======
public class _EventOngoingScreenState : State<EventOngoingScreen>
{
>>>>>>>
public class _EventOngoingScreenState : State<EventOngoingScreen> {
<<<<<<<
protected override bool wantKeepAlive {
get => false;
}
=======
>>>>>>>
<<<<<<<
public override Widget build(BuildContext context) {
if (widget.viewModel.eventOngoingLoading && widget.viewModel.ongoingEvents.isEmpty()) return new GlobalLoading();
if (widget.viewModel.ongoingEvents.Count <= 0) return new BlankView("暂无即将开始活动");
=======
public override Widget build(BuildContext context)
{
if (widget.viewModel.eventOngoingLoading) return new GlobalLoading();
if (widget.viewModel.ongoingEvents.isEmpty())
{
return new BlankView("暂无即将开始的活动");
}
>>>>>>>
public override Widget build(BuildContext context) {
if (widget.viewModel.eventOngoingLoading && widget.viewModel.ongoingEvents.isEmpty()) return new GlobalLoading();
if (widget.viewModel.ongoingEvents.Count <= 0) return new BlankView("暂无即将开始活动"); |
<<<<<<<
using ConnectApp.components.pull_to_refresh;
using ConnectApp.constants;
=======
>>>>>>>
using ConnectApp.components.pull_to_refresh;
using ConnectApp.constants;
<<<<<<<
ArticleApi.FetchArticles(action.pageNumber)
.Then(articlesResponse => {
StoreProvider.store.Dispatch(new UserMapAction
{userMap = articlesResponse.userMap});
StoreProvider.store.Dispatch(new TeamMapAction {teamMap = articlesResponse.teamMap});
StoreProvider.store.Dispatch(new FetchArticleSuccessAction {
pageNumber = action.pageNumber,
articleList = articlesResponse.items,
total = articlesResponse.total,
isRefresh = action.isRefresh
});
})
.Catch(error => {
StoreProvider.store.Dispatch(new FetchArticleFailedAction {
pageNumber = action.pageNumber,
isRefresh = action.isRefresh
});
Debug.Log(error);
});
=======
>>>>>>> |
<<<<<<<
if (!StoreProvider.store.state.loginState.isLoggedIn)
{
ToLogin();
}
else
{
if (!_article.like)
=======
if (!StoreProvider.store.state.loginState.isLoggedIn) {
_toLogin();
} else {
if (!articleDetail.like)
>>>>>>>
if (!StoreProvider.store.state.loginState.isLoggedIn) {
_toLogin();
} else {
if (!_article.like)
<<<<<<<
originItems.Add(_actionCards(context, _article.like));
=======
originItems.Add(_buildActionCards(context, articleDetail.like));
>>>>>>>
originItems.Add(_buildActionCards(context, _article.like)); |
<<<<<<<
$"版本号：{Config.versionCode}",
style: CTextStyle.PLargeBody4
=======
$"版本号：{Config.versionNumber}",
style: new TextStyle(
fontSize: 16,
fontFamily: "Roboto-Regular",
color: CColors.TextBody4
)
>>>>>>>
$"版本号：{Config.versionNumber}",
style: CTextStyle.PLargeBody4 |
<<<<<<<
readonly InputContentManager _inputContentManager = new InputContentManager();
GlobalKey _smartRefresherKey = GlobalKey<State<SmartRefresher>>.key("SmartRefresher");
=======
readonly GlobalKey _smartRefresherKey = GlobalKey<State<SmartRefresher>>.key("SmartRefresher");
>>>>>>>
readonly GlobalKey _smartRefresherKey = GlobalKey<State<SmartRefresher>>.key("SmartRefresher");
readonly InputContentManager _inputContentManager = new InputContentManager();
<<<<<<<
if (this.widget.viewModel.mentionAutoFocus) {
FocusScope.of(this.context).requestFocus(this._focusNode);
if (!this.widget.viewModel.mentionUserId.isEmpty()) {
var userName = this.widget.viewModel.channel.membersDict[this.widget.viewModel.mentionUserId].user.fullName;
this._inputContentManager.AddMention(userName + " ", this.widget.viewModel.mentionUserId, this._textController.text + userName + " ");
this._textController.text += userName + " ";
this._textController.selection = TextSelection.collapsed(this._textController.text.Length);
}
this.widget.actionModel.clearLastChannelMention();
}
=======
>>>>>>>
if (this.widget.viewModel.mentionAutoFocus) {
FocusScope.of(this.context).requestFocus(this._focusNode);
if (!this.widget.viewModel.mentionUserId.isEmpty()) {
var userName = this.widget.viewModel.channel.membersDict[this.widget.viewModel.mentionUserId].user.fullName;
this._inputContentManager.AddMention(userName + " ", this.widget.viewModel.mentionUserId, this._textController.text + userName + " ");
this._textController.text += userName + " ";
this._textController.selection = TextSelection.collapsed(this._textController.text.Length);
}
this.widget.actionModel.clearLastChannelMention();
} |
<<<<<<<
public string mentionUserId;
public bool mentionAutoFocus;
public Dictionary<string, Dictionary<string, ChannelMember>> mentionSuggestions;
public bool mentionLoading;
=======
public bool socketConnected;
>>>>>>>
public bool socketConnected;
public string mentionUserId;
public bool mentionAutoFocus;
public Dictionary<string, Dictionary<string, ChannelMember>> mentionSuggestions;
public bool mentionLoading; |
<<<<<<<
using ConnectApp.utils;
=======
using RSG;
>>>>>>>
using ConnectApp.utils;
using RSG;
<<<<<<<
private int _pageNumber = 1;
=======
private int pageNumber = firstPageNumber;
>>>>>>>
private int _pageNumber = firstPageNumber;
<<<<<<<
private string _eventBusId;
=======
// protected override bool wantKeepAlive
// {
// get => true;
// }
>>>>>>>
private string _eventBusId;
// protected override bool wantKeepAlive
// {
// get => true;
// }
<<<<<<<
_eventBusId = EventBus.subscribe(EventBusConstant.article_refresh, args => {
_refreshController.sendBack((bool)args[0], (int)args[1]);
});
_pageNumber = StoreProvider.store.state.articleState.pageNumber;
if (StoreProvider.store.state.articleState.articleList.Count == 0)
StoreProvider.store.Dispatch(new FetchArticlesAction {pageNumber = _pageNumber, isRefresh = false});
}
public override void dispose() {
EventBus.unSubscribe(EventBusConstant.article_refresh, _eventBusId);
base.dispose();
=======
SchedulerBinding.instance.addPostFrameCallback(_ =>
{
widget.actionModel.startFetchArticles();
widget.actionModel.fetchArticles(firstPageNumber);
});
>>>>>>>
SchedulerBinding.instance.addPostFrameCallback(_ => {
widget.actionModel.startFetchArticles();
widget.actionModel.fetchArticles(firstPageNumber);
}); |
<<<<<<<
public static readonly IconData open_in_browser = new IconData(0xe89d, "Material Icons");
=======
public static readonly IconData feedback = new IconData(0xe5ca, "Material Icons");
>>>>>>>
public static readonly IconData open_in_browser = new IconData(0xe89d, "Material Icons");
public static readonly IconData feedback = new IconData(0xe5ca, "Material Icons"); |
<<<<<<<
_FetchMessages(Promise<FetchCommentsResponse> promise, string channelId, string currOldestMessageId) {
var url = IApi.apiAddress + "/api/channels/" + channelId + "/messages";
if (currOldestMessageId.isNotEmpty()) url += "?before=" + currOldestMessageId;
=======
_FetchMessages(Promise promise, string channelId, string currOldestMessageId) {
var url = Config.apiAddress + "/api/channels/" + channelId + "/messages?limit=5";
if (currOldestMessageId.Length > 0) url += "&before=" + currOldestMessageId;
>>>>>>>
_FetchMessages(Promise<FetchCommentsResponse> promise, string channelId, string currOldestMessageId) {
var url = Config.apiAddress + "/api/channels/" + channelId + "/messages";
if (currOldestMessageId.isNotEmpty()) url += "?before=" + currOldestMessageId; |
<<<<<<<
public class _EventCompletedScreenState : AutomaticKeepAliveClientMixin<EventCompletedScreen> {
=======
public class _EventCompletedScreenState : State<EventCompletedScreen>
{
>>>>>>>
public class _EventCompletedScreenState : State<EventCompletedScreen> {
<<<<<<<
protected override bool wantKeepAlive {
get => false;
}
=======
>>>>>>>
<<<<<<<
public override Widget build(BuildContext context) {
if (widget.viewModel.eventCompletedLoading && widget.viewModel.completedEvents.isEmpty()) return new GlobalLoading();
if (widget.viewModel.completedEvents.Count <= 0) return new BlankView("暂无往期活动");
=======
public override Widget build(BuildContext context)
{
if (widget.viewModel.eventCompletedLoading) return new GlobalLoading();
if (widget.viewModel.completedEvents.isEmpty())
{
return new BlankView("暂无即将开始的活动");
}
>>>>>>>
public override Widget build(BuildContext context) {
if (widget.viewModel.eventCompletedLoading && widget.viewModel.completedEvents.isEmpty()) return new GlobalLoading();
if (widget.viewModel.completedEvents.Count <= 0) return new BlankView("暂无往期活动"); |
<<<<<<<
readonly int initialPage;
=======
>>>>>>>
readonly int initialPage;
<<<<<<<
=======
startFetchFollowing = () => dispatcher.dispatch(new StartFetchFollowingAction()),
fetchFollowing = offset =>
dispatcher.dispatch<IPromise>(Actions.fetchFollowing(this.userId, offset)),
startFollowUser = followUserId => dispatcher.dispatch(new StartFetchFollowUserAction {
followUserId = followUserId
}),
followUser = followUserId =>
dispatcher.dispatch<IPromise>(Actions.fetchFollowUser(followUserId)),
startUnFollowUser = unFollowUserId => dispatcher.dispatch(new StartFetchUnFollowUserAction {
unFollowUserId = unFollowUserId
}),
unFollowUser = unFollowUserId =>
dispatcher.dispatch<IPromise>(Actions.fetchUnFollowUser(unFollowUserId)),
startSearchFollowing = () => dispatcher.dispatch(new StartSearchFollowingAction()),
searchFollowing = (keyword, pageNumber) => dispatcher.dispatch<IPromise>(
Actions.searchFollowings(keyword, pageNumber)),
>>>>>>>
<<<<<<<
=======
this.widget.actionModel.startFetchFollowing();
this.widget.actionModel.fetchFollowing(0);
>>>>>>>
<<<<<<<
=======
this.widget.actionModel.startSearchFollowing();
this.widget.actionModel.searchFollowing(arg1: text, 0);
}
void _onRefreshFollowing(bool up) {
this._userOffset = up ? 0 : this.widget.viewModel.userOffset;
this.widget.actionModel.fetchFollowing(arg: this._userOffset)
.Then(() => this._refreshController.sendBack(up: up, up ? RefreshStatus.completed : RefreshStatus.idle))
.Catch(_ => this._refreshController.sendBack(up: up, mode: RefreshStatus.failed));
}
void _onRefreshSearchFollowing(bool up) {
if (up) {
this._pageNumber = 0;
}
else {
this._pageNumber++;
}
this.widget.actionModel
.searchFollowing(arg1: this.widget.viewModel.searchFollowingKeyword, arg2: this._pageNumber)
.Then(() => this._refreshController.sendBack(up: up, up ? RefreshStatus.completed : RefreshStatus.idle))
.Catch(_ => this._refreshController.sendBack(up: up, mode: RefreshStatus.failed));
}
void _onFollow(UserType userType, string userId) {
if (this.widget.viewModel.isLoggedIn) {
if (userType == UserType.follow) {
ActionSheetUtils.showModalActionSheet(
new ActionSheet(
title: "确定不再关注？",
items: new List<ActionSheetItem> {
new ActionSheetItem("确定", type: ActionType.normal,
() => {
this.widget.actionModel.startUnFollowUser(obj: userId);
this.widget.actionModel.unFollowUser(arg: userId);
}),
new ActionSheetItem("取消", type: ActionType.cancel)
}
)
);
}
if (userType == UserType.unFollow) {
this.widget.actionModel.startFollowUser(obj: userId);
this.widget.actionModel.followUser(arg: userId);
}
}
else {
this.widget.actionModel.pushToLogin();
}
>>>>>>>
<<<<<<<
=======
Widget content;
if (this.widget.viewModel.searchFollowingLoading) {
content = new GlobalLoading();
}
else if (this.widget.viewModel.searchFollowingKeyword.Length > 0) {
if (this.widget.viewModel.searchFollowings.Count > 0) {
content = new Container(
color: CColors.Background,
child: new CustomScrollbar(
new SmartRefresher(
controller: this._refreshController,
enablePullDown: false,
enablePullUp: this.widget.viewModel.searchFollowingHasMore,
onRefresh: this._onRefreshSearchFollowing,
child: ListView.builder(
physics: new AlwaysScrollableScrollPhysics(),
itemCount: this.widget.viewModel.searchFollowings.Count,
itemBuilder: (cxt, index) => {
var searchUser = this.widget.viewModel.searchFollowings[index: index];
return new UserCard(
user: searchUser,
() => this.widget.actionModel.pushToUserDetail(obj: searchUser.id),
key: new ObjectKey(value: searchUser.id)
);
}
)
)
)
);
}
else {
content = new BlankView(
"哎呀，换个关键词试试吧",
"image/default-search",
true,
() => {
this.widget.actionModel.startFetchFollowing();
this.widget.actionModel.fetchFollowing(0);
}
);
}
}
else if (this.widget.viewModel.followingLoading && this.widget.viewModel.followings.isEmpty()) {
content = new GlobalLoading();
}
else if (this.widget.viewModel.followings.Count <= 0) {
content = new BlankView(
"没有关注的人，去首页看看吧",
"image/default-following",
true,
() => {
this.widget.actionModel.startFetchFollowing();
this.widget.actionModel.fetchFollowing(0);
}
);
}
else {
content = new CustomScrollbar(
new SmartRefresher(
controller: this._refreshController,
enablePullDown: true,
enablePullUp: this.widget.viewModel.followingsHasMore,
onRefresh: this._onRefreshFollowing,
child: ListView.builder(
physics: new AlwaysScrollableScrollPhysics(),
itemCount: this.widget.viewModel.followings.Count,
itemBuilder: (cxt, index) => {
var following = this.widget.viewModel.followings[index: index];
UserType userType = UserType.unFollow;
if (!this.widget.viewModel.isLoggedIn) {
userType = UserType.unFollow;
}
else {
var followUserLoading = false;
if (this.widget.viewModel.userDict.ContainsKey(key: following.id)) {
var user = this.widget.viewModel.userDict[key: following.id];
followUserLoading = user.followUserLoading ?? false;
}
if (this.widget.viewModel.currentUserId == following.id) {
userType = UserType.me;
}
else if (followUserLoading) {
userType = UserType.loading;
}
else if (this.widget.viewModel.followMap.ContainsKey(key: following.id)) {
userType = UserType.follow;
}
}
return new UserCard(
user: following,
() => this.widget.actionModel.pushToUserDetail(obj: following.id),
userType: userType,
() => this._onFollow(userType: userType, userId: following.id),
new ObjectKey(value: following.id)
);
}
)
)
);
}
>>>>>>> |
<<<<<<<
Application.targetFrameRate = 60;
FontManager.instance.addFont(Resources.Load<Font>("Material Icons"));
FontManager.instance.addFont(Resources.Load<Font>("Roboto-Regular"));
FontManager.instance.addFont(Resources.Load<Font>("Roboto-Medium"));
FontManager.instance.addFont(Resources.Load<Font>("Roboto-Bold"));
FontManager.instance.addFont(Resources.Load<Font>("PingFangSC-Regular"));
FontManager.instance.addFont(Resources.Load<Font>("PingFangSC-Medium"));
FontManager.instance.addFont(Resources.Load<Font>("PingFangSC-Semibold"));
=======
Application.targetFrameRate = 300;
var iconFont = Resources.Load<Font>("MaterialIcons");
FontManager.instance.addFont(iconFont);
var regularFont = Resources.Load<Font>("PingFang-Regular");
FontManager.instance.addFont(regularFont);
var mediumFont = Resources.Load<Font>("PingFang-Medium");
FontManager.instance.addFont(mediumFont);
var semiboldFont = Resources.Load<Font>("PingFang-Semibold");
FontManager.instance.addFont(semiboldFont);
var videoPlayer = GetComponent<VideoPlayer>();
VideoPlayerManager.instance.player = videoPlayer;
>>>>>>>
Application.targetFrameRate = 60;
FontManager.instance.addFont(Resources.Load<Font>("Material Icons"));
FontManager.instance.addFont(Resources.Load<Font>("Roboto-Regular"));
FontManager.instance.addFont(Resources.Load<Font>("Roboto-Medium"));
FontManager.instance.addFont(Resources.Load<Font>("Roboto-Bold"));
FontManager.instance.addFont(Resources.Load<Font>("PingFangSC-Regular"));
FontManager.instance.addFont(Resources.Load<Font>("PingFangSC-Medium"));
FontManager.instance.addFont(Resources.Load<Font>("PingFangSC-Semibold"));
var videoPlayer = GetComponent<VideoPlayer>();
VideoPlayerManager.instance.player = videoPlayer; |
<<<<<<<
=======
protected override bool wantKeepAlive {
get => true;
}
>>>>>>>
protected override bool wantKeepAlive {
get => true;
}
<<<<<<<
Widget content = new Container();
if (widget.viewModel.notifationLoading) {
=======
base.build(context);
object content = new Container();
if (widget.viewModel.notifationLoading&&widget.viewModel.notifications.Count==0) {
>>>>>>>
base.build(context);
Widget content = new Container();
if (widget.viewModel.notifationLoading&&widget.viewModel.notifications.Count==0) { |
<<<<<<<
public ChannelState channelState { get; set; }
=======
public TabBarState tabBarState { get; set; }
>>>>>>>
public ChannelState channelState { get; set; }
public TabBarState tabBarState { get; set; }
<<<<<<<
},
channelState = new ChannelState {
publicChannels = new List<string>(),
discoverPage = 1,
joinedChannels = new List<string>(),
channelDict = new Dictionary<string, ChannelView>(),
messageDict = new Dictionary<string, ChannelMessageView>(),
membersDict = new Dictionary<string, ChannelMember>(),
unreadDict = ChannelUnreadMessageManager.getUnread() ?? new Dictionary<string, long>(),
channelTop = new Dictionary<string, bool>()
=======
},
tabBarState = new TabBarState {
currentTabIndex = 0
>>>>>>>
},
channelState = new ChannelState {
publicChannels = new List<string>(),
discoverPage = 1,
joinedChannels = new List<string>(),
channelDict = new Dictionary<string, ChannelView>(),
messageDict = new Dictionary<string, ChannelMessageView>(),
membersDict = new Dictionary<string, ChannelMember>(),
unreadDict = ChannelUnreadMessageManager.getUnread() ?? new Dictionary<string, long>(),
channelTop = new Dictionary<string, bool>()
},
tabBarState = new TabBarState {
currentTabIndex = 0 |
<<<<<<<
child: new Text(
data: this.widget.viewModel.socketConnected ? this.widget.viewModel.channel.name : "收取中...",
style: CTextStyle.PXLargeMedium,
maxLines: 1,
overflow: TextOverflow.ellipsis
=======
child: new Row(
mainAxisAlignment: MainAxisAlignment.center,
children: new List<Widget> {
new Flexible(
child: new Text(
data: this.widget.viewModel.channel.name,
style: CTextStyle.PXLargeMedium,
maxLines: 1,
overflow: TextOverflow.ellipsis
)
),
this.widget.viewModel.channel.isMute
? new Container(
margin: EdgeInsets.only(4),
child: new Icon(
icon: Icons.notifications_off,
size: 16,
color: CColors.MuteIcon
)
) : new Container()
}
>>>>>>>
child: new Row(
mainAxisAlignment: MainAxisAlignment.center,
children: new List<Widget> {
new Flexible(
child: new Text(
this.widget.viewModel.socketConnected
? this.widget.viewModel.channel.name
: "收取中...",
style: CTextStyle.PXLargeMedium,
maxLines: 1,
overflow: TextOverflow.ellipsis
)
),
this.widget.viewModel.channel.isMute
? new Container(
margin: EdgeInsets.only(4),
child: new Icon(
icon: Icons.notifications_off,
size: 16,
color: CColors.MuteIcon
)
)
: new Container()
} |
<<<<<<<
fontFamily: "Roboto-Medium",
color: CColors.White
=======
fontFamily: "PingFang-Medium",
color: CColors.H5White
);
public static readonly TextStyle PXLarge = new TextStyle(
height: 1.33f,
fontSize: 18,
fontFamily: "PingFang-Regular",
letterSpacing: 0.6f,
color: CColors.TextBody
);
public static readonly TextStyle PXLargeBlue = new TextStyle(
height: 1.33f,
fontSize: 18,
fontFamily: "PingFang-Regular",
letterSpacing: 0.6f,
color: CColors.PrimaryBlue
>>>>>>>
fontFamily: "Roboto-Medium",
color: CColors.H5White
);
public static readonly TextStyle PXLarge = new TextStyle(
height: 1.33f,
fontSize: 18,
fontFamily: "Roboto-Regular",
letterSpacing: 0.6f,
color: CColors.TextBody
);
public static readonly TextStyle PXLargeBlue = new TextStyle(
height: 1.33f,
fontSize: 18,
fontFamily: "Roboto-Regular",
letterSpacing: 0.6f,
color: CColors.PrimaryBlue
<<<<<<<
fontFamily: "Roboto-Regular",
color: CColors.TextBody
=======
fontFamily: "PingFang-Regular",
color: CColors.PrimaryBlue
>>>>>>>
fontFamily: "Roboto-Regular",
color: CColors.PrimaryBlue
<<<<<<<
fontFamily: "Roboto-Medium",
color: CColors.TextBody
=======
fontFamily: "PingFang-Medium",
color: CColors.TextTitle
>>>>>>>
fontFamily: "Roboto-Medium",
color: CColors.TextTitle
<<<<<<<
fontFamily: "Roboto-Regular",
color: CColors.TextBody
=======
fontFamily: "PingFang-Regular",
color: CColors.TextTitle
>>>>>>>
fontFamily: "Roboto-Regular",
color: CColors.TextTitle
<<<<<<<
public static readonly TextStyle TextBody1 = new TextStyle(
height: 1.7f,
fontSize: 18,
fontFamily: "Roboto-Regular",
color: CColors.TextBody
);
=======
>>>>>>>
public static readonly TextStyle TextBody1 = new TextStyle(
height: 1.7f,
fontSize: 18,
fontFamily: "Roboto-Regular",
color: CColors.TextBody
); |
<<<<<<<
using System.Collections.Generic;
using ConnectApp.Components;
using ConnectApp.Constants;
using ConnectApp.Main;
using ConnectApp.redux;
using ConnectApp.Utils;
using Unity.UIWidgets.widgets;
namespace ConnectApp.screens {
public class MainScreen : StatelessWidget {
public override Widget build(BuildContext context) {
var child = new Container(
color: CColors.White,
child: new CustomSafeArea(
bottom: false,
child: new CustomTabBarConnector(
new List<Widget> {
new ArticlesScreenConnector(),
new EventsScreen(),
new MessageScreenConnector(),
new PersonalScreenConnector()
},
new List<CustomTabBarItem> {
new CustomTabBarItem(
0,
Icons.UnityTabIcon,
Icons.UnityTabIcon,
"首页"
),
new CustomTabBarItem(
1,
Icons.outline_event,
Icons.eventIcon,
"活动"
),
new CustomTabBarItem(
2,
Icons.outline_question_answer,
Icons.question_answer,
"群聊"
),
new CustomTabBarItem(
3,
Icons.mood,
Icons.mood,
"我的"
)
},
backgroundColor: CColors.TabBarBg,
(fromIndex, toIndex) => {
AnalyticsManager.ClickHomeTab(fromIndex: fromIndex, toIndex: toIndex);
if (toIndex != 2 || StoreProvider.store.getState().loginState.isLoggedIn) {
return true;
}
Router.navigator.pushNamed(routeName: MainNavigatorRoutes.Login);
return false;
}
)
)
);
return new VersionUpdater(
child: child
);
}
}
=======
using System.Collections.Generic;
using ConnectApp.Components;
using ConnectApp.Constants;
using ConnectApp.Main;
using ConnectApp.redux;
using ConnectApp.redux.actions;
using ConnectApp.Utils;
using Unity.UIWidgets.widgets;
namespace ConnectApp.screens {
public class MainScreen : StatelessWidget {
public override Widget build(BuildContext context) {
var child = new Container(
color: CColors.White,
child: new CustomSafeArea(
top: false,
bottom: false,
child: new CustomTabBar(
new List<Widget> {
new ArticlesScreenConnector(),
new EventsScreen(),
new NotificationScreenConnector(),
new PersonalScreenConnector()
},
new List<CustomTabBarItem> {
new CustomTabBarItem(
0,
Icons.UnityTabIcon,
Icons.UnityTabIcon,
"首页"
),
new CustomTabBarItem(
1,
Icons.outline_event,
Icons.eventIcon,
"活动"
),
new CustomTabBarItem(
2,
Icons.outline_notification,
Icons.notification,
"通知"
),
new CustomTabBarItem(
3,
Icons.mood,
Icons.mood,
"我的"
)
},
backgroundColor: CColors.TabBarBg,
(fromIndex, toIndex) => {
AnalyticsManager.ClickHomeTab(fromIndex: fromIndex, toIndex: toIndex);
if (toIndex != 2 || StoreProvider.store.getState().loginState.isLoggedIn) {
StatusBarManager.statusBarStyle(toIndex == 3 && UserInfoManager.isLogin());
StoreProvider.store.dispatcher.dispatch(new SwitchTabBarIndexAction {index = toIndex});
return true;
}
Router.navigator.pushNamed(routeName: MainNavigatorRoutes.Login);
return false;
}
)
)
);
return new VersionUpdater(
child: child
);
}
}
>>>>>>>
using System.Collections.Generic;
using ConnectApp.Components;
using ConnectApp.Constants;
using ConnectApp.Main;
using ConnectApp.redux;
using ConnectApp.redux.actions;
using ConnectApp.Utils;
using Unity.UIWidgets.widgets;
namespace ConnectApp.screens {
public class MainScreen : StatelessWidget {
public override Widget build(BuildContext context) {
var child = new Container(
color: CColors.White,
child: new CustomSafeArea(
top: false,
bottom: false,
child: new CustomTabBarConnector(
new List<Widget> {
new ArticlesScreenConnector(),
new EventsScreen(),
new MessageScreenConnector(),
new PersonalScreenConnector()
},
new List<CustomTabBarItem> {
new CustomTabBarItem(
0,
Icons.UnityTabIcon,
Icons.UnityTabIcon,
"首页"
),
new CustomTabBarItem(
1,
Icons.outline_event,
Icons.eventIcon,
"活动"
),
new CustomTabBarItem(
2,
Icons.outline_question_answer,
Icons.question_answer,
"群聊"
),
new CustomTabBarItem(
3,
Icons.mood,
Icons.mood,
"我的"
)
},
backgroundColor: CColors.TabBarBg,
(fromIndex, toIndex) => {
AnalyticsManager.ClickHomeTab(fromIndex: fromIndex, toIndex: toIndex);
if (toIndex != 2 || StoreProvider.store.getState().loginState.isLoggedIn) {
StatusBarManager.statusBarStyle(toIndex == 3 && UserInfoManager.isLogin());
StoreProvider.store.dispatcher.dispatch(new SwitchTabBarIndexAction {index = toIndex});
return true;
}
Router.navigator.pushNamed(routeName: MainNavigatorRoutes.Login);
return false;
}
)
)
);
return new VersionUpdater(
child: child
);
}
} |
<<<<<<<
using System;
using System.Collections.Generic;
using Highway.Data.Contexts;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Highway.Data.Tests.InMemory.BugTests
{
[TestClass]
public class InMemBugTests
{
private IDataContext _context;
[TestMethod]
public void ShouldNotThrowErrorOnAdd()
{
_context = new InMemoryDataContext();
var repo = new Repository(_context);
var businessEntity = new BusinessEntity(
1,
"name",
"abbr",
string.Empty,
new StatusType(),
new List<EntityType> {new EntityType()},
new DateTime(2014, 1, 1),
null);
repo.Context.Add(businessEntity);
}
[TestMethod]
public void ShouldNotThrowErrorsOnAddWithSimilarThings()
{
var repo = new Repository(new InMemoryDataContext());
var specification = new CreatePollingDeviceSpecification { DeviceModel = "Test" };
var deviceModel = new DeviceModel
{
Id = 1,
Code = specification.DeviceModel,
Name = specification.DeviceModel
};
repo.Context.Add(deviceModel);
repo.Context.Commit();
}
}
public class DeviceModel : IIdentifiable<long>
{
public long Id { get; set; }
public string Code { get; set; }
public string Name { get; set; }
}
public class CreatePollingDeviceSpecification
{
public string DeviceModel { get; set; }
}
public class BusinessEntity : IIdentifiable<long>
{
public BusinessEntity(long id, string name, string abbreviation, string epaNumber, StatusType status, List<EntityType> entityTypes, DateTime startDate, DateTime? endDate)
{
ValidateInitialValues(abbreviation);
EntityTypes = entityTypes;
Id = id;
Name = name;
Abbreviation = abbreviation;
EpaNumber = epaNumber;
EntityStatusType = status;
StartDate = startDate;
EndDate = endDate;
}
private static void ValidateInitialValues(string abbreviation)
{
if (abbreviation.Length != 4)
{
throw new ArgumentOutOfRangeException(abbreviation, "Abbreviation must be four characters long.");
}
}
public long Id { get; set; }
public string Name { get; protected set; }
public string Abbreviation { get; protected set; }
public string EpaNumber { get; protected set; }
public List<EntityType> EntityTypes { get; protected set; }
public StatusType EntityStatusType { get; protected set; }
public DateTime StartDate { get; protected set; }
public DateTime? EndDate { get; protected set; }
public DateTime CreateDate { get; protected set; }
public string CreatedBy { get; protected set; }
public DateTime LastModifiedDate { get; protected set; }
public string LastModifiedBy { get; protected set; }
public Customer Customer { get; protected set; }
public void SetCustomer(Customer customer)
{
customer.SetBusinessEntity(this);
customer.SetEntityType(new EntityType { Id = 1, EntityTypeName = "Customer" });
Customer = customer;
}
}
public class Customer
{
public void SetBusinessEntity(BusinessEntity businessEntity)
{
throw new NotImplementedException();
}
public void SetEntityType(EntityType entityType)
{
throw new NotImplementedException();
}
}
public class EntityType
{
public int Id { get; set; }
public string EntityTypeName { get; set; }
}
public class StatusType
{
}
=======
using System;
using System.Collections.Generic;
using Highway.Data;
using Highway.Data.Contexts;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Highway.Data.Tests.InMemory.BugTests
{
[TestClass]
public class InMemBugTests
{
private IDataContext _context;
[TestMethod]
public void ShouldNotThrowErrorOnAdd()
{
this._context = new InMemoryDataContext();
var businessEntity = new BusinessEntity(
1,
"name",
"abbr",
string.Empty,
new StatusType(),
new List<EntityType>() { new EntityType() },
new DateTime(2014, 1, 1),
null);
this._context.Add(businessEntity);
}
class BusinessEntity : IIdentifiable<long>
{
public BusinessEntity(long id, string name, string abbreviation, string epaNumber, StatusType status, List<EntityType> entityTypes, DateTime startDate, DateTime? endDate)
{
ValidateInitialValues(name, abbreviation, entityTypes);
EntityTypes = entityTypes;
Id = id;
Name = name;
Abbreviation = abbreviation;
EpaNumber = epaNumber;
EntityStatusType = status;
StartDate = startDate;
EndDate = endDate;
}
private static void ValidateInitialValues(string name, string abbreviation, List<EntityType> entityTypes)
{
if (abbreviation.Length != 4)
{
throw new ArgumentOutOfRangeException(abbreviation, "Abbreviation must be four characters long.");
}
}
public long Id { get; set; }
public string Name { get; protected set; }
public string Abbreviation { get; protected set; }
public string EpaNumber { get; protected set; }
public List<EntityType> EntityTypes { get; protected set; }
public StatusType EntityStatusType { get; protected set; }
public DateTime StartDate { get; protected set; }
public DateTime? EndDate { get; protected set; }
public DateTime CreateDate { get; protected set; }
public string CreatedBy { get; protected set; }
public DateTime LastModifiedDate { get; protected set; }
public string LastModifiedBy { get; protected set; }
public Customer Customer { get; protected set; }
public void SetCustomer(Customer customer)
{
customer.SetBusinessEntity(this);
customer.SetEntityType(new EntityType() { Id = 1, EntityTypeName = "Customer" });
this.Customer = customer;
}
}
class Customer
{
public void SetBusinessEntity(BusinessEntity businessEntity)
{
throw new NotImplementedException();
}
public void SetEntityType(EntityType entityType)
{
throw new NotImplementedException();
}
}
class EntityType
{
public int Id { get; set; }
public string EntityTypeName { get; set; }
}
class StatusType
{
}
}
>>>>>>>
using System;
using System.Collections.Generic;
using Highway.Data.Contexts;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Highway.Data.Tests.InMemory.BugTests
{
[TestClass]
public class InMemBugTests
{
private IDataContext _context;
[TestMethod]
public void ShouldNotThrowErrorOnAdd()
{
_context = new InMemoryDataContext();
var repo = new Repository(_context);
var businessEntity = new BusinessEntity(
1,
"name",
"abbr",
string.Empty,
new StatusType(),
new List<EntityType> {new EntityType()},
new DateTime(2014, 1, 1),
null);
repo.Context.Add(businessEntity);
}
[TestMethod]
public void ShouldNotThrowErrorsOnAddWithSimilarThings()
{
var repo = new Repository(new InMemoryDataContext());
var specification = new CreatePollingDeviceSpecification { DeviceModel = "Test" };
var deviceModel = new DeviceModel
{
Id = 1,
Code = specification.DeviceModel,
Name = specification.DeviceModel
};
repo.Context.Add(deviceModel);
repo.Context.Commit();
}
}
public class DeviceModel : IIdentifiable<long>
{
public long Id { get; set; }
public string Code { get; set; }
public string Name { get; set; }
}
public class CreatePollingDeviceSpecification
{
public string DeviceModel { get; set; }
}
public class BusinessEntity : IIdentifiable<long>
{
public BusinessEntity(long id, string name, string abbreviation, string epaNumber, StatusType status, List<EntityType> entityTypes, DateTime startDate, DateTime? endDate)
{
ValidateInitialValues(abbreviation);
EntityTypes = entityTypes;
Id = id;
Name = name;
Abbreviation = abbreviation;
EpaNumber = epaNumber;
EntityStatusType = status;
StartDate = startDate;
EndDate = endDate;
}
private static void ValidateInitialValues(string abbreviation)
{
if (abbreviation.Length != 4)
{
throw new ArgumentOutOfRangeException(abbreviation, "Abbreviation must be four characters long.");
}
}
public long Id { get; set; }
public string Name { get; protected set; }
public string Abbreviation { get; protected set; }
public string EpaNumber { get; protected set; }
public List<EntityType> EntityTypes { get; protected set; }
public StatusType EntityStatusType { get; protected set; }
public DateTime StartDate { get; protected set; }
public DateTime? EndDate { get; protected set; }
public DateTime CreateDate { get; protected set; }
public string CreatedBy { get; protected set; }
public DateTime LastModifiedDate { get; protected set; }
public string LastModifiedBy { get; protected set; }
public Customer Customer { get; protected set; }
public void SetCustomer(Customer customer)
{
customer.SetBusinessEntity(this);
customer.SetEntityType(new EntityType { Id = 1, EntityTypeName = "Customer" });
Customer = customer;
}
}
class Customer
{
public void SetBusinessEntity(BusinessEntity businessEntity)
{
throw new NotImplementedException();
}
public void SetEntityType(EntityType entityType)
{
throw new NotImplementedException();
}
}
class EntityType
{
public int Id { get; set; }
public string EntityTypeName { get; set; }
}
class StatusType
{
}
} |
<<<<<<<
using Highway.Data.EntityFramework.Tests.Properties;
=======
>>>>>>>
using Highway.Data.EntityFramework.Tests.Properties;
<<<<<<<
using Rhino.Mocks;
namespace Highway.Data.EntityFramework.Tests.UnitTests
=======
using Rhino.Mocks;
using Highway.Data.EntityFramework.Tests.Properties;
using Highway.Data.Tests;
using Castle.MicroKernel.Registration;
using Highway.Data.EntityFramework.Tests.Initializer;
using Highway.Data.EntityFramework.Tests.Mapping;
namespace Highway.Data.EntityFramework.Tests.UnitTests
>>>>>>>
using Rhino.Mocks;
using Highway.Data.Tests;
using Castle.MicroKernel.Registration;
using Highway.Data.EntityFramework.Tests.Initializer;
namespace Highway.Data.EntityFramework.Tests.UnitTests |
<<<<<<<
using Kooboo.Sites.KscriptConfig;
=======
using System.ComponentModel;
using KScript.Sites;
using Kooboo.Sites.Scripting;
using Kooboo;
>>>>>>>
using System.ComponentModel;
using KScript.Sites;
using Kooboo.Sites.Scripting;
using Kooboo;
using Kooboo.Sites.KscriptConfig; |
<<<<<<<
public string CommandUIExtension { get; set; }
=======
#region Properties
/// <summary>
/// Gets or sets the name of the custom action.
/// </summary>
>>>>>>>
#region Properties
/// <summary>
/// Gets or sets the name of the custom action.
/// </summary>
public string CommandUIExtension { get; set; }
<<<<<<<
public string RegistrationId { get; set; }
public UserCustomActionRegistrationType RegistrationType { get; set; }
public bool Remove { get; set; }
=======
/// <summary>
/// Gets or sets the URL, URI, or ECMAScript (JScript, JavaScript) function associated with the action.
/// </summary>
>>>>>>>
public string RegistrationId { get; set; }
public UserCustomActionRegistrationType RegistrationType { get; set; }
public bool Remove { get; set; }
/// <summary>
/// Gets or sets the URL, URI, or ECMAScript (JScript, JavaScript) function associated with the action.
/// </summary> |
<<<<<<<
{
ModulePath = Path.Combine(AppContext.BaseDirectory, "modules");
if (!Directory.Exists(ModulePath)) Directory.CreateDirectory(ModulePath);
var modulesHash = GetModulesHash();
Version = Assembly.GetEntryAssembly().GetName().Version;
var build = Version.Build + modulesHash.Take(8).Sum(s => s);
var revision = Version.Revision + modulesHash.Skip(8).Sum(s => s);
Version = new Version(Version.Major, Version.Minor, build, revision);
=======
{
Version = typeof(Kooboo.Data.Models.WebSite).Assembly.GetName().Version;
>>>>>>>
{
ModulePath = Path.Combine(AppContext.BaseDirectory, "modules");
if (!Directory.Exists(ModulePath)) Directory.CreateDirectory(ModulePath);
var modulesHash = GetModulesHash();
Version = typeof(Kooboo.Data.Models.WebSite).Assembly.GetName().Version;
var build = Version.Build + modulesHash.Take(8).Sum(s => s);
var revision = Version.Revision + modulesHash.Skip(8).Sum(s => s);
Version = new Version(Version.Major, Version.Minor, build, revision); |
<<<<<<<
if (e.KeyModifiers == KeyModifiers.Shift) PatternFire(Fire, null);
else PatternPlay(Play, null);
=======
if (e.Modifiers == InputModifiers.Shift) PatternFire(Fire, null);
else if (e.Modifiers == InputModifiers.None) PatternPlay(Play, null);
return;
>>>>>>>
if (e.KeyModifiers == KeyModifiers.Shift) PatternFire(Fire, null);
else if (e.KeyModifiers == KeyModifiers.None) PatternPlay(Play, null);
else PatternPlay(Play, null);
<<<<<<<
bool shift = e.KeyModifiers == KeyModifiers.Shift;
=======
if (e.Modifiers != InputModifiers.None && e.Modifiers != InputModifiers.Shift) return;
bool shift = e.Modifiers == InputModifiers.Shift;
>>>>>>>
if (e.KeyModifiers != KeyModifiers.None && e.KeyModifiers != KeyModifiers.Shift) return;
bool shift = e.KeyModifiers == KeyModifiers.Shift;
<<<<<<<
if (mods.HasFlag(App.ControlKey)) {
if (_pattern[_pattern.Expanded].Screen[signalIndex] != new Color(0)) {
Color color = _pattern[_pattern.Expanded].Screen[signalIndex];
ColorPicker.SetColor(color.Clone());
ColorHistory.Select(color.Clone(), true);
}
=======
if (mods.HasFlag(Program.ControlKey)) {
Color color = _pattern[_pattern.Expanded].Screen[signalIndex];
ColorPicker.SetColor(color.Clone());
ColorHistory.Select(color.Clone(), true);
>>>>>>>
if (mods.HasFlag(App.ControlKey)) {
Color color = _pattern[_pattern.Expanded].Screen[signalIndex];
ColorPicker.SetColor(color.Clone());
ColorHistory.Select(color.Clone(), true); |
<<<<<<<
routes.MapGrpcService<GreeterService>();
routes.MapRazorPages();
=======
routes.MapGrpcService<GreeterService>().RequireAuthorization("protectedScope");
>>>>>>>
routes.MapGrpcService<GreeterService>().RequireAuthorization("protectedScope");
routes.MapRazorPages(); |
<<<<<<<
const string SignOutMessageCookieIdtoRemove = "ids:SignOutMessageCookieIdtoRemove";
public static void QueueRemovalOfSignOutMessageCookie(this IOwinContext context, string id)
{
if (context == null) throw new ArgumentNullException("context");
if (id != null)
{
context.Environment[SignOutMessageCookieIdtoRemove] = id;
}
}
public static void ProcessRemovalOfSignOutMessageCookie(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
if (context.Response.StatusCode == 200 && context.Environment.ContainsKey(SignOutMessageCookieIdtoRemove))
{
var signOutMessageCookie = context.ResolveDependency<MessageCookie<SignOutMessage>>();
signOutMessageCookie.Clear((string)context.Environment[SignOutMessageCookieIdtoRemove]);
}
}
const string QueueRenderLoggedOutPageFlag = "ids:QueueRenderLoggedOutPage";
public static void QueueRenderLoggedOutPage(this IOwinContext context, string signOutMessageId)
{
if (context == null) throw new ArgumentNullException("context");
context.Environment[QueueRenderLoggedOutPageFlag] = signOutMessageId;
}
public static bool ShouldRenderLoggedOutPage(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
return context.Environment.ContainsKey(QueueRenderLoggedOutPageFlag);
}
public static void PrepareContextForLoggedOutPage(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
context.Request.Method = "POST";
context.Request.ContentType = "application/x-www-form-urlencoded";
context.Request.Path = new PathString("/" + Constants.RoutePaths.Logout);
context.Request.QueryString = new QueryString("id", (string)context.Environment[QueueRenderLoggedOutPageFlag]);
context.SetSuppressAntiForgeryCheck();
}
const string SuppressAntiForgeryCheck = "ids:SuppressAntiForgeryCheck";
public static void SetSuppressAntiForgeryCheck(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
context.Environment[SuppressAntiForgeryCheck] = true;
}
public static bool GetSuppressAntiForgeryCheck(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
return context.Environment.ContainsKey(SuppressAntiForgeryCheck) && true.Equals(context.Environment[SuppressAntiForgeryCheck]);
}
=======
public static void ClearAuthenticationCookies(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
context.Authentication.SignOut(
Constants.PrimaryAuthenticationType,
Constants.ExternalAuthenticationType,
Constants.PartialSignInAuthenticationType);
}
public static void SignOutOfExternalIdP(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
// look for idp claim other than IdSvr
// if present, then signout of it
var user = context.Authentication.User;
if (user != null && user.Identity != null && user.Identity.IsAuthenticated)
{
var idp = user.GetIdentityProvider();
if (idp != Constants.BuiltInIdentityProvider)
{
context.Authentication.SignOut(idp);
}
}
}
>>>>>>>
const string SignOutMessageCookieIdtoRemove = "ids:SignOutMessageCookieIdtoRemove";
public static void QueueRemovalOfSignOutMessageCookie(this IOwinContext context, string id)
{
if (context == null) throw new ArgumentNullException("context");
if (id != null)
{
context.Environment[SignOutMessageCookieIdtoRemove] = id;
}
}
public static void ProcessRemovalOfSignOutMessageCookie(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
if (context.Response.StatusCode == 200 && context.Environment.ContainsKey(SignOutMessageCookieIdtoRemove))
{
var signOutMessageCookie = context.ResolveDependency<MessageCookie<SignOutMessage>>();
signOutMessageCookie.Clear((string)context.Environment[SignOutMessageCookieIdtoRemove]);
}
}
const string QueueRenderLoggedOutPageFlag = "ids:QueueRenderLoggedOutPage";
public static void QueueRenderLoggedOutPage(this IOwinContext context, string signOutMessageId)
{
if (context == null) throw new ArgumentNullException("context");
context.Environment[QueueRenderLoggedOutPageFlag] = signOutMessageId;
}
public static bool ShouldRenderLoggedOutPage(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
return context.Environment.ContainsKey(QueueRenderLoggedOutPageFlag);
}
public static void PrepareContextForLoggedOutPage(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
context.Request.Method = "POST";
context.Request.ContentType = "application/x-www-form-urlencoded";
context.Request.Path = new PathString("/" + Constants.RoutePaths.Logout);
context.Request.QueryString = new QueryString("id", (string)context.Environment[QueueRenderLoggedOutPageFlag]);
context.SetSuppressAntiForgeryCheck();
}
const string SuppressAntiForgeryCheck = "ids:SuppressAntiForgeryCheck";
public static void SetSuppressAntiForgeryCheck(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
context.Environment[SuppressAntiForgeryCheck] = true;
}
public static bool GetSuppressAntiForgeryCheck(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
return context.Environment.ContainsKey(SuppressAntiForgeryCheck) && true.Equals(context.Environment[SuppressAntiForgeryCheck]);
}
public static void ClearAuthenticationCookies(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
context.Authentication.SignOut(
Constants.PrimaryAuthenticationType,
Constants.ExternalAuthenticationType,
Constants.PartialSignInAuthenticationType);
}
public static void SignOutOfExternalIdP(this IOwinContext context)
{
if (context == null) throw new ArgumentNullException("context");
// look for idp claim other than IdSvr
// if present, then signout of it
var user = context.Authentication.User;
if (user != null && user.Identity != null && user.Identity.IsAuthenticated)
{
var idp = user.GetIdentityProvider();
if (idp != Constants.BuiltInIdentityProvider)
{
context.Authentication.SignOut(idp);
}
}
} |
<<<<<<<
public bool? http_logout_supported { get; set; }
=======
public string introspection_endpoint { get; set; }
>>>>>>>
public string introspection_endpoint { get; set; }
public bool? http_logout_supported { get; set; } |
<<<<<<<
public static readonly DiagnosticDescriptor RemoveFileWithNoCode = new DiagnosticDescriptor(
id: DiagnosticIdentifiers.RemoveFileWithNoCode,
title: "Remove file with no code.",
messageFormat: "Consider removing file with no code.",
category: DiagnosticCategories.General,
defaultSeverity: DiagnosticSeverity.Info,
isEnabledByDefault: true
);
public static readonly DiagnosticDescriptor DeclareUsingDirectiveOnTopLevel = new DiagnosticDescriptor(
id: DiagnosticIdentifiers.DeclareUsingDirectiveOnTopLevel,
title: "Declare using directive on top level.",
messageFormat: "Consider declaring using directive on top level.",
category: DiagnosticCategories.General,
defaultSeverity: DiagnosticSeverity.Warning,
isEnabledByDefault: false
);
}
=======
public static readonly DiagnosticDescriptor UseCSharp6DictionaryInitializer = new DiagnosticDescriptor(
id: DiagnosticIdentifiers.UseCSharp6DictionaryInitializer,
title: "Use C# 6.0 dictionary initializer.",
messageFormat: "Consider using C# 6.0 dictionary initializer.",
category: DiagnosticCategories.General,
defaultSeverity: DiagnosticSeverity.Warning,
isEnabledByDefault: true
);
}
>>>>>>>
public static readonly DiagnosticDescriptor RemoveFileWithNoCode = new DiagnosticDescriptor(
id: DiagnosticIdentifiers.RemoveFileWithNoCode,
title: "Remove file with no code.",
messageFormat: "Consider removing file with no code.",
category: DiagnosticCategories.General,
defaultSeverity: DiagnosticSeverity.Info,
isEnabledByDefault: true
);
public static readonly DiagnosticDescriptor DeclareUsingDirectiveOnTopLevel = new DiagnosticDescriptor(
id: DiagnosticIdentifiers.DeclareUsingDirectiveOnTopLevel,
title: "Declare using directive on top level.",
messageFormat: "Consider declaring using directive on top level.",
category: DiagnosticCategories.General,
defaultSeverity: DiagnosticSeverity.Warning,
isEnabledByDefault: false
);
public static readonly DiagnosticDescriptor UseCSharp6DictionaryInitializer = new DiagnosticDescriptor(
id: DiagnosticIdentifiers.UseCSharp6DictionaryInitializer,
title: "Use C# 6.0 dictionary initializer.",
messageFormat: "Consider using C# 6.0 dictionary initializer.",
category: DiagnosticCategories.General,
defaultSeverity: DiagnosticSeverity.Warning,
isEnabledByDefault: true
);
} |
<<<<<<<
using System.Collections.ObjectModel;
using System.Globalization;
=======
using System.Diagnostics;
>>>>>>>
using System.Collections.ObjectModel;
using System.Globalization;
<<<<<<<
=======
using OtpNet;
>>>>>>>
using OtpNet;
<<<<<<<
driver.WaitUntilVisible(By.XPath(Elements.Xpath[Reference.Login.CrmMainPage]), TimeSpan.FromSeconds(60), "Login page failed.");
SwitchToMainFrame(driver);
=======
d.WaitUntilVisible(By.XPath(Elements.Xpath[Reference.Login.CrmMainPage]), new TimeSpan(0, 0, 60),
e => SwitchToMainFrame(d),
f => throw new Exception("Login page failed."));
>>>>>>>
driver.WaitUntilVisible(By.XPath(Elements.Xpath[Reference.Login.CrmMainPage]), TimeSpan.FromSeconds(60), "Login page failed.");
SwitchToMainFrame(driver);
<<<<<<<
driver.WaitUntilVisible(By.XPath(Elements.Xpath[Reference.Login.CrmMainPage]), TimeSpan.FromSeconds(60), "Login page failed.");
SwitchToMainFrame(driver);
=======
d.WaitUntilVisible(By.XPath(Elements.Xpath[Reference.Login.CrmMainPage])
, new TimeSpan(0, 0, 60),
e => SwitchToMainFrame(d),
f => throw new Exception("Login page failed."));
>>>>>>>
driver.WaitUntilVisible(By.XPath(Elements.Xpath[Reference.Login.CrmMainPage]), TimeSpan.FromSeconds(60), "Login page failed.");
SwitchToMainFrame(driver);
<<<<<<<
//9.0.2
var areas = OpenMenu();
if (areas != null)
{
if (!areas.ContainsKey(area))
{
throw new InvalidOperationException($"No area with the name '{area}' exists.");
}
return areas;
}
//9.1
areas = OpenMenuFallback(area);
=======
// 9.1 ?? 9.0.2 <- inverted order (fallback first) run quickly
var areas = OpenMenuFallback(area).Value ?? OpenMenu().Value;
>>>>>>>
// 9.1 ?? 9.0.2 <- inverted order (fallback first) run quickly
var areas = OpenMenuFallback(area).Value ?? OpenMenu().Value;
<<<<<<<
}
=======
>>>>>>>
<<<<<<<
AddMenuItemsFrom(driver, AppReference.Navigation.SitemapSwitcherFlyout, dictionary);
=======
driver.WaitUntilAvailable(By.XPath(AppElements.Xpath[AppReference.Navigation.SitemapSwitcherFlyout]),
new TimeSpan(0, 0, 2),
d =>
{
var menu = driver.FindElement(By.XPath(AppElements.Xpath[AppReference.Navigation.SitemapSwitcherFlyout]));
var menuItems = menu.FindElements(By.TagName("li"));
foreach (var item in menuItems)
{
dictionary.Add(item.Text.ToLowerString(), item);
}
},
e => throw new InvalidOperationException("The Main Menu is not available."));
>>>>>>>
AddMenuItemsFrom(driver, AppReference.Navigation.SitemapSwitcherFlyout, dictionary);
<<<<<<<
TimeSpan.FromSeconds(9), 3
=======
new TimeSpan(0, 0, 9), 3
>>>>>>>
TimeSpan.FromSeconds(9), 3 |
<<<<<<<
ContentItem oldVersion = item.Clone(false);
if(item.State == ContentState.Published)
stateChanger.ChangeTo(oldVersion, ContentState.Unpublished);
else
stateChanger.ChangeTo(oldVersion, ContentState.Draft);
oldVersion.Expires = Utility.CurrentTime().AddSeconds(-1);
oldVersion.Updated = Utility.CurrentTime().AddSeconds(-1);
oldVersion.Parent = null;
oldVersion.VersionOf = item;
if (item.Parent != null)
oldVersion["ParentID"] = item.Parent.ID;
itemRepository.SaveOrUpdate(oldVersion);
if (ItemSavedVersion != null)
ItemSavedVersion.Invoke(this, new ItemEventArgs(oldVersion));
TrimVersionCountTo(item, maximumVersionsPerItem);
return oldVersion;
=======
ContentItem oldVersion = item.Clone(false);
if(item.State == ContentState.Published)
stateChanger.ChangeTo(oldVersion, ContentState.Unpublished);
else
stateChanger.ChangeTo(oldVersion, ContentState.Draft);
oldVersion.Expires = Utility.CurrentTime().AddSeconds(-1);
oldVersion.Updated = Utility.CurrentTime().AddSeconds(-1);
oldVersion.Parent = null;
oldVersion.VersionOf = item;
if (item.Parent != null)
oldVersion["ParentID"] = item.Parent.ID;
itemRepository.SaveOrUpdate(oldVersion);
itemRepository.Flush();
if (ItemSavedVersion != null)
ItemSavedVersion.Invoke(this, new ItemEventArgs(oldVersion));
TrimVersionCountTo(item, maximumVersionsPerItem);
return oldVersion;
}
return null;
>>>>>>>
ContentItem oldVersion = item.Clone(false);
if(item.State == ContentState.Published)
stateChanger.ChangeTo(oldVersion, ContentState.Unpublished);
else
stateChanger.ChangeTo(oldVersion, ContentState.Draft);
oldVersion.Expires = Utility.CurrentTime().AddSeconds(-1);
oldVersion.Updated = Utility.CurrentTime().AddSeconds(-1);
oldVersion.Parent = null;
oldVersion.VersionOf = item;
if (item.Parent != null)
oldVersion["ParentID"] = item.Parent.ID;
itemRepository.SaveOrUpdate(oldVersion);
itemRepository.Flush();
if (ItemSavedVersion != null)
ItemSavedVersion.Invoke(this, new ItemEventArgs(oldVersion));
TrimVersionCountTo(item, maximumVersionsPerItem);
return oldVersion; |
<<<<<<<
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, null);
=======
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, new ThreadContext());
>>>>>>>
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, null);
<<<<<<<
TrashHandler th = mocks.PartialMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, null);
=======
TrashHandler th = mocks.PartialMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, new ThreadContext());
>>>>>>>
TrashHandler th = mocks.PartialMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null);
TrashHandler th = mocks.PartialMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, null);
TrashHandler th = mocks.PartialMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, new ThreadContext());
<<<<<<<
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, null);
=======
TrashHandler th = new TrashHandler(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), new StateChanger(), new ThreadContext());
>>>>>>>
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null);
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, null);
TrashHandler th = new TrashHandler(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), new StateChanger(), new ThreadContext());
<<<<<<<
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, null);
=======
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, new ThreadContext());
>>>>>>>
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null);
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, null);
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, new ThreadContext()); |
<<<<<<<
/// <param name="utcLastModified">The time the resource was modified.</param>
public static void SetValidUntilExpires(this HttpResponse response, DateTime utcLastModified)
=======
/// <param name="lastModified">The time the resource was modified.</param>
public static void SetValidUntilExpires(this HttpResponse response, DateTime utcLastModified)
>>>>>>>
/// <param name="utcLastModified">The time the resource was modified.</param>
public static void SetValidUntilExpires(this HttpResponse response, DateTime utcLastModified)
<<<<<<<
/// <summary>Sets public cacheablility (ask server if resources is modified) on the response header.</summary>
/// <param name="response">The response whose cache to modify.</param>
/// <param name="expires">The time the resource expires.</param>
public static HttpResponse SetOutputCache(this HttpResponse response, DateTime expires)
{
response.Cache.SetExpires(expires);
response.Cache.SetCacheability(HttpCacheability.ServerAndPrivate);
response.Cache.SetValidUntilExpires(true);
return response;
}
/// <summary>Sets public cacheablility (ask server if resources is modified) on the response header.</summary>
/// <param name="response">The response whose cache to modify.</param>
/// <param name="expires">The time the resource expires.</param>
public static HttpResponseBase SetOutputCache(this HttpResponseBase response, DateTime expires)
{
response.Cache.SetExpires(expires);
response.Cache.SetCacheability(HttpCacheability.ServerAndPrivate);
response.Cache.SetValidUntilExpires(true);
return response;
}
=======
/// <summary>Sets public cacheablility (ask server if resources is modified) on the response header.</summary>
/// <param name="response">The response whose cache to modify.</param>
/// <param name="lastModified">The time the resource was modified.</param>
public static HttpResponse SetOutputCache(this HttpResponse response, DateTime expires)
{
response.Cache.SetExpires(expires);
response.Cache.SetCacheability(HttpCacheability.ServerAndPrivate);
response.Cache.SetValidUntilExpires(true);
return response;
}
/// <summary>Sets public cacheablility (ask server if resources is modified) on the response header.</summary>
/// <param name="response">The response whose cache to modify.</param>
/// <param name="lastModified">The time the resource was modified.</param>
public static HttpResponseBase SetOutputCache(this HttpResponseBase response, DateTime expires)
{
response.Cache.SetExpires(expires);
response.Cache.SetCacheability(HttpCacheability.ServerAndPrivate);
response.Cache.SetValidUntilExpires(true);
return response;
}
>>>>>>>
/// <summary>Sets public cacheablility (ask server if resources is modified) on the response header.</summary>
/// <param name="response">The response whose cache to modify.</param>
/// <param name="expires">The time the resource expires.</param>
public static HttpResponse SetOutputCache(this HttpResponse response, DateTime expires)
{
response.Cache.SetExpires(expires);
response.Cache.SetCacheability(HttpCacheability.ServerAndPrivate);
response.Cache.SetValidUntilExpires(true);
return response;
}
/// <summary>Sets public cacheablility (ask server if resources is modified) on the response header.</summary>
/// <param name="response">The response whose cache to modify.</param>
/// <param name="expires">The time the resource expires.</param>
public static HttpResponseBase SetOutputCache(this HttpResponseBase response, DateTime expires)
{
response.Cache.SetExpires(expires);
response.Cache.SetCacheability(HttpCacheability.ServerAndPrivate);
response.Cache.SetValidUntilExpires(true);
return response;
}
/// <param name="lastModified">The time the resource was modified.</param>
public static HttpResponse SetOutputCache(this HttpResponse response, DateTime expires)
{
response.Cache.SetExpires(expires);
response.Cache.SetCacheability(HttpCacheability.ServerAndPrivate);
response.Cache.SetValidUntilExpires(true);
return response;
}
/// <summary>Sets public cacheablility (ask server if resources is modified) on the response header.</summary>
/// <param name="response">The response whose cache to modify.</param>
/// <param name="lastModified">The time the resource was modified.</param>
public static HttpResponseBase SetOutputCache(this HttpResponseBase response, DateTime expires)
{
response.Cache.SetExpires(expires);
response.Cache.SetCacheability(HttpCacheability.ServerAndPrivate);
response.Cache.SetValidUntilExpires(true);
return response;
} |
<<<<<<<
/// <param name="clearBeforeReindex"></param>
void ReindexDescendants(N2.ContentItem root, bool clearBeforeReindex);
=======
void ReindexDescendants(int rootID, bool clearBeforeReindex);
>>>>>>>
/// <param name="clearBeforeReindex"></param>
void ReindexDescendants(int rootID, bool clearBeforeReindex); |
<<<<<<<
using System.Collections.Generic;
using System.Diagnostics;
=======
using System.Collections.Generic;
using System.Diagnostics;
>>>>>>>
using System.Collections.Generic;
using System.Diagnostics;
<<<<<<<
using N2.Collections;
using N2.Security;
=======
using N2.Collections;
using N2.Security;
>>>>>>>
using N2.Collections;
using N2.Security;
<<<<<<<
{
return CreateDirectory(pair.Folder, fs, persister, dependencyInjector);
}
internal static Directory CreateDirectory(FileSystemRoot folder, IFileSystem fs, IPersister persister, IDependencyInjector dependencyInjector)
{
var dd = fs.GetDirectoryOrVirtual(folder.Path);
var parent = persister.Get(folder.GetParentID());
var dir = Directory.New(dd, parent, dependencyInjector);
dir.Name = folder.GetName();
dir.Title = folder.Title ?? dir.Name;
Apply(folder.Readers, dir);
Apply(folder.Writers, dir);
return dir;
}
private static void Apply(PermissionMap map, Directory dir)
{
if (map.IsAltered)
DynamicPermissionMap.SetRoles(dir, map.Permissions, map.Roles);
else
DynamicPermissionMap.SetAllRoles(dir, map.Permissions);
=======
{
return CreateDirectory(pair.Folder, fs, repository, dependencyInjector);
}
internal static Directory CreateDirectory(FileSystemRoot folder, IFileSystem fs, IRepository<ContentItem> persister, IDependencyInjector dependencyInjector)
{
var dd = fs.GetDirectoryOrVirtual(folder.Path);
var parent = persister.Get(folder.GetParentID());
var dir = Directory.New(dd, parent, dependencyInjector);
dir.Name = folder.GetName();
dir.Title = folder.Title ?? dir.Name;
Apply(folder.Readers, dir);
Apply(folder.Writers, dir);
return dir;
>>>>>>>
{
return CreateDirectory(pair.Folder, fs, persister, dependencyInjector);
}
internal static Directory CreateDirectory(FileSystemRoot folder, IFileSystem fs, IPersister persister, IDependencyInjector dependencyInjector)
{
var dd = fs.GetDirectoryOrVirtual(folder.Path);
var parent = persister.Get(folder.GetParentID());
var dir = Directory.New(dd, parent, dependencyInjector);
dir.Name = folder.GetName();
dir.Title = folder.Title ?? dir.Name;
Apply(folder.Readers, dir);
Apply(folder.Writers, dir);
return dir; |
<<<<<<<
using System.Linq;
using System.Reflection;
=======
using System.Web.UI;
using System.Reflection;
using System.Web;
using System.Collections;
using System.IO;
using N2.Engine.Globalization;
using System.Text;
>>>>>>>
using System.Linq;
using System.Web.UI;
using System.Reflection;
using System.Web;
using System.Collections;
using System.IO;
using N2.Engine.Globalization;
using System.Text;
<<<<<<<
var source = SetupContentSource(itemRepository);
persister = new ContentPersister(source, itemRepository);
new BehaviorInvoker(persister, new N2.Definitions.Static.DefinitionMap()).Start();
=======
persister = new ContentPersister(itemRepository, linkRepository);
new BehaviorInvoker(persister, new N2.Definitions.Static.DefinitionMap()).Start();
>>>>>>>
var source = SetupContentSource(itemRepository);
persister = new ContentPersister(source, itemRepository);
new BehaviorInvoker(persister, new N2.Definitions.Static.DefinitionMap()).Start();
<<<<<<<
public static N2.Edit.Versioning.ContentVersionRepository CreateVersionRepository(params Type[] definedTypes)
{
IPersister persister = null;
return CreateVersionRepository(ref persister, definedTypes);
}
public static N2.Edit.Versioning.DraftRepository CreateDraftRepository(ref IPersister persister, params Type[] definedTypes)
{
return new DraftRepository(CreateVersionRepository(ref persister, definedTypes), new CacheWrapper(persister, new ThreadContext(), new DatabaseSection()));
}
public static N2.Edit.Versioning.ContentVersionRepository CreateVersionRepository(ref IPersister persister, params Type[] definedTypes)
{
if (persister == null)
persister = SetupFakePersister();
var definitions = SetupDefinitions(definedTypes);
return new ContentVersionRepository(
new FakeRepository<ContentVersion>(),
new Exporter(
new ItemXmlWriter(
definitions,
new UrlParser(persister,
new ThreadContext(),
new Host(new ThreadContext(), new HostSection()),
new ConnectionMonitor(),
new HostSection()),
new FakeMemoryFileSystem())),
new Importer(persister,
new ItemXmlReader(definitions,
new ContentActivator(new StateChanger(), null, new EmptyProxyFactory()),
persister.Repository),
new Fakes.FakeMemoryFileSystem()),
new UrlParser(persister, new ThreadContext(), new Host(new ThreadContext(), new HostSection()), new ConnectionMonitor(), new HostSection()),
new EmptyProxyFactory());
}
public static ContentActivator SetupContentActivator()
{
return new ContentActivator(new N2.Edit.Workflow.StateChanger(), new ItemNotifier(), new N2.Persistence.Proxying.EmptyProxyFactory());
}
public static Host SetupHost()
{
return new Host(new ThreadContext(), new HostSection());
}
public static ContentSource SetupContentSource(params SourceBase[] sources)
{
return new ContentSource(new SecurityManager(new ThreadContext(), new EditSection()), sources);
}
public static VersionManager SetupVersionManager(IPersister persister, ContentVersionRepository versionRepository)
{
return new VersionManager(versionRepository, persister.Repository, new N2.Edit.Workflow.StateChanger(), new EditSection());
}
=======
public static void InitRecursive(this Page page)
{
typeof(Page).GetMethod("InitRecursive", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(page, new[] { page });
}
public static IDisposable InitializeHttpContext(string appRelativeExecutionFilePath, string queryString)
{
var request = new HttpRequest("/Default.aspx", "http://localhost/", queryString);
request.Browser = new HttpBrowserCapabilities();
request.Browser.Capabilities = new Hashtable();
request.Browser.Capabilities["ecmascriptversion"] = "1.7";
request.Browser.Capabilities["w3cdomversion"] = "2.0";
var response = new HttpResponse(new StringWriter(new StringBuilder()));
HttpContext.Current = new HttpContext(request, response)
{
ApplicationInstance = new HttpApplication(),
User = SecurityUtilities.CreatePrincipal("admin")
};
return new Scope(() => HttpContext.Current = null);
}
>>>>>>>
public static N2.Edit.Versioning.ContentVersionRepository CreateVersionRepository(params Type[] definedTypes)
{
IPersister persister = null;
return CreateVersionRepository(ref persister, definedTypes);
}
public static N2.Edit.Versioning.DraftRepository CreateDraftRepository(ref IPersister persister, params Type[] definedTypes)
{
return new DraftRepository(CreateVersionRepository(ref persister, definedTypes), new CacheWrapper(persister, new ThreadContext(), new DatabaseSection()));
}
public static N2.Edit.Versioning.ContentVersionRepository CreateVersionRepository(ref IPersister persister, params Type[] definedTypes)
{
if (persister == null)
persister = SetupFakePersister();
var definitions = SetupDefinitions(definedTypes);
return new ContentVersionRepository(
new FakeRepository<ContentVersion>(),
new Exporter(
new ItemXmlWriter(
definitions,
new UrlParser(persister,
new ThreadContext(),
new Host(new ThreadContext(), new HostSection()),
new ConnectionMonitor(),
new HostSection()),
new FakeMemoryFileSystem())),
new Importer(persister,
new ItemXmlReader(definitions,
new ContentActivator(new StateChanger(), null, new EmptyProxyFactory()),
persister.Repository),
new Fakes.FakeMemoryFileSystem()),
new UrlParser(persister, new ThreadContext(), new Host(new ThreadContext(), new HostSection()), new ConnectionMonitor(), new HostSection()),
new EmptyProxyFactory());
}
public static ContentActivator SetupContentActivator()
{
return new ContentActivator(new N2.Edit.Workflow.StateChanger(), new ItemNotifier(), new N2.Persistence.Proxying.EmptyProxyFactory());
}
public static Host SetupHost()
{
return new Host(new ThreadContext(), new HostSection());
}
public static ContentSource SetupContentSource(params SourceBase[] sources)
{
return new ContentSource(new SecurityManager(new ThreadContext(), new EditSection()), sources);
}
public static VersionManager SetupVersionManager(IPersister persister, ContentVersionRepository versionRepository)
{
return new VersionManager(versionRepository, persister.Repository, new N2.Edit.Workflow.StateChanger(), new EditSection());
}
public static void InitRecursive(this Page page)
{
typeof(Page).GetMethod("InitRecursive", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(page, new[] { page });
}
public static IDisposable InitializeHttpContext(string appRelativeExecutionFilePath, string queryString)
{
var request = new HttpRequest("/Default.aspx", "http://localhost/", queryString);
request.Browser = new HttpBrowserCapabilities();
request.Browser.Capabilities = new Hashtable();
request.Browser.Capabilities["ecmascriptversion"] = "1.7";
request.Browser.Capabilities["w3cdomversion"] = "2.0";
var response = new HttpResponse(new StringWriter(new StringBuilder()));
HttpContext.Current = new HttpContext(request, response)
{
ApplicationInstance = new HttpApplication(),
User = SecurityUtilities.CreatePrincipal("admin")
};
return new Scope(() => HttpContext.Current = null);
} |
<<<<<<<
return finder.Find<ServiceAttribute>(typeof(object), false)
.Where(t => !t.Type.IsAbstract)
.Where(t => !t.Type.IsInterface)
.Where(t => !t.Type.IsEnum)
.Where(t => !t.Type.IsValueType)
.Where(t => t.Type.IsPublic)
.Select(ai => new AttributeInfo<ServiceAttribute> { Attribute = ai.Attribute, DecoratedType = ai.Type });
=======
foreach (Type type in finder.Find(typeof(object)).Where(t => !t.IsAbstract).Where(t => !t.IsInterface).Where(t => !t.IsEnum).Where(t => !t.IsValueType))
{
var attributes = type.GetCustomAttributes(typeof(ServiceAttribute), false);
foreach (ServiceAttribute attribute in attributes)
{
yield return new AttributeInfo<ServiceAttribute> { Attribute = attribute, DecoratedType = type };
}
}
>>>>>>>
return finder.Find<ServiceAttribute>(typeof(object), false)
.Where(t => !t.Type.IsAbstract)
.Where(t => !t.Type.IsInterface)
.Where(t => !t.Type.IsEnum)
.Where(t => !t.Type.IsValueType)
.Select(ai => new AttributeInfo<ServiceAttribute> { Attribute = ai.Attribute, DecoratedType = ai.Type }); |
<<<<<<<
if (preHandlers != null && (VersionsTriggersEvents || item.VersionOf == null))
=======
if (handler != null && (VersionsTriggersEvents || !item.VersionOf.HasValue))
>>>>>>>
if (preHandlers != null && (VersionsTriggersEvents || !item.VersionOf.HasValue)) |
<<<<<<<
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web.Mvc;
using System.Web.Security;
using Dinamico.Models;
using N2;
using N2.Definitions;
using N2.Engine.Globalization;
using N2.Persistence.Search;
using N2.Web;
using N2.Web.Mvc;
namespace Dinamico.Controllers
{
/// <summary>
/// The registration <see cref="Registrations.StartPageRegistration"/> is responsible for
/// connecting this controller to the start page model.
/// </summary>
public class StartPageController : ContentController<StartPage>
{
public ActionResult NotFound()
{
var closestMatch = Content.Traverse.Path(Request.AppRelativeCurrentExecutionFilePath.Trim('~', '/')).StopItem;
var startPage = Content.Traverse.ClosestStartPage(closestMatch);
var urlText = Request.AppRelativeCurrentExecutionFilePath.Trim('~', '/').Replace('/', ' ');
var similarPages = GetSearchResults(startPage, urlText, 10).ToList();
ControllerContext.RouteData.ApplyCurrentPath(new PathData(new ContentPage { Parent = startPage }));
Response.TrySkipIisCustomErrors = true;
Response.Status = "404 Not Found";
return View(similarPages);
}
[ContentOutputCache]
public ActionResult SiteMap()
{
var start = this.Content.Traverse.StartPage;
string content = Tree.From(start)
.Filters(N2.Content.Is.Navigatable())
.ExcludeRoot(true).ToString();
return Content("<li>" + Link.To(start) + "</li>" + content);
}
public ActionResult Search(string q)
{
if (string.IsNullOrWhiteSpace(q))
return Content("<li>A search term is required</li>");
var hits = GetSearchResults(CurrentPage ?? this.Content.Traverse.StartPage, q, 50);
StringBuilder results = new StringBuilder();
foreach (var hit in hits)
{
results.Append("<li>").Append(Link.To(hit)).Append("</li>");
}
if (results.Length == 0)
return Content("<li>No hits</li>");
return Content(results.ToString());
}
private IEnumerable<ContentItem> GetSearchResults(ContentItem root, string text, int take)
{
var query = Query.For(text).Below(root).ReadableBy(User, Roles.GetRolesForUser).Except(Query.For(typeof(ISystemNode)));
var hits = Engine.Resolve<IContentSearcher>().Search(query).Hits.Select(h => h.Content);
return hits;
}
[ContentOutputCache]
public ActionResult Translations(int id)
{
StringBuilder sb = new StringBuilder();
var item = Engine.Persister.Get(id);
var lg = Engine.Resolve<LanguageGatewaySelector>().GetLanguageGateway(item);
var translations = lg.FindTranslations(item);
foreach (var language in translations)
sb.Append("<li>").Append(Link.To(language).Text(lg.GetLanguage(language).LanguageTitle)).Append("</li>");
if (sb.Length == 0)
return Content("<li>This page is not translated</li>");
return Content(sb.ToString());
}
}
}
=======
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web.Mvc;
using System.Web.Security;
using Dinamico.Models;
using N2;
using N2.Definitions;
using N2.Engine.Globalization;
using N2.Persistence.Search;
using N2.Web;
using N2.Web.Mvc;
namespace Dinamico.Controllers
{
/// <summary>
/// The registration <see cref="Registrations.StartPageRegistration"/> is responsible for
/// connecting this controller to the start page model.
/// </summary>
public class StartPageController : ContentController<StartPage>
{
public ActionResult NotFound()
{
var closestMatch = Content.Traverse.Path(Request.AppRelativeCurrentExecutionFilePath.Trim('~', '/')).StopItem;
var startPage = Content.Traverse.ClosestStartPage(closestMatch);
var urlText = Request.AppRelativeCurrentExecutionFilePath.Trim('~', '/').Replace('/', ' ');
var similarPages = GetSearchResults(startPage, urlText, 10).ToList();
ControllerContext.RouteData.ApplyCurrentPath(new PathData(new ContentPage { Parent = startPage }));
Response.TrySkipIisCustomErrors = true;
Response.Status = "404 Not Found";
return View(similarPages);
}
[ContentOutputCache]
public ActionResult SiteMap()
{
var start = this.Content.Traverse.StartPage;
string content = Tree.From(start)
.Filters(N2.Content.Is.Accessible())
.ExcludeRoot(true).ToString();
return Content("<ul>"
+ "<li>" + Link.To(start) + "</li>"
+ content + "</ul>");
}
public ActionResult Search(string q)
{
if (string.IsNullOrWhiteSpace(q))
return Content("<ul><li>A search term is required</li></ul>");
var hits = GetSearchResults(CurrentPage ?? this.Content.Traverse.StartPage, q, 50);
StringBuilder results = new StringBuilder();
foreach (var hit in hits)
{
results.Append("<li>").Append(Link.To(hit)).Append("</li>");
}
if (results.Length == 0)
return Content("<ul><li>No hits</li></ul>");
return Content("<ul>" + results + "</ul>");
}
private IEnumerable<ContentItem> GetSearchResults(ContentItem root, string text, int take)
{
var query = Query.For(text).Below(root).ReadableBy(User, GetRolesForUser).Except(Query.For(typeof(ISystemNode)));
var hits = Engine.Resolve<IContentSearcher>().Search(query).Hits.Select(h => h.Content);
return hits;
}
protected virtual string[] GetRolesForUser(string username)
{
if (Roles.Enabled)
return Roles.GetRolesForUser(username);
else
return new [] { N2.Security.AuthorizedRole.Everyone };
}
[ContentOutputCache]
public ActionResult Translations(int id)
{
StringBuilder sb = new StringBuilder();
var item = Engine.Persister.Get(id);
var lg = Engine.Resolve<LanguageGatewaySelector>().GetLanguageGateway(item);
var translations = lg.FindTranslations(item);
foreach (var language in translations)
sb.Append("<li>").Append(Link.To(language).Text(lg.GetLanguage(language).LanguageTitle)).Append("</li>");
if (sb.Length == 0)
return Content("<ul><li>This page is not translated</li></ul>");
return Content("<ul>" + sb + "</ul>");
}
}
}
>>>>>>>
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web.Mvc;
using System.Web.Security;
using Dinamico.Models;
using N2;
using N2.Definitions;
using N2.Engine.Globalization;
using N2.Persistence.Search;
using N2.Web;
using N2.Web.Mvc;
namespace Dinamico.Controllers
{
/// <summary>
/// The registration <see cref="Registrations.StartPageRegistration"/> is responsible for
/// connecting this controller to the start page model.
/// </summary>
public class StartPageController : ContentController<StartPage>
{
public ActionResult NotFound()
{
var closestMatch = Content.Traverse.Path(Request.AppRelativeCurrentExecutionFilePath.Trim('~', '/')).StopItem;
var startPage = Content.Traverse.ClosestStartPage(closestMatch);
var urlText = Request.AppRelativeCurrentExecutionFilePath.Trim('~', '/').Replace('/', ' ');
var similarPages = GetSearchResults(startPage, urlText, 10).ToList();
ControllerContext.RouteData.ApplyCurrentPath(new PathData(new ContentPage { Parent = startPage }));
Response.TrySkipIisCustomErrors = true;
Response.Status = "404 Not Found";
return View(similarPages);
}
[ContentOutputCache]
public ActionResult SiteMap()
{
var start = this.Content.Traverse.StartPage;
string content = Tree.From(start)
.Filters(N2.Content.Is.Navigatable())
.ExcludeRoot(true).ToString();
return Content("<li>" + Link.To(start) + "</li>" + content);
}
public ActionResult Search(string q)
{
if (string.IsNullOrWhiteSpace(q))
return Content("<li>A search term is required</li>");
var hits = GetSearchResults(CurrentPage ?? this.Content.Traverse.StartPage, q, 50);
StringBuilder results = new StringBuilder();
foreach (var hit in hits)
{
results.Append("<li>").Append(Link.To(hit)).Append("</li>");
}
if (results.Length == 0)
return Content("<li>No hits</li>");
return Content(results.ToString());
}
private IEnumerable<ContentItem> GetSearchResults(ContentItem root, string text, int take)
{
var query = Query.For(text).Below(root).ReadableBy(User, GetRolesForUser).Except(Query.For(typeof(ISystemNode)));
var hits = Engine.Resolve<IContentSearcher>().Search(query).Hits.Select(h => h.Content);
return hits;
}
protected virtual string[] GetRolesForUser(string username)
{
if (Roles.Enabled)
return Roles.GetRolesForUser(username);
else
return new [] { N2.Security.AuthorizedRole.Everyone };
}
[ContentOutputCache]
public ActionResult Translations(int id)
{
StringBuilder sb = new StringBuilder();
var item = Engine.Persister.Get(id);
var lg = Engine.Resolve<LanguageGatewaySelector>().GetLanguageGateway(item);
var translations = lg.FindTranslations(item);
foreach (var language in translations)
sb.Append("<li>").Append(Link.To(language).Text(lg.GetLanguage(language).LanguageTitle)).Append("</li>");
if (sb.Length == 0)
return Content("<li>This page is not translated</li>");
return Content(sb.ToString());
}
}
} |
<<<<<<<
{
get { return (object)GetDetail("ObjectProperty"); }
set { SetDetail<object>("ObjectProperty", value); }
}
[EditableEnum]
public virtual AppDomainManagerInitializationOptions EnumProperty
{
get { return GetDetail("EnumProperty", AppDomainManagerInitializationOptions.None); }
set { SetDetail("EnumProperty", value, AppDomainManagerInitializationOptions.None); }
}
public virtual Guid GuidProperty
{
get
{
string value = GetDetail<string>("GuidProperty", null);
return string.IsNullOrEmpty(value) ? Guid.Empty : new Guid(value);
}
set
{
SetDetail("GuidProperty", value.ToString());
}
}
public virtual string WritableGuid
{
get { return (string)(GetDetail("WritableRSSString") ?? Guid.NewGuid().ToString()); }
set { SetDetail("WritableRSSString", value, Guid.NewGuid().ToString()); }
}
public virtual string ReadOnlyGuid
{
get
{
string result = (string)GetDetail("ReadOnlyRSSString");
if (string.IsNullOrEmpty(result))
{
result = Guid.NewGuid().ToString();
SetDetail("ReadOnlyRSSString", result);
}
return result;
}
}
[Indexable]
public virtual string NonDetailProperty { get; set; }
[Indexable]
public virtual string NonDetailOnlyGetterProperty { get { return "Lorem ipsum"; } }
[EditableTags]
public virtual IEnumerable<string> Tags
{
get { return GetDetailCollection("Tags", true).OfType<string>(); }
set { GetDetailCollection("Tags", true).Replace(value); }
}
[Persistable]
public virtual string PersistableProperty { get; set; }
[EditableDummy]
public virtual List<string> StringList { get; set; }
[EditableLink]
public virtual ContentItem EditableLink { get; set; }
}
public class EditableDummyAttribute : AbstractEditableAttribute
{
public override bool UpdateItem(ContentItem item, System.Web.UI.Control editor)
{
return true;
}
public override void UpdateEditor(ContentItem item, System.Web.UI.Control editor)
{
}
protected override System.Web.UI.Control AddEditor(System.Web.UI.Control container)
{
return null;
}
}
[PageDefinition("NonIndexable persistable Item")]
[Indexable(IsIndexable = false)]
public class PersistableItem1b : PersistableItem1
{
}
=======
{
get { return (object)GetDetail("ObjectProperty"); }
set { SetDetail<object>("ObjectProperty", value); }
}
public virtual Guid GuidProperty
{
get
{
string value = GetDetail<string>("GuidProperty", null);
return string.IsNullOrEmpty(value) ? Guid.Empty : new Guid(value);
}
set
{
SetDetail("GuidProperty", value.ToString());
}
}
public virtual string WritableGuid
{
get { return (string)(GetDetail("WritableRSSString") ?? Guid.NewGuid().ToString()); }
set { SetDetail("WritableRSSString", value, Guid.NewGuid().ToString()); }
}
public virtual string ReadOnlyGuid
{
get
{
string result = (string)GetDetail("ReadOnlyRSSString");
if (string.IsNullOrEmpty(result))
{
result = Guid.NewGuid().ToString();
SetDetail("ReadOnlyRSSString", result);
}
return result;
}
}
[Indexable]
public virtual string NonDetailProperty { get; set; }
[Indexable]
public virtual string NonDetailOnlyGetterProperty { get { return "Lorem ipsum"; } }
[EditableTags]
public virtual IEnumerable<string> Tags
{
get { return GetDetailCollection("Tags", true).OfType<string>(); }
set { GetDetailCollection("Tags", true).Replace(value); }
}
[Persistable]
public virtual string PersistableProperty { get; set; }
[EditableDummy]
public virtual List<string> StringList { get; set; }
[EditableLink]
public virtual ContentItem EditableLink { get; set; }
}
public class EditableDummyAttribute : AbstractEditableAttribute
{
public override bool UpdateItem(ContentItem item, System.Web.UI.Control editor)
{
return true;
}
public override void UpdateEditor(ContentItem item, System.Web.UI.Control editor)
{
}
protected override System.Web.UI.Control AddEditor(System.Web.UI.Control container)
{
return null;
}
}
[PageDefinition("NonIndexable persistable Item")]
[Indexable(IsIndexable = false)]
public class PersistableItem1b : PersistableItem1
{
}
>>>>>>>
{
get { return (object)GetDetail("ObjectProperty"); }
set { SetDetail<object>("ObjectProperty", value); }
}
[EditableEnum]
public virtual AppDomainManagerInitializationOptions EnumProperty
{
get { return GetDetail("EnumProperty", AppDomainManagerInitializationOptions.None); }
set { SetDetail("EnumProperty", value, AppDomainManagerInitializationOptions.None); }
}
public virtual string WritableGuid
{
get { return (string)(GetDetail("WritableRSSString") ?? Guid.NewGuid().ToString()); }
set { SetDetail("WritableRSSString", value, Guid.NewGuid().ToString()); }
}
public virtual string ReadOnlyGuid
{
get
{
string result = (string)GetDetail("ReadOnlyRSSString");
if (string.IsNullOrEmpty(result))
{
result = Guid.NewGuid().ToString();
SetDetail("ReadOnlyRSSString", result);
}
return result;
}
}
[Indexable]
public virtual string NonDetailProperty { get; set; }
[Indexable]
public virtual string NonDetailOnlyGetterProperty { get { return "Lorem ipsum"; } }
[EditableTags]
public virtual IEnumerable<string> Tags
{
get { return GetDetailCollection("Tags", true).OfType<string>(); }
set { GetDetailCollection("Tags", true).Replace(value); }
}
[Persistable]
public virtual string PersistableProperty { get; set; }
[EditableDummy]
public virtual List<string> StringList { get; set; }
[EditableLink]
public virtual ContentItem EditableLink { get; set; }
}
public class EditableDummyAttribute : AbstractEditableAttribute
{
public override bool UpdateItem(ContentItem item, System.Web.UI.Control editor)
{
return true;
}
public override void UpdateEditor(ContentItem item, System.Web.UI.Control editor)
{
}
protected override System.Web.UI.Control AddEditor(System.Web.UI.Control container)
{
return null;
}
}
[PageDefinition("NonIndexable persistable Item")]
[Indexable(IsIndexable = false)]
public class PersistableItem1b : PersistableItem1
{
} |
<<<<<<<
_ObjectStore.MarkSerialized(nested);
string nestedObjectPath = Path.Combine(alphaPath, removeInvalidFile(uniqueIdProperty.GetValue(nested).ToString()));
=======
_ObjectStore.MarkEncountered(nested, ref nextID);
string nestedObjectPath = Path.Combine(alphaPath, removeInvalidFile(folderNameProperty.GetValue(nested).ToString()));
>>>>>>>
_ObjectStore.MarkSerialized(nested);
string nestedObjectPath = Path.Combine(alphaPath, removeInvalidFile(folderNameProperty.GetValue(nested).ToString()));
<<<<<<<
_ObjectStore.MarkSerialized(nested);
string nestedObjectPath = Path.Combine(nestedPath, removeInvalidFile(uniqueIdProperty.GetValue(nested).ToString()));
=======
_ObjectStore.MarkEncountered(nested, ref nextID);
string nestedObjectPath = Path.Combine(nestedPath, removeInvalidFile(folderNameProperty.GetValue(nested).ToString()));
>>>>>>>
_ObjectStore.MarkSerialized(nested);
string nestedObjectPath = Path.Combine(nestedPath, removeInvalidFile(folderNameProperty.GetValue(nested).ToString())); |
<<<<<<<
[Test]
public void Find_TypeAndParent_ShouldOnlyInclude_ItemWithSpecified_TypeAndParent()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
ContentItem child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
ContentItem child2 = CreateOneItem<Definitions.PersistablePart1>(0, "part2", root);
repository.Save(root);
var results = repository.Find(new Parameter("class", "PersistableItem"), new Parameter("Parent", root));
results.Single().ShouldBe(child1);
}
[Test]
public void FindReferencing_ShouldReturn_ItemsThatLinkToTarget()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1["Link"] = child2;
child2["Link"] = child1;
repository.Save(root);
repository.Flush();
var results = repository.FindReferencing(child2);
results.Single().ShouldBe(child1);
}
[Test]
public void FindReferencing_ShouldReturn_ItemsThatLinkToTarget_InDetailCollection()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1.GetDetailCollection("Links", true).Add(child2);
child2.GetDetailCollection("Links", true).Add(child1);
repository.Save(root);
repository.Flush();
var results = repository.FindReferencing(child2);
results.Single().ShouldBe(child1);
}
[Test]
public void RemoveReferencesTo_ShouldRemove_LinkFromOtherItem()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1["Link"] = child2;
child2["Link"] = child1;
repository.Save(root);
repository.Flush();
repository.RemoveReferencesToRecursive(child2);
child1["Link"].ShouldBe(null);
}
[Test]
public void RemoveReferencesTo_ShouldRemove_LinkToDescendantItem_FromOtherItem()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var grandchild1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", child1);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1["Link"] = grandchild1;
grandchild1["Link"] = grandchild1;
child2["Link"] = grandchild1;
repository.Save(root);
repository.Flush();
repository.RemoveReferencesToRecursive(child1);
child2["Link"].ShouldBe(null);
}
[Test]
public void RemoveReferencesTo_ShouldRemove_LinkToDescendantItem_FromItself()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var grandchild1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", child1);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1["Link"] = grandchild1;
grandchild1["Link"] = grandchild1;
child2["Link"] = grandchild1;
repository.Save(root);
repository.Flush();
repository.RemoveReferencesToRecursive(child1);
grandchild1["Link"].ShouldBe(null);
}
[Test]
public void RemoveReferencesTo_ShouldRemove_LinkToDescendantItem_FromParent()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var grandchild1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", child1);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1["Link"] = grandchild1;
grandchild1["Link"] = grandchild1;
child2["Link"] = grandchild1;
repository.Save(root);
repository.Flush();
repository.RemoveReferencesToRecursive(child1);
child1["Link"].ShouldBe(null);
}
[Test]
public void RemoveReferencesTo_ShouldShouldReturn_NumberOfRemovedReferences()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var grandchild1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", child1);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1["Link"] = grandchild1;
grandchild1["Link"] = grandchild1;
child2["Link"] = grandchild1;
repository.Save(root);
repository.Flush();
int count = repository.RemoveReferencesToRecursive(child1);
count.ShouldBe(3);
}
=======
[Test]
public void FindDescends_WithNull_FinsAllInDb()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
repository.Save(root);
ContentItem child1 = CreateOneItem<Definitions.PersistableItem1>(0, "item1", null);
repository.Save(child1);
var discriminators = repository.FindDescendants(null, "PersistableItem");
discriminators.Count().ShouldBe(2);
}
>>>>>>>
[Test]
public void FindDescends_WithNull_FinsAllInDb()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
repository.Save(root);
ContentItem child1 = CreateOneItem<Definitions.PersistableItem1>(0, "item1", null);
repository.Save(child1);
var discriminators = repository.FindDescendants(null, "PersistableItem");
discriminators.Count().ShouldBe(2);
}
[Test]
public void Find_TypeAndParent_ShouldOnlyInclude_ItemWithSpecified_TypeAndParent()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
ContentItem child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
ContentItem child2 = CreateOneItem<Definitions.PersistablePart1>(0, "part2", root);
repository.Save(root);
var results = repository.Find(new Parameter("class", "PersistableItem"), new Parameter("Parent", root));
results.Single().ShouldBe(child1);
}
[Test]
public void FindReferencing_ShouldReturn_ItemsThatLinkToTarget()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1["Link"] = child2;
child2["Link"] = child1;
repository.Save(root);
repository.Flush();
var results = repository.FindReferencing(child2);
results.Single().ShouldBe(child1);
}
[Test]
public void FindReferencing_ShouldReturn_ItemsThatLinkToTarget_InDetailCollection()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1.GetDetailCollection("Links", true).Add(child2);
child2.GetDetailCollection("Links", true).Add(child1);
repository.Save(root);
repository.Flush();
var results = repository.FindReferencing(child2);
results.Single().ShouldBe(child1);
}
[Test]
public void RemoveReferencesTo_ShouldRemove_LinkFromOtherItem()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1["Link"] = child2;
child2["Link"] = child1;
repository.Save(root);
repository.Flush();
repository.RemoveReferencesToRecursive(child2);
child1["Link"].ShouldBe(null);
}
[Test]
public void RemoveReferencesTo_ShouldRemove_LinkToDescendantItem_FromOtherItem()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var grandchild1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", child1);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1["Link"] = grandchild1;
grandchild1["Link"] = grandchild1;
child2["Link"] = grandchild1;
repository.Save(root);
repository.Flush();
repository.RemoveReferencesToRecursive(child1);
child2["Link"].ShouldBe(null);
}
[Test]
public void RemoveReferencesTo_ShouldRemove_LinkToDescendantItem_FromItself()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var grandchild1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", child1);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1["Link"] = grandchild1;
grandchild1["Link"] = grandchild1;
child2["Link"] = grandchild1;
repository.Save(root);
repository.Flush();
repository.RemoveReferencesToRecursive(child1);
grandchild1["Link"].ShouldBe(null);
}
[Test]
public void RemoveReferencesTo_ShouldRemove_LinkToDescendantItem_FromParent()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var grandchild1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", child1);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1["Link"] = grandchild1;
grandchild1["Link"] = grandchild1;
child2["Link"] = grandchild1;
repository.Save(root);
repository.Flush();
repository.RemoveReferencesToRecursive(child1);
child1["Link"].ShouldBe(null);
}
[Test]
public void RemoveReferencesTo_ShouldShouldReturn_NumberOfRemovedReferences()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
var child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
var grandchild1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", child1);
var child2 = CreateOneItem<Definitions.PersistableItem1>(0, "page2", root);
child1["Link"] = grandchild1;
grandchild1["Link"] = grandchild1;
child2["Link"] = grandchild1;
repository.Save(root);
repository.Flush();
int count = repository.RemoveReferencesToRecursive(child1);
count.ShouldBe(3);
} |
<<<<<<<
private void CreateDirectoryPath(DirectoryInfo directory)
{
if (directory == null || directory.Exists)
return;
CreateDirectoryPath(directory.Parent);
directory.Create();
}
public virtual Stream OpenFile(string virtualPath, bool readOnly = false)
=======
[Obsolete("Change to OpenFile(string, bool)")]
public virtual System.IO.Stream OpenFile(string virtualPath)
{
return OpenFile(virtualPath, false);
}
public virtual Stream OpenFile(string virtualPath, bool readOnly)
>>>>>>>
private void CreateDirectoryPath(DirectoryInfo directory)
{
if (directory == null || directory.Exists)
return;
CreateDirectoryPath(directory.Parent);
directory.Create();
}
[Obsolete("Change to OpenFile(string, bool)")]
public virtual System.IO.Stream OpenFile(string virtualPath)
{
return OpenFile(virtualPath, false);
}
public virtual Stream OpenFile(string virtualPath, bool readOnly) |
<<<<<<<
using N2.Persistence;
=======
using N2.Definitions;
>>>>>>>
using N2.Definitions;
using N2.Persistence; |
<<<<<<<
=======
using N2.Edit.Settings;
using N2.Definitions;
>>>>>>>
using N2.Edit.Settings;
using N2.Definitions; |
<<<<<<<
_timestamp = DateTime.Now;
=======
>>>>>>>
<<<<<<<
var hello = HelloPrxHelper.uncheckedCast(c.adapter.addWithUUID(new HelloI(_name, _nextId++)));
=======
HelloPrx hello = HelloPrxHelper.uncheckedCast(current.adapter.addWithUUID(new HelloI(_name, _nextId++)));
>>>>>>>
var hello = HelloPrxHelper.uncheckedCast(current.adapter.addWithUUID(new HelloI(_name, _nextId++)));
<<<<<<<
public override void refresh(Ice.Current c)
{
lock(this)
{
if(_destroy)
{
throw new Ice.ObjectNotExistException();
}
_timestamp = DateTime.Now;
}
}
=======
>>>>>>>
<<<<<<<
c.adapter.remove(c.id);
foreach(var p in _objs)
=======
current.adapter.remove(current.id);
foreach(HelloPrx p in _objs)
>>>>>>>
current.adapter.remove(current.id);
foreach(HelloPrx p in _objs)
<<<<<<<
public DateTime timestamp()
{
lock(this)
{
if(_destroy)
{
throw new Ice.ObjectNotExistException();
}
return _timestamp;
}
}
=======
>>>>>>>
<<<<<<<
private DateTime _timestamp; // The last time the session was refreshed.
=======
>>>>>>> |
<<<<<<<
case AvailableSensors.WebcamActiveSensor:
DetectionMode detectionMode;
switch ((WebcamDetectionMode)model.DetectionMode)
{
case WebcamDetectionMode.Registry:
detectionMode = DetectionMode.Registry;
break;
case WebcamDetectionMode.OpenCV:
detectionMode = DetectionMode.OpenCV;
break;
default:
detectionMode = DetectionMode.Registry;
break;
}
sensorToCreate = new WebcamActiveSensor(this._publisher, (int)model.UpdateInterval, model.Name, detectionMode);
break;
case AvailableSensors.MicrophoneActiveSensor:
sensorToCreate = new MicrophoneActiveSensor(this._publisher, (int)model.UpdateInterval, model.Name);
break;
=======
case AvailableSensors.NamedWindowSensor:
sensorToCreate = new NamedWindowSensor(this._publisher, model.WindowName, model.Name, (int)model.UpdateInterval);
break;
>>>>>>>
case AvailableSensors.WebcamActiveSensor:
DetectionMode detectionMode;
switch ((WebcamDetectionMode)model.DetectionMode)
{
case WebcamDetectionMode.Registry:
detectionMode = DetectionMode.Registry;
break;
case WebcamDetectionMode.OpenCV:
detectionMode = DetectionMode.OpenCV;
break;
default:
detectionMode = DetectionMode.Registry;
break;
}
sensorToCreate = new WebcamActiveSensor(this._publisher, (int)model.UpdateInterval, model.Name, detectionMode);
break;
case AvailableSensors.MicrophoneActiveSensor:
sensorToCreate = new MicrophoneActiveSensor(this._publisher, (int)model.UpdateInterval, model.Name);
break;
case AvailableSensors.NamedWindowSensor:
sensorToCreate = new NamedWindowSensor(this._publisher, model.WindowName, model.Name, (int)model.UpdateInterval);
break; |
<<<<<<<
public sealed class ExpandedNodeId : IEquatable<ExpandedNodeId?>
=======
[DataTypeId(DataTypeIds.ExpandedNodeId)]
public sealed class ExpandedNodeId : IEquatable<ExpandedNodeId>
>>>>>>>
[DataTypeId(DataTypeIds.ExpandedNodeId)]
public sealed class ExpandedNodeId : IEquatable<ExpandedNodeId?> |
<<<<<<<
namespace EVEMon.Gateways.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default {
get {
return defaultInstance;
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://localhost:38164")]
public string InternalServerBaseURL {
get {
return ((string)(this["InternalServerBaseURL"]));
}
}
}
=======
namespace EVEMon.Gateways.EVEAuthGateway.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://localhost:38164")]
public string InternalServerBaseURL
{
get
{
return ((string)(this["InternalServerBaseURL"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("https://login.eveonline.com/oauth")]
public string LoginServerBaseUrl
{
get
{
return ((string)(this["LoginServerBaseURL"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute(@"<?xml version=""1.0"" encoding=""utf-16""?>
<ArrayOfString xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
<string>corporationContactsRead</string>
<string>publicData</string>
<string>characterStatsRead</string>
<string>characterWalletRead</string>
<string>characterCalendarRead</string>
<string>characterFactionalWarfareRead</string>
<string>characterIndustryJobsRead</string>
<string>characterMarketOrdersRead</string>
<string>characterNotificationsRead</string>
<string>characterResearchRead</string>
<string>characterSkillsRead</string>
<string>characterAccountRead</string>
<string>characterContractsRead</string>
<string>characterBookmarksRead</string>
<string>characterClonesRead</string>
<string>characterOpportunitiesRead</string>
<string>characterLoyaltyPointsRead</string>
<string>corporationWalletRead</string>
<string>corporationAssetsRead</string>
<string>corporationMedalsRead</string>
<string>corporationFactionalWarfareRead</string>
<string>corporationIndustryJobsRead</string>
<string>corporationKillsRead</string>
<string>corporationMembersRead</string>
<string>corporationMarketOrdersRead</string>
<string>corporationShareholdersRead</string>
<string>corporationContractsRead</string>
<string>corporationBookmarksRead</string>
<string>esi-calendar.respond_calendar_events.v1</string>
<string>esi-calendar.read_calendar_events.v1</string>
<string>esi-location.read_location.v1</string>
<string>esi-location.read_ship_type.v1</string>
<string>esi-mail.read_mail.v1</string>
<string>esi-skills.read_skills.v1</string>
<string>esi-skills.read_skillqueue.v1</string>
<string>esi-wallet.read_character_wallet.v1</string>
<string>esi-search.search_structures.v1</string>
<string>esi-clones.read_clones.v1</string>
<string>esi-characters.read_contacts.v1</string>
<string>esi-universe.read_structures.v1</string>
<string>esi-bookmarks.read_character_bookmarks.v1</string>
<string>esi-killmails.read_killmails.v1</string>
<string>esi-corporations.read_corporation_membership.v1</string>
<string>esi-assets.read_assets.v1</string>
<string>esi-planets.manage_planets.v1</string>
<string>esi-markets.structure_markets.v1</string>
<string>esi-corporations.read_structures.v1</string>
<string>esi-characters.read_loyalty.v1</string>
<string>esi-characters.read_opportunities.v1</string>
<string>esi-characters.read_medals.v1</string>
<string>esi-characters.read_standings.v1</string>
<string>esi-characters.read_agents_research.v1</string>
</ArrayOfString>")]
public global::System.Collections.Specialized.StringCollection Scopes
{
get
{
return ((global::System.Collections.Specialized.StringCollection)(this["Scopes"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("6744fb2bede34f02a21a8becb3647f45")]
public string ClientID
{
get
{
return ((string)(this["ClientID"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("J2vJrNrHxLPHwdQksLVlL8gaCArKgZ6cCnegb5Jp")]
public string ClientSecret
{
get
{
return ((string)(this["ClientSecret"]));
}
}
}
>>>>>>>
namespace EVEMon.Gateways.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default {
get {
return defaultInstance;
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://localhost:38164")]
public string InternalServerBaseURL {
get {
return ((string)(this["InternalServerBaseURL"]));
}
}
}
}
namespace EVEMon.Gateways.EVEAuthGateway.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://localhost:38164")]
public string InternalServerBaseURL
{
get
{
return ((string)(this["InternalServerBaseURL"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("https://login.eveonline.com/oauth")]
public string LoginServerBaseUrl
{
get
{
return ((string)(this["LoginServerBaseURL"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute(@"<?xml version=""1.0"" encoding=""utf-16""?>
<ArrayOfString xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
<string>corporationContactsRead</string>
<string>publicData</string>
<string>characterStatsRead</string>
<string>characterWalletRead</string>
<string>characterCalendarRead</string>
<string>characterFactionalWarfareRead</string>
<string>characterIndustryJobsRead</string>
<string>characterMarketOrdersRead</string>
<string>characterNotificationsRead</string>
<string>characterResearchRead</string>
<string>characterSkillsRead</string>
<string>characterAccountRead</string>
<string>characterContractsRead</string>
<string>characterBookmarksRead</string>
<string>characterClonesRead</string>
<string>characterOpportunitiesRead</string>
<string>characterLoyaltyPointsRead</string>
<string>corporationWalletRead</string>
<string>corporationAssetsRead</string>
<string>corporationMedalsRead</string>
<string>corporationFactionalWarfareRead</string>
<string>corporationIndustryJobsRead</string>
<string>corporationKillsRead</string>
<string>corporationMembersRead</string>
<string>corporationMarketOrdersRead</string>
<string>corporationShareholdersRead</string>
<string>corporationContractsRead</string>
<string>corporationBookmarksRead</string>
<string>esi-calendar.respond_calendar_events.v1</string>
<string>esi-calendar.read_calendar_events.v1</string>
<string>esi-location.read_location.v1</string>
<string>esi-location.read_ship_type.v1</string>
<string>esi-mail.read_mail.v1</string>
<string>esi-skills.read_skills.v1</string>
<string>esi-skills.read_skillqueue.v1</string>
<string>esi-wallet.read_character_wallet.v1</string>
<string>esi-search.search_structures.v1</string>
<string>esi-clones.read_clones.v1</string>
<string>esi-characters.read_contacts.v1</string>
<string>esi-universe.read_structures.v1</string>
<string>esi-bookmarks.read_character_bookmarks.v1</string>
<string>esi-killmails.read_killmails.v1</string>
<string>esi-corporations.read_corporation_membership.v1</string>
<string>esi-assets.read_assets.v1</string>
<string>esi-planets.manage_planets.v1</string>
<string>esi-markets.structure_markets.v1</string>
<string>esi-corporations.read_structures.v1</string>
<string>esi-characters.read_loyalty.v1</string>
<string>esi-characters.read_opportunities.v1</string>
<string>esi-characters.read_medals.v1</string>
<string>esi-characters.read_standings.v1</string>
<string>esi-characters.read_agents_research.v1</string>
</ArrayOfString>")]
public global::System.Collections.Specialized.StringCollection Scopes
{
get
{
return ((global::System.Collections.Specialized.StringCollection)(this["Scopes"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("6744fb2bede34f02a21a8becb3647f45")]
public string ClientID
{
get
{
return ((string)(this["ClientID"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("J2vJrNrHxLPHwdQksLVlL8gaCArKgZ6cCnegb5Jp")]
public string ClientSecret
{
get
{
return ((string)(this["ClientSecret"]));
}
}
} |
<<<<<<<
using System;
using System.IO;
=======
using System;
>>>>>>>
using System;
using System.IO; |
<<<<<<<
var flowListViewRef = new WeakReference<FlowListView>(this);
ItemTemplate = new FlowDataTemplateSelector(flowListViewRef);
SeparatorVisibility = SeparatorVisibility.None;
SeparatorColor = Color.Transparent;
=======
var flowListViewRef = new WeakReference<FlowListView>(this);
ItemTemplate = new DataTemplate(() => new FlowListViewInternalCell(flowListViewRef));
SeparatorVisibility = SeparatorVisibility.None;
SeparatorColor = Color.Transparent;
>>>>>>>
var flowListViewRef = new WeakReference<FlowListView>(this);
ItemTemplate = new FlowDataTemplateSelector(flowListViewRef);
SeparatorVisibility = SeparatorVisibility.None;
SeparatorColor = Color.Transparent;
<<<<<<<
protected override void OnSizeAllocated(double width, double height)
{
base.OnSizeAllocated(width, height);
RefreshDesiredColumnCount();
}
internal void FlowPerformTap(object item)
=======
internal void FlowPerformTap(object sender, object item)
>>>>>>>
protected override void OnSizeAllocated(double width, double height)
{
base.OnSizeAllocated(width, height);
RefreshDesiredColumnCount();
}
internal void FlowPerformTap(object sender, object item)
<<<<<<<
=======
int desiredColumnCount;
internal int DesiredColumnCount
{
get
{
if (desiredColumnCount == 0)
return 1;
return desiredColumnCount;
}
set
{
desiredColumnCount = value;
}
}
>>>>>>>
<<<<<<<
if (groupKeyValue == null)
{
groupKeyValue = groupContainer;
}
var flowGroup = new FlowGroup(groupKeyValue);
if (gr.Count <= 0 && FlowEmptyTemplate != null)
{
flowGroup.Add(new FlowEmptyModel());
}
else
{
int position = -1;
var ix = 0;
for (int i = 0; i < gr.Count; i++)
{
var item = gr[i];
if (flowItemVisibleBindingPropertyName != null)
{
var itemVisibleBindingPropertyName = item.GetType().GetRuntimeProperty(flowItemVisibleBindingPropertyName);
if (itemVisibleBindingPropertyName != null)
{
if (!(bool)itemVisibleBindingPropertyName.GetValue(item))
continue;
}
}
if (ix % groupColumnCount == 0)
{
position++;
flowGroup.Add(new FlowGroupColumn(groupColumnCount.GetValueOrDefault()) { item });
}
else
{
var exContItm = (flowGroup[position] as IList);
exContItm?.Add(item);
}
ix++;
}
}
flowGroupsList.Add(flowGroup);
=======
int i = 0;
foreach (var item in gr)
{
if (i % colCount == 0)
{
position++;
flowGroup.Add(new ObservableCollection<object>() { item });
}
else
{
var exContItm = flowGroup[position];
exContItm.Add(item);
}
i++;
}
flowGroupsList.Add(flowGroup);
>>>>>>>
if (groupKeyValue == null)
{
groupKeyValue = groupContainer;
}
var flowGroup = new FlowGroup(groupKeyValue);
if (gr.Count <= 0 && FlowEmptyTemplate != null)
{
flowGroup.Add(new FlowEmptyModel());
}
else
{
int position = -1;
var ix = 0;
for (int i = 0; i < gr.Count; i++)
{
var item = gr[i];
if (flowItemVisibleBindingPropertyName != null)
{
var itemVisibleBindingPropertyName = item.GetType().GetRuntimeProperty(flowItemVisibleBindingPropertyName);
if (itemVisibleBindingPropertyName != null)
{
if (!(bool)itemVisibleBindingPropertyName.GetValue(item))
continue;
}
}
if (ix % groupColumnCount == 0)
{
position++;
flowGroup.Add(new FlowGroupColumn(groupColumnCount.GetValueOrDefault()) { item });
}
else
{
var exContItm = (flowGroup[position] as IList);
exContItm?.Add(item);
}
ix++;
}
}
flowGroupsList.Add(flowGroup); |
<<<<<<<
true,
SettingsClient.Get<string>("Appearance", "ColorScheme"));
Container.Resolve<IExternalControlService>();
=======
true
);
>>>>>>>
true
);
Container.Resolve<IExternalControlService>(); |
<<<<<<<
=======
new ExternalComponent
{
Name = "Json.NET",
Description = "Popular high-performance JSON framework for .NET",
Url = "https://github.com/JamesNK/Newtonsoft.Json",
LicenseUrl = "https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md"
},
new ExternalComponent
{
Name = "NVorbis",
Description = "A .NET library for decoding Xiph.org Vorbis files.",
Url = "https://github.com/ioctlLR/NVorbis",
LicenseUrl = "https://github.com/ioctlLR/NVorbis/blob/master/LICENSE"
},
>>>>>>>
new ExternalComponent
{
Name = "Json.NET",
Description = "Popular high-performance JSON framework for .NET",
Url = "https://github.com/JamesNK/Newtonsoft.Json",
LicenseUrl = "https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md"
}, |
<<<<<<<
response.Content.LoadIntoBufferAsync().ContinueWith(t => mre.Set());
if (mre.WaitOne (Manager.DefaultOptions.RequestTimeout, true) == false) {
Log.E ("DefaultAuthHandler", "mre.WaitOne timed out");
}
=======
response.Content.LoadIntoBufferAsync().ConfigureAwait(false).GetAwaiter().OnCompleted(() => mre.Set());
mre.WaitOne(Manager.DefaultOptions.RequestTimeout, true);
>>>>>>>
response.Content.LoadIntoBufferAsync().ConfigureAwait(false).GetAwaiter().OnCompleted(() => mre.Set());
if (mre.WaitOne (Manager.DefaultOptions.RequestTimeout, true) == false) {
Log.E ("DefaultAuthHandler", "mre.WaitOne timed out");
} |
<<<<<<<
static SettingsDialog()
{
foreach (SupportedFileInfo info in SupportedFilesHandler.Files)
{
foreach (string s in info._extensions)
{
_assocList.Add(FileAssociation.Get("." + s));
_typeList.Add(FileType.Get("SSBB." + s.ToUpper()));
}
}
}
=======
private static FileAssociation[] _assocList =new FileAssociation[] {
FileAssociation.Get(".pac"),
FileAssociation.Get(".pcs"),
FileAssociation.Get(".arc"),
FileAssociation.Get(".szs"),
FileAssociation.Get(".brres"),
FileAssociation.Get(".brmdl"),
FileAssociation.Get(".brtex"),
FileAssociation.Get(".msbin"),
FileAssociation.Get(".brsar"),
FileAssociation.Get(".brstm"),
FileAssociation.Get(".tex0"),
FileAssociation.Get(".plt0"),
FileAssociation.Get(".mdl0"),
FileAssociation.Get(".chr0"),
FileAssociation.Get(".srt0"),
FileAssociation.Get(".shp0"),
FileAssociation.Get(".pat0"),
FileAssociation.Get(".vis0"),
FileAssociation.Get(".scn0"),
FileAssociation.Get(".clr0"),
FileAssociation.Get(".efls"),
FileAssociation.Get(".breff"),
FileAssociation.Get(".breft"),
FileAssociation.Get(".brwsd"),
FileAssociation.Get(".brbnk"),
FileAssociation.Get(".brseq"),
FileAssociation.Get(".dol"),
FileAssociation.Get(".rel"),
FileAssociation.Get(".tpl"),
};
private CheckBox chkShowPropDesc;
private CheckBox chkUpdatesOnStartup;
private static FileType[] _typeList = new FileType[]{
FileType.Get("SSBB.PAC"),
FileType.Get("SSBB.PCS"),
FileType.Get("SSBB.ARC"),
FileType.Get("SSBB.SZS"),
FileType.Get("SSBB.BRRES"),
FileType.Get("SSBB.BRMDL"),
FileType.Get("SSBB.BRTEX"),
FileType.Get("SSBB.MSBIN"),
FileType.Get("SSBB.BRSAR"),
FileType.Get("SSBB.BRSTM"),
FileType.Get("SSBB.TEX0"),
FileType.Get("SSBB.PLT0"),
FileType.Get("SSBB.MDL0"),
FileType.Get("SSBB.CHR0"),
FileType.Get("SSBB.SRT0"),
FileType.Get("SSBB.SHP0"),
FileType.Get("SSBB.PAT0"),
FileType.Get("SSBB.VIS0"),
FileType.Get("SSBB.SCN0"),
FileType.Get("SSBB.CLR0"),
FileType.Get("SSBB.EFLS"),
FileType.Get("SSBB.BREFF"),
FileType.Get("SSBB.BREFT"),
FileType.Get("SSBB.BRWSD"),
FileType.Get("SSBB.BRBNK"),
FileType.Get("SSBB.BRSEQ"),
FileType.Get("SSBB.DOL"),
FileType.Get("SSBB.REL"),
FileType.Get("SSBB.TPL"),
};
>>>>>>>
static SettingsDialog()
{
foreach (SupportedFileInfo info in SupportedFilesHandler.Files)
{
foreach (string s in info._extensions)
{
_assocList.Add(FileAssociation.Get("." + s));
_typeList.Add(FileType.Get("SSBB." + s.ToUpper()));
}
}
}
private static List<FileAssociation> _assocList = new List<FileAssociation>();
private static List<FileType> _typeList = new List<FileType>();
private CheckBox chkShowPropDesc;
private CheckBox chkUpdatesOnStartup;
<<<<<<<
listView1.Items.Clear();
foreach (SupportedFileInfo info in SupportedFilesHandler.Files)
{
foreach (string s in info._extensions)
{
listView1.Items.Add(new ListViewItem() { Text = String.Format("{0} (*.{1})", info._name, s) });
}
}
=======
>>>>>>>
listView1.Items.Clear();
foreach (SupportedFileInfo info in SupportedFilesHandler.Files)
foreach (string s in info._extensions)
listView1.Items.Add(new ListViewItem() { Text = String.Format("{0} (*.{1})", info._name, s) }); |
<<<<<<<
"/Scripts/slick.model.js",
"/Scripts/qp.js",
=======
>>>>>>>
"/Scripts/qp.js", |
<<<<<<<
string.Compare(l.Name, Id.ToString(), StringComparison.OrdinalIgnoreCase) == 0);
=======
string.Compare(l.Name, id.ToString(), StringComparison.CurrentCultureIgnoreCase) == 0);
}
private LockFileTargetLibrary FindLibraryInLockFile(LockFile lockFile)
{
return FindLibraryInLockFile(lockFile, Id);
>>>>>>>
string.Compare(l.Name, id.ToString(), StringComparison.OrdinalIgnoreCase) == 0);
}
private LockFileTargetLibrary FindLibraryInLockFile(LockFile lockFile)
{
return FindLibraryInLockFile(lockFile, Id); |
<<<<<<<
=======
using System.Linq;
using System.Diagnostics;
using System.Runtime.InteropServices;
>>>>>>>
using System.Collections.Generic;
using System.Diagnostics;
using System.Runtime.InteropServices;
<<<<<<<
return ProcessArgs(args);
=======
using (PerfTrace.Current.CaptureTiming())
{
return ProcessArgs(args, startupTime);
}
>>>>>>>
return ProcessArgs(args, startupTime);
<<<<<<<
var parseResult = Parser.Instance.Parse(args);
=======
return ProcessArgs(args, new TimeSpan(0));
}
internal static int ProcessArgs(string[] args, TimeSpan startupTime, ITelemetry telemetryClient = null )
{
// CommandLineApplication is a bit restrictive, so we parse things ourselves here. Individual apps should use CLA.
var success = true;
var command = string.Empty;
var lastArg = 0;
Dictionary<string, double> performanceData = new Dictionary<string, double>();
TopLevelCommandParserResult topLevelCommandParserResult = TopLevelCommandParserResult.Empty;
>>>>>>>
return ProcessArgs(args, new TimeSpan(0));
}
internal static int ProcessArgs(string[] args, TimeSpan startupTime, ITelemetry telemetryClient = null )
{
Dictionary<string, double> performanceData = new Dictionary<string, double>();
PerformanceLogEventSource.Log.BuiltInCommandParserStart();
Stopwatch parseStartTime = Stopwatch.StartNew();
var parseResult = Parser.Instance.Parse(args);
performanceData.Add("Parse Time", parseStartTime.Elapsed.TotalMilliseconds);
PerformanceLogEventSource.Log.BuiltInCommandParserStop();
<<<<<<<
=======
else
{
// It's the command, and we're done!
command = args[lastArg];
if (string.IsNullOrEmpty(command))
{
command = "help";
}
PerformanceLogEventSource.Log.FirstTimeConfigurationStart();
var environmentProvider = new EnvironmentProvider();
bool generateAspNetCertificate =
environmentProvider.GetEnvironmentVariableAsBool("DOTNET_GENERATE_ASPNET_CERTIFICATE", defaultValue: true);
bool telemetryOptout =
environmentProvider.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", defaultValue: false);
bool addGlobalToolsToPath =
environmentProvider.GetEnvironmentVariableAsBool("DOTNET_ADD_GLOBAL_TOOLS_TO_PATH", defaultValue: true);
bool nologo =
environmentProvider.GetEnvironmentVariableAsBool("DOTNET_NOLOGO", defaultValue: false);
ReportDotnetHomeUsage(environmentProvider);
topLevelCommandParserResult = new TopLevelCommandParserResult(command);
var isDotnetBeingInvokedFromNativeInstaller = false;
if (IsDotnetBeingInvokedFromNativeInstaller(topLevelCommandParserResult))
{
aspNetCertificateSentinel = new NoOpAspNetCertificateSentinel();
firstTimeUseNoticeSentinel = new NoOpFirstTimeUseNoticeSentinel();
toolPathSentinel = new NoOpFileSentinel(exists: false);
isDotnetBeingInvokedFromNativeInstaller = true;
}
var dotnetFirstRunConfiguration = new DotnetFirstRunConfiguration(
generateAspNetCertificate: generateAspNetCertificate,
telemetryOptout: telemetryOptout,
addGlobalToolsToPath: addGlobalToolsToPath,
nologo: nologo);
ConfigureDotNetForFirstTimeUse(
firstTimeUseNoticeSentinel,
aspNetCertificateSentinel,
toolPathSentinel,
isDotnetBeingInvokedFromNativeInstaller,
dotnetFirstRunConfiguration,
environmentProvider,
performanceData);
>>>>>>>
<<<<<<<
=======
break;
}
}
if (!success)
{
HelpCommand.PrintHelp();
return 1;
>>>>>>>
<<<<<<<
TelemetryEventEntry.SendFiltered(parseResult);
=======
performanceData.Add("Startup Time", startupTime.TotalMilliseconds);
TelemetryEventEntry.SendFiltered(Tuple.Create(topLevelCommandParserResult, performanceData));
>>>>>>>
performanceData.Add("Startup Time", startupTime.TotalMilliseconds);
TelemetryEventEntry.SendFiltered(Tuple.Create(parseResult, performanceData));
<<<<<<<
DotDefaultPathCorrector.Correct();
=======
var environmentPath = EnvironmentPathFactory.CreateEnvironmentPath(isDotnetBeingInvokedFromNativeInstaller, environmentProvider);
var commandFactory = new DotNetCommandFactory(alwaysRunOutOfProc: true);
var aspnetCertificateGenerator = new AspNetCoreCertificateGenerator();
var dotnetConfigurer = new DotnetFirstTimeUseConfigurer(
firstTimeUseNoticeSentinel,
aspNetCertificateSentinel,
aspnetCertificateGenerator,
toolPathSentinel,
dotnetFirstRunConfiguration,
Reporter.Output,
CliFolderPathCalculator.CliFallbackFolderPath,
environmentPath,
performanceMeasurements);
dotnetConfigurer.Configure();
if (isDotnetBeingInvokedFromNativeInstaller && OperatingSystem.IsWindows())
{
DotDefaultPathCorrector.Correct();
}
>>>>>>>
DotDefaultPathCorrector.Correct(); |
<<<<<<<
LocalizableStrings.AppFullName,
Accept.ZeroOrMoreArguments,
=======
".NET dependency restorer",
Accept.ZeroOrMoreArguments(),
>>>>>>>
LocalizableStrings.AppFullName,
Accept.ZeroOrMoreArguments(),
<<<<<<<
LocalizableStrings.CmdSourceOptionDescription,
Accept.OneOrMoreArguments
.With(name: LocalizableStrings.CmdSourceOption)
=======
"Specifies a NuGet package source to use during the restore.",
Accept.OneOrMoreArguments()
.With(name: "SOURCE")
>>>>>>>
LocalizableStrings.CmdSourceOptionDescription,
Accept.OneOrMoreArguments()
.With(name: LocalizableStrings.CmdSourceOption)
<<<<<<<
LocalizableStrings.CmdRuntimeOptionDescription,
Accept.OneOrMoreArguments
=======
"Target runtime to restore packages for.",
Accept.OneOrMoreArguments()
>>>>>>>
LocalizableStrings.CmdRuntimeOptionDescription,
Accept.OneOrMoreArguments()
<<<<<<<
LocalizableStrings.CmdPackagesOptionDescription,
Accept.ExactlyOneArgument
.With(name: LocalizableStrings.CmdPackagesOption)
=======
"Directory to install packages in.",
Accept.ExactlyOneArgument()
.With(name: "PACKAGES_DIRECTORY")
>>>>>>>
LocalizableStrings.CmdPackagesOptionDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdPackagesOption)
<<<<<<<
LocalizableStrings.CmdDisableParallelOptionDescription,
Accept.NoArguments
=======
"Disables restoring multiple projects in parallel.",
Accept.NoArguments()
>>>>>>>
LocalizableStrings.CmdDisableParallelOptionDescription,
Accept.NoArguments()
<<<<<<<
LocalizableStrings.CmdConfigFileOptionDescription,
Accept.ExactlyOneArgument
.With(name: LocalizableStrings.CmdConfigFileOption)
=======
"The NuGet configuration file to use.",
Accept.ExactlyOneArgument()
.With(name: "FILE")
>>>>>>>
LocalizableStrings.CmdConfigFileOptionDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdConfigFileOption)
<<<<<<<
LocalizableStrings.CmdNoCacheOptionDescription,
Accept.NoArguments
=======
"Do not cache packages and http requests.",
Accept.NoArguments()
>>>>>>>
LocalizableStrings.CmdNoCacheOptionDescription,
Accept.NoArguments()
<<<<<<<
LocalizableStrings.CmdIgnoreFailedSourcesOptionDescription,
Accept.NoArguments
=======
"Treat package source failures as warnings.",
Accept.NoArguments()
>>>>>>>
LocalizableStrings.CmdIgnoreFailedSourcesOptionDescription,
Accept.NoArguments()
<<<<<<<
LocalizableStrings.CmdNoDependenciesOptionDescription,
Accept.NoArguments
=======
"Set this flag to ignore project to project references and only restore the root project",
Accept.NoArguments()
>>>>>>>
LocalizableStrings.CmdNoDependenciesOptionDescription,
Accept.NoArguments() |
<<<<<<<
using Microsoft.DotNet.Tools;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
=======
>>>>>>>
using Microsoft.DotNet.Tools; |
<<<<<<<
using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Cli.Utils;
=======
using Microsoft.DotNet.Cli.Utils;
>>>>>>>
using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Cli.Utils;
<<<<<<<
using Microsoft.DotNet.Tools.List;
using Microsoft.DotNet.Tools.Migrate;
using Microsoft.DotNet.Tools.MSBuild;
using Microsoft.DotNet.Tools.New;
using Microsoft.DotNet.Tools.NuGet;
using Microsoft.DotNet.Tools.Pack;
using Microsoft.DotNet.Tools.Publish;
using Microsoft.DotNet.Tools.Remove;
using Microsoft.DotNet.Tools.Restore;
using Microsoft.DotNet.Tools.Run;
using Microsoft.DotNet.Tools.Sln;
using Microsoft.DotNet.Tools.Test;
using Microsoft.DotNet.Tools.VSTest;
using Microsoft.DotNet.Tools.Cache;
=======
>>>>>>>
using Microsoft.DotNet.Tools.List;
using Microsoft.DotNet.Tools.Migrate;
using Microsoft.DotNet.Tools.MSBuild;
using Microsoft.DotNet.Tools.New;
using Microsoft.DotNet.Tools.NuGet;
using Microsoft.DotNet.Tools.Pack;
using Microsoft.DotNet.Tools.Publish;
using Microsoft.DotNet.Tools.Remove;
using Microsoft.DotNet.Tools.Restore;
using Microsoft.DotNet.Tools.Run;
using Microsoft.DotNet.Tools.Sln;
using Microsoft.DotNet.Tools.Test;
using Microsoft.DotNet.Tools.VSTest;
using Microsoft.DotNet.Tools.Cache;
<<<<<<<
private static Dictionary<string, Func<string[], int>> s_builtIns = new Dictionary<string, Func<string[], int>>
{
["add"] = AddCommand.Run,
["build"] = BuildCommand.Run,
["cache"] = CacheCommand.Run,
["clean"] = CleanCommand.Run,
["help"] = HelpCommand.Run,
["list"] = ListCommand.Run,
["migrate"] = MigrateCommand.Run,
["msbuild"] = MSBuildCommand.Run,
["new"] = NewCommandShim.Run,
["nuget"] = NuGetCommand.Run,
["pack"] = PackCommand.Run,
["publish"] = PublishCommand.Run,
["remove"] = RemoveCommand.Run,
["restore"] = RestoreCommand.Run,
["run"] = RunCommand.Run,
["sln"] = SlnCommand.Run,
["test"] = TestCommand.Run,
["vstest"] = VSTestCommand.Run,
["complete"] = CompleteCommand.Run,
["parse"] = ParseCommand.Run
};
=======
>>>>>>>
private static Dictionary<string, Func<string[], int>> s_builtIns = new Dictionary<string, Func<string[], int>>
{
["add"] = AddCommand.Run,
["build"] = BuildCommand.Run,
["cache"] = CacheCommand.Run,
["clean"] = CleanCommand.Run,
["help"] = HelpCommand.Run,
["list"] = ListCommand.Run,
["migrate"] = MigrateCommand.Run,
["msbuild"] = MSBuildCommand.Run,
["new"] = NewCommandShim.Run,
["nuget"] = NuGetCommand.Run,
["pack"] = PackCommand.Run,
["publish"] = PublishCommand.Run,
["remove"] = RemoveCommand.Run,
["restore"] = RestoreCommand.Run,
["run"] = RunCommand.Run,
["sln"] = SlnCommand.Run,
["test"] = TestCommand.Run,
["vstest"] = VSTestCommand.Run,
["complete"] = CompleteCommand.Run,
["parse"] = ParseCommand.Run
}; |
<<<<<<<
(_) => (store, store, packageInstallerMock),
=======
(location, forwardArguments) => (store, packageInstallerMock),
>>>>>>>
(location, forwardArguments) => (store, store, packageInstallerMock), |
<<<<<<<
Create.Command(
"pack",
LocalizableStrings.AppDescription,
Accept.ZeroOrMoreArguments,
CommonOptions.HelpOption(),
Create.Option(
"-o|--output",
LocalizableStrings.CmdOutputDirDescription,
Accept.ExactlyOneArgument
.With(name: LocalizableStrings.CmdOutputDir)
.ForwardAs(o => $"/p:PackageOutputPath={o.Arguments.Single()}")),
Create.Option("--no-build",
LocalizableStrings.CmdNoBuildOptionDescription,
Accept.NoArguments.ForwardAs("/p:NoBuild=true")),
Create.Option("--include-symbols",
LocalizableStrings.CmdIncludeSymbolsDescription,
Accept.NoArguments.ForwardAs("/p:IncludeSymbols=true")),
Create.Option("--include-source",
LocalizableStrings.CmdIncludeSourceDescription,
Accept.NoArguments.ForwardAs("/p:IncludeSource=true")),
CommonOptions.ConfigurationOption(),
CommonOptions.VersionSuffixOption(),
Create.Option("-s|--serviceable",
LocalizableStrings.CmdServiceableDescription,
Accept.NoArguments.ForwardAs("/p:Serviceable=true")),
CommonOptions.VerbosityOption());
=======
Create.Command("pack",
".NET Core NuGet Package Packer",
CommonOptions.HelpOption(),
Create.Option("-o|--output",
"Directory in which to place built packages.",
Accept.ExactlyOneArgument()
.With(name: "OUTPUT_DIR")),
Create.Option("--no-build",
"Skip building the project prior to packing. By default, the project will be built."),
Create.Option("--include-symbols",
"Include packages with symbols in addition to regular packages in output directory."),
Create.Option("--include-source",
"Include PDBs and source files. Source files go into the src folder in the resulting nuget package"),
Create.Option("-c|--configuration",
"Configuration to use for building the project. Default for most projects is \"Debug\".",
Accept.ExactlyOneArgument()
.With(name: "CONFIGURATION")
.WithSuggestionsFrom("DEBUG",
"RELEASE")),
Create.Option("--version-suffix",
"Defines the value for the $(VersionSuffix) property in the project.",
Accept.ExactlyOneArgument()
.With(name: "VERSION_SUFFIX")),
Create.Option("-s|--serviceable",
"Set the serviceable flag in the package. For more information, please see https://aka.ms/nupkgservicing."),
CommonOptions.VerbosityOption());
>>>>>>>
Create.Command(
"pack",
LocalizableStrings.AppDescription,
Accept.ZeroOrMoreArguments,
CommonOptions.HelpOption(),
Create.Option(
"-o|--output",
LocalizableStrings.CmdOutputDirDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdOutputDir)
.ForwardAs(o => $"/p:PackageOutputPath={o.Arguments.Single()}")),
Create.Option("--no-build",
LocalizableStrings.CmdNoBuildOptionDescription,
Accept.NoArguments.ForwardAs("/p:NoBuild=true")),
Create.Option("--include-symbols",
LocalizableStrings.CmdIncludeSymbolsDescription,
Accept.NoArguments.ForwardAs("/p:IncludeSymbols=true")),
Create.Option("--include-source",
LocalizableStrings.CmdIncludeSourceDescription,
Accept.NoArguments.ForwardAs("/p:IncludeSource=true")),
CommonOptions.ConfigurationOption(),
CommonOptions.VersionSuffixOption(),
Create.Option("-s|--serviceable",
LocalizableStrings.CmdServiceableDescription,
Accept.NoArguments.ForwardAs("/p:Serviceable=true")),
CommonOptions.VerbosityOption()); |
<<<<<<<
mockProj.Properties.Count(p => p.Name == "RuntimeIdentifiers").Should().Be(0);
mockProj.Properties.Count(p => p.Name == "RuntimeIdentifier").Should().Be(0);
=======
mockProj.Properties.Count(p => p.Name == "RuntimeIdentifiers").Should().Be(1);
mockProj.Properties.First(p => p.Name == "RuntimeIdentifiers")
.Value.Should().Be("win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64");
}
[Fact]
public void MigratingCoreAndDesktopTFMsAddsRuntimeIdentifierWithWin7x86ConditionOnAllFullFrameworksWhenNoRuntimesExistAlready()
{
var testDirectory = Temp.CreateDirectory().Path;
var testPJ = new ProjectJsonBuilder(TestAssets)
.FromTestAssetBase("PJAppWithMultipleFrameworks")
.SaveToDisk(testDirectory);
var projectContexts = ProjectContext.CreateContextForEachFramework(testDirectory);
var mockProj = ProjectRootElement.Create();
var migrationSettings = MigrationSettings.CreateMigrationSettingsTestHook(testDirectory, testDirectory, mockProj);
var migrationInputs = new MigrationRuleInputs(
projectContexts,
mockProj,
mockProj.AddItemGroup(),
mockProj.AddPropertyGroup());
new MigrateTFMRule().Apply(migrationSettings, migrationInputs);
mockProj.Properties.Count(p => p.Name == "RuntimeIdentifier").Should().Be(1);
var runtimeIdentifier = mockProj.Properties.First(p => p.Name == "RuntimeIdentifier");
runtimeIdentifier.Value.Should().Be("win7-x86");
runtimeIdentifier.Condition.Should().Be(" '$(TargetFramework)' == 'net20' OR '$(TargetFramework)' == 'net35' OR '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net461' ");
>>>>>>>
mockProj.Properties.Count(p => p.Name == "RuntimeIdentifiers").Should().Be(0);
mockProj.Properties.Count(p => p.Name == "RuntimeIdentifier").Should().Be(0);
}
[Fact]
public void MigratingCoreAndDesktopTFMsAddsRuntimeIdentifierWithWin7x86ConditionOnAllFullFrameworksWhenNoRuntimesExistAlready()
{
var testDirectory = Temp.CreateDirectory().Path;
var testPJ = new ProjectJsonBuilder(TestAssets)
.FromTestAssetBase("PJAppWithMultipleFrameworks")
.SaveToDisk(testDirectory);
var projectContexts = ProjectContext.CreateContextForEachFramework(testDirectory);
var mockProj = ProjectRootElement.Create();
var migrationSettings = MigrationSettings.CreateMigrationSettingsTestHook(testDirectory, testDirectory, mockProj);
var migrationInputs = new MigrationRuleInputs(
projectContexts,
mockProj,
mockProj.AddItemGroup(),
mockProj.AddPropertyGroup());
new MigrateTFMRule().Apply(migrationSettings, migrationInputs);
mockProj.Properties.Count(p => p.Name == "RuntimeIdentifier").Should().Be(1);
var runtimeIdentifier = mockProj.Properties.First(p => p.Name == "RuntimeIdentifier");
runtimeIdentifier.Value.Should().Be("win7-x86");
runtimeIdentifier.Condition.Should().Be(" '$(TargetFramework)' == 'net20' OR '$(TargetFramework)' == 'net35' OR '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net461' "); |
<<<<<<<
// [InlineData("console", "microsoft.netcore.app")] re-enable when this issue is resolved: "https://github.com/dotnet/cli/issues/9420"
[InlineData("classlib", "netstandard.library")]
public void NewProjectRestoresCorrectPackageVersion(string type, string packageName)
=======
[InlineData("console", "microsoft.netcore.app", "2.1.0")]
[InlineData("classlib", "netstandard.library", null)]
public void NewProjectRestoresCorrectPackageVersion(string type, string packageName, string expectedVersion)
>>>>>>>
[InlineData("console", "microsoft.netcore.app")]
// re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574
[InlineData("classlib", "netstandard.library", null)]
public void NewProjectRestoresCorrectPackageVersion(string type, string packageName, string expectedVersion)
<<<<<<<
.Single(d => d.Name.StartsWith("2.1.1"));
=======
.Single(d => d.Name.StartsWith("2.2.0"));
>>>>>>>
.Single(d => d.Name.StartsWith("2.1.0")); |
<<<<<<<
internal delegate (IToolPackageStore, IToolPackageStoreQuery, IToolPackageInstaller, IToolPackageUninstaller) CreateToolPackageStoresAndInstallerAndUninstaller(
DirectoryPath? nonGlobalLocation = null);
=======
internal delegate (IToolPackageStore, IToolPackageInstaller) CreateToolPackageStoreAndInstaller(
DirectoryPath? nonGlobalLocation = null,
IEnumerable<string> additionalRestoreArguments = null);
>>>>>>>
internal delegate (IToolPackageStore, IToolPackageStoreQuery, IToolPackageInstaller, IToolPackageUninstaller) CreateToolPackageStoresAndInstallerAndUninstaller(
DirectoryPath? nonGlobalLocation = null,
IEnumerable<string> additionalRestoreArguments = null); |
<<<<<<<
=======
using NuGet.Frameworks;
using Command = Microsoft.DotNet.Cli.Utils.Command;
>>>>>>>
using Command = Microsoft.DotNet.Cli.Utils.Command;
<<<<<<<
return 1;
}
catch (Exception e) when (!e.ShouldBeDisplayedAsError())
{
// If telemetry object has not been initialized yet. It cannot be collected
TelemetryEventEntry.SendFiltered(e);
Reporter.Error.WriteLine(e.ToString().Red().Bold());
=======
new MulticoreJitActivator().TryActivateMulticoreJit();
PerformanceLogEventSource.Log.LogStartUpInformation(startupInfo);
PerformanceLogEventSource.Log.CLIStart();
if (Env.GetEnvironmentVariableAsBool("DOTNET_CLI_CAPTURE_TIMING", false))
{
PerfTrace.Enabled = true;
}
InitializeProcess();
try
{
using (PerfTrace.Current.CaptureTiming())
{
return ProcessArgs(args);
}
}
catch (HelpException e)
{
Reporter.Output.WriteLine(e.Message);
return 0;
}
catch (Exception e) when (e.ShouldBeDisplayedAsError())
{
Reporter.Error.WriteLine(CommandContext.IsVerbose()
? e.ToString().Red().Bold()
: e.Message.Red().Bold());
var commandParsingException = e as CommandParsingException;
if (commandParsingException != null)
{
Reporter.Output.WriteLine(commandParsingException.HelpText);
}
return 1;
}
catch (Exception e) when (!e.ShouldBeDisplayedAsError())
{
// If telemetry object has not been initialized yet. It cannot be collected
TelemetryEventEntry.SendFiltered(e);
Reporter.Error.WriteLine(e.ToString().Red().Bold());
>>>>>>>
new MulticoreJitActivator().TryActivateMulticoreJit();
PerformanceLogEventSource.Log.LogStartUpInformation(startupInfo);
PerformanceLogEventSource.Log.CLIStart();
if (Env.GetEnvironmentVariableAsBool("DOTNET_CLI_CAPTURE_TIMING", false))
{
PerfTrace.Enabled = true;
}
InitializeProcess();
try
{
using (PerfTrace.Current.CaptureTiming())
{
return ProcessArgs(args);
}
}
catch (HelpException e)
{
Reporter.Output.WriteLine(e.Message);
return 0;
}
catch (Exception e) when (e.ShouldBeDisplayedAsError())
{
Reporter.Error.WriteLine(CommandContext.IsVerbose()
? e.ToString().Red().Bold()
: e.Message.Red().Bold());
return 1;
}
catch (Exception e) when (!e.ShouldBeDisplayedAsError())
{
// If telemetry object has not been initialized yet. It cannot be collected
TelemetryEventEntry.SendFiltered(e);
Reporter.Error.WriteLine(e.ToString().Red().Bold());
<<<<<<<
Environment.SetEnvironmentVariable(CommandContext.Variables.Verbose, bool.TrueString);
CommandContext.SetVerbose(true);
}
if (parseResult.HasOption(Parser.VersionOption))
{
CommandLineInfo.PrintVersion();
return 0;
}
else if (parseResult.HasOption(Parser.InfoOption))
{
CommandLineInfo.PrintInfo();
return 0;
}
else if (parseResult.CommandResult.Command.Equals(Parser.RootCommand) && parseResult.HasOption("-h"))
{
HelpCommand.PrintHelp();
return 0;
}
else
{
var environmentProvider = new EnvironmentProvider();
=======
if (IsArg(args[lastArg], "d", "diagnostics"))
{
Environment.SetEnvironmentVariable(CommandContext.Variables.Verbose, bool.TrueString);
CommandContext.SetVerbose(true);
}
else if (IsArg(args[lastArg], "version"))
{
PrintVersion();
return 0;
}
else if (IsArg(args[lastArg], "info"))
{
PrintInfo();
return 0;
}
else if (IsArg(args[lastArg], "h", "help") ||
args[lastArg] == "-?" ||
args[lastArg] == "/?")
{
HelpCommand.PrintHelp();
return 0;
}
else if (args[lastArg].StartsWith("-", StringComparison.OrdinalIgnoreCase))
{
Reporter.Error.WriteLine($"Unknown option: {args[lastArg]}");
success = false;
}
else
{
// It's the command, and we're done!
command = args[lastArg];
if (string.IsNullOrEmpty(command))
{
command = "help";
}
PerformanceLogEventSource.Log.FirstTimeConfigurationStart();
var environmentProvider = new EnvironmentProvider();
bool generateAspNetCertificate =
environmentProvider.GetEnvironmentVariableAsBool("DOTNET_GENERATE_ASPNET_CERTIFICATE", defaultValue: true);
bool telemetryOptout =
environmentProvider.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", defaultValue: false);
bool addGlobalToolsToPath =
environmentProvider.GetEnvironmentVariableAsBool("DOTNET_ADD_GLOBAL_TOOLS_TO_PATH", defaultValue: true);
bool nologo =
environmentProvider.GetEnvironmentVariableAsBool("DOTNET_NOLOGO", defaultValue: false);
ReportDotnetHomeUsage(environmentProvider);
topLevelCommandParserResult = new TopLevelCommandParserResult(command);
var isDotnetBeingInvokedFromNativeInstaller = false;
if (IsDotnetBeingInvokedFromNativeInstaller(topLevelCommandParserResult))
{
aspNetCertificateSentinel = new NoOpAspNetCertificateSentinel();
firstTimeUseNoticeSentinel = new NoOpFirstTimeUseNoticeSentinel();
toolPathSentinel = new NoOpFileSentinel(exists: false);
isDotnetBeingInvokedFromNativeInstaller = true;
}
>>>>>>>
Environment.SetEnvironmentVariable(CommandContext.Variables.Verbose, bool.TrueString);
CommandContext.SetVerbose(true);
}
if (parseResult.HasOption(Parser.VersionOption))
{
CommandLineInfo.PrintVersion();
return 0;
}
else if (parseResult.HasOption(Parser.InfoOption))
{
CommandLineInfo.PrintInfo();
return 0;
}
else if (parseResult.CommandResult.Command.Equals(Parser.RootCommand) && parseResult.HasOption("-h"))
{
HelpCommand.PrintHelp();
return 0;
}
else
{
PerformanceLogEventSource.Log.FirstTimeConfigurationStart();
var environmentProvider = new EnvironmentProvider();
<<<<<<<
var isDotnetBeingInvokedFromNativeInstaller = false;
if (parseResult.CommandResult.Command.Equals(Parser.InstallSuccessCommand))
{
aspNetCertificateSentinel = new NoOpAspNetCertificateSentinel();
firstTimeUseNoticeSentinel = new NoOpFirstTimeUseNoticeSentinel();
toolPathSentinel = new NoOpFileSentinel(exists: false);
isDotnetBeingInvokedFromNativeInstaller = true;
=======
PerformanceLogEventSource.Log.FirstTimeConfigurationStop();
break;
>>>>>>>
var isDotnetBeingInvokedFromNativeInstaller = false;
if (parseResult.CommandResult.Command.Equals(Parser.InstallSuccessCommand))
{
aspNetCertificateSentinel = new NoOpAspNetCertificateSentinel();
firstTimeUseNoticeSentinel = new NoOpFirstTimeUseNoticeSentinel();
toolPathSentinel = new NoOpFileSentinel(exists: false);
isDotnetBeingInvokedFromNativeInstaller = true;
<<<<<<<
TelemetryEventEntry.SendFiltered(parseResult);
=======
PerformanceLogEventSource.Log.TelemetrySaveIfEnabledStart();
TelemetryEventEntry.SendFiltered(topLevelCommandParserResult);
PerformanceLogEventSource.Log.TelemetrySaveIfEnabledStop();
>>>>>>>
PerformanceLogEventSource.Log.TelemetrySaveIfEnabledStart();
TelemetryEventEntry.SendFiltered(parseResult);
PerformanceLogEventSource.Log.TelemetrySaveIfEnabledStop();
<<<<<<<
var topLevelCommandParser = parseResult.RootCommandResult.Children.FirstOrDefault(c => c.Token() != null && c.Token().Type.Equals(TokenType.Command));
var topLevelCommands = new string[] { "dotnet", topLevelCommandParser.Symbol.Name };
exitCode = builtIn.Command(parseResult.Tokens.Select(t => t.Value).Except(topLevelCommands).ToArray());
=======
PerformanceLogEventSource.Log.BuiltInCommandStart();
exitCode = builtIn.Command(appArgs.ToArray());
PerformanceLogEventSource.Log.BuiltInCommandStop();
}
else if (string.IsNullOrEmpty(topLevelCommandParserResult.Command))
{
exitCode = 0;
>>>>>>>
PerformanceLogEventSource.Log.BuiltInCommandStart();
var topLevelCommandParser = parseResult.RootCommandResult.Children.FirstOrDefault(c => c.Token() != null && c.Token().Type.Equals(TokenType.Command));
var topLevelCommands = new string[] { "dotnet", topLevelCommandParser.Symbol.Name };
exitCode = builtIn.Command(parseResult.Tokens.Select(t => t.Value).Except(topLevelCommands).ToArray());
PerformanceLogEventSource.Log.BuiltInCommandStop();
<<<<<<<
Utils.CommandResult result = CommandFactory.CommandFactoryUsingResolver.Create(
"dotnet-" + parseResult.ValueForArgument<string>(Parser.DotnetSubCommand),
parseResult.UnmatchedTokens,
FrameworkConstants.CommonFrameworks.NetStandardApp15)
.Execute();
=======
PerformanceLogEventSource.Log.ExtensibleCommandResolverStart();
Command resolvedCommand = CommandFactoryUsingResolver.Create(
"dotnet-" + topLevelCommandParserResult.Command,
appArgs,
FrameworkConstants.CommonFrameworks.NetStandardApp15);
PerformanceLogEventSource.Log.ExtensibleCommandResolverStop();
PerformanceLogEventSource.Log.ExtensibleCommandStart();
CommandResult result = resolvedCommand.Execute();
PerformanceLogEventSource.Log.ExtensibleCommandStop();
>>>>>>>
PerformanceLogEventSource.Log.ExtensibleCommandResolverStart();
var resolvedCommand = CommandFactoryUsingResolver.Create(
"dotnet-" + parseResult.ValueForArgument<string>(Parser.DotnetSubCommand),
parseResult.UnmatchedTokens,
FrameworkConstants.CommonFrameworks.NetStandardApp15);
PerformanceLogEventSource.Log.ExtensibleCommandResolverStop();
PerformanceLogEventSource.Log.ExtensibleCommandStart();
CommandResult result = resolvedCommand.Execute();
PerformanceLogEventSource.Log.ExtensibleCommandStop(); |
<<<<<<<
public const string TestSdkPackageName = "Microsoft.NET.Test.Sdk";
public const string TestSdkPackageVersion = "15.0.0-preview-20161024-02";
public const string XUnitPackageName = "xunit";
public const string XUnitPackageVersion = "2.2.0-beta3-build3402";
public const string XUnitRunnerPackageName = "xunit.runner.visualstudio";
public const string XUnitRunnerPackageVersion = "2.2.0-beta4-build1188";
=======
public static readonly IDictionary<string, string> AspProjectDependencyToolsPackages = new Dictionary<string, string> {
{"Microsoft.EntityFrameworkCore.Tools", "Microsoft.EntityFrameworkCore.Tools"},
{"Microsoft.AspNetCore.Razor.Tools", "Microsoft.AspNetCore.Razor.Design"},
{"Microsoft.AspNetCore.Razor.Design", "Microsoft.AspNetCore.Razor.Design"},
{"Microsoft.VisualStudio.Web.CodeGenerators.Mvc", "Microsoft.VisualStudio.Web.CodGeneration.Design"},
{"Microsoft.VisualStudio.Web.CodeGeneration.Tools", ""},
};
public static readonly IDictionary<string, string> AspProjectToolsPackages = new Dictionary<string, string> {
{"Microsoft.EntityFrameworkCore.Tools", "Microsoft.EntityFrameworkCore.Tools.DotNet"},
{"Microsoft.AspNetCore.Razor.Tools", "Microsoft.AspNetCore.Razor.Tools"},
{"Microsoft.VisualStudio.Web.CodeGeneration.Tools", "Microsoft.VisualStudio.Web.CodeGeneration.Tools"},
{"Microsoft.DotNet.Watcher.Tools", "Microsoft.DotNet.Watcher.Tools"},
{"Microsoft.Extensions.SecretManager.Tools", "Microsoft.Extensions.SecretManager.Tools"},
{"Microsoft.AspNetCore.Server.IISIntegration.Tools", ""}
};
>>>>>>>
public const string TestSdkPackageName = "Microsoft.NET.Test.Sdk";
public const string TestSdkPackageVersion = "15.0.0-preview-20161024-02";
public const string XUnitPackageName = "xunit";
public const string XUnitPackageVersion = "2.2.0-beta3-build3402";
public const string XUnitRunnerPackageName = "xunit.runner.visualstudio";
public const string XUnitRunnerPackageVersion = "2.2.0-beta4-build1188";
public static readonly IDictionary<string, string> AspProjectDependencyToolsPackages = new Dictionary<string, string> {
{"Microsoft.EntityFrameworkCore.Tools", "Microsoft.EntityFrameworkCore.Tools"},
{"Microsoft.AspNetCore.Razor.Tools", "Microsoft.AspNetCore.Razor.Design"},
{"Microsoft.AspNetCore.Razor.Design", "Microsoft.AspNetCore.Razor.Design"},
{"Microsoft.VisualStudio.Web.CodeGenerators.Mvc", "Microsoft.VisualStudio.Web.CodGeneration.Design"},
{"Microsoft.VisualStudio.Web.CodeGeneration.Tools", ""},
};
public static readonly IDictionary<string, string> AspProjectToolsPackages = new Dictionary<string, string> {
{"Microsoft.EntityFrameworkCore.Tools", "Microsoft.EntityFrameworkCore.Tools.DotNet"},
{"Microsoft.AspNetCore.Razor.Tools", "Microsoft.AspNetCore.Razor.Tools"},
{"Microsoft.VisualStudio.Web.CodeGeneration.Tools", "Microsoft.VisualStudio.Web.CodeGeneration.Tools"},
{"Microsoft.DotNet.Watcher.Tools", "Microsoft.DotNet.Watcher.Tools"},
{"Microsoft.Extensions.SecretManager.Tools", "Microsoft.Extensions.SecretManager.Tools"},
{"Microsoft.AspNetCore.Server.IISIntegration.Tools", ""}
}; |
<<<<<<<
using Xunit.Abstractions;
=======
using Microsoft.Build.Utilities;
>>>>>>>
using Xunit.Abstractions;
using Microsoft.Build.Utilities; |
<<<<<<<
internal delegate (IToolPackageStore, IToolPackageStoreQuery, IToolPackageInstaller) CreateToolPackageStoresAndInstaller(DirectoryPath? nonGlobalLocation = null);
=======
internal delegate (IToolPackageStore, IToolPackageInstaller) CreateToolPackageStoreAndInstaller(
DirectoryPath? nonGlobalLocation = null,
IEnumerable<string> forwardRestoreArguments = null);
>>>>>>>
internal delegate (IToolPackageStore, IToolPackageStoreQuery, IToolPackageInstaller) CreateToolPackageStoresAndInstaller(
DirectoryPath? nonGlobalLocation = null,
IEnumerable<string> forwardRestoreArguments = null);
<<<<<<<
_createToolPackageStoresAndInstaller = createToolPackageStoreAndInstaller ?? ToolPackageFactory.CreateToolPackageStoresAndInstaller;
=======
_createToolPackageStoreAndInstaller = createToolPackageStoreAndInstaller ?? ToolPackageFactory.CreateToolPackageStoreAndInstaller;
_forwardRestoreArguments = appliedCommand.OptionValuesToBeForwarded();
>>>>>>>
_createToolPackageStoresAndInstaller = createToolPackageStoreAndInstaller ?? ToolPackageFactory.CreateToolPackageStoresAndInstaller;
_forwardRestoreArguments = appliedCommand.OptionValuesToBeForwarded();
<<<<<<<
(IToolPackageStore toolPackageStore, IToolPackageStoreQuery toolPackageStoreQuery, IToolPackageInstaller toolPackageInstaller) =
_createToolPackageStoresAndInstaller(toolPath);
=======
(IToolPackageStore toolPackageStore, IToolPackageInstaller toolPackageInstaller) =
_createToolPackageStoreAndInstaller(toolPath, _forwardRestoreArguments);
>>>>>>>
(IToolPackageStore toolPackageStore, IToolPackageStoreQuery toolPackageStoreQuery, IToolPackageInstaller toolPackageInstaller) =
_createToolPackageStoresAndInstaller(toolPath, _forwardRestoreArguments); |
<<<<<<<
// Diagnostics
public const string DiagnosticCode = "DiagnosticCode";
public const string Message = "Message";
public const string FilePath = "FilePath";
public const string Severity = "Severity";
public const string StartLine = "StartLine";
public const string StartColumn = "StartColumn";
public const string EndLine = "EndLine";
public const string EndColumn = "EndColumn";
=======
public const string TransitiveProjectReference = "TransitiveProjectReference";
>>>>>>>
public const string TransitiveProjectReference = "TransitiveProjectReference";
// Diagnostics
public const string DiagnosticCode = "DiagnosticCode";
public const string Message = "Message";
public const string FilePath = "FilePath";
public const string Severity = "Severity";
public const string StartLine = "StartLine";
public const string StartColumn = "StartColumn";
public const string EndLine = "EndLine";
public const string EndColumn = "EndColumn"; |
<<<<<<<
[Fact]
public void It_resolves_assembly_conflicts_with_a_NETFramework_library()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return;
}
TestProject project = new TestProject()
{
Name = "NETFrameworkLibrary",
TargetFrameworks = "net462",
IsSdkProject = true
};
var testAsset = _testAssetsManager.CreateTestProject(project)
.WithProjectChanges(p =>
{
var ns = p.Root.Name.Namespace;
// Note: if you want to see how this fails when conflicts are not resolved, set the DisableHandlePackageFileConflicts property to true, like this:
// p.Root.Element(ns + "PropertyGroup").Add(new XElement(ns + "DisableHandlePackageFileConflicts", "True"));
var itemGroup = new XElement(ns + "ItemGroup");
p.Root.Add(itemGroup);
itemGroup.Add(new XElement(ns + "PackageReference",
new XAttribute("Include", "NETStandard.Library"),
new XAttribute("Version", "$(BundledNETStandardPackageVersion)")));
foreach (var dependency in TestAsset.NetStandard1_3Dependencies)
{
itemGroup.Add(new XElement(ns + "PackageReference",
new XAttribute("Include", dependency.Item1),
new XAttribute("Version", dependency.Item2)));
}
})
.Restore(project.Name);
string projectFolder = Path.Combine(testAsset.Path, project.Name);
var buildCommand = new BuildCommand(MSBuildTest.Stage0MSBuild, projectFolder);
buildCommand
.CaptureStdOut()
.Execute()
.Should()
.Pass()
.And
.NotHaveStdOutContaining("warning")
.And
.NotHaveStdOutContaining("MSB3243");
}
=======
[Fact]
public void It_can_preserve_compilation_context_and_reference_netstandard_library()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return;
}
var testAsset = _testAssetsManager
.CopyTestAsset("DesktopReferencingNetStandardLibrary")
.WithSource()
.Restore();
var buildCommand = new BuildCommand(MSBuildTest.Stage0MSBuild, testAsset.TestRoot);
buildCommand
.Execute()
.Should().Pass();
using (var depsJsonFileStream = File.OpenRead(Path.Combine(buildCommand.GetOutputDirectory("net46").FullName, "Library.deps.json")))
{
var dependencyContext = new DependencyContextJsonReader().Read(depsJsonFileStream);
dependencyContext.CompileLibraries.Should().NotBeEmpty();
}
}
>>>>>>>
[Fact]
public void It_can_preserve_compilation_context_and_reference_netstandard_library()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return;
}
var testAsset = _testAssetsManager
.CopyTestAsset("DesktopReferencingNetStandardLibrary")
.WithSource()
.Restore();
var buildCommand = new BuildCommand(MSBuildTest.Stage0MSBuild, testAsset.TestRoot);
buildCommand
.Execute()
.Should().Pass();
using (var depsJsonFileStream = File.OpenRead(Path.Combine(buildCommand.GetOutputDirectory("net46").FullName, "Library.deps.json")))
{
var dependencyContext = new DependencyContextJsonReader().Read(depsJsonFileStream);
dependencyContext.CompileLibraries.Should().NotBeEmpty();
}
}
[Fact]
public void It_resolves_assembly_conflicts_with_a_NETFramework_library()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return;
}
TestProject project = new TestProject()
{
Name = "NETFrameworkLibrary",
TargetFrameworks = "net462",
IsSdkProject = true
};
var testAsset = _testAssetsManager.CreateTestProject(project)
.WithProjectChanges(p =>
{
var ns = p.Root.Name.Namespace;
// Note: if you want to see how this fails when conflicts are not resolved, set the DisableHandlePackageFileConflicts property to true, like this:
// p.Root.Element(ns + "PropertyGroup").Add(new XElement(ns + "DisableHandlePackageFileConflicts", "True"));
var itemGroup = new XElement(ns + "ItemGroup");
p.Root.Add(itemGroup);
itemGroup.Add(new XElement(ns + "PackageReference",
new XAttribute("Include", "NETStandard.Library"),
new XAttribute("Version", "$(BundledNETStandardPackageVersion)")));
foreach (var dependency in TestAsset.NetStandard1_3Dependencies)
{
itemGroup.Add(new XElement(ns + "PackageReference",
new XAttribute("Include", dependency.Item1),
new XAttribute("Version", dependency.Item2)));
}
})
.Restore(project.Name);
string projectFolder = Path.Combine(testAsset.Path, project.Name);
var buildCommand = new BuildCommand(MSBuildTest.Stage0MSBuild, projectFolder);
buildCommand
.CaptureStdOut()
.Execute()
.Should()
.Pass()
.And
.NotHaveStdOutContaining("warning")
.And
.NotHaveStdOutContaining("MSB3243");
} |
<<<<<<<
var commandPath = Env.GetCommandPath(_command, ".exe", ".cmd", "") ??
Env.GetCommandPathFromRootPath(AppContext.BaseDirectory, _command, ".exe", ".cmd", "");
=======
>>>>>>>
var commandPath = Env.GetCommandPath(_command, ".exe", ".cmd", "") ??
Env.GetCommandPathFromRootPath(AppContext.BaseDirectory, _command, ".exe", ".cmd", ""); |
<<<<<<<
_createToolPackageStoreAndInstaller = (_) => (_toolPackageStore, _toolPackageStoreQuery, CreateToolPackageInstaller());
=======
_createToolPackageStoreAndInstaller =
(location, forwardArguments) => (_toolPackageStore, CreateToolPackageInstaller());
>>>>>>>
_createToolPackageStoreAndInstaller = (location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, CreateToolPackageInstaller());
<<<<<<<
(_) => (_toolPackageStore, _toolPackageStoreQuery, toolToolPackageInstaller),
=======
(location, forwardArguments) => (_toolPackageStore, toolToolPackageInstaller),
>>>>>>>
(location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, toolToolPackageInstaller),
<<<<<<<
(_) => (_toolPackageStore, _toolPackageStoreQuery, toolPackageInstaller),
=======
(location, forwardArguments) => (_toolPackageStore, toolPackageInstaller),
>>>>>>>
(location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, toolPackageInstaller),
<<<<<<<
(_) => (_toolPackageStore, _toolPackageStoreQuery, toolPackageInstaller),
=======
(location, forwardArguments) => (_toolPackageStore, toolPackageInstaller),
>>>>>>>
(location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, toolPackageInstaller),
<<<<<<<
(_) => (_toolPackageStore, _toolPackageStoreQuery, toolPackageInstaller),
=======
(location, forwardArguments) => (_toolPackageStore, toolPackageInstaller),
>>>>>>>
(location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, toolPackageInstaller),
<<<<<<<
(_) => (_toolPackageStore, _toolPackageStoreQuery, new ToolPackageInstallerMock(
=======
(location, forwardArguments) => (_toolPackageStore, new ToolPackageInstallerMock(
>>>>>>>
(location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, new ToolPackageInstallerMock( |
<<<<<<<
LocalizableStrings.AppFullName,
Accept.ZeroOrMoreArguments,
=======
".NET Publisher",
Accept.ZeroOrMoreArguments(),
>>>>>>>
LocalizableStrings.AppFullName,
Accept.ZeroOrMoreArguments(),
<<<<<<<
CommonOptions.FrameworkOption(),
CommonOptions.RuntimeOption(),
Create.Option(
"-o|--output",
LocalizableStrings.OutputOptionDescription,
Accept.ExactlyOneArgument
.With(name: LocalizableStrings.OutputOption)
.ForwardAs(o => $"/p:PublishDir={o.Arguments.Single()}")),
CommonOptions.ConfigurationOption(),
CommonOptions.VersionSuffixOption(),
Create.Option(
"--filter",
LocalizableStrings.FilterProjOptionDescription,
Accept.ExactlyOneArgument
.With(name: LocalizableStrings.FilterProjOption)
.ForwardAs(o => $"/p:FilterProjectFiles={o.Arguments.Single()}")),
=======
Create.Option("-f|--framework",
"Target framework to publish for. The target framework has to be specified in the project file.",
Accept.ExactlyOneArgument()
.WithSuggestionsFrom(_ => Suggest.TargetFrameworksFromProjectFile())
.With(name: "FRAMEWORK")
.ForwardAs(o => $"/p:TargetFramework={o.Arguments.Single()}")),
Create.Option("-r|--runtime",
"Publish the project for a given runtime. This is used when creating self-contained deployment. Default is to publish a framework-dependent app.",
Accept.ExactlyOneArgument()
.WithSuggestionsFrom(_ => Suggest.RunTimesFromProjectFile())
.With(name: "RUNTIME_IDENTIFIER")
.ForwardAs(o => $"/p:RuntimeIdentifier={o.Arguments.Single()}")),
Create.Option("-o|--output",
"Output directory in which to place the published artifacts.",
Accept.ExactlyOneArgument()
.With(name: "OUTPUT_DIR")
.ForwardAs(o => $"/p:PublishDir={o.Arguments.Single()}")),
Create.Option("-c|--configuration", "Configuration to use for building the project. Default for most projects is \"Debug\".",
Accept.ExactlyOneArgument()
.With(name: "CONFIGURATION")
.WithSuggestionsFrom("DEBUG", "RELEASE")
.ForwardAs(o => $"/p:Configuration={o.Arguments.Single()}")),
Create.Option("--version-suffix", "Defines the value for the $(VersionSuffix) property in the project.",
Accept.ExactlyOneArgument()
.With(name: "VERSION_SUFFIX")
.ForwardAs(o => $"/p:VersionSuffix={o.Arguments.Single()}")),
Create.Option("--filter", "The XML file that contains the list of packages to be excluded from publish step.",
Accept.ExactlyOneArgument()
.With(name: "PROFILE_XML")
.ForwardAs(o => $"/p:FilterProjectFiles={o.Arguments.Single()}")),
>>>>>>>
CommonOptions.FrameworkOption(),
CommonOptions.RuntimeOption(),
Create.Option(
"-o|--output",
LocalizableStrings.OutputOptionDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.OutputOption)
.ForwardAs(o => $"/p:PublishDir={o.Arguments.Single()}")),
CommonOptions.ConfigurationOption(),
"--filter",
LocalizableStrings.FilterProjOptionDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.FilterProjOption)
.ForwardAs(o => $"/p:FilterProjectFiles={o.Arguments.Single()}")), |
<<<<<<<
using Parser = Microsoft.DotNet.Cli.Parser;
=======
using System.Linq;
>>>>>>>
using System.Linq;
using Parser = Microsoft.DotNet.Cli.Parser;
<<<<<<<
var parser = Parser.Instance;
=======
CommandOption projectArguments = app.Option(
$"-e|--entries <{LocalizableStrings.ProjectEntries}>", LocalizableStrings.ProjectEntryDescription,
CommandOptionType.MultipleValue);
>>>>>>>
var parser = Parser.Instance;
<<<<<<<
msbuildArgs.AddRange(appliedBuildOptions.Arguments);
=======
List<string> msbuildArgs = null;
app.OnExecute(() =>
{
msbuildArgs = new List<string>();
if (!projectArguments.HasValue())
{
throw new InvalidOperationException(LocalizableStrings.SpecifyEntries).DisplayAsError();
}
msbuildArgs.Add("/t:ComposeCache");
msbuildArgs.Add(projectArguments.Values[0]);
var additionalProjectsargs = projectArguments.Values.Skip(1);
if (additionalProjectsargs.Count() > 0)
{
msbuildArgs.Add($"/p:AdditionalProjects={string.Join("%3B", additionalProjectsargs)}");
}
if (!string.IsNullOrEmpty(frameworkOption.Value()))
{
msbuildArgs.Add($"/p:TargetFramework={frameworkOption.Value()}");
}
if (!string.IsNullOrEmpty(runtimeOption.Value()))
{
msbuildArgs.Add($"/p:RuntimeIdentifier={runtimeOption.Value()}");
}
if (!string.IsNullOrEmpty(outputOption.Value()))
{
var outputPath = Path.GetFullPath(outputOption.Value());
msbuildArgs.Add($"/p:ComposeDir={outputPath}");
}
if (!string.IsNullOrEmpty(fxOption.Value()))
{
msbuildArgs.Add($"/p:FX_Version={fxOption.Value()}");
}
if (!string.IsNullOrEmpty(workingDir.Value()))
{
msbuildArgs.Add($"/p:ComposeWorkingDir={workingDir.Value()}");
}
if (skipOptimizationOption.HasValue())
{
msbuildArgs.Add($"/p:SkipOptimization=true");
}
if (preserveWorkingDir.HasValue())
{
msbuildArgs.Add($"/p:PreserveComposeWorkingDir=true");
}
if (!string.IsNullOrEmpty(verbosityOption.Value()))
{
msbuildArgs.Add($"/verbosity:{verbosityOption.Value()}");
}
msbuildArgs.AddRange(app.RemainingArguments);
return 0;
});
int exitCode = app.Execute(args);
if (msbuildArgs == null)
{
throw new CommandCreationException(exitCode);
}
>>>>>>>
msbuildArgs.AddRange(appliedBuildOptions.Arguments); |
<<<<<<<
_testRoot = helloWorldAsset.TestRoot;
var packCommand = new PackCommand(Log, helloWorldAsset.TestRoot);
packCommand.Execute();
_packageId = Path.GetFileNameWithoutExtension(packCommand.ProjectFile);
return packCommand.GetNuGetPackage(packageVersion: _packageVersion);
=======
>>>>>>>
<<<<<<<
[WindowsOnlyTheory]
[InlineData(true)]
[InlineData(false)]
public void When_version_and_packageVersion_is_different_It_produces_valid_shims2(bool multiTarget)
{
if (!Environment.Is64BitOperatingSystem)
{
// only sample test on win-x64 since shims are RID specific
return;
}
_packageVersion = "1000.0.0";
var nugetPackage = SetupNuGetPackage(multiTarget,
additionalProperty: new Dictionary<string, string>()
{
["version"] = "1000",
});
AssertShimIsValid(nugetPackage);
}
private void AssertShimIsValid(string nugetPackage)
=======
private void AssertValidShim(string testRoot, string nugetPackage)
>>>>>>>
[WindowsOnlyTheory]
[InlineData(true)]
[InlineData(false)]
public void When_version_and_packageVersion_is_different_It_produces_valid_shims2(bool multiTarget)
{
if (!Environment.Is64BitOperatingSystem)
{
// only sample test on win-x64 since shims are RID specific
return;
}
_packageVersion = "1000.0.0";
var nugetPackage = SetupNuGetPackage(multiTarget,
additionalProperty: new Dictionary<string, string>()
{
["version"] = "1000",
});
AssertShimIsValid(nugetPackage);
}
private void AssertShimIsValid(string nugetPackage) |
<<<<<<<
private Uri stubbedLocation;
private String stubbedTitle;
=======
>>>>>>> |
<<<<<<<
services.AddScoped<IMenuAdminPresenter, MenuAdminPresenter>();
services.AddScoped<IMenuAdminManager, MenuAdminManager>();
=======
services.AddScoped<ImageCleanerAdminService>();
>>>>>>>
services.AddScoped<IMenuAdminPresenter, MenuAdminPresenter>();
services.AddScoped<IMenuAdminManager, MenuAdminManager>();
services.AddScoped<ImageCleanerAdminService>(); |
<<<<<<<
IPagedList<PostViewModel> posts =
await blogPresenter.GetPostsFromMultiCategoriesAsync(categoriesIds, page, blogOptions.PostsPageSize);
=======
async Task<IPagedList<PostViewModel>> LoadDataAsync()
{
return await blogPresenter.GetCategoriesPostsAsync(categoriesIds, page, blogOptions.PostsPageSize);
}
>>>>>>>
async Task<IPagedList<PostViewModel>> LoadDataAsync()
{
return await blogPresenter.GetPostsFromMultiCategoriesAsync(categoriesIds, page, blogOptions.PostsPageSize);
} |
<<<<<<<
using SunEngine.Commons.Cache.CachePolicy;
=======
using SunEngine.Commons.Cache.Services;
>>>>>>>
using SunEngine.Commons.Cache.CachePolicy;
using SunEngine.Commons.Cache.Services; |
<<<<<<<
// Site version 1.0.0-beta.11
=======
/// <summary>
/// Initial migration for FluentMigrator
/// </summary>
>>>>>>>
// Site version 1.0.0-beta.11
/// <summary>
/// Initial migration for FluentMigrator
/// </summary>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
=======
using Magicodes.ExporterAndImporter.Core.Extension;
using Magicodes.ExporterAndImporter.Core.Models;
using Magicodes.ExporterAndImporter.Csv;
using Magicodes.ExporterAndImporter.Tests.Models.Export.ExportByTemplate_Test1;
using OfficeOpenXml.Drawing;
>>>>>>>
using Magicodes.ExporterAndImporter.Csv; |
<<<<<<<
get { return watinInstance.Uri; }
}
=======
get { return Watin.Uri; }
}
public bool ConsiderInvisibleElements
{
get { return elementFinder.ConsiderInvisibleElements; }
set { elementFinder.ConsiderInvisibleElements = value; }
}
public bool Disposed { get; private set; }
>>>>>>>
get { return Watin.Uri; }
}
public bool Disposed { get; private set; } |
<<<<<<<
public GameObject player;
=======
private GameObject player;
>>>>>>>
private GameObject player;
<<<<<<<
=======
player = GameObject.FindGameObjectWithTag("Player");
>>>>>>>
player = GameObject.FindGameObjectWithTag("Player"); |
<<<<<<<
snapshotList = new List<Snapshot> ();
File.CreateText (fileName);
=======
>>>>>>>
File.CreateText (fileName);
<<<<<<<
if (recording)
RecordSnapshot();
if(recordKeys)
RecordKeys ();
=======
if (recording) {
frameDuration += Time.deltaTime;
if (frameDuration > recordingFrameDurationMin) {
Vector3 position = playerRigidbody.position;
Quaternion rotation = playerRigidbody.rotation;
bool inJump = !rigidbodyFPSController.onGround;
float duration = frameDuration;
//Add the snapshot to the list
Snapshot s = new Snapshot (position, rotation, inJump, duration);
snapshotList.Add (s);
//reset frame duration
frameDuration = 0;
}
}
>>>>>>>
if (recording)
RecordSnapshot();
if(recordKeys)
RecordKeys (); |
<<<<<<<
//using UnityEditor;
=======
#if UNITY_EDITOR
using UnityEditor;
#endif
>>>>>>>
using UnityEditor;
#if UNITY_EDITOR
using UnityEditor;
#endif
<<<<<<<
/* [CustomEditor(typeof(BombController))]
=======
#if UNITY_EDITOR
[CustomEditor(typeof(BombController))]
>>>>>>>
#if UNITY_EDITOR
[CustomEditor(typeof(BombController))]
<<<<<<<
} */
=======
}
#endif
>>>>>>>
}
#endif |
<<<<<<<
=======
private FakeDriver driver;
private SpyRobustWrapper spyRobustWrapper;
private Session session;
[SetUp]
public void SetUp()
{
driver = new FakeDriver();
spyRobustWrapper = new SpyRobustWrapper();
session = new Session(driver, spyRobustWrapper);
}
[TearDown]
public void TearDown()
{
Configuration.WaitBeforeClick = TimeSpan.Zero;
}
>>>>>>>
[TearDown]
public void TearDown()
{
Configuration.WaitBeforeClick = TimeSpan.Zero;
} |
<<<<<<<
using ElasticLinq.Response.Model;
using System.Collections.Generic;
=======
using System;
>>>>>>>
using ElasticLinq.Response.Model;
using System;
using System.Collections.Generic;
<<<<<<<
[Fact]
public void SimpleSelectProducesValidMaterializer()
{
var translation = ElasticQueryTranslator.Translate(Mapping, Robots.Expression);
var response = new ElasticResponse { hits = new Hits { hits = new List<Hit>() } };
Assert.NotNull(translation.Materializer);
var materialized = translation.Materializer.Materialize(response);
Assert.IsAssignableFrom<IEnumerable<Robot>>(materialized);
Assert.Empty((IEnumerable<Robot>)materialized);
}
}
=======
[Theory]
[InlineData(42, 2112)]
[InlineData(2112, 42)]
public void TakeTranslatesToSmallestSize(int size1, int size2)
{
var expectedSize = Math.Min(size1, size2);
var taken = Robots.Take(size1).Take(size2);
var translation = ElasticQueryTranslator.Translate(Mapping, taken.Expression);
Assert.Equal(expectedSize, translation.SearchRequest.Size);
}
}
>>>>>>>
[Fact]
public void SimpleSelectProducesValidMaterializer()
{
var translation = ElasticQueryTranslator.Translate(Mapping, Robots.Expression);
var response = new ElasticResponse { hits = new Hits { hits = new List<Hit>() } };
Assert.NotNull(translation.Materializer);
var materialized = translation.Materializer.Materialize(response);
Assert.IsAssignableFrom<IEnumerable<Robot>>(materialized);
Assert.Empty((IEnumerable<Robot>)materialized);
}
[Theory]
[InlineData(42, 2112)]
[InlineData(2112, 42)]
public void TakeTranslatesToSmallestSize(int size1, int size2)
{
var expectedSize = Math.Min(size1, size2);
var taken = Robots.Take(size1).Take(size2);
var translation = ElasticQueryTranslator.Translate(Mapping, taken.Expression);
Assert.Equal(expectedSize, translation.SearchRequest.Size);
}
} |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"RequestHeader")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool absolute_timeoutSpecified
{
get { return _absolute_timeout != null; }
set { if (value == (_absolute_timeout== null)) _absolute_timeout = value ? this.absolute_timeout : (uint?)null; }
}
private bool ShouldSerializeabsolute_timeout() { return absolute_timeoutSpecified; }
private void Resetabsolute_timeout() { absolute_timeoutSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"RequestHeader")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool absolute_timeoutSpecified
{
get { return _absolute_timeout != null; }
set { if (value == (_absolute_timeout== null)) _absolute_timeout = value ? this.absolute_timeout : (uint?)null; }
}
private bool ShouldSerializeabsolute_timeout() { return absolute_timeoutSpecified; }
private void Resetabsolute_timeout() { absolute_timeoutSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"RequestHeader")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"ResponseHeader")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool bodySpecified
{
get { return _body != null; }
set { if (value == (_body== null)) _body = value ? this.body : (byte[])null; }
}
private bool ShouldSerializebody() { return bodySpecified; }
private void Resetbody() { bodySpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"ResponseHeader")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool bodySpecified
{
get { return _body != null; }
set { if (value == (_body== null)) _body = value ? this.body : (byte[])null; }
}
private bool ShouldSerializebody() { return bodySpecified; }
private void Resetbody() { bodySpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"ResponseHeader")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"MessageRange")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool gcsql_versionSpecified
{
get { return _gcsql_version != null; }
set { if (value == (_gcsql_version== null)) _gcsql_version = value ? this.gcsql_version : (CMsgGCMsgSetOptions.GCSQLVersion?)null; }
}
private bool ShouldSerializegcsql_version() { return gcsql_versionSpecified; }
private void Resetgcsql_version() { gcsql_versionSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"MessageRange")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool gcsql_versionSpecified
{
get { return _gcsql_version != null; }
set { if (value == (_gcsql_version== null)) _gcsql_version = value ? this.gcsql_version : (CMsgGCMsgSetOptions.GCSQLVersion?)null; }
}
private bool ShouldSerializegcsql_version() { return gcsql_versionSpecified; }
private void Resetgcsql_version() { gcsql_versionSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"MessageRange")] |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Player")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool building_stateSpecified
{
get { return _building_state != null; }
set { if (value == (_building_state== null)) _building_state = value ? this.building_state : (uint?)null; }
}
private bool ShouldSerializebuilding_state() { return building_stateSpecified; }
private void Resetbuilding_state() { building_stateSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Player")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool building_stateSpecified
{
get { return _building_state != null; }
set { if (value == (_building_state== null)) _building_state = value ? this.building_state : (uint?)null; }
}
private bool ShouldSerializebuilding_state() { return building_stateSpecified; }
private void Resetbuilding_state() { building_stateSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Player")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"CTeam")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool pre_game_durationSpecified
{
get { return _pre_game_duration != null; }
set { if (value == (_pre_game_duration== null)) _pre_game_duration = value ? this.pre_game_duration : (uint?)null; }
}
private bool ShouldSerializepre_game_duration() { return pre_game_durationSpecified; }
private void Resetpre_game_duration() { pre_game_durationSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"CTeam")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool pre_game_durationSpecified
{
get { return _pre_game_duration != null; }
set { if (value == (_pre_game_duration== null)) _pre_game_duration = value ? this.pre_game_duration : (uint?)null; }
}
private bool ShouldSerializepre_game_duration() { return pre_game_durationSpecified; }
private void Resetpre_game_duration() { pre_game_durationSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"CTeam")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Team")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool match_idSpecified
{
get { return _match_id != null; }
set { if (value == (_match_id== null)) _match_id = value ? this.match_id : (ulong?)null; }
}
private bool ShouldSerializematch_id() { return match_idSpecified; }
private void Resetmatch_id() { match_idSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Team")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool match_idSpecified
{
get { return _match_id != null; }
set { if (value == (_match_id== null)) _match_id = value ? this.match_id : (ulong?)null; }
}
private bool ShouldSerializematch_id() { return match_idSpecified; }
private void Resetmatch_id() { match_idSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Team")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"AwardPoints")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool audit_actionSpecified
{
get { return _audit_action != null; }
set { if (value == (_audit_action== null)) _audit_action = value ? this.audit_action : (uint?)null; }
}
private bool ShouldSerializeaudit_action() { return audit_actionSpecified; }
private void Resetaudit_action() { audit_actionSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"AwardPoints")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool audit_actionSpecified
{
get { return _audit_action != null; }
set { if (value == (_audit_action== null)) _audit_action = value ? this.audit_action : (uint?)null; }
}
private bool ShouldSerializeaudit_action() { return audit_actionSpecified; }
private void Resetaudit_action() { audit_actionSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"AwardPoints")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"AdditionalDrops")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool match_idSpecified
{
get { return _match_id != null; }
set { if (value == (_match_id== null)) _match_id = value ? this.match_id : (ulong?)null; }
}
private bool ShouldSerializematch_id() { return match_idSpecified; }
private void Resetmatch_id() { match_idSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"AdditionalDrops")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool match_idSpecified
{
get { return _match_id != null; }
set { if (value == (_match_id== null)) _match_id = value ? this.match_id : (ulong?)null; }
}
private bool ShouldSerializematch_id() { return match_idSpecified; }
private void Resetmatch_id() { match_idSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"AdditionalDrops")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"User")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool match_idSpecified
{
get { return _match_id != null; }
set { if (value == (_match_id== null)) _match_id = value ? this.match_id : (ulong?)null; }
}
private bool ShouldSerializematch_id() { return match_idSpecified; }
private void Resetmatch_id() { match_idSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"User")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool match_idSpecified
{
get { return _match_id != null; }
set { if (value == (_match_id== null)) _match_id = value ? this.match_id : (ulong?)null; }
}
private bool ShouldSerializematch_id() { return match_idSpecified; }
private void Resetmatch_id() { match_idSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"User")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"Challenge")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool hero_idSpecified
{
get { return _hero_id != null; }
set { if (value == (_hero_id== null)) _hero_id = value ? this.hero_id : (uint?)null; }
}
private bool ShouldSerializehero_id() { return hero_idSpecified; }
private void Resethero_id() { hero_idSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"Challenge")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool hero_idSpecified
{
get { return _hero_id != null; }
set { if (value == (_hero_id== null)) _hero_id = value ? this.hero_id : (uint?)null; }
}
private bool ShouldSerializehero_id() { return hero_idSpecified; }
private void Resethero_id() { hero_idSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"Challenge")]
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"HoldRequest")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool hold_untilSpecified
{
get { return _hold_until != null; }
set { if (value == (_hold_until== null)) _hold_until = value ? this.hold_until : (uint?)null; }
}
private bool ShouldSerializehold_until() { return hold_untilSpecified; }
private void Resethold_until() { hold_untilSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"HoldRequest")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool hold_untilSpecified
{
get { return _hold_until != null; }
set { if (value == (_hold_until== null)) _hold_until = value ? this.hold_until : (uint?)null; }
}
private bool ShouldSerializehold_until() { return hold_untilSpecified; }
private void Resethold_until() { hold_untilSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"HoldRequest")] |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
[global::ProtoBuf.ProtoContract(Name=@"RequestedSession")]
=======
[global::System.Xml.Serialization.XmlIgnore]
[global::System.ComponentModel.Browsable(false)]
public bool languageSpecified
{
get { return _language != null; }
set { if (value == (_language== null)) _language = value ? this.language : (string)null; }
}
private bool ShouldSerializelanguage() { return languageSpecified; }
private void Resetlanguage() { languageSpecified = false; }
[global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"RequestedSession")]
>>>>>>>
[global::System.Xml.Serialization.XmlIgnore]
public bool languageSpecified
{
get { return _language != null; }
set { if (value == (_language== null)) _language = value ? this.language : (string)null; }
}
private bool ShouldSerializelanguage() { return languageSpecified; }
private void Resetlanguage() { languageSpecified = false; }
[global::ProtoBuf.ProtoContract(Name=@"RequestedSession")] |