Skip to content

Commit d2e3257

Browse files
isc30isc30
authored
Fix dotnet pack (#43)
1 parent b82ee67 commit d2e3257

File tree

12 files changed

+53
-22
lines changed

12 files changed

+53
-22
lines changed

‎demo/Logger/Logger.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0" />
10-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.2" />
10+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.2" />
1111
</ItemGroup>
1212

1313
<!-- Use Local NuGet package -->
1414
<ItemGroup Condition="$(BLLUseLocalNugetPackages)">
15-
<PackageReference Include="BlazorLazyLoading.Components" Version="$(BLLVersion)" PrivateAssets="all" />
15+
<PackageReference Include="BlazorLazyLoading.Components" Version="$(BLLVersion)" />
1616
</ItemGroup>
1717

1818
<!-- Use Project reference -->
1919
<ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
20-
<ProjectReference Include="..\..\nuget\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj" PrivateAssets="all" />
20+
<ProjectReference Include="..\..\nuget\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎demo/ServerHost/ServerHost.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<ProjectReference Include="..\WasmHost\WasmHost.csproj" />
23+
<ProjectReference Include="..\WasmHost\WasmHost.csproj" PrivateAssets="all" />
2424
</ItemGroup>
2525

2626
</Project>

‎nuget/BlazorLazyLoading.Components/BlazorLazyLoading.Components.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<ProjectReference Include="..\..\src\LazyComponents\LazyComponents.csproj" />
17-
<ProjectReference Include="..\..\src\ManifestReader\ManifestReader.csproj" />
16+
<ProjectReference Include="..\..\src\LazyComponents\LazyComponents.csproj" />
17+
<ProjectReference Include="..\..\src\ManifestReader\ManifestReader.csproj" />
1818
</ItemGroup>
1919

2020
</Project>

‎nuget/BlazorLazyLoading.Server/BlazorLazyLoading.Server.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
@@ -9,10 +9,10 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<ProjectReference Include="..\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj" />
1312
<ProjectReference Include="..\..\src\AssemblyLoader.Server\AssemblyLoader.Server.csproj" />
13+
<ProjectReference Include="..\..\src\ManifestReader\ManifestReader.csproj" />
1414
</ItemGroup>
15-
15+
1616
<PropertyGroup>
1717
<PackageId>$(MSBuildProjectName)</PackageId>
1818
<Product>$(MSBuildProjectName)</Product>

‎nuget/BlazorLazyLoading.Server/Properties/launchSettings.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"iisSettings": {
3+
"windowsAuthentication": false,
4+
"anonymousAuthentication": true,
5+
"iisExpress": {
6+
"applicationUrl": "http://localhost:56316/",
7+
"sslPort": 44315
8+
}
9+
},
10+
"profiles": {
11+
"IIS Express": {
12+
"commandName": "IISExpress",
13+
"launchBrowser": true,
14+
"environmentVariables": {
15+
"ASPNETCORE_ENVIRONMENT": "Development"
16+
}
17+
},
18+
"BlazorLazyLoading.Server": {
19+
"commandName": "Project",
20+
"launchBrowser": true,
21+
"environmentVariables": {
22+
"ASPNETCORE_ENVIRONMENT": "Development"
23+
},
24+
"applicationUrl": "https://localhost:5001;http://localhost:5000"
25+
}
26+
}
27+
}

‎nuget/BlazorLazyLoading.Wasm/BlazorLazyLoading.Wasm.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="..\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj" />
1211
<ProjectReference Include="..\..\src\AssemblyLoader.Wasm\AssemblyLoader.Wasm.csproj" />
12+
<ProjectReference Include="..\..\src\ManifestReader\ManifestReader.csproj" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" PrivateAssets="all" />
1317
</ItemGroup>
1418

1519
<PropertyGroup>

‎nuget/NugetCommon.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Version>0.0.0</Version>
1717
<NoPackageAnalysis>true</NoPackageAnalysis>
1818

19-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
19+
<GeneratePackageOnBuild Condition="!$(BLLUseLocalNugetPackages)">true</GeneratePackageOnBuild>
2020
<IsPackable>true</IsPackable>
2121
<IncludeSymbols>true</IncludeSymbols>
2222
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -53,7 +53,7 @@
5353
</PropertyGroup>
5454
</Target>
5555

56-
<Target Name="SetDemoNugetVersion" AfterTargets="Build">
56+
<Target Name="SetDemoNugetVersion" AfterTargets="Build;Pack;Restore">
5757
<CallTarget Targets="GetVersion" />
5858
<ItemGroup>
5959
<LocalNugetVersionProps Remove="*" />

‎src/AssemblyLoader.Server/AssemblyLoader.Server.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-rc1.20223.4" />
21-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
22-
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="3.1.3" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" PrivateAssets="all" />
21+
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="3.1.0" PrivateAssets="all" />
2322
</ItemGroup>
2423

2524
</Project>

‎src/AssemblyLoader.Wasm/AssemblyLoader.Wasm.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
15+
<ProjectReference Include="..\AssemblyLoader\AssemblyLoader.csproj" />
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<ProjectReference Include="..\AssemblyLoader\AssemblyLoader.csproj" />
19+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" PrivateAssets="all" />
2020
</ItemGroup>
2121

2222
</Project>

‎src/AssemblyLoader/AssemblyLoader.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="System.Reflection.Metadata" Version="1.8.0" />
15+
<PackageReference Include="System.Reflection.Metadata" Version="1.8.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/LazyComponents/LazyComponents.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0" />
1616
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0" />
17+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
1718
</ItemGroup>
1819

1920
<ItemGroup>
20-
<ProjectReference Include="..\AssemblyLoader\AssemblyLoader.csproj" />
21-
<ProjectReference Include="..\ManifestReader\ManifestReader.csproj" />
21+
<ProjectReference Include="..\AssemblyLoader\AssemblyLoader.csproj" />
22+
<ProjectReference Include="..\ManifestReader\ManifestReader.csproj" />
2223
</ItemGroup>
2324

2425
</Project>

‎src/ManifestReader/ManifestReader.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\AssemblyLoader\AssemblyLoader.csproj" />
15+
<ProjectReference Include="..\AssemblyLoader\AssemblyLoader.csproj" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

0 commit comments

Comments
 (0)