Skip to content

Commit

Permalink
Merge pull request #149 from Esri/July2016Release
Browse files Browse the repository at this point in the history 
July2016 release
  • Loading branch information
@MikeMillerGIS
MikeMillerGIS committed Sep 23, 2016
2 parents 9e91758 + ad7ce1f commit f07e33a
Show file tree
Hide file tree
Showing 80 changed files with 3,605 additions and 1,251 deletions.
7 changes: 3 additions & 4 deletions A4LGDesktopTools10_1.sln
View file
@@ -1,9 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddressManagementFunctions", "Address Desktop Tools\AddressManagementFunctions\AddressManagementFunctions.csproj", "{5D00EC80-2E06-4D4D-9C9D-49732E35CDB2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddressManagementFunctions10_1", "Address Desktop Tools\AddressManagementFunctions\AddressManagementFunctions10_1.csproj", "{5D00EC80-2E06-4D4D-9C9D-49732E35CDB2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LGSharedFunctions", "ArcGISTemplateSharedFunctions\LGSharedFunctions.csproj", "{17F1BA9D-F53B-4601-8333-6D3127A162D4}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LGSharedFunctions10_1", "ArcGISTemplateSharedFunctions\LGSharedFunctions10_1.csproj", "{17F1BA9D-F53B-4601-8333-6D3127A162D4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AttributeAssistantAddIn10_1", "Attribute Assistant Add In\AttributeAssistantAddIn\AttributeAssistantAddIn10_1.csproj", "{F7BAFF33-9613-4608-8ACF-E3BF528BDFF0}"
EndProject
Expand All @@ -15,7 +14,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaterUtilitiesDesktopAddIn1
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ProjectCostEstimatingTools10_1", "Project Cost Estimating\ProjectCostEstimatingTools10_1.vbproj", "{CED73875-ED55-417C-BA75-AF4C208DAC6F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UtilitiesDesktopFunctions", "Water Utilities Desktop Tools\WaterUtilitiesDesktopFunctions\UtilitiesDesktopFunctions.csproj", "{A1285DE2-50A3-4121-A119-4715810F3232}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UtilitiesDesktopFunctions10_1", "Water Utilities Desktop Tools\WaterUtilitiesDesktopFunctions\UtilitiesDesktopFunctions10_1.csproj", "{A1285DE2-50A3-4121-A119-4715810F3232}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
78 changes: 61 additions & 17 deletions Address Desktop Tools/AddressManagementAddIn/AddressManagementAddIn.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>A4LGAddressManagement</RootNamespace>
<AssemblyName>AddressManagement</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
Expand Down Expand Up @@ -45,6 +45,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<PlatformTarget>x86</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -54,45 +55,52 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="ESRI.ArcGIS.ArcMap, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<Reference Include="ESRI.ArcGIS.ArcMap, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="ESRI.ArcGIS.Carto, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<Reference Include="ESRI.ArcGIS.Carto, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="ESRI.ArcGIS.Desktop.AddIns">
<Reference Include="ESRI.ArcGIS.Desktop.AddIns, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
<Reference Include="ESRI.ArcGIS.Display, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<Reference Include="ESRI.ArcGIS.Display, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="ESRI.ArcGIS.Editor, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
<Reference Include="ESRI.ArcGIS.Editor, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="ESRI.ArcGIS.Framework">
<Private>False</Private>
<Reference Include="ESRI.ArcGIS.Framework, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="ESRI.ArcGIS.Geodatabase, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<Reference Include="ESRI.ArcGIS.Geodatabase, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="ESRI.ArcGIS.Geometry, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<Reference Include="ESRI.ArcGIS.GeoDatabaseDistributed, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="ESRI.ArcGIS.System">
<Private>False</Private>
<Reference Include="ESRI.ArcGIS.Geometry, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
</ItemGroup>
<ItemGroup>
<Reference Include="ESRI.ArcGIS.SystemUI, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<Reference Include="ESRI.ArcGIS.System, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="ESRI.ArcGIS.SystemUI, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>True</EmbedInteropTypes>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -104,6 +112,23 @@
<Reference Include="System.Drawing" />
</ItemGroup>
<ItemGroup>
<Compile Include="AddressMapTip.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="AddressMapTip.Designer.cs">
<DependentUpon>AddressMapTip.cs</DependentUpon>
</Compile>
<Compile Include="AddressSettings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>AddressSettings.settings</DependentUpon>
</Compile>
<Compile Include="AutoIncrementWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="AutoIncrementWindow.Designer.cs">
<DependentUpon>AutoIncrementWindow.cs</DependentUpon>
</Compile>
<Compile Include="ConstructionTools.cs" />
<Compile Include="Config.Designer.cs">
<AutoGen>True</AutoGen>
Expand Down Expand Up @@ -194,6 +219,23 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="AddressMapTip.resx">
<DependentUpon>AddressMapTip.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="AutoIncrementWindow.resx">
<DependentUpon>AutoIncrementWindow.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="AddressSettings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>AddressSettings.Designer.cs</LastGenOutput>
</None>
<None Include="app.config" />
</ItemGroup>
<PropertyGroup>
<ZipFileExtension>esriAddIn</ZipFileExtension>
<AddInTargetProduct>Desktop</AddInTargetProduct>
Expand All @@ -215,6 +257,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
Expand All @@ -231,9 +274,10 @@
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.11.targets" Condition="Exists('$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.11.targets')" />
<Import Project="$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.targets" Condition="Exists('$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
2 changes: 1 addition & 1 deletion Address Desktop Tools/AddressManagementAddIn/AddressManagementAddIn.csproj.user
View file
Expand Up @@ -20,7 +20,7 @@
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<StartProgram>C:\Program Files %28x86%29\ArcGIS\Desktop10.3\Bin\ArcMap.exe</StartProgram>
<StartProgram>C:\Program Files %28x86%29\ArcGIS\Desktop10.4\bin\ArcMap.exe</StartProgram>
<StartAction>Program</StartAction>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
Expand Down
39 changes: 36 additions & 3 deletions Address Desktop Tools/AddressManagementAddIn/AddressManagementAddIn10_1.csproj
View file
Expand Up @@ -104,6 +104,23 @@
<Reference Include="System.Drawing" />
</ItemGroup>
<ItemGroup>
<Compile Include="AddressMapTip.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="AddressMapTip.Designer.cs">
<DependentUpon>AddressMapTip.cs</DependentUpon>
</Compile>
<Compile Include="AddressSettings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>AddressSettings.settings</DependentUpon>
</Compile>
<Compile Include="AutoIncrementWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="AutoIncrementWindow.Designer.cs">
<DependentUpon>AutoIncrementWindow.cs</DependentUpon>
</Compile>
<Compile Include="ConstructionTools.cs" />
<Compile Include="Config.Designer.cs">
<AutoGen>True</AutoGen>
Expand Down Expand Up @@ -131,14 +148,13 @@
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\ArcGISTemplateSharedFunctions\LGSharedFunctions.csproj">
<ProjectReference Include="..\..\ArcGISTemplateSharedFunctions\LGSharedFunctions10_1.csproj">
<Project>{17F1BA9D-F53B-4601-8333-6D3127A162D4}</Project>
<Name>LGSharedFunctions</Name>
<Name>LGSharedFunctions10_1</Name>
</ProjectReference>
<ProjectReference Include="..\AddressManagementFunctions\AddressManagementFunctions.csproj">
<Project>{5D00EC80-2E06-4D4D-9C9D-49732E35CDB2}</Project>
<Name>AddressManagementFunctions</Name>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -195,6 +211,23 @@
<ItemGroup>
<AddInContent Include="Images\Config2.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="AddressMapTip.resx">
<DependentUpon>AddressMapTip.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="AutoIncrementWindow.resx">
<DependentUpon>AutoIncrementWindow.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="AddressSettings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>AddressSettings.Designer.cs</LastGenOutput>
</None>
<None Include="app.config" />
</ItemGroup>
<PropertyGroup>
<ZipFileExtension>esriAddIn</ZipFileExtension>
<AddInTargetProduct>Desktop</AddInTargetProduct>
Expand Down
72 changes: 72 additions & 0 deletions Address Desktop Tools/AddressManagementAddIn/AddressMapTip.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions Address Desktop Tools/AddressManagementAddIn/AddressMapTip.cs
View file
@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;

namespace A4LGAddressManagement
{
public partial class AddressMapTip : Form
{
public AddressMapTip()
{
InitializeComponent();
}

public void SetLabel(string text)
{
this.mapTipLabel.Text = text;
}
}
}

0 comments on commit f07e33a

Please sign in to comment.