Merge pull request #21 from Slivo-fr/fix-tls-update-check

fix TLS update check
Slivo-fr · Nov 11, 2021 · 2b378b4 · 2b378b4
2 parents b4e1df0 + b5110d2
commit 2b378b4
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 31 deletions.
diff --git a/Elinor/Elinor reloaded.csproj b/Elinor/Elinor reloaded.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Elinor</RootNamespace>
     <AssemblyName>Elinor</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -46,6 +47,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -55,6 +57,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>mainicon.ico</ApplicationIcon>

diff --git a/Elinor/Properties/AssemblyInfo.cs b/Elinor/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // 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("1.9.1.0")]
-[assembly: AssemblyFileVersion("1.9.1.0")]
+[assembly: AssemblyVersion("1.10.0.0")]
+[assembly: AssemblyFileVersion("1.10.0.0")]
diff --git a/Elinor/Properties/Resources.Designer.cs b/Elinor/Properties/Resources.Designer.cs
diff --git a/Elinor/Properties/Settings.Designer.cs b/Elinor/Properties/Settings.Designer.cs
diff --git a/Elinor/app.config b/Elinor/app.config
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="Elinor.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="Elinor.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <userSettings>
         <Elinor.Properties.Settings>
             <setting name="logpath" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="showtutorial" serializeAs="String">
                 <value>True</value>
@@ -23,8 +23,8 @@
                 <value>False</value>
             </setting>
             <setting name="selectedprofile" serializeAs="String">
-                <value />
+                <value/>
             </setting>
         </Elinor.Properties.Settings>
     </userSettings>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
diff --git a/Elinor/currentVersion.xml b/Elinor/currentVersion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <elinor>
-	<version>1.9.1.0</version>
+	<version>1.10.0.0</version>
 	<url>https://github.com/Slivo-fr/elinor-reloaded/releases</url>
 </elinor>
 

diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj
@@ -266,15 +266,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Elinor reloaded"
-        "ProductCode" = "8:{3A711BAF-BA14-4929-AC7D-CBD15777E4B5}"
-        "PackageCode" = "8:{A561632F-BA0E-4348-93D6-5BC9F115D9E6}"
+        "ProductCode" = "8:{DE8E1C55-71C7-4745-AEC1-C1D95C3F8801}"
+        "PackageCode" = "8:{96889B37-4514-4ECE-B44D-1D5503213283}"
         "UpgradeCode" = "8:{F54F50ED-FDA6-4419-B476-E665ADA1FCBC}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.9.1"
+        "ProductVersion" = "8:1.10.0"
         "Manufacturer" = "8:Slivo"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -849,7 +849,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_03585DC2BD1048A19B1FB7CB5F6533F2"
             {
-            "SourcePath" = "8:..\\Elinor\\obj\\x86\\Release\\Elinor.exe"
+            "SourcePath" = "8:..\\Elinor\\obj\\x86\\Debug\\Elinor.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_1022C19006BB4A9C811CB9D8739B72B3"