Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

рефакторинг структуры проекта #68

Merged
merged 4 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
if: github.event_name == 'pull_request_target'
uses: 5monkeys/cobertura-action@master
with:
path: ./HydraScript.Tests/coverage.cobertura.xml
path: ./tests/HydraScript.Tests/coverage.cobertura.xml
repo_token: ${{ secrets.GITHUB_TOKEN }}
minimum_coverage: 20
fail_below_threshold: true
Expand All @@ -56,7 +56,7 @@ jobs:
if: github.ref == 'refs/heads/master' && github.event_name == 'push'
uses: irongut/[email protected]
with:
filename: ./HydraScript.Tests/coverage.cobertura.xml
filename: ./tests/HydraScript.Tests/coverage.cobertura.xml
badge: true
fail_below_min: false
format: markdown
Expand All @@ -66,7 +66,7 @@ jobs:
- name: ReportGenerator
uses: danielpalme/[email protected]
with:
reports: './HydraScript.Tests/coverage.cobertura.xml'
reports: './tests/HydraScript.Tests/coverage.cobertura.xml'
targetdir: './coverage-report'
- name: Upload coverage report artifact
if: github.event_name == 'push'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Publish
run: |
mkdir output
dotnet publish ./HydraScript/HydraScript.csproj -c Release -r ${{ matrix.config.rid }} -p:PublishSingleFile=true -p:DebugType=embedded --self-contained false -o ./output
dotnet publish ./src/HydraScript/HydraScript.csproj -c Release -r ${{ matrix.config.rid }} -p:PublishSingleFile=true -p:DebugType=embedded --self-contained false -o ./output
- name: Upload release assets
uses: shogo82148/actions-upload-release-asset@v1
with:
Expand Down
78 changes: 75 additions & 3 deletions ExtendedJavaScriptSubset.sln
Original file line number Diff line number Diff line change
@@ -1,10 +1,74 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript.Lib", "HydraScript.Lib\HydraScript.Lib.csproj", "{83524079-4A56-4AF0-9011-F7CA871536E9}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript.Lib", "src\HydraScript.Lib\HydraScript.Lib.csproj", "{83524079-4A56-4AF0-9011-F7CA871536E9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript", "HydraScript\HydraScript.csproj", "{5DA79C0C-2B98-4E64-81EA-92AFFC5204D3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript", "src\HydraScript\HydraScript.csproj", "{5DA79C0C-2B98-4E64-81EA-92AFFC5204D3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript.Tests", "HydraScript.Tests\HydraScript.Tests.csproj", "{F0DD56CB-C68A-4CDC-AA54-0A07342FE08B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript.Tests", "tests\HydraScript.Tests\HydraScript.Tests.csproj", "{F0DD56CB-C68A-4CDC-AA54-0A07342FE08B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{86CF2A2F-4DFE-48E7-B062-EF824730916A}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
CONTRIBUTING.md = CONTRIBUTING.md
contributor-licence-agreement.md = contributor-licence-agreement.md
LICENSE = LICENSE
Readme.md = Readme.md
SECURITY.md = SECURITY.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GithubFolder", "GithubFolder", "{54CBE5A7-3C3E-44ED-B877-7B08A818083B}"
ProjectSection(SolutionItems) = preProject
.github\pull_request_template.md = .github\pull_request_template.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{C7773DC6-9052-4F69-B947-CBFD5D663E80}"
ProjectSection(SolutionItems) = preProject
.github\workflows\cla.yml = .github\workflows\cla.yml
.github\workflows\develop.yml = .github\workflows\develop.yml
.github\workflows\release.yml = .github\workflows\release.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IssueTemplate", "IssueTemplate", "{0E31199C-4893-4920-A356-D1FF7850BFAD}"
ProjectSection(SolutionItems) = preProject
.github\ISSUE_TEMPLATE\bug_report.md = .github\ISSUE_TEMPLATE\bug_report.md
.github\ISSUE_TEMPLATE\feature_request.md = .github\ISSUE_TEMPLATE\feature_request.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{04ABBF20-AD95-4366-8EDE-57095A37735E}"
ProjectSection(SolutionItems) = preProject
samples\abs.js = samples\abs.js
samples\arraddremove.js = samples\arraddremove.js
samples\arreditread.js = samples\arreditread.js
samples\ceil.js = samples\ceil.js
samples\defaultarray.js = samples\defaultarray.js
samples\equals.js = samples\equals.js
samples\exprtest.js = samples\exprtest.js
samples\fastpow.js = samples\fastpow.js
samples\forwardref.js = samples\forwardref.js
samples\gcd.js = samples\gcd.js
samples\lcm.js = samples\lcm.js
samples\linkedlist.js = samples\linkedlist.js
samples\objeditread.js = samples\objeditread.js
samples\posneg.js = samples\posneg.js
samples\prime.js = samples\prime.js
samples\primefactor.js = samples\primefactor.js
samples\quicksort.js = samples\quicksort.js
samples\range.js = samples\range.js
samples\recur.js = samples\recur.js
samples\searchinll.js = samples\searchinll.js
samples\settable.js = samples\settable.js
samples\squareroot.js = samples\squareroot.js
samples\summator.js = samples\summator.js
samples\tern.js = samples\tern.js
samples\this.js = samples\this.js
samples\typeresolving.js = samples\typeresolving.js
samples\vec2d.js = samples\vec2d.js
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Src", "Src", "{FB8F6EE1-1942-46D6-954E-9A1647BBDF10}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3F131901-A9EC-451A-B7E9-726887CFE5FB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -25,4 +89,12 @@ Global
{F0DD56CB-C68A-4CDC-AA54-0A07342FE08B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F0DD56CB-C68A-4CDC-AA54-0A07342FE08B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{54CBE5A7-3C3E-44ED-B877-7B08A818083B} = {86CF2A2F-4DFE-48E7-B062-EF824730916A}
{C7773DC6-9052-4F69-B947-CBFD5D663E80} = {54CBE5A7-3C3E-44ED-B877-7B08A818083B}
{0E31199C-4893-4920-A356-D1FF7850BFAD} = {54CBE5A7-3C3E-44ED-B877-7B08A818083B}
{5DA79C0C-2B98-4E64-81EA-92AFFC5204D3} = {FB8F6EE1-1942-46D6-954E-9A1647BBDF10}
{83524079-4A56-4AF0-9011-F7CA871536E9} = {FB8F6EE1-1942-46D6-954E-9A1647BBDF10}
{F0DD56CB-C68A-4CDC-AA54-0A07342FE08B} = {3F131901-A9EC-451A-B7E9-726887CFE5FB}
EndGlobalSection
EndGlobal
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\HydraScript.Lib\HydraScript.Lib.csproj" />
<ProjectReference Include="..\HydraScript\HydraScript.csproj" />
<ProjectReference Include="..\..\src\HydraScript.Lib\HydraScript.Lib.csproj" />
<ProjectReference Include="..\..\src\HydraScript\HydraScript.csproj" />
</ItemGroup>

</Project>
Loading
Loading