Switch to .NET 4.5 and prefer SourceRange.Start.PosInLine over `Sou…

…rceRange.StartIndex`
qwertie · Jun 12, 2017 · 74ba785 · 74ba785
1 parent 9c26721
commit 74ba785
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/App.config b/App.config
@@ -1,24 +1,24 @@
-<?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="LesGraphingCalc.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="LesGraphingCalc.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
     <userSettings>
         <LesGraphingCalc.Properties.Settings>
             <setting name="Formulas" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Variables" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Ranges" serializeAs="String">
-                <value />
+                <value/>
             </setting>
         </LesGraphingCalc.Properties.Settings>
     </userSettings>
-</configuration>
+</configuration>
diff --git a/CalcForm.cs b/CalcForm.cs
@@ -243,7 +243,7 @@ static List<LNode> ParseExprs(string fieldName, string text)
                 if (severity >= Severity.Error) {
                     var msg = fieldName + ": " + fmt.Localized(args);
                     if (ctx is SourceRange)
-                        msg += $"\r\n{text}\r\n{new string('-', ((SourceRange)ctx).StartIndex)}^";
+                        msg += $"\r\n{text}\r\n{new string('-', ((SourceRange)ctx).Start.PosInLine-1)}^";
                     throw new LogException(severity, ctx, msg);
                 }
             });

diff --git a/GraphingCalc.csproj b/GraphingCalc.csproj
@@ -9,10 +9,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LesGraphingCalc</RootNamespace>
     <AssemblyName>GraphingCalc</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <PublishUrl>installer\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -38,6 +40,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -47,6 +50,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>112DCF705FF2DFE9A511B132CD2B9C64D86B4E0B</ManifestCertificateThumbprint>