Skip to content

use local nuget #17

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Apr 19, 2020
Merged

use local nuget #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6480734
demo solution
isc30 Apr 16, 2020
edd4299
update demo to packagereference
isc30 Apr 16, 2020
036fd71
support both local nuget and packagereference
isc30 Apr 17, 2020
01f7ac0
get artifacts for all builds
isc30 Apr 18, 2020
d32b87e
downgrade newtonsoft.json
isc30 Apr 19, 2020
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
27 changes: 24 additions & 3 deletions .github/workflows/build-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,29 @@ jobs:
with:
dotnet-version: 3.1.200

- name: Build with dotnet
- name: Restore library
run: dotnet restore BlazorLazyLoading.sln

- name: Build library
run: dotnet build -c Release BlazorLazyLoading.sln

- name: Test with dotnet
run: dotnet test BlazorLazyLoading.sln
- name: Test library
run: dotnet test -c Release BlazorLazyLoading.sln

- name: Pack library
run: dotnet pack -c Release BlazorLazyLoading.sln

- name: Upload artifacts
uses: actions/upload-artifact@v1
with:
name: output
path: output

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

- name: Build demo
run: dotnet build -c Release -p:BLLUseLocalNugetPackages=true demo/Demo.sln

- name: Test demo
run: dotnet test -c Release demo/Demo.sln
22 changes: 17 additions & 5 deletions .github/workflows/nuget-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,27 @@ jobs:
with:
dotnet-version: 3.1.200

- name: Build with dotnet
- name: Restore library
run: dotnet restore BlazorLazyLoading.sln

- name: Build library
run: dotnet build -c Release BlazorLazyLoading.sln

- name: Test with dotnet
run: dotnet test BlazorLazyLoading.sln

- name: Pack with dotnet
- name: Test library
run: dotnet test -c Release BlazorLazyLoading.sln

- name: Pack library
run: dotnet pack -c Release BlazorLazyLoading.sln

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

- name: Build demo
run: dotnet build -c Release -p:BLLUseLocalNugetPackages=true demo/Demo.sln

- name: Test demo
run: dotnet test -c Release demo/Demo.sln

- name: Push package to NuGet
run: dotnet nuget push output/**/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate

Expand Down
50 changes: 1 addition & 49 deletions BlazorLazyLoading.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyLoader.Wasm", "src\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyLoader.Server", "src\AssemblyLoader.Server\AssemblyLoader.Server.csproj", "{BFC6F53C-1292-48AE-A95D-3D53148AB22B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{747AA1B8-FA3B-4328-B058-3541880F924F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerHost", "demo\ServerHost\ServerHost.csproj", "{F853567E-C00A-4D8C-A8F5-E33162EDE769}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmHost", "demo\WasmHost\WasmHost.csproj", "{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logger", "demo\Logger\Logger.csproj", "{3895A6EF-A93A-4277-A92C-79930588CBD7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{593AE082-BD15-4FEB-8DC2-20D4ABA3AFD4}"
ProjectSection(SolutionItems) = preProject
nuget\Directory.Build.props = nuget\Directory.Build.props
GitVersion.yml = GitVersion.yml
nuget\NugetCommon.props = nuget\NugetCommon.props
EndProjectSection
EndProject
Expand All @@ -34,7 +25,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{AE8E1C15-B862-43CB-AC0E-94B83BE0A250}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
nuget.config = nuget.config
GitVersion.yml = GitVersion.yml
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Server", "nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj", "{B14D3B51-3320-46B7-8815-0FF3F18DBCB3}"
Expand Down Expand Up @@ -89,42 +80,6 @@ Global
{BFC6F53C-1292-48AE-A95D-3D53148AB22B}.Release|x64.Build.0 = Release|Any CPU
{BFC6F53C-1292-48AE-A95D-3D53148AB22B}.Release|x86.ActiveCfg = Release|Any CPU
{BFC6F53C-1292-48AE-A95D-3D53148AB22B}.Release|x86.Build.0 = Release|Any CPU
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Debug|x64.ActiveCfg = Debug|Any CPU
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Debug|x64.Build.0 = Debug|Any CPU
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Debug|x86.ActiveCfg = Debug|Any CPU
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Debug|x86.Build.0 = Debug|Any CPU
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Release|Any CPU.Build.0 = Release|Any CPU
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Release|x64.ActiveCfg = Release|Any CPU
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Release|x64.Build.0 = Release|Any CPU
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Release|x86.ActiveCfg = Release|Any CPU
{F853567E-C00A-4D8C-A8F5-E33162EDE769}.Release|x86.Build.0 = Release|Any CPU
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Debug|x64.ActiveCfg = Debug|Any CPU
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Debug|x64.Build.0 = Debug|Any CPU
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Debug|x86.ActiveCfg = Debug|Any CPU
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Debug|x86.Build.0 = Debug|Any CPU
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Release|Any CPU.Build.0 = Release|Any CPU
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Release|x64.ActiveCfg = Release|Any CPU
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Release|x64.Build.0 = Release|Any CPU
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Release|x86.ActiveCfg = Release|Any CPU
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44}.Release|x86.Build.0 = Release|Any CPU
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Debug|x64.ActiveCfg = Debug|Any CPU
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Debug|x64.Build.0 = Debug|Any CPU
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Debug|x86.ActiveCfg = Debug|Any CPU
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Debug|x86.Build.0 = Debug|Any CPU
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Release|Any CPU.Build.0 = Release|Any CPU
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Release|x64.ActiveCfg = Release|Any CPU
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Release|x64.Build.0 = Release|Any CPU
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Release|x86.ActiveCfg = Release|Any CPU
{3895A6EF-A93A-4277-A92C-79930588CBD7}.Release|x86.Build.0 = Release|Any CPU
{36FDF188-E5B9-4E1C-8EB7-707DE44AB77F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36FDF188-E5B9-4E1C-8EB7-707DE44AB77F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36FDF188-E5B9-4E1C-8EB7-707DE44AB77F}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -181,9 +136,6 @@ Global
{BA733883-4EB1-4BD3-91EB-6414814196E3} = {7A7C9856-CA0D-4655-8AF9-4BF60D997ACB}
{2E031DBF-19C0-40F1-A77F-39F7429081BA} = {7A7C9856-CA0D-4655-8AF9-4BF60D997ACB}
{BFC6F53C-1292-48AE-A95D-3D53148AB22B} = {7A7C9856-CA0D-4655-8AF9-4BF60D997ACB}
{F853567E-C00A-4D8C-A8F5-E33162EDE769} = {747AA1B8-FA3B-4328-B058-3541880F924F}
{08A0B764-E28C-48CD-BB2F-EEE254C9BD44} = {747AA1B8-FA3B-4328-B058-3541880F924F}
{3895A6EF-A93A-4277-A92C-79930588CBD7} = {747AA1B8-FA3B-4328-B058-3541880F924F}
{36FDF188-E5B9-4E1C-8EB7-707DE44AB77F} = {593AE082-BD15-4FEB-8DC2-20D4ABA3AFD4}
{B14D3B51-3320-46B7-8815-0FF3F18DBCB3} = {593AE082-BD15-4FEB-8DC2-20D4ABA3AFD4}
{0DE40B36-69C4-4F1C-B419-B9A4DB9CFC8D} = {593AE082-BD15-4FEB-8DC2-20D4ABA3AFD4}
Expand Down
8 changes: 8 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>

<PropertyGroup>
<!-- Polyfill $(SolutionDir) -->
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
</PropertyGroup>

</Project>
2 changes: 2 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<Project>
</Project>
1 change: 1 addition & 0 deletions demo/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LocalNugetVersion.props
73 changes: 73 additions & 0 deletions demo/Demo.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logger", "Logger\Logger.csproj", "{55AE3294-F228-468E-9D62-F2BAAFD40918}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerHost", "ServerHost\ServerHost.csproj", "{A55BC18A-E465-4516-98C5-26D814536907}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmHost", "WasmHost\WasmHost.csproj", "{C9941BB9-0C56-45C4-B54C-3755A868DA0D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{02660401-5C19-4019-9294-1928A4EE6A62}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
LocalNugetVersion.props = LocalNugetVersion.props
NuGet.Config = NuGet.Config
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Debug|Any CPU.Build.0 = Debug|Any CPU
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Debug|x64.ActiveCfg = Debug|Any CPU
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Debug|x64.Build.0 = Debug|Any CPU
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Debug|x86.ActiveCfg = Debug|Any CPU
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Debug|x86.Build.0 = Debug|Any CPU
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Release|Any CPU.ActiveCfg = Release|Any CPU
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Release|Any CPU.Build.0 = Release|Any CPU
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Release|x64.ActiveCfg = Release|Any CPU
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Release|x64.Build.0 = Release|Any CPU
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Release|x86.ActiveCfg = Release|Any CPU
{55AE3294-F228-468E-9D62-F2BAAFD40918}.Release|x86.Build.0 = Release|Any CPU
{A55BC18A-E465-4516-98C5-26D814536907}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A55BC18A-E465-4516-98C5-26D814536907}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A55BC18A-E465-4516-98C5-26D814536907}.Debug|x64.ActiveCfg = Debug|Any CPU
{A55BC18A-E465-4516-98C5-26D814536907}.Debug|x64.Build.0 = Debug|Any CPU
{A55BC18A-E465-4516-98C5-26D814536907}.Debug|x86.ActiveCfg = Debug|Any CPU
{A55BC18A-E465-4516-98C5-26D814536907}.Debug|x86.Build.0 = Debug|Any CPU
{A55BC18A-E465-4516-98C5-26D814536907}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A55BC18A-E465-4516-98C5-26D814536907}.Release|Any CPU.Build.0 = Release|Any CPU
{A55BC18A-E465-4516-98C5-26D814536907}.Release|x64.ActiveCfg = Release|Any CPU
{A55BC18A-E465-4516-98C5-26D814536907}.Release|x64.Build.0 = Release|Any CPU
{A55BC18A-E465-4516-98C5-26D814536907}.Release|x86.ActiveCfg = Release|Any CPU
{A55BC18A-E465-4516-98C5-26D814536907}.Release|x86.Build.0 = Release|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Debug|x64.ActiveCfg = Debug|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Debug|x64.Build.0 = Debug|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Debug|x86.ActiveCfg = Debug|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Debug|x86.Build.0 = Debug|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|Any CPU.Build.0 = Release|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x64.ActiveCfg = Release|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x64.Build.0 = Release|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x86.ActiveCfg = Release|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B979A335-AE81-406A-AADA-F236549D23D3}
EndGlobalSection
EndGlobal
10 changes: 10 additions & 0 deletions demo/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project>

<Import Project="LocalNugetVersion.props" />

<!-- Convert $(BLLUseLocalNugetPackages) to bool -->
<PropertyGroup>
<BLLUseLocalNugetPackages Condition="'$(BLLUseLocalNugetPackages)' == ''">false</BLLUseLocalNugetPackages>
</PropertyGroup>

</Project>
2 changes: 2 additions & 0 deletions demo/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<Project>
</Project>
13 changes: 10 additions & 3 deletions demo/Logger/Logger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,19 @@
<RazorLangVersion>3.0</RazorLangVersion>
</PropertyGroup>

<!-- simulate nuget automatic props/targets -->
<PropertyGroup><IsFakeNugetPackage>true</IsFakeNugetPackage></PropertyGroup>
<ItemGroup><ProjectReference Include="..\..\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj" /></ItemGroup>
<!-- Use Local NuGet package -->
<ItemGroup Condition="$(BLLUseLocalNugetPackages)">
<PackageReference Include="BlazorLazyLoading.Module" Version="$(BLLVersion)" PrivateAssets="all" />
</ItemGroup>

<!-- Use Project reference -->
<ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
<ProjectReference Include="..\..\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj" PrivateAssets="all" />
</ItemGroup>
<Import Project="..\..\nuget\BlazorLazyLoading.Module\build\BlazorLazyLoading.Module.props" />
<Import Project="..\..\nuget\BlazorLazyLoading.Module\build\BlazorLazyLoading.Module.targets" />

