another attempt to fix Python R Script paths

Riverscapes · Feb 20, 2019 · 1030428 · 1030428
1 parent 5358664
commit 1030428
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/TATAddin/Config.Designer.vb b/TATAddin/Config.Designer.vb
diff --git a/TATAddin/Config.esriaddinx b/TATAddin/Config.esriaddinx
@@ -2,7 +2,7 @@
   <Name>TATAddin</Name>
   <AddInID>{6726f1a0-44da-40cf-b66b-797cad31736b}</AddInID>
   <Description>Type in a description for this Add-in.</Description>
-  <Version>1.0.1</Version>
+  <Version>1.0.2</Version>
   <Image>Images\TATAddin.png</Image>
   <Author>Philip Bailey</Author>
   <Company>North Arrow Research Ltd.</Company>

diff --git a/TATAddin/My Project/AssemblyInfo.vb b/TATAddin/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.1.0")>
-<Assembly: AssemblyFileVersion("1.0.1.0")>
+<Assembly: AssemblyVersion("1.0.2.0")>
+<Assembly: AssemblyFileVersion("1.0.2.0")>
diff --git a/TATAddin/TATAddin.vbproj b/TATAddin/TATAddin.vbproj
@@ -58,12 +58,14 @@
   <ItemGroup>
     <Reference Include="ESRI.ArcGIS.3DAnalyst, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
       <HintPath>..\..\..\..\..\..\Program Files (x86)\ArcGIS\DeveloperKit10.1\DotNet\ESRI.ArcGIS.3DAnalyst.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ESRI.ArcGIS.AnalysisTools, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\Program Files (x86)\ArcGIS\DeveloperKit10.1\DotNet\ToolBoxes\ESRI.ArcGIS.AnalysisTools.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ESRI.ArcGIS.Analyst3DTools, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -79,6 +81,7 @@
     <Reference Include="ESRI.ArcGIS.CartographyTools, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\Program Files (x86)\ArcGIS\DeveloperKit10.1\DotNet\ToolBoxes\ESRI.ArcGIS.CartographyTools.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ESRI.ArcGIS.Catalog, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -95,10 +98,12 @@
     <Reference Include="ESRI.ArcGIS.ConversionTools, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\Program Files (x86)\ArcGIS\DeveloperKit10.1\DotNet\ToolBoxes\ESRI.ArcGIS.ConversionTools.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ESRI.ArcGIS.DataManagementTools, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\Program Files (x86)\ArcGIS\DeveloperKit10.1\DotNet\ToolBoxes\ESRI.ArcGIS.DataManagementTools.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ESRI.ArcGIS.DataSourcesFile, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -167,19 +172,23 @@
     <Reference Include="ESRI.ArcGIS.GeostatisticalAnalystTools, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\Program Files (x86)\ArcGIS\DeveloperKit10.1\DotNet\ToolBoxes\ESRI.ArcGIS.GeostatisticalAnalystTools.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ESRI.ArcGIS.SpatialAnalyst, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
       <HintPath>..\..\..\..\..\..\Program Files (x86)\ArcGIS\DeveloperKit10.1\DotNet\ESRI.ArcGIS.SpatialAnalyst.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ESRI.ArcGIS.SpatialAnalystTools, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\Program Files (x86)\ArcGIS\DeveloperKit10.1\DotNet\ToolBoxes\ESRI.ArcGIS.SpatialAnalystTools.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ESRI.ArcGIS.SpatialStatisticsTools, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\Program Files (x86)\ArcGIS\DeveloperKit10.1\DotNet\ToolBoxes\ESRI.ArcGIS.SpatialStatisticsTools.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ESRI.ArcGIS.System">
       <Private>False</Private>
@@ -198,7 +207,7 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
     <Reference Include="ZedGraph">
-      <HintPath>..\..\..\professional\NorthArrowResearch\GCD\gcd-addin\bin\x86\Release\ZedGraph.dll</HintPath>
+      <HintPath>_Redistributable\ZedGraph\ZedGraph.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/docs/Download/release_notes.md b/docs/Download/release_notes.md
@@ -3,6 +3,10 @@ title: Release Notes
 weight: 4
 ---
 
+## 1.0.2 - 19 Feb 2019
+
+* Second attempt to fix Python and R Script paths
+
 ## 1.0.1  - 19 Feb 2019
 
 * Fixed paths to Python files ([#5](https://github.com/Riverscapes/tat-addin/issues/5) and [#6](https://github.com/Riverscapes/tat-addin/issues/6))