Skip to content

Commit a3550b7

Browse files
feO2xfeO2x
authored
Merge pull request #4 from feO2x/project-layout-restructuring
Project layout restructuring
2 parents 9a9b83d + bf87a22 commit a3550b7

32 files changed

+288
-15
lines changed

‎.github/workflows/build-and-test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up .NET
1616
uses: actions/setup-dotnet@v4
1717
with:
18-
dotnet-version: 8.0.x
18+
global-json-file: ./global.json
1919
- name: Cache NuGet packages
2020
uses: actions/cache@v4
2121
with:
@@ -24,8 +24,8 @@ jobs:
2424
restore-keys: |
2525
nuget-${{ runner.os }}-
2626
- name: Restore dependencies
27-
run: dotnet restore ./Light.TemporaryStreams.sln
27+
run: dotnet restore ./Light.TemporaryStreams.sln /p:ContinuousIntegrationBuild=true
2828
- name: Build
29-
run: dotnet build ./Light.TemporaryStreams.sln --configuration Release --no-restore
29+
run: dotnet build ./Light.TemporaryStreams.sln --configuration Release --no-restore /p:ContinuousIntegrationBuild=true
3030
- name: Test
31-
run: dotnet test ./Light.TemporaryStreams.sln --configuration Release --no-build --no-restore --verbosity normal
31+
run: dotnet test ./Light.TemporaryStreams.sln --configuration Release --no-build --verbosity normal

‎Directory.Build.props‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
<Project>
1+
<Project>
22
<PropertyGroup>
33
<TargetFramework>net8.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>disable</ImplicitUsings>
6+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
7+
<RestoreLockedMode Condition="'$(ContinuousIntegrationBuild)' == 'true'">true</RestoreLockedMode>
68
</PropertyGroup>
7-
</Project>
9+
</Project>

‎Directory.Packages.props‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageVersion Include="FluentAssertions" Version="[7.2.0]" />
9+
<PackageVersion Include="Light.GuardClauses" Version="13.0.0" />
10+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
11+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
12+
<PackageVersion Include="xunit.v3" Version="2.0.3" />
13+
</ItemGroup>
14+
</Project>

‎Light.TemporaryStreams.sln‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio Version 17
43
VisualStudioVersion = 17.0.31903.59
54
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Light.TemporaryStreams", "Light.TemporaryStreams\Light.TemporaryStreams.csproj", "{C86E6D31-A10A-4B61-B490-5A7AC4451BA5}"
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Light.TemporaryStreams", "src\Light.TemporaryStreams\Light.TemporaryStreams.csproj", "{C86E6D31-A10A-4B61-B490-5A7AC4451BA5}"
76
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Light.TemporaryStreams.Tests", "Light.TemporaryStreams.Tests\Light.TemporaryStreams.Tests.csproj", "{4D6B4F48-1E4B-4ACA-9F32-829442DB5E56}"
7+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Light.TemporaryStreams.Tests", "tests\Light.TemporaryStreams.Tests\Light.TemporaryStreams.Tests.csproj", "{4D6B4F48-1E4B-4ACA-9F32-829442DB5E56}"
98
EndProject
109
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{73CAF5D7-5150-498F-978D-5D5D16E227FF}"
1110
ProjectSection(SolutionItems) = preProject
@@ -14,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
1413
LICENSE = LICENSE
1514
.editorconfig = .editorconfig
1615
Light.TemporaryStreams.sln.DotSettings = Light.TemporaryStreams.sln.DotSettings
16+
Directory.Packages.props = Directory.Packages.props
17+
global.json = global.json
1718
EndProjectSection
1819
EndProject
1920
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{677E4EE1-7062-46AB-81FF-8D20E9316ED6}"
@@ -23,6 +24,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
2324
.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
2425
EndProjectSection
2526
EndProject
27+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{048D0C61-6CF0-43E6-B7DB-1FDD8F791D57}"
28+
EndProject
29+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DA93B299-75F5-4A49-B2A6-4A1247047E5E}"
30+
EndProject
2631
Global
2732
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2833
Debug|Any CPU = Debug|Any CPU
@@ -63,5 +68,7 @@ Global
6368
EndGlobalSection
6469
GlobalSection(NestedProjects) = preSolution
6570
{05D48EEC-A2AB-4143-9533-A633E7B25EA3} = {677E4EE1-7062-46AB-81FF-8D20E9316ED6}
71+
{C86E6D31-A10A-4B61-B490-5A7AC4451BA5} = {048D0C61-6CF0-43E6-B7DB-1FDD8F791D57}
72+
{4D6B4F48-1E4B-4ACA-9F32-829442DB5E56} = {DA93B299-75F5-4A49-B2A6-4A1247047E5E}
6673
EndGlobalSection
6774
EndGlobal

‎global.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "8.0.411",
4+
"rollForward": "disable"
5+
}
6+
}

Light.TemporaryStreams/FileStreamFactory.cs renamed to src/Light.TemporaryStreams/FileStreamFactory.cs

File renamed without changes.

Light.TemporaryStreams/Hashing/CopyToHashCalculator.cs renamed to src/Light.TemporaryStreams/Hashing/CopyToHashCalculator.cs

File renamed without changes.

Light.TemporaryStreams/Hashing/HashConversionMethod.cs renamed to src/Light.TemporaryStreams/Hashing/HashConversionMethod.cs

File renamed without changes.

Light.TemporaryStreams/Hashing/HashingPlugin.cs renamed to src/Light.TemporaryStreams/Hashing/HashingPlugin.cs

File renamed without changes.

Light.TemporaryStreams/ICopyToTemporaryStreamPlugin.cs renamed to src/Light.TemporaryStreams/ICopyToTemporaryStreamPlugin.cs

File renamed without changes.

0 commit comments

Comments
 (0)