diff --git a/ClimbingCompetition.sln b/ClimbingCompetition.sln
index a21f214..fcc54c9 100644
--- 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
index d6f69b5..ac4dcc1 100644
--- a/Desktop/_Exe/ClimbingCompetition/ClimbingCompetition.csproj
+++ b/Desktop/_Exe/ClimbingCompetition/ClimbingCompetition.csproj
@@ -81,10 +81,26 @@
-->
+
+ ..\..\UserForms\Dependencies\Microsoft.Office.Interop.Excel.dll
+ True
+
+
+ ..\..\UserForms\Dependencies\Microsoft.Office.Interop.Word.dll
+ True
+
+
+ ..\..\UserForms\Dependencies\Microsoft.Vbe.Interop.dll
+ True
+
False
..\..\..\packages_bin\Newtonsoft.Json\Newtonsoft.Json.dll
+
+ ..\..\UserForms\Dependencies\office.dll
+ True
+
@@ -388,25 +404,6 @@
-
- {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}
- 2
- 7
- 0
- primary
- False
- False
- True
-
-
- {00020813-0000-0000-C000-000000000046}
- 1
- 8
- 0
- primary
- False
- True
-
{00020813-0000-0000-C000-000000000046}
1
@@ -424,25 +421,6 @@
0
primary
False
- True
-
-
- {00020905-0000-0000-C000-000000000046}
- 8
- 6
- 0
- primary
- False
- False
- True
-
-
- {0002E157-0000-0000-C000-000000000046}
- 5
- 3
- 0
- primary
- False
False
True
diff --git a/Desktop/_Installer/WixInstaller/Product.wxs b/Desktop/_Installer/WixInstaller/Product.wxs
index f4c3be0..184a99f 100644
--- a/Desktop/_Installer/WixInstaller/Product.wxs
+++ b/Desktop/_Installer/WixInstaller/Product.wxs
@@ -1,6 +1,6 @@
-
+
diff --git a/General/AssemblyInfoHeader.cs b/General/AssemblyInfoHeader.cs
index d20d43a..d6f951c 100644
--- 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")]
\ No newline at end of file