Skip to content

Dmitrij ovsjanik#31

Merged
jskonst merged 28 commits into
ISUCT:Dmitrij_Ovsjanikfrom
ovsjanik:Dmitrij_Ovsjanik
Dec 17, 2019
Merged

Dmitrij ovsjanik#31
jskonst merged 28 commits into
ISUCT:Dmitrij_Ovsjanikfrom
ovsjanik:Dmitrij_Ovsjanik

Conversation

@ovsjanik
Copy link
Copy Markdown

Заработало

Comment thread .github/workflows/dotnetcore.yml
Comment thread CourseApp/City.cs Outdated
}
}

public int Pop {get; set;}
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

duplicate 🔪

Comment thread README.md Outdated
@@ -1 +1,6 @@
# Tprogramming_147_2019 No newline at end of file
# Tprogramming_147_2019
<<<<<<< HEAD
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Resolve conflicts

Comment thread CourseApp.Tests/DemoTest.cs
Comment thread CourseApp.Tests/FunctionsTest.cs Outdated

[Fact]
public void TestNormalB()
{ //И это?
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

А то, обязательно

Comment thread CourseApp.Tests/FunctionsTest.cs Outdated
public class FunctionsTest
{
[Theory]
[InlineData(0, 0, 0, double.NaN)]
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

И почему 2 одинаковых файла?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Они не одинаковые) Я второй создал

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Разницы между CourseApp.Tests/FunctionsTest.cs и CourseApp.Tests/DemoTest.cs практически нет, оставьте пока только 1 файл теста, второй - пусть будет для Города

Comment thread .github/workflows/blank.yml Outdated
@@ -0,0 +1,17 @@
name: CI
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Этот файл не нужен, я так полагаю

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Файл все еще тут :(

Comment thread CourseApp.Tests/FunctionsTest.cs Outdated
public class FunctionsTest
{
[Theory]
[InlineData(0, 0, 0, double.NaN)]
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Разницы между CourseApp.Tests/FunctionsTest.cs и CourseApp.Tests/DemoTest.cs практически нет, оставьте пока только 1 файл теста, второй - пусть будет для Города

Comment thread CourseApp/City.cs
Comment thread CourseApp/Functions.cs Outdated
return c;
}

public static double[] TaskA (
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Используйте List

@jskonst
Copy link
Copy Markdown
Collaborator

jskonst commented Dec 2, 2019

@Rankaros - Actions говорят что что-то не собирается проект. 🔧 (починить надо все комментарии)

@jskonst
Copy link
Copy Markdown
Collaborator

jskonst commented Dec 12, 2019

@Rankaros Код не собирается!

@jskonst
Copy link
Copy Markdown
Collaborator

jskonst commented Dec 12, 2019

🔧 Все пойнты

Comment thread .github/workflows/blank.yml Outdated
@@ -0,0 +1,17 @@
name: CI
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Файл все еще тут :(

Comment thread CourseApp.Tests/DemoTest.cs
@jskonst jskonst merged commit a01a09c into ISUCT:Dmitrij_Ovsjanik Dec 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants