Skip to content

[#40] Fix dotnet pack #43

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 3 commits into from
May 3, 2020
Merged

[#40] Fix dotnet pack #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
909b491
[#40] Fix dotnet pack
isc30 May 3, 2020
a623585
Fix version issues
isc30 May 3, 2020
275a6b8
Fixes
isc30 May 3, 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
8 changes: 4 additions & 4 deletions demo/Logger/Logger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.2" />
</ItemGroup>

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

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

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion demo/ServerHost/ServerHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WasmHost\WasmHost.csproj" />
<ProjectReference Include="..\WasmHost\WasmHost.csproj" PrivateAssets="all" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions nuget/BlazorLazyLoading.Components/BlazorLazyLoading.Components.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\LazyComponents\LazyComponents.csproj" />
<ProjectReference Include="..\..\src\ManifestReader\ManifestReader.csproj" />
<ProjectReference Include="..\..\src\LazyComponents\LazyComponents.csproj" />
<ProjectReference Include="..\..\src\ManifestReader\ManifestReader.csproj" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions nuget/BlazorLazyLoading.Server/BlazorLazyLoading.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
Expand All @@ -9,10 +9,10 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj" />
<ProjectReference Include="..\..\src\AssemblyLoader.Server\AssemblyLoader.Server.csproj" />
<ProjectReference Include="..\..\src\ManifestReader\ManifestReader.csproj" />
</ItemGroup>

<PropertyGroup>
<PackageId>$(MSBuildProjectName)</PackageId>
<Product>$(MSBuildProjectName)</Product>
Expand Down
27 changes: 27 additions & 0 deletions nuget/BlazorLazyLoading.Server/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:56316/",
"sslPort": 44315
}
},
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"BlazorLazyLoading.Server": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:5001;http://localhost:5000"
}
}
}
6 changes: 5 additions & 1 deletion nuget/BlazorLazyLoading.Wasm/BlazorLazyLoading.Wasm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj" />
<ProjectReference Include="..\..\src\AssemblyLoader.Wasm\AssemblyLoader.Wasm.csproj" />
<ProjectReference Include="..\..\src\ManifestReader\ManifestReader.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" PrivateAssets="all" />
</ItemGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions nuget/NugetCommon.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Version>0.0.0</Version>
<NoPackageAnalysis>true</NoPackageAnalysis>

<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<GeneratePackageOnBuild Condition="!$(BLLUseLocalNugetPackages)">true</GeneratePackageOnBuild>
<IsPackable>true</IsPackable>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
Expand Down Expand Up @@ -53,7 +53,7 @@
</PropertyGroup>
</Target>

<Target Name="SetDemoNugetVersion" AfterTargets="Build">
<Target Name="SetDemoNugetVersion" AfterTargets="Build;Pack;Restore">
<CallTarget Targets="GetVersion" />
<ItemGroup>
<LocalNugetVersionProps Remove="*" />
Expand Down
5 changes: 2 additions & 3 deletions src/AssemblyLoader.Server/AssemblyLoader.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-rc1.20223.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="3.1.0" PrivateAssets="all" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/AssemblyLoader.Wasm/AssemblyLoader.Wasm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
<ProjectReference Include="..\AssemblyLoader\AssemblyLoader.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\AssemblyLoader\AssemblyLoader.csproj" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" PrivateAssets="all" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/AssemblyLoader/AssemblyLoader.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Reflection.Metadata" Version="1.8.0" />
<PackageReference Include="System.Reflection.Metadata" Version="1.8.0" />
</ItemGroup>

</Project>
5 changes: 3 additions & 2 deletions src/LazyComponents/LazyComponents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\AssemblyLoader\AssemblyLoader.csproj" />
<ProjectReference Include="..\ManifestReader\ManifestReader.csproj" />
<ProjectReference Include="..\AssemblyLoader\AssemblyLoader.csproj" />
<ProjectReference Include="..\ManifestReader\ManifestReader.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/ManifestReader/ManifestReader.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\AssemblyLoader\AssemblyLoader.csproj" />
<ProjectReference Include="..\AssemblyLoader\AssemblyLoader.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down