Skip to content

Commit 2bffd2a

Browse files
authored
рефакторинг структуры проекта (#68)
* #31 - non code elements * #31 - samples * #31 - structure refac * #31 - one more file
1 parent 539bf49 commit 2bffd2a

File tree

187 files changed

+10545
-9
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+10545
-9
lines changed

.github/workflows/develop.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: github.event_name == 'pull_request_target'
4444
uses: 5monkeys/cobertura-action@master
4545
with:
46-
path: ./HydraScript.Tests/coverage.cobertura.xml
46+
path: ./tests/HydraScript.Tests/coverage.cobertura.xml
4747
repo_token: ${{ secrets.GITHUB_TOKEN }}
4848
minimum_coverage: 20
4949
fail_below_threshold: true
@@ -56,7 +56,7 @@ jobs:
5656
if: github.ref == 'refs/heads/master' && github.event_name == 'push'
5757
uses: irongut/CodeCoverageSummary@v1.3.0
5858
with:
59-
filename: ./HydraScript.Tests/coverage.cobertura.xml
59+
filename: ./tests/HydraScript.Tests/coverage.cobertura.xml
6060
badge: true
6161
fail_below_min: false
6262
format: markdown
@@ -66,7 +66,7 @@ jobs:
6666
- name: ReportGenerator
6767
uses: danielpalme/ReportGenerator-GitHub-Action@5.2.1
6868
with:
69-
reports: './HydraScript.Tests/coverage.cobertura.xml'
69+
reports: './tests/HydraScript.Tests/coverage.cobertura.xml'
7070
targetdir: './coverage-report'
7171
- name: Upload coverage report artifact
7272
if: github.event_name == 'push'

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: Publish
5050
run: |
5151
mkdir output
52-
dotnet publish ./HydraScript/HydraScript.csproj -c Release -r ${{ matrix.config.rid }} -p:PublishSingleFile=true -p:DebugType=embedded --self-contained false -o ./output
52+
dotnet publish ./src/HydraScript/HydraScript.csproj -c Release -r ${{ matrix.config.rid }} -p:PublishSingleFile=true -p:DebugType=embedded --self-contained false -o ./output
5353
- name: Upload release assets
5454
uses: shogo82148/actions-upload-release-asset@v1
5555
with:

ExtendedJavaScriptSubset.sln

+75-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,74 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript.Lib", "HydraScript.Lib\HydraScript.Lib.csproj", "{83524079-4A56-4AF0-9011-F7CA871536E9}"
3+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript.Lib", "src\HydraScript.Lib\HydraScript.Lib.csproj", "{83524079-4A56-4AF0-9011-F7CA871536E9}"
44
EndProject
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript", "HydraScript\HydraScript.csproj", "{5DA79C0C-2B98-4E64-81EA-92AFFC5204D3}"
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript", "src\HydraScript\HydraScript.csproj", "{5DA79C0C-2B98-4E64-81EA-92AFFC5204D3}"
66
EndProject
7-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript.Tests", "HydraScript.Tests\HydraScript.Tests.csproj", "{F0DD56CB-C68A-4CDC-AA54-0A07342FE08B}"
7+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript.Tests", "tests\HydraScript.Tests\HydraScript.Tests.csproj", "{F0DD56CB-C68A-4CDC-AA54-0A07342FE08B}"
8+
EndProject
9+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{86CF2A2F-4DFE-48E7-B062-EF824730916A}"
10+
ProjectSection(SolutionItems) = preProject
11+
.gitignore = .gitignore
12+
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
13+
CONTRIBUTING.md = CONTRIBUTING.md
14+
contributor-licence-agreement.md = contributor-licence-agreement.md
15+
LICENSE = LICENSE
16+
Readme.md = Readme.md
17+
SECURITY.md = SECURITY.md
18+
EndProjectSection
19+
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GithubFolder", "GithubFolder", "{54CBE5A7-3C3E-44ED-B877-7B08A818083B}"
21+
ProjectSection(SolutionItems) = preProject
22+
.github\pull_request_template.md = .github\pull_request_template.md
23+
EndProjectSection
24+
EndProject
25+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{C7773DC6-9052-4F69-B947-CBFD5D663E80}"
26+
ProjectSection(SolutionItems) = preProject
27+
.github\workflows\cla.yml = .github\workflows\cla.yml
28+
.github\workflows\develop.yml = .github\workflows\develop.yml
29+
.github\workflows\release.yml = .github\workflows\release.yml
30+
EndProjectSection
31+
EndProject
32+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IssueTemplate", "IssueTemplate", "{0E31199C-4893-4920-A356-D1FF7850BFAD}"
33+
ProjectSection(SolutionItems) = preProject
34+
.github\ISSUE_TEMPLATE\bug_report.md = .github\ISSUE_TEMPLATE\bug_report.md
35+
.github\ISSUE_TEMPLATE\feature_request.md = .github\ISSUE_TEMPLATE\feature_request.md
36+
EndProjectSection
37+
EndProject
38+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{04ABBF20-AD95-4366-8EDE-57095A37735E}"
39+
ProjectSection(SolutionItems) = preProject
40+
samples\abs.js = samples\abs.js
41+
samples\arraddremove.js = samples\arraddremove.js
42+
samples\arreditread.js = samples\arreditread.js
43+
samples\ceil.js = samples\ceil.js
44+
samples\defaultarray.js = samples\defaultarray.js
45+
samples\equals.js = samples\equals.js
46+
samples\exprtest.js = samples\exprtest.js
47+
samples\fastpow.js = samples\fastpow.js
48+
samples\forwardref.js = samples\forwardref.js
49+
samples\gcd.js = samples\gcd.js
50+
samples\lcm.js = samples\lcm.js
51+
samples\linkedlist.js = samples\linkedlist.js
52+
samples\objeditread.js = samples\objeditread.js
53+
samples\posneg.js = samples\posneg.js
54+
samples\prime.js = samples\prime.js
55+
samples\primefactor.js = samples\primefactor.js
56+
samples\quicksort.js = samples\quicksort.js
57+
samples\range.js = samples\range.js
58+
samples\recur.js = samples\recur.js
59+
samples\searchinll.js = samples\searchinll.js
60+
samples\settable.js = samples\settable.js
61+
samples\squareroot.js = samples\squareroot.js
62+
samples\summator.js = samples\summator.js
63+
samples\tern.js = samples\tern.js
64+
samples\this.js = samples\this.js
65+
samples\typeresolving.js = samples\typeresolving.js
66+
samples\vec2d.js = samples\vec2d.js
67+
EndProjectSection
68+
EndProject
69+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Src", "Src", "{FB8F6EE1-1942-46D6-954E-9A1647BBDF10}"
70+
EndProject
71+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3F131901-A9EC-451A-B7E9-726887CFE5FB}"
872
EndProject
973
Global
1074
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,4 +89,12 @@ Global
2589
{F0DD56CB-C68A-4CDC-AA54-0A07342FE08B}.Release|Any CPU.ActiveCfg = Release|Any CPU
2690
{F0DD56CB-C68A-4CDC-AA54-0A07342FE08B}.Release|Any CPU.Build.0 = Release|Any CPU
2791
EndGlobalSection
92+
GlobalSection(NestedProjects) = preSolution
93+
{54CBE5A7-3C3E-44ED-B877-7B08A818083B} = {86CF2A2F-4DFE-48E7-B062-EF824730916A}
94+
{C7773DC6-9052-4F69-B947-CBFD5D663E80} = {54CBE5A7-3C3E-44ED-B877-7B08A818083B}
95+
{0E31199C-4893-4920-A356-D1FF7850BFAD} = {54CBE5A7-3C3E-44ED-B877-7B08A818083B}
96+
{5DA79C0C-2B98-4E64-81EA-92AFFC5204D3} = {FB8F6EE1-1942-46D6-954E-9A1647BBDF10}
97+
{83524079-4A56-4AF0-9011-F7CA871536E9} = {FB8F6EE1-1942-46D6-954E-9A1647BBDF10}
98+
{F0DD56CB-C68A-4CDC-AA54-0A07342FE08B} = {3F131901-A9EC-451A-B7E9-726887CFE5FB}
99+
EndGlobalSection
28100
EndGlobal
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

HydraScript.Tests/HydraScript.Tests.csproj renamed to tests/HydraScript.Tests/HydraScript.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<ProjectReference Include="..\HydraScript.Lib\HydraScript.Lib.csproj" />
37-
<ProjectReference Include="..\HydraScript\HydraScript.csproj" />
36+
<ProjectReference Include="..\..\src\HydraScript.Lib\HydraScript.Lib.csproj" />
37+
<ProjectReference Include="..\..\src\HydraScript\HydraScript.csproj" />
3838
</ItemGroup>
3939

4040
</Project>

0 commit comments

Comments
 (0)