Skip to content

Commit af049b7

Browse files
isc30isc30
authored
Support Local NuGet Packages (#17)
fixes #8
1 parent 11ed317 commit af049b7

20 files changed

+230
-68
lines changed

‎.github/workflows/build-all.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,29 @@ jobs:
2020
with:
2121
dotnet-version: 3.1.200
2222

23-
- name: Build with dotnet
23+
- name: Restore library
24+
run: dotnet restore BlazorLazyLoading.sln
25+
26+
- name: Build library
2427
run: dotnet build -c Release BlazorLazyLoading.sln
2528

26-
- name: Test with dotnet
27-
run: dotnet test BlazorLazyLoading.sln
29+
- name: Test library
30+
run: dotnet test -c Release BlazorLazyLoading.sln
31+
32+
- name: Pack library
33+
run: dotnet pack -c Release BlazorLazyLoading.sln
34+
35+
- name: Upload artifacts
36+
uses: actions/upload-artifact@v1
37+
with:
38+
name: output
39+
path: output
40+
41+
- name: Restore demo
42+
run: dotnet restore -p:BLLUseLocalNugetPackages=true demo/Demo.sln
43+
44+
- name: Build demo
45+
run: dotnet build -c Release -p:BLLUseLocalNugetPackages=true demo/Demo.sln
46+
47+
- name: Test demo
48+
run: dotnet test -c Release demo/Demo.sln

‎.github/workflows/nuget-publish.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,27 @@ jobs:
2727
with:
2828
dotnet-version: 3.1.200
2929

30-
- name: Build with dotnet
30+
- name: Restore library
31+
run: dotnet restore BlazorLazyLoading.sln
32+
33+
- name: Build library
3134
run: dotnet build -c Release BlazorLazyLoading.sln
32-
33-
- name: Test with dotnet
34-
run: dotnet test BlazorLazyLoading.sln
3535

36-
- name: Pack with dotnet
36+
- name: Test library
37+
run: dotnet test -c Release BlazorLazyLoading.sln
38+
39+
- name: Pack library
3740
run: dotnet pack -c Release BlazorLazyLoading.sln
3841

42+
- name: Restore demo
43+
run: dotnet restore -p:BLLUseLocalNugetPackages=true demo/Demo.sln
44+
45+
- name: Build demo
46+
run: dotnet build -c Release -p:BLLUseLocalNugetPackages=true demo/Demo.sln
47+
48+
- name: Test demo
49+
run: dotnet test -c Release demo/Demo.sln
50+
3951
- name: Push package to NuGet
4052
run: dotnet nuget push output/**/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
4153

‎BlazorLazyLoading.sln

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyLoader.Wasm", "src\
1414
EndProject
1515
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyLoader.Server", "src\AssemblyLoader.Server\AssemblyLoader.Server.csproj", "{BFC6F53C-1292-48AE-A95D-3D53148AB22B}"
1616
EndProject
17-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{747AA1B8-FA3B-4328-B058-3541880F924F}"
18-
EndProject
19-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerHost", "demo\ServerHost\ServerHost.csproj", "{F853567E-C00A-4D8C-A8F5-E33162EDE769}"
20-
EndProject
21-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmHost", "demo\WasmHost\WasmHost.csproj", "{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}"
22-
EndProject
23-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logger", "demo\Logger\Logger.csproj", "{3895A6EF-A93A-4277-A92C-79930588CBD7}"
24-
EndProject
2517
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{593AE082-BD15-4FEB-8DC2-20D4ABA3AFD4}"
2618
ProjectSection(SolutionItems) = preProject
2719
nuget\Directory.Build.props = nuget\Directory.Build.props
28-
GitVersion.yml = GitVersion.yml
2920
nuget\NugetCommon.props = nuget\NugetCommon.props
3021
EndProjectSection
3122
EndProject
@@ -34,7 +25,7 @@ EndProject
3425
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{AE8E1C15-B862-43CB-AC0E-94B83BE0A250}"
3526
ProjectSection(SolutionItems) = preProject
3627
.gitignore = .gitignore
37-
nuget.config = nuget.config
28+
GitVersion.yml = GitVersion.yml
3829
EndProjectSection
3930
EndProject
4031
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Server", "nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj", "{B14D3B51-3320-46B7-8815-0FF3F18DBCB3}"
@@ -89,42 +80,6 @@ Global
8980
{BFC6F53C-1292-48AE-A95D-3D53148AB22B}.Release|x64.Build.0 = Release|Any CPU
9081
{BFC6F53C-1292-48AE-A95D-3D53148AB22B}.Release|x86.ActiveCfg = Release|Any CPU
9182
{BFC6F53C-1292-48AE-A95D-3D53148AB22B}.Release|x86.Build.0 = Release|Any CPU
92-
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
93-
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Debug|Any CPU.Build.0 = Debug|Any CPU
94-
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Debug|x64.ActiveCfg = Debug|Any CPU
95-
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Debug|x64.Build.0 = Debug|Any CPU
96-
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Debug|x86.ActiveCfg = Debug|Any CPU
97-
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Debug|x86.Build.0 = Debug|Any CPU
98-
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Release|Any CPU.ActiveCfg = Release|Any CPU
99-
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Release|Any CPU.Build.0 = Release|Any CPU
100-
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Release|x64.ActiveCfg = Release|Any CPU
101-
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Release|x64.Build.0 = Release|Any CPU
102-
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Release|x86.ActiveCfg = Release|Any CPU
103-
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Release|x86.Build.0 = Release|Any CPU
104-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
105-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Debug|Any CPU.Build.0 = Debug|Any CPU
106-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Debug|x64.ActiveCfg = Debug|Any CPU
107-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Debug|x64.Build.0 = Debug|Any CPU
108-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Debug|x86.ActiveCfg = Debug|Any CPU
109-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Debug|x86.Build.0 = Debug|Any CPU
110-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Release|Any CPU.ActiveCfg = Release|Any CPU
111-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Release|Any CPU.Build.0 = Release|Any CPU
112-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Release|x64.ActiveCfg = Release|Any CPU
113-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Release|x64.Build.0 = Release|Any CPU
114-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Release|x86.ActiveCfg = Release|Any CPU
115-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Release|x86.Build.0 = Release|Any CPU
116-
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
117-
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
118-
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Debug|x64.ActiveCfg = Debug|Any CPU
119-
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Debug|x64.Build.0 = Debug|Any CPU
120-
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Debug|x86.ActiveCfg = Debug|Any CPU
121-
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Debug|x86.Build.0 = Debug|Any CPU
122-
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
123-
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Release|Any CPU.Build.0 = Release|Any CPU
124-
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Release|x64.ActiveCfg = Release|Any CPU
125-
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Release|x64.Build.0 = Release|Any CPU
126-
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Release|x86.ActiveCfg = Release|Any CPU
127-
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Release|x86.Build.0 = Release|Any CPU
12883
{36FDF188-E5B9-4E1C-8EB7-707DE44AB77F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
12984
{36FDF188-E5B9-4E1C-8EB7-707DE44AB77F}.Debug|Any CPU.Build.0 = Debug|Any CPU
13085
{36FDF188-E5B9-4E1C-8EB7-707DE44AB77F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -181,9 +136,6 @@ Global
181136
{BA733883-4EB1-4BD3-91EB-6414814196E3} = {7A7C9856-CA0D-4655-8AF9-4BF60D997ACB}
182137
{2E031DBF-19C0-40F1-A77F-39F7429081BA} = {7A7C9856-CA0D-4655-8AF9-4BF60D997ACB}
183138
{BFC6F53C-1292-48AE-A95D-3D53148AB22B} = {7A7C9856-CA0D-4655-8AF9-4BF60D997ACB}
184-
{F853567E-C00A-4D8C-A8F5-E33162EDE769} = {747AA1B8-FA3B-4328-B058-3541880F924F}
185-
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44} = {747AA1B8-FA3B-4328-B058-3541880F924F}
186-
{3895A6EF-A93A-4277-A92C-79930588CBD7} = {747AA1B8-FA3B-4328-B058-3541880F924F}
187139
{36FDF188-E5B9-4E1C-8EB7-707DE44AB77F} = {593AE082-BD15-4FEB-8DC2-20D4ABA3AFD4}
188140
{B14D3B51-3320-46B7-8815-0FF3F18DBCB3} = {593AE082-BD15-4FEB-8DC2-20D4ABA3AFD4}
189141
{0DE40B36-69C4-4F1C-B419-B9A4DB9CFC8D} = {593AE082-BD15-4FEB-8DC2-20D4ABA3AFD4}

‎Directory.Build.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<!-- Polyfill $(SolutionDir) -->
5+
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
6+
</PropertyGroup>
7+
8+
</Project>

‎Directory.Build.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<Project>
2+
</Project>

‎demo/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
LocalNugetVersion.props

‎demo/Demo.sln

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29613.14
5+
MinimumVisualStudioVersion = 15.0.26124.0
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logger", "Logger\Logger.csproj", "{55AE3294-F228-468E-9D62-F2BAAFD40918}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerHost", "ServerHost\ServerHost.csproj", "{A55BC18A-E465-4516-98C5-26D814536907}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmHost", "WasmHost\WasmHost.csproj", "{C9941BB9-0C56-45C4-B54C-3755A868DA0D}"
11+
EndProject
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{02660401-5C19-4019-9294-1928A4EE6A62}"
13+
ProjectSection(SolutionItems) = preProject
14+
Directory.Build.props = Directory.Build.props
15+
Directory.Build.targets = Directory.Build.targets
16+
LocalNugetVersion.props = LocalNugetVersion.props
17+
NuGet.Config = NuGet.Config
18+
EndProjectSection
19+
EndProject
20+
Global
21+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
22+
Debug|Any CPU = Debug|Any CPU
23+
Debug|x64 = Debug|x64
24+
Debug|x86 = Debug|x86
25+
Release|Any CPU = Release|Any CPU
26+
Release|x64 = Release|x64
27+
Release|x86 = Release|x86
28+
EndGlobalSection
29+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30+
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Debug|x64.ActiveCfg = Debug|Any CPU
33+
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Debug|x64.Build.0 = Debug|Any CPU
34+
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Debug|x86.ActiveCfg = Debug|Any CPU
35+
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Debug|x86.Build.0 = Debug|Any CPU
36+
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Release|x64.ActiveCfg = Release|Any CPU
39+
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Release|x64.Build.0 = Release|Any CPU
40+
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Release|x86.ActiveCfg = Release|Any CPU
41+
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Release|x86.Build.0 = Release|Any CPU
42+
{A55BC18A-E465-4516-98C5-26D814536907}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{A55BC18A-E465-4516-98C5-26D814536907}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{A55BC18A-E465-4516-98C5-26D814536907}.Debug|x64.ActiveCfg = Debug|Any CPU
45+
{A55BC18A-E465-4516-98C5-26D814536907}.Debug|x64.Build.0 = Debug|Any CPU
46+
{A55BC18A-E465-4516-98C5-26D814536907}.Debug|x86.ActiveCfg = Debug|Any CPU
47+
{A55BC18A-E465-4516-98C5-26D814536907}.Debug|x86.Build.0 = Debug|Any CPU
48+
{A55BC18A-E465-4516-98C5-26D814536907}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{A55BC18A-E465-4516-98C5-26D814536907}.Release|Any CPU.Build.0 = Release|Any CPU
50+
{A55BC18A-E465-4516-98C5-26D814536907}.Release|x64.ActiveCfg = Release|Any CPU
51+
{A55BC18A-E465-4516-98C5-26D814536907}.Release|x64.Build.0 = Release|Any CPU
52+
{A55BC18A-E465-4516-98C5-26D814536907}.Release|x86.ActiveCfg = Release|Any CPU
53+
{A55BC18A-E465-4516-98C5-26D814536907}.Release|x86.Build.0 = Release|Any CPU
54+
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55+
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
56+
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Debug|x64.ActiveCfg = Debug|Any CPU
57+
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Debug|x64.Build.0 = Debug|Any CPU
58+
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Debug|x86.ActiveCfg = Debug|Any CPU
59+
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Debug|x86.Build.0 = Debug|Any CPU
60+
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x64.ActiveCfg = Release|Any CPU
63+
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x64.Build.0 = Release|Any CPU
64+
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x86.ActiveCfg = Release|Any CPU
65+
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x86.Build.0 = Release|Any CPU
66+
EndGlobalSection
67+
GlobalSection(SolutionProperties) = preSolution
68+
HideSolutionNode = FALSE
69+
EndGlobalSection
70+
GlobalSection(ExtensibilityGlobals) = postSolution
71+
SolutionGuid = {B979A335-AE81-406A-AADA-F236549D23D3}
72+
EndGlobalSection
73+
EndGlobal

‎demo/Directory.Build.props

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
3+
<Import Project="LocalNugetVersion.props" />
4+
5+
<!-- Convert $(BLLUseLocalNugetPackages) to bool -->
6+
<PropertyGroup>
7+
<BLLUseLocalNugetPackages Condition="'$(BLLUseLocalNugetPackages)' == ''">false</BLLUseLocalNugetPackages>
8+
</PropertyGroup>
9+
10+
</Project>

‎demo/Directory.Build.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<Project>
2+
</Project>

‎demo/Logger/Logger.csproj

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,19 @@
55
<RazorLangVersion>3.0</RazorLangVersion>
66
</PropertyGroup>
77

8-
<!-- simulate nuget automatic props/targets -->
9-
<PropertyGroup><IsFakeNugetPackage>true</IsFakeNugetPackage></PropertyGroup>
10-
<ItemGroup><ProjectReference Include="..\..\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj" /></ItemGroup>
8+
<!-- Use Local NuGet package -->
9+
<ItemGroup Condition="$(BLLUseLocalNugetPackages)">
10+
<PackageReference Include="BlazorLazyLoading.Module" Version="$(BLLVersion)" PrivateAssets="all" />
11+
</ItemGroup>
12+
13+
<!-- Use Project reference -->
14+
<ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
15+
<ProjectReference Include="..\..\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj" PrivateAssets="all" />
16+
</ItemGroup>
1117
<Import Project="..\..\nuget\BlazorLazyLoading.Module\build\BlazorLazyLoading.Module.props" />
1218
<Import Project="..\..\nuget\BlazorLazyLoading.Module\build\BlazorLazyLoading.Module.targets" />
1319

20+
<!-- Extra dependencies -->
1421
<ItemGroup>
1522
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0" />
1623
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0" />

‎demo/NuGet.Config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="local-repo" value="../output/" />
5+
</packageSources>
6+
</configuration>

‎demo/ServerHost/ServerHost.csproj

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,19 @@
44
<TargetFramework>netcoreapp3.1</TargetFramework>
55
</PropertyGroup>
66

7+
<!-- Use Local NuGet package -->
8+
<ItemGroup Condition="$(BLLUseLocalNugetPackages)">
9+
<PackageReference Include="BlazorLazyLoading.Server" Version="$(BLLVersion)" PrivateAssets="all" />
10+
</ItemGroup>
11+
12+
<!-- Use Project reference -->
13+
<ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
14+
<ProjectReference Include="..\..\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj" PrivateAssets="all" />
15+
</ItemGroup>
16+
17+
<!-- Extra dependencies -->
718
<ItemGroup>
819
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview3.20168.3" PrivateAssets="all" />
9-
<ProjectReference Include="..\..\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj" PrivateAssets="all" />
1020
</ItemGroup>
1121

1222
<ItemGroup>

‎demo/WasmHost/WasmHost.csproj

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,22 @@
66
<BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking>
77
</PropertyGroup>
88

9+
<!-- Use Local NuGet package -->
10+
<ItemGroup Condition="$(BLLUseLocalNugetPackages)">
11+
<PackageReference Include="BlazorLazyLoading.Wasm" Version="$(BLLVersion)" PrivateAssets="all" />
12+
</ItemGroup>
13+
14+
<!-- Use Project reference -->
15+
<ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
16+
<ProjectReference Include="..\..\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj" PrivateAssets="all" />
17+
</ItemGroup>
18+
19+
<!-- Extra dependencies -->
920
<ItemGroup>
1021
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview3.20168.3" />
1122
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-preview3.20168.3" PrivateAssets="all" />
1223
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-preview3.20168.3" PrivateAssets="all" />
1324
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview3.20168.3" />
14-
<ProjectReference Include="..\..\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj" PrivateAssets="all" />
1525
</ItemGroup>
1626

1727
<ItemGroup>

‎nuget/BlazorLazyLoading.Module/BlazorLazyLoading.Module.csproj

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,18 @@
1919
<ProjectReference Include="..\..\src\ManifestGenerator\ManifestGenerator.csproj" />
2020
</ItemGroup>
2121

22+
<ItemGroup>
23+
<Compile Remove="build\bin\**" />
24+
<EmbeddedResource Remove="build\bin\**" />
25+
<None Remove="build\bin\**" />
26+
</ItemGroup>
27+
28+
<Target Name="CopyBinToBuild" AfterTargets="Build">
29+
<Message Importance="high" Text="Copying bin files..." />
30+
<ItemGroup>
31+
<BinFiles Include="$(MSBuildThisFileDirectory)bin/$(Configuration)/$(TargetFramework)/**/*.*" />
32+
</ItemGroup>
33+
<Copy SourceFiles="@(BinFiles)" DestinationFolder="$(MSBuildThisFileDirectory)build/bin/" />
34+
</Target>
35+
2236
</Project>

‎nuget/BlazorLazyLoading.Module/build/BlazorLazyLoading.Module.props

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

33
<PropertyGroup>
4-
<_NugetPackageBuildBinDirectory>$(MSBuildThisFileDirectory)../build/bin/</_NugetPackageBuildBinDirectory>
5-
<_NugetPackageBuildBinDirectory Condition="$(IsFakeNugetPackage)">$(MSBuildThisFileDirectory)../bin/$(Configuration)/$(TargetFramework)/</_NugetPackageBuildBinDirectory>
4+
<_BLLNugetPackageBuildBinDirectory>$(MSBuildThisFileDirectory)../build/bin/</_BLLNugetPackageBuildBinDirectory>
65
</PropertyGroup>
76

87
<PropertyGroup>

‎nuget/BlazorLazyLoading.Module/build/BlazorLazyLoading.Module.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<RemoveDir Directories="$(ModuleLazyDirectory)" />
1212
</Target>
1313

14-
<UsingTask TaskName="LoadDLLInfo" AssemblyFile="$(_NugetPackageBuildBinDirectory)ManifestGenerator.dll" Condition="Exists('$(_NugetPackageBuildBinDirectory)ManifestGenerator.dll')" />
14+
<UsingTask TaskName="LoadDLLInfo" AssemblyFile="$(_BLLNugetPackageBuildBinDirectory)ManifestGenerator.dll" />
1515

1616
<Target Name="CopyDependencies" AfterTargets="Build">
1717

@@ -21,7 +21,7 @@
2121

2222
<LoadDLLInfo
2323
AssemblyName="$(MSBuildProjectName)"
24-
AssemblyPaths="$(ProjectOutDir);$(_NugetPackageBuildBinDirectory)"
24+
AssemblyPaths="$(ProjectOutDir);$(_BLLNugetPackageBuildBinDirectory)"
2525
JsonManifestPath="$(ModuleManifestPath)" />
2626

2727
<ItemGroup>

‎nuget/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
<!-- automatically create packages -->
412
<Import Project="$(MSBuildThisFileDirectory)NugetCommon.props" />
513

0 commit comments

Comments
 (0)