Merge pull request #2631 from JeffreySu/Developer

Developer
JeffreySu · May 4, 2022 · aa1770e · aa1770e
2 parents 1acb651 + 348a1d5
commit aa1770e
Show file tree

Hide file tree

Showing 73 changed files with 59,681 additions and 19,701 deletions.
diff --git a/Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/Senparc.Weixin.Sample.Net6.csproj b/Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/Senparc.Weixin.Sample.Net6.csproj
@@ -9,31 +9,6 @@
 
 	<ItemGroup>
 		<None Include="wwwroot\js\site.js" />
-		<None Include="wwwroot\lib\bootstrap\dist\css\bootstrap-grid.css.map" />
-		<None Include="wwwroot\lib\bootstrap\dist\css\bootstrap-grid.min.css.map" />
-		<None Include="wwwroot\lib\bootstrap\dist\css\bootstrap-reboot.css.map" />
-		<None Include="wwwroot\lib\bootstrap\dist\css\bootstrap-reboot.min.css.map" />
-		<None Include="wwwroot\lib\bootstrap\dist\css\bootstrap.css.map" />
-		<None Include="wwwroot\lib\bootstrap\dist\css\bootstrap.min.css.map" />
-		<None Include="wwwroot\lib\bootstrap\dist\js\bootstrap.bundle.js" />
-		<None Include="wwwroot\lib\bootstrap\dist\js\bootstrap.bundle.js.map" />
-		<None Include="wwwroot\lib\bootstrap\dist\js\bootstrap.bundle.min.js" />
-		<None Include="wwwroot\lib\bootstrap\dist\js\bootstrap.bundle.min.js.map" />
-		<None Include="wwwroot\lib\bootstrap\dist\js\bootstrap.js" />
-		<None Include="wwwroot\lib\bootstrap\dist\js\bootstrap.js.map" />
-		<None Include="wwwroot\lib\bootstrap\dist\js\bootstrap.min.js" />
-		<None Include="wwwroot\lib\bootstrap\dist\js\bootstrap.min.js.map" />
-		<None Include="wwwroot\lib\bootstrap\LICENSE" />
-		<None Include="wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.js" />
-		<None Include="wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.min.js" />
-		<None Include="wwwroot\lib\jquery-validation\dist\additional-methods.js" />
-		<None Include="wwwroot\lib\jquery-validation\dist\additional-methods.min.js" />
-		<None Include="wwwroot\lib\jquery-validation\dist\jquery.validate.js" />
-		<None Include="wwwroot\lib\jquery-validation\dist\jquery.validate.min.js" />
-		<None Include="wwwroot\lib\jquery-validation\LICENSE.md" />
-		<None Include="wwwroot\lib\jquery\dist\jquery.js" />
-		<None Include="wwwroot\lib\jquery\dist\jquery.min.js" />
-		<None Include="wwwroot\lib\jquery\dist\jquery.min.map" />
 		<None Include="wwwroot\lib\signalr\dist\browser\signalr.js" />
 		<None Include="wwwroot\lib\signalr\dist\browser\signalr.min.js" />
 	</ItemGroup>

diff --git a/Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/Views/Shared/_Layout.cshtml b/Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/Views/Shared/_Layout.cshtml
@@ -17,26 +17,10 @@
     <link href="~/Content/reset.css" rel="stylesheet" />
     <link href="~/Content/style.css" rel="stylesheet" />
 
-    <environment names="Development">
-        <script src="~/lib/jquery/dist/jquery.js"></script>
-        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
-        <script src="~/js/site.js" asp-append-version="true"></script>
-    </environment>
-    <environment names="Staging,Production">
-        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-3.5.1.min.js"
-                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
-                asp-fallback-test="window.jQuery"
-                crossorigin="anonymous"
-                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
-        </script>
-        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
-                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
-                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
-                crossorigin="anonymous"
-                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
-        </script>
-        <script src="~/js/site.min.js" asp-append-version="true"></script>
-    </environment>
+    <script src="~/lib/jquery/dist/jquery.min.js"></script>
+    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="~/js/site.js" asp-append-version="true"></script>
+
     <script src="~/Content/danktooltip/js/jquery.darktooltip.min.js"></script>
     <script src="~/Scripts/global.js"></script>
     <script src="~/Scripts/jquery.form.js"></script>

diff --git a/Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/wwwroot/lib/bootstrap/.bower.json b/Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/wwwroot/lib/bootstrap/.bower.json
diff --git a/Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/wwwroot/lib/bootstrap/LICENSE b/Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/wwwroot/lib/bootstrap/LICENSE
@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2016 Twitter, Inc.
+Copyright (c) 2011-2021 Twitter, Inc.
+Copyright (c) 2011-2021 The Bootstrap Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal