* возвращены типовые конфигурации решения (Release, Debug), msi - тол…

…ько compressed (#3) [ci skip]
IT-Service · Dec 10, 2016 · 8b94c44 · 8b94c44
1 parent 3da5d5e
commit 8b94c44
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 58 deletions.
diff --git a/Bootstrapper/Bootstrapper.csproj b/Bootstrapper/Bootstrapper.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}</ProjectGuid>
     <OutputType>WinExe</OutputType>
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile />
-    <PublishUrl>опубликовать\</PublishUrl>
+    <PublishUrl></PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>

diff --git a/ITG.WixUtils/ITGWixUtils.wixproj b/ITG.WixUtils/ITGWixUtils.wixproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProductVersion>3.8</ProductVersion>
     <ProjectGuid>a6247d3f-c713-46f7-876f-fabf05437b65</ProjectGuid>

diff --git a/Metrcontrol/Metrcontrol.wixproj b/Metrcontrol/Metrcontrol.wixproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Admin image</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProductVersion>3.7</ProductVersion>
     <ProjectGuid>00cb7f8e-8726-4e55-91b7-eb05d0a4a5d3</ProjectGuid>
@@ -20,15 +20,13 @@
     <OutputPath>$(SolutionDir)bin\$(Configuration)\$(Platform)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\$(Platform)\</IntermediateOutputPath>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Admin image|x86' ">
-    <DefineConstants>AdminImage</DefineConstants>
-    <SuppressIces>ICE39;ICE69;ICE90;ICE80</SuppressIces>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Single .msi file|x86' ">
     <DefineConstants>SingleMSIFile</DefineConstants>
     <SuppressIces>ICE39;ICE69;ICE90;ICE80</SuppressIces>
   </PropertyGroup>
+  <!-- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Admin image|x86' "> -->
+    <!-- <DefineConstants>AdminImage</DefineConstants> -->
+    <!-- <SuppressIces>ICE39;ICE69;ICE90;ICE80</SuppressIces> -->
+  <!-- </PropertyGroup> -->
   <ItemGroup>
     <Compile Include="csmadmin.wxs" />
     <Compile Include="CSMBootstrapper.wxs" />

