Skip to content

Commit 193a07a

Browse files
authored
cleanup src (#51)
* move library to src * fix gh actions * fix local nuget path
1 parent 103af1c commit 193a07a

File tree

91 files changed

+127
-37
lines changed

Some content is hidden

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

91 files changed

+127
-37
lines changed

.github/workflows/build-all.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ jobs:
2626
dotnet-version: 3.1.200
2727

2828
- name: Restore library
29-
run: dotnet restore BlazorLazyLoading.sln -p:BLLUseLocalNugetPackages=true
29+
run: dotnet restore src/BlazorLazyLoading.sln -p:BLLUseLocalNugetPackages=true
3030

3131
- name: Build library
32-
run: dotnet build BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
32+
run: dotnet build src/BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
3333

3434
- name: Test library
35-
run: dotnet test BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
35+
run: dotnet test src/BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
3636

3737
- name: Pack library
38-
run: dotnet pack BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
38+
run: dotnet pack src/BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
3939

4040
- name: Restore demo
4141
run: dotnet restore demo/Demo.sln -p:BLLUseLocalNugetPackages=true

.github/workflows/nuget-publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ jobs:
3333
dotnet-version: 3.1.200
3434

3535
- name: Restore library
36-
run: dotnet restore BlazorLazyLoading.sln -p:BLLUseLocalNugetPackages=true
36+
run: dotnet restore src/BlazorLazyLoading.sln -p:BLLUseLocalNugetPackages=true
3737

3838
- name: Build library
39-
run: dotnet build BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
39+
run: dotnet build src/BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
4040

4141
- name: Test library
42-
run: dotnet test BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
42+
run: dotnet test src/BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
4343

4444
- name: Pack library
45-
run: dotnet pack BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
45+
run: dotnet pack src/BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
4646

4747
- name: Restore demo
4848
run: dotnet restore demo/Demo.sln -p:BLLUseLocalNugetPackages=true

Directory.Build.props

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<!-- Polyfill $(SolutionDir) -->
5-
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
6-
</PropertyGroup>
7-
8-
<!-- Convert $(BLLUseLocalNugetPackages) to bool -->
9-
<PropertyGroup>
10-
<BLLUseLocalNugetPackages Condition="'$(BLLUseLocalNugetPackages)' == ''">false</BLLUseLocalNugetPackages>
4+
<RepoDir Condition="'$(RepoDir)' == ''">$(MSBuildThisFileDirectory)</RepoDir>
115
</PropertyGroup>
126

137
</Project>

Directory.Build.targets

Lines changed: 0 additions & 2 deletions
This file was deleted.

demo/BlazorLazyLoading.Components.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
<!-- Use Project reference -->
88
<ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
9-
<ProjectReference Include="$(MSBuildThisFileDirectory)..\nuget\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj" />
9+
<ProjectReference Include="$(SolutionDir)..\src\nuget\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj" />
1010
</ItemGroup>
1111
</Project>

demo/BlazorLazyLoading.Module.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
<!-- Use Project reference -->
88
<ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
9-
<ProjectReference Include="$(MSBuildThisFileDirectory)..\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj" PrivateAssets="all" />
9+
<ProjectReference Include="$(MSBuildThisFileDirectory)..\src\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj" PrivateAssets="all" />
1010
</ItemGroup>
11-
<Import Condition="!$(BLLUseLocalNugetPackages)" Project="$(MSBuildThisFileDirectory)..\nuget\BlazorLazyLoading.Module\build\BlazorLazyLoading.Module.props" />
12-
<Import Condition="!$(BLLUseLocalNugetPackages)" Project="$(MSBuildThisFileDirectory)..\nuget\BlazorLazyLoading.Module\build\BlazorLazyLoading.Module.targets" />
11+
<Import Condition="!$(BLLUseLocalNugetPackages)" Project="$(MSBuildThisFileDirectory)..\src\nuget\BlazorLazyLoading.Module\build\BlazorLazyLoading.Module.props" />
12+
<Import Condition="!$(BLLUseLocalNugetPackages)" Project="$(MSBuildThisFileDirectory)..\src\nuget\BlazorLazyLoading.Module\build\BlazorLazyLoading.Module.targets" />
1313
</Project>

demo/BlazorLazyLoading.Server.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
<!-- Use Project reference -->
88
<ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
9-
<ProjectReference Include="$(MSBuildThisFileDirectory)..\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj" PrivateAssets="all" />
9+
<ProjectReference Include="$(MSBuildThisFileDirectory)..\src\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj" PrivateAssets="all" />
1010
</ItemGroup>
1111
</Project>

demo/BlazorLazyLoading.Wasm.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
<!-- Use Project reference -->
88
<ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
9-
<ProjectReference Include="$(MSBuildThisFileDirectory)..\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj" PrivateAssets="all" />
9+
<ProjectReference Include="$(MSBuildThisFileDirectory)..\src\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj" PrivateAssets="all" />
1010
</ItemGroup>
1111
</Project>

demo/Demo.sln

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1919
EndProject
2020
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorLazyLoading", "BlazorLazyLoading", "{2DFA918F-9417-49B8-9FDA-E2231179978C}"
2121
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Module", "..\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj", "{E3E28F5C-3F96-4634-9528-10C23F2478DF}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Module", "..\src\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj", "{E3E28F5C-3F96-4634-9528-10C23F2478DF}"
2323
EndProject
24-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Server", "..\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj", "{6C5945E8-44F9-4898-AB78-FF0D85F5515B}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Server", "..\src\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj", "{6C5945E8-44F9-4898-AB78-FF0D85F5515B}"
2525
EndProject
26-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Wasm", "..\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj", "{B78FC2FE-F107-49AB-95FC-E7F4559C879A}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Wasm", "..\src\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj", "{B78FC2FE-F107-49AB-95FC-E7F4559C879A}"
27+
EndProject
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Components", "..\src\nuget\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj", "{83419656-8137-4AEB-9A5B-74C7B85621F6}"
2729
EndProject
2830
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModulesHost", "ModulesHost\ModulesHost.csproj", "{9B062109-5E21-46CD-BDD1-315529E585E8}"
2931
EndProject
3032
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{2587AE99-7624-47E4-B6B8-79EC67346F67}"
3133
EndProject
32-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Components", "..\nuget\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj", "{83419656-8137-4AEB-9A5B-74C7B85621F6}"
33-
EndProject
3434
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hosts", "Hosts", "{E503BF43-DE57-4DB6-AF93-A5F765C94154}"
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LazyAreas", "LazyAreas", "{566D14F1-B2FB-463C-A627-C5EB23B763B7}"

demo/Directory.Build.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<Project>
22

3+
<!--
4+
Enable hierarchical 'Directory.Build.props'
5+
This must be imported at the top of the file
6+
-->
7+
<Import
8+
Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"
9+
Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />
10+
311
<Import Project="LocalNugetVersion.props" />
412

513
<PropertyGroup>

BlazorLazyLoading.sln renamed to src/BlazorLazyLoading.sln

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{AE8E1C
2626
ProjectSection(SolutionItems) = preProject
2727
.gitignore = .gitignore
2828
Directory.Build.props = Directory.Build.props
29-
Directory.Build.targets = Directory.Build.targets
3029
GitVersion.yml = GitVersion.yml
3130
nuget.config = nuget.config
3231
EndProjectSection
@@ -51,9 +50,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manifest", "Manifest", "{2B
5150
EndProject
5251
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{38184F2E-7DDA-4F92-B730-85637350E56F}"
5352
EndProject
54-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerHost", "demo\ServerHost\ServerHost.csproj", "{2EF3EB2F-0E00-4554-8EDC-7CEEE5C7B899}"
53+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerHost", "..\demo\ServerHost\ServerHost.csproj", "{2EF3EB2F-0E00-4554-8EDC-7CEEE5C7B899}"
5554
EndProject
56-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmHost", "demo\WasmHost\WasmHost.csproj", "{D2DF44FE-098D-48EF-925B-F71DFDD7134D}"
55+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmHost", "..\demo\WasmHost\WasmHost.csproj", "{D2DF44FE-098D-48EF-925B-F71DFDD7134D}"
5756
EndProject
5857
Global
5958
GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Directory.Build.props

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@
88
Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"
99
Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />
1010

11-
<!-- automatically create "Internal" packages -->
12-
<Import Project="$(MSBuildThisFileDirectory)../nuget/NugetCommon.props" />
11+
<PropertyGroup>
12+
<!-- Polyfill $(SolutionDir) -->
13+
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
14+
</PropertyGroup>
15+
16+
<!-- Convert $(BLLUseLocalNugetPackages) to bool -->
17+
<PropertyGroup>
18+
<BLLUseLocalNugetPackages Condition="'$(BLLUseLocalNugetPackages)' == ''">false</BLLUseLocalNugetPackages>
19+
</PropertyGroup>
1320

1421
</Project>
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="local-repo" value="output/nuget/" />
4+
<add key="local-repo" value="../output/nuget/" />
55
</packageSources>
66
</configuration>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- Autogenerated -->
2+
<!-- Please build 'BlazorLazyLoading.sln' first -->
3+
<Project>
4+
<PropertyGroup>
5+
<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
6+
</PropertyGroup>
7+
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- Autogenerated -->
2+
<!-- Please build 'BlazorLazyLoading.sln' first -->
3+
<Project>
4+
<PropertyGroup>
5+
<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
6+
</PropertyGroup>
7+
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- Autogenerated -->
2+
<!-- Please build 'BlazorLazyLoading.sln' first -->
3+
<Project>
4+
<PropertyGroup>
5+
<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
6+
</PropertyGroup>
7+
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- Autogenerated -->
2+
<!-- Please build 'BlazorLazyLoading.sln' first -->
3+
<Project>
4+
<PropertyGroup>
5+
<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
6+
</PropertyGroup>
7+
</Project>
File renamed without changes.

nuget/NugetCommon.props renamed to src/nuget/NugetCommon.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</ItemGroup>
99

1010
<PropertyGroup>
11-
<PackageOutputDir>$(MSBuildThisFileDirectory)..\output\nuget</PackageOutputDir>
12-
<PackageOutputPath>$(MSBuildThisFileDirectory)..\output\nuget</PackageOutputPath>
11+
<PackageOutputDir>$(RepoDir)output\nuget</PackageOutputDir>
12+
<PackageOutputPath>$(RepoDir)output\nuget</PackageOutputPath>
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
@@ -68,7 +68,7 @@
6868
</ItemGroup>
6969

7070
<WriteLinesToFile
71-
File="$(MSBuildThisFileDirectory)../demo/LocalNugetVersion.props"
71+
File="$(RepoDir)demo/LocalNugetVersion.props"
7272
Lines="@(LocalNugetVersionProps)"
7373
Overwrite="true" />
7474
</Target>
File renamed without changes.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- Autogenerated -->
2+
<!-- Please build 'BlazorLazyLoading.sln' first -->
3+
<Project>
4+
<PropertyGroup>
5+
<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
6+
</PropertyGroup>
7+
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- Autogenerated -->
2+
<!-- Please build 'BlazorLazyLoading.sln' first -->
3+
<Project>
4+
<PropertyGroup>
5+
<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
6+
</PropertyGroup>
7+
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- Autogenerated -->
2+
<!-- Please build 'BlazorLazyLoading.sln' first -->
3+
<Project>
4+
<PropertyGroup>
5+
<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
6+
</PropertyGroup>
7+
</Project>

src/src/Directory.Build.props

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project>
2+
3+
<!--
4+
Enable hierarchical 'Directory.Build.props'
5+
This must be imported at the top of the file
6+
-->
7+
<Import
8+
Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"
9+
Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />
10+
11+
<!-- automatically create "Internal" packages -->
12+
<Import Project="$(MSBuildThisFileDirectory)../nuget/NugetCommon.props" />
13+
14+
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- Autogenerated -->
2+
<!-- Please build 'BlazorLazyLoading.sln' first -->
3+
<Project>
4+
<PropertyGroup>
5+
<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
6+
</PropertyGroup>
7+
</Project>
File renamed without changes.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- Autogenerated -->
2+
<!-- Please build 'BlazorLazyLoading.sln' first -->
3+
<Project>
4+
<PropertyGroup>
5+
<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
6+
</PropertyGroup>
7+
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- Autogenerated -->
2+
<!-- Please build 'BlazorLazyLoading.sln' first -->
3+
<Project>
4+
<PropertyGroup>
5+
<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
6+
</PropertyGroup>
7+
</Project>

0 commit comments

Comments
 (0)