Skip to content

chore(Props): update project configuration #4433

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 6 commits into from
Oct 11, 2024
Merged

chore(Props): update project configuration #4433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4856e0d
chore: update Html2Pdf to 8.2.1
ArgoZhang Oct 11, 2024
89dda36
chore: update dependence package version
ArgoZhang Oct 11, 2024
4d86191
Merge branch 'main' into chore-dept
ArgoZhang Oct 11, 2024
3bc8b16
chore: 更新 bundle 配置
ArgoZhang Oct 11, 2024
7da4afb
chore: 更新 wasm 配置支持
ArgoZhang Oct 11, 2024
b615d3d
chore: 更新仓库信息配置
ArgoZhang Oct 11, 2024
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
37 changes: 0 additions & 37 deletions src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,6 @@
<Version>8.10.2</Version>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(NET6Version)" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(NET6Version)" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(NET6Version)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET6Version)" />
<PackageReference Include="Microsoft.Extensions.Http" Version="$(NET6Version)" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET6Version)" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(NET6Version)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(NET7Version)" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(NET7Version)" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(NET7Version)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET7Version)" />
<PackageReference Include="Microsoft.Extensions.Http" Version="$(NET7Version)" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET7Version)" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(NET7Version)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(NET8Version)" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(NET8Version)" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(NET8Version)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET8Version)" />
<PackageReference Include="Microsoft.Extensions.Http" Version="$(NET8Version)" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET8Version)" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="8.0.5" />
</ItemGroup>

<ItemGroup>
<Content Remove="Locales\*.json" />
<EmbeddedResource Include="Locales\*.json" />
Expand All @@ -57,10 +24,6 @@
<None Include="wwwroot\src\**\*.*" />
</ItemGroup>

<ItemGroup>
<SupportedPlatform Include="browser" />
</ItemGroup>

<ItemGroup>
<Using Include="BootstrapBlazor.Components" />
<Using Include="Microsoft.AspNetCore.Components" />
Expand Down
42 changes: 40 additions & 2 deletions src/BootstrapBlazor/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@

<Import Project="..\Directory.Build.props" />
<Import Project="..\Logo.props" />
<Import Project="..\Bundle.props" />
<Import Project="..\SourceLink.targets" />

<PropertyGroup>
<PackageTags>Bootstrap Blazor WebAssembly wasm UI Components</PackageTags>
<Description>Bootstrap UI components for Blazor and Razor Components</Description>
<PackageReadmeFile>readme.md</PackageReadmeFile>
<PackageReleaseNotes>https://github.com/dotnetcore/BootstrapBlazor/releases?wt.mc_id=DT-MVP-5004174</PackageReleaseNotes>
<PackageProjectUrl>https://www.blazor.zone</PackageProjectUrl>
<RepositoryType>github</RepositoryType>
<RepositoryUrl>https://github.com/dotnetcore/BootstrapBlazor.git</RepositoryUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -19,9 +23,43 @@
<PropertyGroup>
<NET6Version>6.0.*</NET6Version>
<NET7Version>7.0.*</NET7Version>
<NET8Version>8.0</NET8Version>
<NET8Version>8.0.*</NET8Version>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(NET6Version)" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(NET6Version)" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET6Version)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(NET7Version)" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(NET7Version)" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET7Version)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(NET8Version)" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(NET8Version)" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET8Version)" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(NET8Version)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET8Version)" />
<PackageReference Include="Microsoft.Extensions.Http" Version="$(NET8Version)" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(NET8Version)" />
<PackageReference Include="System.Text.Json" Version="$(NET8Version)" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AspNetCore.SassCompiler" Version="1.*" Condition="'$(Configuration)'=='Debug' and '$(TargetFramework)' == 'net8.0'" />
</ItemGroup>

<ItemGroup>
<SupportedPlatform Include="browser" />
</ItemGroup>

<ItemGroup>
<None Include="readme.md" Pack="true" PackagePath="" />
</ItemGroup>
Expand Down
7 changes: 0 additions & 7 deletions src/Bundle.props
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
<Import Project="..\Directory.Build.props" />

<PropertyGroup>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup>
<RepositoryUrl>https://github.com/dotnetcore/BootstrapBlazor.git</RepositoryUrl>
<PackageProjectUrl>https://www.blazor.zone</PackageProjectUrl>
<RepositoryType>github</RepositoryType>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<DocumentationFile>$(MSBuildProjectName).xml</DocumentationFile>
</PropertyGroup>

Expand Down