diff --git a/Metrocontrol.sln b/Metrocontrol.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Metrcontrol", "Metrcontrol\Metrcontrol.wixproj", "{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -10,7 +10,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Metrcontrol", "Metrcontrol\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{49BCD175-34FD-40B6-8597-465D735DFA40}"
 	ProjectSection(SolutionItems) = preProject
-		Issuer.cer = Issuer.cer
 		readme.md = readme.md
 	EndProjectSection
 EndProject
@@ -20,80 +19,50 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ITGWixUtils", "ITG.WixUtils
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Admin image|Any CPU = Admin image|Any CPU
-		Admin image|Mixed Platforms = Admin image|Mixed Platforms
-		Admin image|x86 = Admin image|x86
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|x86 = Release|x86
-		Single .msi file|Any CPU = Single .msi file|Any CPU
-		Single .msi file|Mixed Platforms = Single .msi file|Mixed Platforms
-		Single .msi file|x86 = Single .msi file|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Admin image|Any CPU.ActiveCfg = Admin image|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Admin image|Mixed Platforms.ActiveCfg = Admin image|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Admin image|Mixed Platforms.Build.0 = Admin image|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Admin image|x86.ActiveCfg = Admin image|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Admin image|x86.Build.0 = Admin image|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Debug|Any CPU.ActiveCfg = Single .msi file|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Debug|Mixed Platforms.ActiveCfg = Single .msi file|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Debug|Mixed Platforms.Build.0 = Single .msi file|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Debug|x86.ActiveCfg = Single .msi file|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Release|Any CPU.ActiveCfg = Single .msi file|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Release|Mixed Platforms.ActiveCfg = Single .msi file|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Release|Mixed Platforms.Build.0 = Single .msi file|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Release|x86.ActiveCfg = Single .msi file|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Single .msi file|Any CPU.ActiveCfg = Single .msi file|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Single .msi file|Mixed Platforms.ActiveCfg = Single .msi file|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Single .msi file|Mixed Platforms.Build.0 = Single .msi file|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Single .msi file|x86.ActiveCfg = Single .msi file|x86
-		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Single .msi file|x86.Build.0 = Single .msi file|x86
-		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Admin image|Any CPU.ActiveCfg = Release|Any CPU
-		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Admin image|Any CPU.Build.0 = Release|Any CPU
-		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Admin image|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Admin image|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Admin image|x86.ActiveCfg = Release|Any CPU
-		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Admin image|x86.Build.0 = Release|Any CPU
+		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Debug|Any CPU.Build.0 = Debug|x86
+		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Debug|x86.ActiveCfg = Debug|x86
+		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Debug|x86.Build.0 = Debug|x86
+		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Release|Any CPU.ActiveCfg = Release|x86
+		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Release|Any CPU.Build.0 = Release|x86
+		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Release|Mixed Platforms.Build.0 = Release|x86
+		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Release|x86.ActiveCfg = Release|x86
+		{00CB7F8E-8726-4E55-91B7-EB05D0A4A5D3}.Release|x86.Build.0 = Release|x86
 		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Debug|x86.Build.0 = Debug|Any CPU
 		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Release|x86.ActiveCfg = Release|Any CPU
-		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Single .msi file|Any CPU.ActiveCfg = Release|Any CPU
-		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Single .msi file|Any CPU.Build.0 = Release|Any CPU
-		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Single .msi file|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Single .msi file|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Single .msi file|x86.ActiveCfg = Release|Any CPU
-		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Single .msi file|x86.Build.0 = Release|Any CPU
-		{A6247D3F-C713-46F7-876F-FABF05437B65}.Admin image|Any CPU.ActiveCfg = Release|x86
-		{A6247D3F-C713-46F7-876F-FABF05437B65}.Admin image|Mixed Platforms.ActiveCfg = Release|x86
-		{A6247D3F-C713-46F7-876F-FABF05437B65}.Admin image|Mixed Platforms.Build.0 = Release|x86
-		{A6247D3F-C713-46F7-876F-FABF05437B65}.Admin image|x86.ActiveCfg = Release|x86
-		{A6247D3F-C713-46F7-876F-FABF05437B65}.Admin image|x86.Build.0 = Release|x86
+		{B65B92A6-FCB0-465E-B7EA-CA77C7C987F0}.Release|x86.Build.0 = Release|Any CPU
 		{A6247D3F-C713-46F7-876F-FABF05437B65}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{A6247D3F-C713-46F7-876F-FABF05437B65}.Debug|Any CPU.Build.0 = Debug|x86
 		{A6247D3F-C713-46F7-876F-FABF05437B65}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{A6247D3F-C713-46F7-876F-FABF05437B65}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{A6247D3F-C713-46F7-876F-FABF05437B65}.Debug|x86.ActiveCfg = Debug|x86
 		{A6247D3F-C713-46F7-876F-FABF05437B65}.Debug|x86.Build.0 = Debug|x86
 		{A6247D3F-C713-46F7-876F-FABF05437B65}.Release|Any CPU.ActiveCfg = Release|x86
+		{A6247D3F-C713-46F7-876F-FABF05437B65}.Release|Any CPU.Build.0 = Release|x86
 		{A6247D3F-C713-46F7-876F-FABF05437B65}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{A6247D3F-C713-46F7-876F-FABF05437B65}.Release|Mixed Platforms.Build.0 = Release|x86
 		{A6247D3F-C713-46F7-876F-FABF05437B65}.Release|x86.ActiveCfg = Release|x86
 		{A6247D3F-C713-46F7-876F-FABF05437B65}.Release|x86.Build.0 = Release|x86
-		{A6247D3F-C713-46F7-876F-FABF05437B65}.Single .msi file|Any CPU.ActiveCfg = Release|x86
-		{A6247D3F-C713-46F7-876F-FABF05437B65}.Single .msi file|Mixed Platforms.ActiveCfg = Release|x86
-		{A6247D3F-C713-46F7-876F-FABF05437B65}.Single .msi file|Mixed Platforms.Build.0 = Release|x86
-		{A6247D3F-C713-46F7-876F-FABF05437B65}.Single .msi file|x86.ActiveCfg = Release|x86
-		{A6247D3F-C713-46F7-876F-FABF05437B65}.Single .msi file|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE