Skip to content

Commit efd7298

Browse files
jianxuanbingjianxuanbing
committed
fix: update solution files
1 parent 370693c commit efd7298

File tree

113 files changed

+381
-410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+381
-410
lines changed

‎asset/props/sourcelink.env.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project>
2-
32
<ItemGroup>
43
<PackageReference Include="DotNetCore.SourceLink.Environment">
54
<Version Condition=" '$(TargetFramework)' == 'net48' ">2.2.0</Version>
@@ -8,10 +7,11 @@
87
<Version Condition=" '$(TargetFramework)' == 'net452' ">2.2.0</Version>
98
<Version Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.2.0</Version>
109
<Version Condition=" '$(TargetFramework)' == 'netstandard2.1' ">2.2.0</Version>
10+
<Version Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">2.2.0</Version>
11+
<Version Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">2.2.0</Version>
1112
<Version Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">3.1.0</Version>
1213
<Version Condition=" '$(TargetFramework)' == 'net5.0' ">3.1.0</Version>
1314
<Version Condition=" '$(TargetFramework)' == 'net6.0' ">3.1.0</Version>
1415
</PackageReference>
1516
</ItemGroup>
16-
1717
</Project>

‎common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<RootNamespace/>
44
<LangVersion>latest</LangVersion>
5-
<NoWarn Condition=" '$(Configuration)' == 'Debug' ">$(NoWarn);NETSDK1138</NoWarn>
5+
<NoWarn Condition=" '$(Configuration)' == 'Debug' ">$(NoWarn);CS1591;NETSDK1138</NoWarn>
66
<NoWarn Condition=" '$(Configuration)' == 'Release' ">$(NoWarn);CS1591;NETSDK1138</NoWarn>
77
</PropertyGroup>
88

‎common.tests.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<LangVersion>latest</LangVersion>
4-
<NoWarn>$(NoWarn);CS1591</NoWarn>
4+
<NoWarn>$(NoWarn);CS1591;NETSDK1138</NoWarn>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

‎components/src/Bing.Biz.OAuthLogin/Taobao/Configs/TaobaoAuthorizationConfig.cs‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,5 @@ namespace Bing.Biz.OAuthLogin.Taobao.Configs
88
/// </summary>
99
public class TaobaoAuthorizationConfig : AuthorizationConfigBase
1010
{
11-
/// <summary>
12-
/// 应用标识
13-
/// </summary>
14-
[Required(ErrorMessage = "应用标识[AppId]不能为空")]
15-
public string AppId { get; set; }
16-
17-
/// <summary>
18-
/// 应用密钥
19-
/// </summary>
20-
[Required(ErrorMessage = "应用密钥[AppKey]不能为空")]
21-
public string AppKey { get; set; }
22-
23-
/// <summary>
24-
/// 回调地址
25-
/// </summary>
26-
[Required(ErrorMessage = "回调地址[CallbackUrl]不能为空")]
27-
public string CallbackUrl { get; set; }
2811
}
2912
}

‎framework/src/Bing.AspNetCore/Bing.AspNetCore.csproj‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="project.props" />
2+
<PropertyGroup>
3+
<TargetFrameworks>netcoreapp3.1;netstandard2.0;</TargetFrameworks>
4+
</PropertyGroup>
35

4-
<Import Project="project.dependency.props" />
6+
<PropertyGroup>
7+
<AssemblyName>Bing.AspNetCore</AssemblyName>
8+
<PackageId>Bing.AspNetCore</PackageId>
9+
<Description>Bing.AspNetCore 组件，提供AspNetCore的服务端功能的封装</Description>
10+
</PropertyGroup>
511

612
<Import Project="..\..\..\common.props" />
713

14+
<Import Project="dependency.props" />
15+
16+
<Import Project="references.props" />
17+
818
<ItemGroup>
919
<Compile Update="Microsoft\AspNetCore\Mvc\ModelBinding\Metadata\MvcModelBindingResource.Designer.cs">
1020
<DesignTime>True</DesignTime>

‎framework/src/Bing.AspNetCore/Bing/Http/MimeTypes.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
namespace Bing.Http;
1+
// ReSharper disable UnusedMember.Global
2+
namespace Bing.Http;
23

34
/// <summary>
45
/// 媒体类型。

framework/src/Bing.AspNetCore/project.dependency.props renamed to framework/src/Bing.AspNetCore/dependency.props

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,4 @@
77
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
88
<FrameworkReference Include="Microsoft.AspNetCore.App" />
99
</ItemGroup>
10-
11-
<ItemGroup>
12-
<ProjectReference Include="..\Bing.Logging\Bing.Logging.csproj" />
13-
<ProjectReference Include="..\Bing.Security\Bing.Security.csproj" />
14-
<ProjectReference Include="..\Bing\Bing.csproj" />
15-
</ItemGroup>
1610
</Project>

‎framework/src/Bing.AspNetCore/project.props‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎framework/src/Bing.AspNetCore/references.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<ItemGroup>
3+
<ProjectReference Include="..\Bing.Logging\Bing.Logging.csproj" />
4+
<ProjectReference Include="..\Bing.Security\Bing.Security.csproj" />
5+
</ItemGroup>
6+
</Project>

‎framework/src/Bing.Auditing.Contracts/Bing.Auditing.Contracts.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
<Import Project="..\..\..\framework.props" />
99

10-
<Import Project="references.props" />
11-
1210
<Import Project="dependency.props" />
1311

12+
<Import Project="references.props" />
13+
1414
</Project>

0 commit comments

Comments
 (0)