<!-- Extra dependencies -->
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0" />
Expand Down
6 changes: 6 additions & 0 deletions demo/NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="local-repo" value="../output/" />
</packageSources>
</configuration>
12 changes: 11 additions & 1 deletion demo/ServerHost/ServerHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,19 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<!-- Use Local NuGet package -->
<ItemGroup Condition="$(BLLUseLocalNugetPackages)">
<PackageReference Include="BlazorLazyLoading.Server" Version="$(BLLVersion)" PrivateAssets="all" />
</ItemGroup>

<!-- Use Project reference -->
<ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
<ProjectReference Include="..\..\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj" PrivateAssets="all" />
</ItemGroup>

<!-- Extra dependencies -->
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview3.20168.3" PrivateAssets="all" />
<ProjectReference Include="..\..\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 11 additions & 1 deletion demo/WasmHost/WasmHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,21 @@
<BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking>
</PropertyGroup>

<!-- Use Local NuGet package -->
<ItemGroup Condition="$(BLLUseLocalNugetPackages)">
<PackageReference Include="BlazorLazyLoading.Wasm" Version="$(BLLVersion)" PrivateAssets="all" />
</ItemGroup>

<!-- Use Project reference -->
<ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
<ProjectReference Include="..\..\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj" PrivateAssets="all" />
</ItemGroup>

<!-- Extra dependencies -->
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview3.20168.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-preview3.20168.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview3.20168.3" />
<ProjectReference Include="..\..\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 14 additions & 0 deletions nuget/BlazorLazyLoading.Module/BlazorLazyLoading.Module.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,18 @@
<ProjectReference Include="..\..\src\ManifestGenerator\ManifestGenerator.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Remove="build\bin\**" />
<EmbeddedResource Remove="build\bin\**" />
<None Remove="build\bin\**" />
</ItemGroup>

<Target Name="CopyBinToBuild" AfterTargets="Build">
<Message Importance="high" Text="Copying bin files..." />
<ItemGroup>
<BinFiles Include="$(MSBuildThisFileDirectory)bin/$(Configuration)/$(TargetFramework)/**/*.*" />
</ItemGroup>
<Copy SourceFiles="@(BinFiles)" DestinationFolder="$(MSBuildThisFileDirectory)build/bin/" />
</Target>

</Project>
3 changes: 1 addition & 2 deletions nuget/BlazorLazyLoading.Module/build/BlazorLazyLoading.Module.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Project>

<PropertyGroup>
<_NugetPackageBuildBinDirectory>$(MSBuildThisFileDirectory)../build/bin/</_NugetPackageBuildBinDirectory>
<_NugetPackageBuildBinDirectory Condition="$(IsFakeNugetPackage)">$(MSBuildThisFileDirectory)../bin/$(Configuration)/$(TargetFramework)/</_NugetPackageBuildBinDirectory>
<_BLLNugetPackageBuildBinDirectory>$(MSBuildThisFileDirectory)../build/bin/</_BLLNugetPackageBuildBinDirectory>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions nuget/BlazorLazyLoading.Module/build/BlazorLazyLoading.Module.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<RemoveDir Directories="$(ModuleLazyDirectory)" />
</Target>

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

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

Expand All @@ -21,7 +21,7 @@

<LoadDLLInfo
AssemblyName="$(MSBuildProjectName)"
AssemblyPaths="$(ProjectOutDir);$(_NugetPackageBuildBinDirectory)"
AssemblyPaths="$(ProjectOutDir);$(_BLLNugetPackageBuildBinDirectory)"
JsonManifestPath="$(ModuleManifestPath)" />

<ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions nuget/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<Project>

<!--
Enable hierarchical 'Directory.Build.props'
This must be imported at the top of the file
-->
<Import
Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"
Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />

<!-- automatically create packages -->
<Import Project="$(MSBuildThisFileDirectory)NugetCommon.props" />

Expand Down
Loading