19.1 fix for online

ivankaurov · Jan 2, 2019 · f4db1bb · f4db1bb
1 parent f0a2783
commit f4db1bb
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 44 deletions.
diff --git a/ClimbingCompetition.sln b/ClimbingCompetition.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.168
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "General", "General", "{352614E1-94EF-4746-8208-E75559E337C3}"
 	ProjectSection(SolutionItems) = preProject
@@ -72,6 +72,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Installer", "_Installer",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Redirector", "Web\Redirector\Redirector.csproj", "{06954222-8C47-4315-AC87-C403CDE4BA49}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixInstaller", "Desktop\_Installer\WixInstaller\WixInstaller.wixproj", "{61239E2F-3E1D-4DCC-9E40-41C61FA4F3F5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -260,6 +262,12 @@ Global
 		{06954222-8C47-4315-AC87-C403CDE4BA49}.Release|Any CPU.Build.0 = Release|Any CPU
 		{06954222-8C47-4315-AC87-C403CDE4BA49}.Release|x86.ActiveCfg = Release|Any CPU
 		{06954222-8C47-4315-AC87-C403CDE4BA49}.Release|x86.Build.0 = Release|Any CPU
+		{61239E2F-3E1D-4DCC-9E40-41C61FA4F3F5}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{61239E2F-3E1D-4DCC-9E40-41C61FA4F3F5}.Debug|x86.ActiveCfg = Debug|x86
+		{61239E2F-3E1D-4DCC-9E40-41C61FA4F3F5}.Debug|x86.Build.0 = Debug|x86
+		{61239E2F-3E1D-4DCC-9E40-41C61FA4F3F5}.Release|Any CPU.ActiveCfg = Release|x86
+		{61239E2F-3E1D-4DCC-9E40-41C61FA4F3F5}.Release|x86.ActiveCfg = Release|x86
+		{61239E2F-3E1D-4DCC-9E40-41C61FA4F3F5}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -291,5 +299,9 @@ Global
 		{E54DE3BE-9F36-48EF-8BC9-171221FF80CF} = {DA64E8D3-66DD-421B-812A-D40D4950054C}
 		{61294EC7-93AC-4F46-B274-79BD6F3A46D9} = {AE9E976C-BB8A-4F8E-A866-7ECD4F97841E}
 		{06954222-8C47-4315-AC87-C403CDE4BA49} = {D99AF0F7-D048-45EC-9C5D-34922F224D8C}
+		{61239E2F-3E1D-4DCC-9E40-41C61FA4F3F5} = {61294EC7-93AC-4F46-B274-79BD6F3A46D9}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {88F32D7C-D3FF-43CF-9EF9-E8CCB1BA84EB}
 	EndGlobalSection
 EndGlobal
diff --git a/Desktop/_Exe/ClimbingCompetition/ClimbingCompetition.csproj b/Desktop/_Exe/ClimbingCompetition/ClimbingCompetition.csproj
@@ -81,10 +81,26 @@
   -->
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Office.Interop.Excel">
+      <HintPath>..\..\UserForms\Dependencies\Microsoft.Office.Interop.Excel.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Office.Interop.Word">
+      <HintPath>..\..\UserForms\Dependencies\Microsoft.Office.Interop.Word.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Vbe.Interop">
+      <HintPath>..\..\UserForms\Dependencies\Microsoft.Vbe.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages_bin\Newtonsoft.Json\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="office">
+      <HintPath>..\..\UserForms\Dependencies\office.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -388,25 +404,6 @@
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="Microsoft.Office.Core">
-      <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>7</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-      <Private>True</Private>
-    </COMReference>
-    <COMReference Include="Microsoft.Office.Interop.Excel">
-      <Guid>{00020813-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>8</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
     <COMReference Include="Microsoft.Office.Interop.Excel">
       <Guid>{00020813-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>1</VersionMajor>
@@ -424,25 +421,6 @@
       <Lcid>0</Lcid>
       <WrapperTool>primary</WrapperTool>
       <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="Microsoft.Office.Interop.Word">
-      <Guid>{00020905-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>6</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-      <Private>True</Private>
-    </COMReference>
-    <COMReference Include="VBIDE">
-      <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>5</VersionMajor>
-      <VersionMinor>3</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>True</Private>
     </COMReference>

diff --git a/Desktop/_Installer/WixInstaller/Product.wxs b/Desktop/_Installer/WixInstaller/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="ClimbingCompetition" Language="1049" Version="18.3.24" Manufacturer="IvanK" UpgradeCode="f84afe98-7816-4f04-b74c-3f14a0d5fe58">
+	<Product Id="*" Name="ClimbingCompetition" Language="1049" Version="19.1.1" Manufacturer="IvanK" UpgradeCode="f84afe98-7816-4f04-b74c-3f14a0d5fe58">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowDowngrades="no" AllowSameVersionUpgrades="yes" />

diff --git a/General/AssemblyInfoHeader.cs b/General/AssemblyInfoHeader.cs
@@ -62,8 +62,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("18.3.24.1")]
-[assembly: AssemblyFileVersion("18.3.24.1")]
+[assembly: AssemblyVersion("19.1.1.1")]
+[assembly: AssemblyFileVersion("19.1.1.1")]
 [assembly: NeutralResourcesLanguage("ru")]
-[assembly: AssemblyInformationalVersion("18.3-HotFix.1")]
+[assembly: AssemblyInformationalVersion("19.1")]
 [assembly: AssemblyDescription("Íîâûå âåðñèè ïðèëîæåíèÿ òóò: https://github.com/ivankaurov/ClimbingCompetition/releases")]