Skip to content
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.

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

Developer net7 #2731

Merged
merged 3 commits into from
Nov 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6.sln
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.Weixin.Sample.TenPa
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.Weixin.Sample.TenPayV3", "..\..\TenPayV3\Senparc.Weixin.Sample.TenPayV3\Senparc.Weixin.Sample.TenPayV3.csproj", "{D70B89B9-27BC-45DD-A908-4282F101B409}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Senparc.Weixin.Sample.Shared", "..\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.shproj", "{81A03BCD-B887-4A40-8867-FF6B8D61CFC3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -693,16 +695,19 @@ Global
{5CDE163E-A083-418F-B70A-63F25A957666} = {34CFB1D8-6025-4E93-A67F-D94DD3B9198F}
{94C58964-01E0-4AA0-AF98-5851208D9755} = {34CFB1D8-6025-4E93-A67F-D94DD3B9198F}
{D70B89B9-27BC-45DD-A908-4282F101B409} = {34CFB1D8-6025-4E93-A67F-D94DD3B9198F}
{81A03BCD-B887-4A40-8867-FF6B8D61CFC3} = {1B168C93-E3E3-4939-8EDC-19CE4E041874}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DC7AD3EC-AB37-497E-925B-DCD5129FE6D3}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{5cde163e-a083-418f-b70a-63f25a957666}*SharedItemsImports = 5
..\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{81a03bcd-b887-4a40-8867-ff6b8d61cfc3}*SharedItemsImports = 13
..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{81a078a9-97d1-446d-88ed-87f4bb484d91}*SharedItemsImports = 5
..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{94c58964-01e0-4aa0-af98-5851208d9755}*SharedItemsImports = 5
..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{9fe36012-8b32-488e-96ad-ba7cedaeeab8}*SharedItemsImports = 13
..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{d70b89b9-27bc-45dd-a908-4282f101b409}*SharedItemsImports = 5
..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{defd229c-0482-4924-8746-73d21b9dab02}*SharedItemsImports = 5
..\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{eb4fcb9f-9670-4b03-9e9e-724aff737fd4}*SharedItemsImports = 5
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
<PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
</PropertyGroup>

<ItemGroup>
<None Include="wwwroot\js\site.js" />
<None Include="wwwroot\lib\signalr\dist\browser\signalr.js" />
<None Include="wwwroot\lib\signalr\dist\browser\signalr.min.js" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Senparc.CO2NET.WebApi" Version="1.2.1" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.1.1.1" />
Expand Down Expand Up @@ -55,10 +49,16 @@
</None>
</ItemGroup>

<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>

<ProjectExtensions>
<VisualStudio>
<UserProperties appsettings_1json__JsonSchema="" />
</VisualStudio>
</ProjectExtensions>

<Import Project="..\..\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems" Label="Shared" />

</Project>
15 changes: 15 additions & 0 deletions Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
using System;
using System.IO;
using System.Text;
using Microsoft.Extensions.FileProviders;

namespace Senparc.Weixin.Sample.Net6
{
Expand Down Expand Up @@ -111,6 +112,20 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env,
}
app.UseHttpsRedirection();
app.UseStaticFiles();
#region 此部分代码为 Sample 共享文件需要而添加,实际项目无需添加
#if DEBUG

if (senparcSetting.Value.IsDebug)
{
app.UseStaticFiles(new StaticFileOptions
{
FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), @"..", "..", "Senparc.Weixin.Sample.Shared", "wwwroot")),
RequestPath = new PathString("")
});
}
#endif
#endregion

app.UseRouting();


Expand Down
Loading