Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP

Audit.csproj

@@ -16,6 +16,7 @@
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -26,9 +27,8 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -56,7 +56,7 @@
     <StartupObject>Audit.App</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>FF6CCA351326B87CFBCEF1771D3D91BD27EAB765</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>74D87CC6BC513EEF88732E235C1B03AFDA32DEF9</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestKeyFile>Audit_TemporaryKey.pfx</ManifestKeyFile>
@@ -70,6 +70,26 @@
   <PropertyGroup>
     <SignManifests>true</SignManifests>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CommonServiceLocator, Version=2.0.6.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>packages\CommonServiceLocator.2.0.6\lib\net48\CommonServiceLocator.dll</HintPath>

Audit.sln

@@ -11,26 +11,36 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{43516CC3-DB11-401F-AC40-94676C508BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{43516CC3-DB11-401F-AC40-94676C508BB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{43516CC3-DB11-401F-AC40-94676C508BB9}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{43516CC3-DB11-401F-AC40-94676C508BB9}.Debug|x64.Build.0 = Debug|Any CPU
+		{43516CC3-DB11-401F-AC40-94676C508BB9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{43516CC3-DB11-401F-AC40-94676C508BB9}.Debug|x86.Build.0 = Debug|Any CPU
 		{43516CC3-DB11-401F-AC40-94676C508BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43516CC3-DB11-401F-AC40-94676C508BB9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{43516CC3-DB11-401F-AC40-94676C508BB9}.Release|x64.ActiveCfg = Release|x64
 		{43516CC3-DB11-401F-AC40-94676C508BB9}.Release|x64.Build.0 = Release|x64
+		{43516CC3-DB11-401F-AC40-94676C508BB9}.Release|x86.ActiveCfg = Release|x86
+		{43516CC3-DB11-401F-AC40-94676C508BB9}.Release|x86.Build.0 = Release|x86
 		{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Debug|Any CPU.Build.0 = Debug|x64
 		{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Debug|x64.Build.0 = Debug|Any CPU
+		{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Debug|x86.Build.0 = Debug|Any CPU
 		{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Release|x64.ActiveCfg = Release|x64
 		{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Release|x64.Build.0 = Release|x64
+		{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE