Skip to content

Commit

Permalink
Merge pull request #2506 from JeffreySu/Developer
Browse files Browse the repository at this point in the history
Developer
  • Loading branch information
JeffreySu authored Nov 9, 2021
2 parents fc9b7e6 + d49942f commit 57aa9eb
Show file tree
Hide file tree
Showing 20 changed files with 191 additions and 186 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="Senparc.NeuChar" Version="1.5.0-preview1.2" />
<PackageReference Include="Senparc.NeuChar" Version="1.5.0" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
<PackageReference Include="ZXing.Net" Version="0.16.4" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.4" />
<PackageReference Include="Senparc.NeuChar.App" Version="0.11.0-preview1.1" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="0.5.0-preview1.1" />
<PackageReference Include="Senparc.NeuChar.App" Version="0.11.0" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="0.5.0" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
<PackageReference Include="ZXing.Net" Version="0.16.4" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"DefaultCacheNamespace": "DefaultCache",

//分布式缓存
//"Cache_Redis_Configuration": "#{Cache_Redis_Configuration}#", //Redis配置
"Cache_Redis_Configuration": "localhost:6379",//不包含密码
"Cache_Redis_Configuration": "#{Cache_Redis_Configuration}#", //Redis配置
//"Cache_Redis_Configuration": "localhost:6379",//不包含密码
//"Cache_Redis_Configuration": "localhost:6379,password=senparc,connectTimeout=1000,connectRetry=2,syncTimeout=10000,defaultDatabase=3",//密码及其他配置
"Cache_Memcached_Configuration": "#{Cache_Memcached_Configuration}#", //Memcached配置
"SenparcUnionAgentKey": "#{SenparcUnionAgentKey}#" //SenparcUnionAgentKey
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net451;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
<Version>0.12</Version>
<AssemblyName>Senparc.WebSocket</AssemblyName>
<RootNamespace>Senparc.WebSocket</RootNamespace>
Expand Down Expand Up @@ -59,27 +59,27 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut</OutputPath>
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
<DocumentationFile>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\Senparc.WebSocket.xml</DocumentationFile>
<DocumentationFile>..\..\..\..\Senparc.Weixin.BuildOutPut\Senparc.WebSocket.xml</DocumentationFile>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
<OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\net45\Senparc.WebSocket.xml</DocumentationFile>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net451|AnyCPU'">
<OutputPath>..\..\..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\Senparc.Weixin.BuildOutPut\net451\Senparc.WebSocket.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\netstandard2.0\Senparc.WebSocket.xml</DocumentationFile>
<OutputPath>..\..\..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\Senparc.Weixin.BuildOutPut\netstandard2.0\Senparc.WebSocket.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
<OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\netstandard2.1\Senparc.WebSocket.xml</DocumentationFile>
<OutputPath>..\..\..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\Senparc.Weixin.BuildOutPut\netstandard2.1\Senparc.WebSocket.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.1|AnyCPU'">
<OutputPath>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\Senparc.Weixin.MP.BuildOutPut\netcoreapp3.1\Senparc.WebSocket.xml</DocumentationFile>
<OutputPath>..\..\..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\..\..\Senparc.Weixin.BuildOutPut\netcoreapp3.1\Senparc.WebSocket.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Core" />
Expand Down Expand Up @@ -123,7 +123,7 @@
<Compile Remove="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET" Version="1.5.2-preview4" />
<PackageReference Include="Senparc.CO2NET" Version="1.6.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
</ItemGroup>
Expand Down
24 changes: 12 additions & 12 deletions src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.netcore3.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net451;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
<Version>0.3</Version>
<AssemblyName>Senparc.Weixin.AspNet</AssemblyName>
<RootNamespace>Senparc.Weixin.AspNet</RootNamespace>
Expand Down Expand Up @@ -34,27 +34,27 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>..\Senparc.Weixin.MP.BuildOutPut</OutputPath>
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
<DocumentationFile>..\Senparc.Weixin.MP.BuildOutPut\Senparc.Weixin.AspNet.xml</DocumentationFile>
<DocumentationFile>..\Senparc.Weixin.BuildOutPut\Senparc.Weixin.AspNet.xml</DocumentationFile>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
<OutputPath>..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\Senparc.Weixin.MP.BuildOutPut\net45\Senparc.Weixin.AspNet.xml</DocumentationFile>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net451|AnyCPU'">
<OutputPath>..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\Senparc.Weixin.BuildOutPut\net451\Senparc.Weixin.AspNet.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<OutputPath>..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\Senparc.Weixin.MP.BuildOutPut\netstandard2.0\Senparc.Weixin.AspNet.xml</DocumentationFile>
<OutputPath>..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\Senparc.Weixin.BuildOutPut\netstandard2.0\Senparc.Weixin.AspNet.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
<OutputPath>..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\Senparc.Weixin.MP.BuildOutPut\netstandard2.1\Senparc.Weixin.AspNet.xml</DocumentationFile>
<OutputPath>..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\Senparc.Weixin.BuildOutPut\netstandard2.1\Senparc.Weixin.AspNet.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.1|AnyCPU'">
<OutputPath>..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\Senparc.Weixin.MP.BuildOutPut\netcoreapp3.1\Senparc.Weixin.AspNet.xml</DocumentationFile>
<OutputPath>..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\Senparc.Weixin.BuildOutPut\netcoreapp3.1\Senparc.Weixin.AspNet.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Compile Remove="AdvancedAPIs\Card\Store\**" />
Expand Down Expand Up @@ -82,7 +82,7 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar.AspNet" Version="0.5.0-preview1.1" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="0.5.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.netcore3.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net451;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>0.3</Version>
<AssemblyName>Senparc.Weixin.Cache.CsRedis</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.CsRedis</RootNamespace>
Expand Down Expand Up @@ -34,27 +34,27 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>..\..\Senparc.Weixin.MP.BuildOutPut</OutputPath>
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
<DocumentationFile>..\..\Senparc.Weixin.MP.BuildOutPut\Senparc.Weixin.Cache.CsRedis.XML</DocumentationFile>
<DocumentationFile>..\..\Senparc.Weixin.BuildOutPut\Senparc.Weixin.Cache.CsRedis.XML</DocumentationFile>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
<OutputPath>..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.MP.BuildOutPut\net45\Senparc.Cache.CsRedis.xml</DocumentationFile>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net451|AnyCPU'">
<OutputPath>..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.BuildOutPut\net451\Senparc.Cache.CsRedis.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net461|AnyCPU'">
<OutputPath>..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.MP.BuildOutPut\net461\Senparc.Cache.CsRedis.xml</DocumentationFile>
<OutputPath>..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.BuildOutPut\net461\Senparc.Cache.CsRedis.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<OutputPath>..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.MP.BuildOutPut\netstandard2.0\Senparc.Cache.CsRedis.xml</DocumentationFile>
<OutputPath>..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.BuildOutPut\netstandard2.0\Senparc.Cache.CsRedis.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
<OutputPath>..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.MP.BuildOutPut\netstandard2.1\Senparc.Cache.CsRedis.xml</DocumentationFile>
<OutputPath>..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.BuildOutPut\netstandard2.1\Senparc.Cache.CsRedis.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Compile Remove="ContainerCacheStrategy\RedisContainerCacheStrategy.RedisUtils.cs" />
Expand All @@ -63,7 +63,7 @@
<ItemGroup>
<!--<PackageReference Include="Senparc.Weixin.Cache.Redis.RedLock" Version="0.1.0" />-->
<PackageReference Include="BinaryFormatter" Version="2.1.4" />
<PackageReference Include="Senparc.CO2NET.Cache.CsRedis" Version="0.5.2-preview4" />
<PackageReference Include="Senparc.CO2NET.Cache.CsRedis" Version="0.6.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net451;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>2.8</Version>
<AssemblyName>Senparc.Weixin.Cache.Memcached</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.Memcached</RootNamespace>
Expand Down Expand Up @@ -83,31 +83,31 @@ https://github.com/JeffreySu/WeiXinMPSDK</Description>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>..\..\Senparc.Weixin.MP.BuildOutPut</OutputPath>
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
<DocumentationFile>..\..\Senparc.Weixin.MP.BuildOutPut\Senparc.Weixin.Cache.Memcached.XML</DocumentationFile>
<DocumentationFile>..\..\Senparc.Weixin.BuildOutPut\Senparc.Weixin.Cache.Memcached.XML</DocumentationFile>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<!--<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.6|AnyCPU'">
<OutputPath>..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.MP.BuildOutPut\netstandard1.6\Senparc.Cache.Memcached.xml</DocumentationFile>
<OutputPath>..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.BuildOutPut\netstandard1.6\Senparc.Cache.Memcached.xml</DocumentationFile>
</PropertyGroup>-->
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
<OutputPath>..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.MP.BuildOutPut\net45\Senparc.Cache.Memcached.xml</DocumentationFile>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net451|AnyCPU'">
<OutputPath>..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.BuildOutPut\net451\Senparc.Cache.Memcached.xml</DocumentationFile>
</PropertyGroup>
<!--<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.6|AnyCPU'">
<OutputPath>..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.MP.BuildOutPut\netstandard1.6\Senparc.Cache.Memcached.xml</DocumentationFile>
<OutputPath>..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.BuildOutPut\netstandard1.6\Senparc.Cache.Memcached.xml</DocumentationFile>
</PropertyGroup>-->
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<OutputPath>..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.MP.BuildOutPut\netstandard2.0\Senparc.Cache.Memcached.xml</DocumentationFile>
<OutputPath>..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.BuildOutPut\netstandard2.0\Senparc.Cache.Memcached.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
<OutputPath>..\..\Senparc.Weixin.MP.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.MP.BuildOutPut\netstandard2.1\Senparc.Cache.Memcached.xml</DocumentationFile>
<OutputPath>..\..\Senparc.Weixin.BuildOutPut\</OutputPath>
<DocumentationFile>..\..\Senparc.Weixin.BuildOutPut\netstandard2.1\Senparc.Cache.Memcached.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Core" />
Expand Down Expand Up @@ -148,7 +148,7 @@ https://github.com/JeffreySu/WeiXinMPSDK</Description>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET.Cache.Memcached" Version="3.9.0-preview4" />
<PackageReference Include="Senparc.CO2NET.Cache.Memcached" Version="3.10.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.netcore3.csproj" />
Expand Down
Loading

0 comments on commit 57aa9eb

Please # to comment.