Merge pull request #8644 from lloyddewit/scriptWindowTildaImprovements

In Script window, implemented ?? operator and ensured tildas correctly parsed
IDEMSInternational · Nov 11, 2023 · 1b5345d · 1b5345d
2 parents ea8d1cf + 8a5f2a2
commit 1b5345d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/instat/instat.vbproj b/instat/instat.vbproj
@@ -155,8 +155,8 @@
     <Reference Include="RDotNet, Version=1.8.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\R.NET.1.8.2\lib\netstandard2.0\RDotNet.dll</HintPath>
     </Reference>
-    <Reference Include="RScript, Version=0.1.0.9, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\RScript.1.0.10\lib\net461\RScript.dll</HintPath>
+    <Reference Include="RScript, Version=0.1.0.10, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RScript.1.0.11\lib\net461\RScript.dll</HintPath>
     </Reference>
     <Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>

diff --git a/instat/packages.config b/instat/packages.config
@@ -11,7 +11,7 @@
   <package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net461" />
   <package id="NLog" version="5.1.0" targetFramework="net461" />
   <package id="R.NET" version="1.8.2" targetFramework="net461" />
-  <package id="RScript" version="1.0.10" targetFramework="net461" />
+  <package id="RScript" version="1.0.11" targetFramework="net461" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.113.3" targetFramework="net461" />
   <package id="System.Collections.Specialized" version="4.3.0" targetFramework="net461" />
   <package id="System.Data.SQLite.Core" version="1.0.113.7" targetFramework="net461" />