Sfoglia il codice sorgente

修复部分文件未改为嵌入式资源

felix 2 anni fa
parent
commit
735d81a76d
2 ha cambiato i file con 71 aggiunte e 85 eliminazioni
  1. 0 5
      Directory.Build.props
  2. 71 80
      Vinno.FIS.Sonopost/Vinno.FIS.Sonopost.csproj

+ 0 - 5
Directory.Build.props

@@ -1,5 +0,0 @@
-<Project>
-	<ItemGroup>
-		<SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
-	</ItemGroup>  
-</Project>

+ 71 - 80
Vinno.FIS.Sonopost/Vinno.FIS.Sonopost.csproj

@@ -231,84 +231,86 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="app.manifest" />
-    <None Include="Assets\wwwroot\css\index.less" />
-    <None Include="Assets\wwwroot\lang\en-us.json" />
-    <None Include="Assets\wwwroot\lang\zh-cn.json" />
-    <None Include="Assets\wwwroot\libs\jquery\jquery.min.map" />
-    <None Include="Assets\wwwroot\libs\layui\font\iconfont.eot" />
-    <Resource Include="Assets\wwwroot\libs\layui\font\iconfont.ttf" />
-    <None Include="Assets\wwwroot\libs\layui\font\iconfont.woff" />
-    <None Include="Assets\wwwroot\libs\layui\font\iconfont.woff2" />
-    <None Include="Assets\wwwroot\README.md" />
+    <EmbeddedResource Include="Assets\wwwroot\css\index.less" />
+    <EmbeddedResource Include="Assets\wwwroot\lang\en-us.json" />
+    <EmbeddedResource Include="Assets\wwwroot\lang\zh-cn.json" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\jquery\jquery.min.map" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\font\iconfont.eot" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\font\iconfont.ttf" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\font\iconfont.woff" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\font\iconfont.woff2" />
+    <EmbeddedResource Include="Assets\wwwroot\README.md" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="Resources\UploadVidTags.conf" />
+    <None Include="Resources\UploadVidTags.conf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Assets\wwwroot\components\DeviceWsPreview.html" />
-    <Content Include="Assets\wwwroot\components\NetworkAdapterItem.html" />
-    <Content Include="Assets\wwwroot\components\NetworkSettingForm.html" />
-    <Content Include="Assets\wwwroot\components\WifiConnectionItem.html" />
-    <Content Include="Assets\wwwroot\css\index.css" />
-    <Resource Include="Assets\wwwroot\favicon.ico" />
-    <Resource Include="Assets\wwwroot\images\headlogo_h100.png" />
-    <Resource Include="Assets\wwwroot\images\icon\success.png" />
-    <Resource Include="Assets\wwwroot\images\icon\warning.png" />
-    <Resource Include="Assets\wwwroot\images\icon\wifi-1.png" />
-    <Resource Include="Assets\wwwroot\images\icon\wifi-2.png" />
-    <Resource Include="Assets\wwwroot\images\icon\wifi-3.png" />
-    <Resource Include="Assets\wwwroot\images\icon\wifi-4.png" />
-    <Resource Include="Assets\wwwroot\images\live-preview.png" />
-    <Content Include="Assets\wwwroot\index.html" />
-    <Content Include="Assets\wwwroot\js\index.js" />
-    <Content Include="Assets\wwwroot\js\prepare.js" />
-    <Content Include="Assets\wwwroot\libs\jquery\jquery.js" />
-    <Content Include="Assets\wwwroot\libs\jquery\jquery.min.js" />
-    <Content Include="Assets\wwwroot\libs\jquery\jquery.qrcode.min.js" />
-    <Content Include="Assets\wwwroot\libs\layui.js" />
-    <Content Include="Assets\wwwroot\libs\layui\css\layui.css" />
-    <Content Include="Assets\wwwroot\libs\layui\css\modules\code.css" />
-    <Content Include="Assets\wwwroot\libs\layui\css\modules\laydate\default\laydate.css" />
-    <Resource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\icon-ext.png" />
-    <Resource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\icon.png" />
-    <Content Include="Assets\wwwroot\libs\layui\css\modules\layer\default\layer.css" />
-    <Resource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\loading-0.gif" />
-    <Resource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\loading-1.gif" />
-    <Resource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\loading-2.gif" />
-    <Content Include="Assets\wwwroot\libs\layui\font\iconfont.svg" />
-    <Content Include="Assets\wwwroot\libs\layui\layui.js" />
-    <Content Include="Assets\wwwroot\libs\polyfill\polyfill.js" />
-    <Content Include="Assets\wwwroot\libs\polyfill\polyfill.min.js" />
-    <Content Include="Assets\wwwroot\pages\404.html" />
-    <Content Include="Assets\wwwroot\pages\dicom\faillist.html" />
-    <Content Include="Assets\wwwroot\pages\dicom\sono.html" />
-    <Content Include="Assets\wwwroot\pages\dicom\station.html" />
-    <Content Include="Assets\wwwroot\pages\live\camera01.html" />
-    <Content Include="Assets\wwwroot\pages\live\camera02.html" />
-    <Content Include="Assets\wwwroot\pages\live\mic.html" />
-    <Content Include="Assets\wwwroot\pages\live\sono.html" />
-    <Content Include="Assets\wwwroot\pages\network\advance.html" />
-    <Content Include="Assets\wwwroot\pages\network\dns.html" />
-    <Content Include="Assets\wwwroot\pages\network\wifi.html" />
-    <Content Include="Assets\wwwroot\pages\network\wire.html" />
-    <Content Include="Assets\wwwroot\pages\server\login.html" />
-    <Content Include="Assets\wwwroot\pages\server\networkcheck.html" />
-    <Content Include="Assets\wwwroot\pages\system\log.html" />
-    <Content Include="Assets\wwwroot\pages\system\oledlang.html" />
-    <Content Include="Assets\wwwroot\pages\system\rainbowimage.html" />
-    <Content Include="Assets\wwwroot\pages\system\recover.html" />
-    <Content Include="Assets\wwwroot\pages\system\restart.html" />
-    <Content Include="Assets\wwwroot\pages\system\vcloudlogin.html" />
-    <Content Include="Assets\wwwroot\pages\system\version.html" />
-    <Resource Include="Resources\wifi_1.png" />
-    <Resource Include="Resources\wifi_2.png" />
-    <Resource Include="Resources\wifi_3.png" />
-    <Resource Include="Resources\wifi_4.png" />
+    <EmbeddedResource Include="Assets\wwwroot\components\DeviceWsPreview.html" />
+    <EmbeddedResource Include="Assets\wwwroot\components\NetworkAdapterItem.html" />
+    <EmbeddedResource Include="Assets\wwwroot\components\NetworkSettingForm.html" />
+    <EmbeddedResource Include="Assets\wwwroot\components\WifiConnectionItem.html" />
+    <EmbeddedResource Include="Assets\wwwroot\css\index.css" />
+    <EmbeddedResource Include="Assets\wwwroot\favicon.ico" />
+    <EmbeddedResource Include="Assets\wwwroot\images\headlogo_h100.png" />
+    <EmbeddedResource Include="Assets\wwwroot\images\icon\success.png" />
+    <EmbeddedResource Include="Assets\wwwroot\images\icon\warning.png" />
+    <EmbeddedResource Include="Assets\wwwroot\images\icon\wifi-1.png" />
+    <EmbeddedResource Include="Assets\wwwroot\images\icon\wifi-2.png" />
+    <EmbeddedResource Include="Assets\wwwroot\images\icon\wifi-3.png" />
+    <EmbeddedResource Include="Assets\wwwroot\images\icon\wifi-4.png" />
+    <EmbeddedResource Include="Assets\wwwroot\images\live-preview.png" />
+    <EmbeddedResource Include="Assets\wwwroot\index.html" />
+    <EmbeddedResource Include="Assets\wwwroot\js\index.js" />
+    <EmbeddedResource Include="Assets\wwwroot\js\prepare.js" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\jquery\jquery.js" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\jquery\jquery.min.js" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\jquery\jquery.qrcode.min.js" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui.js" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\layui.css" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\code.css" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\laydate\default\laydate.css" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\icon-ext.png" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\icon.png" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\layer.css" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\loading-0.gif" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\loading-1.gif" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\loading-2.gif" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\font\iconfont.svg" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\layui\layui.js" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\polyfill\polyfill.js" />
+    <EmbeddedResource Include="Assets\wwwroot\libs\polyfill\polyfill.min.js" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\404.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\dicom\faillist.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\dicom\sono.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\dicom\station.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\live\camera01.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\live\camera02.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\live\mic.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\live\sono.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\network\advance.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\network\dns.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\network\wifi.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\network\wire.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\server\login.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\server\networkcheck.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\system\log.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\system\oledlang.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\system\rainbowimage.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\system\recover.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\system\restart.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\system\vcloudlogin.html" />
+    <EmbeddedResource Include="Assets\wwwroot\pages\system\version.html" />
+    <EmbeddedResource Include="Resources\wifi_1.png" />
+    <EmbeddedResource Include="Resources\wifi_2.png" />
+    <EmbeddedResource Include="Resources\wifi_3.png" />
+    <EmbeddedResource Include="Resources\wifi_4.png" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FISSDK\FISIMPL\FISIMPL.csproj">
@@ -332,17 +334,6 @@
       <Name>Vinno.vCloud.FIS.CrossPlatform.Windows</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="SkiaSharp">
-      <Version>1.68.2.1</Version>
-    </PackageReference>
-    <PackageReference Include="sqlite-net-pcl">
-      <Version>1.7.335</Version>
-    </PackageReference>
-    <PackageReference Include="System.Text.Json">
-      <Version>5.0.2</Version>
-    </PackageReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>if not exist "$(TargetDir)x64" mkdir "$(TargetDir)x64"