abpframework#19528 clean dependencies to leverage framework

thompson-tomo · Apr 25, 2024 · eee4f58 · eee4f58
1 parent ea9ebe1
commit eee4f58
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 12 deletions.
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj
@@ -17,22 +17,25 @@
  <PackageReference Include="SharpZipLib" />
  <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
  <PackageReference Include="NuGet.Versioning" />
- <PackageReference Include="System.Text.Encoding.CodePages" />
  <PackageReference Include="System.Security.Permissions" />
  <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
  <PackageReference Include="Polly" />
  <PackageReference Include="Polly.Extensions.Http" />
  <PackageReference Include="LibGit2Sharp" />
+ <PackageReference Include="Newtonsoft.Json" />
  <PackageReference Include="StackExchange.Redis" />
  <PackageReference Include="DeepL.net" />
  </ItemGroup>
 
+ <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
+ <PackageReference Include="System.Text.Encoding.CodePages" />
+ </ItemGroup>
+
  <ItemGroup>
  <ProjectReference Include="..\Volo.Abp.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj" />
  <ProjectReference Include="..\Volo.Abp.Http\Volo.Abp.Http.csproj" />
  <ProjectReference Include="..\Volo.Abp.IdentityModel\Volo.Abp.IdentityModel.csproj" />
  <ProjectReference Include="..\Volo.Abp.Json\Volo.Abp.Json.csproj" />
  <ProjectReference Include="..\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
- <PackageReference Include="Newtonsoft.Json" />
  </ItemGroup>
 </Project>
diff --git a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj
@@ -15,7 +15,6 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.CSharp" />
  <PackageReference Include="Serilog.Extensions.Logging" />
  <PackageReference Include="Serilog.Sinks.File" />
  <PackageReference Include="Serilog.Sinks.Console" />

diff --git a/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj b/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj
@@ -16,7 +16,6 @@
  <RootNamespace />
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="System.Collections.Immutable" />
  <PackageReference Include="Microsoft.Extensions.Localization" />
  <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
  <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
@@ -26,17 +25,18 @@
  <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
  <PackageReference Include="Microsoft.Extensions.Logging" />
  <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
- <PackageReference Include="System.Text.Encodings.Web" />
- <PackageReference Include="System.Runtime.Loader" />
  <PackageReference Include="System.Linq.Dynamic.Core" />
- <PackageReference Include="System.Linq.Queryable" />
  <PackageReference Include="JetBrains.Annotations" />
  <PackageReference Include="Nito.AsyncEx.Context" />
  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1')) ">
  <PackageReference Include="System.ComponentModel.Annotations" />
  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.0')) ">
+ <PackageReference Include="System.Collections.Immutable" />
+ <PackageReference Include="System.Text.Encodings.Web" />
+ <PackageReference Include="System.Runtime.Loader" />
+ <PackageReference Include="System.Linq.Queryable" />
  <PackageReference Include="Nullable">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/framework/src/Volo.Abp.Json.SystemTextJson/Volo.Abp.Json.SystemTextJson.csproj b/framework/src/Volo.Abp.Json.SystemTextJson/Volo.Abp.Json.SystemTextJson.csproj
@@ -20,6 +20,9 @@
  <ProjectReference Include="..\Volo.Abp.Json.Abstractions\Volo.Abp.Json.Abstractions.csproj" />
  <ProjectReference Include="..\Volo.Abp.Timing\Volo.Abp.Timing.csproj" />
  <ProjectReference Include="..\Volo.Abp.Data\Volo.Abp.Data.csproj" />
+ </ItemGroup>
+
+ <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
  <PackageReference Include="System.Text.Json" />
  </ItemGroup>
 

diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.csproj b/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.csproj
@@ -17,7 +17,6 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="System.Text.Encodings.Web" />
  <ProjectReference Include="..\Volo.Abp.Account.Application.Contracts\Volo.Abp.Account.Application.Contracts.csproj" />
  <ProjectReference Include="..\..\..\identity\src\Volo.Abp.Identity.Application\Volo.Abp.Identity.Application.csproj" />
  <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.UI.Navigation\Volo.Abp.UI.Navigation.csproj" />

diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Properties/launchSettings.json b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+ "profiles": {
+ "Volo.Abp.Account.Web.IdentityServer": {
+ "commandName": "Project",
+ "launchBrowser": true,
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ },
+ "applicationUrl": "https://localhost:61630;http://localhost:61633"
+ }
+ }
+}
diff --git a/...ccount/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj b/...ccount/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj
@@ -33,10 +33,6 @@
  <ProjectReference Include="..\Volo.Abp.Account.Web\Volo.Abp.Account.Web.csproj" />
  </ItemGroup>
 
- <ItemGroup>
- <PackageReference Include="System.Security.Principal.Windows" />
- </ItemGroup>
-
  <ItemGroup>
  <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" />
  </ItemGroup>

diff --git a/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Properties/launchSettings.json b/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+ "profiles": {
+ "Volo.Abp.Account.Web.OpenIddict": {
+ "commandName": "Project",
+ "launchBrowser": true,
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ },
+ "applicationUrl": "https://localhost:61631;http://localhost:61632"
+ }
+ }
+}