Skip to content

Commit

Permalink
Reorganize project structure
Browse files Browse the repository at this point in the history
  • Loading branch information
0xced committed Mar 6, 2024
1 parent 3394ae7 commit 6fde161
Show file tree
Hide file tree
Showing 17 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
*.user
bin/
obj/
src/tasks/
src/Chisel/tasks/
.idea/
.vs/
12 changes: 9 additions & 3 deletions Chisel.sln
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,26 @@ ProjectSection(SolutionItems) = preProject
NuGet.config = NuGet.config
.config\dotnet-tools.json = .config\dotnet-tools.json
.github\workflows\continuous-integration.yml = .github\workflows\continuous-integration.yml
src\packages.lock.json = src\packages.lock.json
src\packages.lock.json = src\Chisel\packages.lock.json
.github\dependabot.yml = .github\dependabot.yml
MAINTENANCE.md = MAINTENANCE.md
CHANGELOG.md = CHANGELOG.md
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
LICENSE = LICENSE
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chisel", "src\Chisel.csproj", "{F4CAEC64-3B0C-4ACD-BF87-760A838A5D86}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chisel", "src\Chisel\Chisel.csproj", "{F4CAEC64-3B0C-4ACD-BF87-760A838A5D86}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chisel.Tests", "tests\Chisel.Tests.csproj", "{EC3CCB92-1AA1-4C33-B296-D7111EEF84E4}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chisel.Tests", "tests\Chisel.Tests\Chisel.Tests.csproj", "{EC3CCB92-1AA1-4C33-B296-D7111EEF84E4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{0CC84E67-19D2-480B-B36A-6BB15A9109E7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDbSample", "samples\MongoDbSample\MongoDbSample.csproj", "{845EDA2A-5207-4C6D-ABE9-9635F4630D90}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{89268D80-B21D-4C76-AF7F-796AAD1E00D9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC8C6685-EDF9-443A-BAF6-A5E7CF777B2A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -43,5 +47,7 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{845EDA2A-5207-4C6D-ABE9-9635F4630D90} = {0CC84E67-19D2-480B-B36A-6BB15A9109E7}
{F4CAEC64-3B0C-4ACD-BF87-760A838A5D86} = {89268D80-B21D-4C76-AF7F-796AAD1E00D9}
{EC3CCB92-1AA1-4C33-B296-D7111EEF84E4} = {AC8C6685-EDF9-443A-BAF6-A5E7CF777B2A}
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions samples/MongoDbSample/MongoDbSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
</PropertyGroup>

<Import Project="../../src/build/Chisel.props" />
<Import Project="../../src/build/Chisel.targets" />
<Import Project="../../src/Chisel/build/Chisel.props" />
<Import Project="../../src/Chisel/build/Chisel.targets" />

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
Expand Down
6 changes: 3 additions & 3 deletions src/Chisel.csproj → src/Chisel/Chisel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
</PropertyGroup>

<ItemGroup Label="Packaging Metadata">
<None Include="../resources/icon.png" Pack="true" PackagePath="" Visible="false" />
<None Include="../README.md" Pack="true" PackagePath="" />
<None Include="../../resources/icon.png" Pack="true" PackagePath="" Visible="false" />
<None Include="../../README.md" Pack="true" PackagePath="" />
</ItemGroup>

<PropertyGroup Label="Versioning">
Expand All @@ -68,7 +68,7 @@
</PropertyGroup>

<PropertyGroup Label="Developing" Condition="$(Configuration) == 'Debug'">
<!-- Doing <Import Project="../../src/build/Chisel.targets" /> locks the Chisel.dll, so don't try 10 times, just once to get the process id to kill -->
<!-- Doing <Import Project="../../src/Chisel/build/Chisel.targets" /> locks the Chisel.dll, so don't try 10 times, just once to get the process id to kill -->
<CopyRetryCount>1</CopyRetryCount>
</PropertyGroup>

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
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 @@ -30,7 +30,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="../src/Chisel.csproj" />
<ProjectReference Include="../../src/Chisel/Chisel.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 6fde161

Please sign in to comment.