ReAdd Vinno.FIS.Sonopost.csproj

FISLib.sln

@@ -46,7 +46,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vinno.FIS.Sonopost.Upgrade"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vinno.FIS.Sonopost.Wireless", "Vinno.FIS.Sonopost.Wireless\Vinno.FIS.Sonopost.Wireless.csproj", "{115E0A13-31AB-4115-939A-E4A1887AB7DC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vinno.FIS.Sonopost", "Vinno.FIS.Sonopost\Vinno.FIS.Sonopost.csproj", "{FEAAF991-8EA5-4D96-BE1A-A8580D05B697}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vinno.FIS.Sonopost", "Vinno.FIS.Sonopost\Vinno.FIS.Sonopost.csproj", "{F77DFC56-4D10-4A51-A483-F2BCD9CAAFA4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -114,10 +114,10 @@ Global
 		{115E0A13-31AB-4115-939A-E4A1887AB7DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{115E0A13-31AB-4115-939A-E4A1887AB7DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{115E0A13-31AB-4115-939A-E4A1887AB7DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FEAAF991-8EA5-4D96-BE1A-A8580D05B697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEAAF991-8EA5-4D96-BE1A-A8580D05B697}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FEAAF991-8EA5-4D96-BE1A-A8580D05B697}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FEAAF991-8EA5-4D96-BE1A-A8580D05B697}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F77DFC56-4D10-4A51-A483-F2BCD9CAAFA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F77DFC56-4D10-4A51-A483-F2BCD9CAAFA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F77DFC56-4D10-4A51-A483-F2BCD9CAAFA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F77DFC56-4D10-4A51-A483-F2BCD9CAAFA4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Vinno.FIS.Sonopost/App.config

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
-    </startup>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+	</startup>
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<probing privatePath="x64;TRTC;" />

Vinno.FIS.Sonopost/App.xaml

@@ -1,9 +1,7 @@
 <Application x:Class="Vinno.FIS.Sonopost.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Vinno.FIS.Sonopost"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-         
     </Application.Resources>
-</Application>
+</Application>

Vinno.FIS.Sonopost/Vinno.FIS.Sonopost.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{FEAAF991-8EA5-4D96-BE1A-A8580D05B697}</ProjectGuid>
+    <ProjectGuid>{F77DFC56-4D10-4A51-A483-F2BCD9CAAFA4}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Vinno.FIS.Sonopost</RootNamespace>
     <AssemblyName>Sonopost</AssemblyName>
@@ -21,21 +21,24 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\Bin\WindowsSonopost\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Bin\WindowsSonopost\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Dicom.Core">
       <HintPath>..\packages\Dicom\Dicom.Core.dll</HintPath>
@@ -227,86 +230,84 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="app.manifest" />
-    <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="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" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="Resources\UploadVidTags.conf">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <None Include="Resources\UploadVidTags.conf" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <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" />
+    <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" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FISSDK\FISIMPL\FISIMPL.csproj">
@@ -339,7 +340,8 @@
   <PropertyGroup>
     <PostBuildEvent>if not exist "$(TargetDir)x64" mkdir "$(TargetDir)x64"
 if not exist "$(TargetDir)TRTC" mkdir "$(TargetDir)TRTC"
-if not exist "$(TargetDir)Settings"  XCopy /Y /E /R  $(SolutionDir)Settings\* $(TargetDir)Settings\* 
+
+if not exist "$(TargetDir)Settings"  XCopy /Y /E /R  $(SolutionDir)Bin\Settings\* $(TargetDir)Settings\* 
 XCopy /E/Y/R "$(SolutionDir)packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\runtimes\win10-x64\*" "$(TargetDir)runtimes\win10-x64\*"
 XCopy /E/Y/R "$(SolutionDir)packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\runtimes\win-x64\*" "$(TargetDir)runtimes\win-x64\*"
 Copy /Y "$(SolutionDir)packages\SmartStreamingSDK\Windows\x64\*.*" "$(TargetDir)x64\*.*"
@@ -347,8 +349,6 @@ Copy /Y "$(SolutionDir)packages\TRTC\Win64\lib\*.*" "$(TargetDir)TRTC\*.*"
 Copy /Y "$(SolutionDir)packages\Lennox.LibYuvSharp.1.1.2\runtimes\win-x64\native\libyuv_internal.dll" "$(TargetDir)libyuv_internal.dll"
 Copy /Y "$(SolutionDir)Bin\Vinno.FIS.TRTCClient\*.*" "$(TargetDir)*.*"
 Move "$(TargetDir)ManageLiteAV.dll" "$(TargetDir)TRTC\ManageLiteAV.dll"
-Move "$(TargetDir)ManageLiteAV.xml" "$(TargetDir)TRTC\ManageLiteAV.xml"
-RD /S/Q "$(TargetDir)x86"
-	</PostBuildEvent>
+Move "$(TargetDir)ManageLiteAV.xml" "$(TargetDir)TRTC\ManageLiteAV.xml"</PostBuildEvent>
   </PropertyGroup>
 </Project>