Merge pull request #93 from Esri/patch-1.1.1

Patch 1.1.1
Esri · Feb 21, 2020 · a6e5862 · a6e5862
2 parents 83dd329 + bc13e36
commit a6e5862
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Data Collection for .NET shows how a robust application can be built with the ArcGIS Platform using the ArcGIS Runtime SDK for .NET, WPF, and UWP. It demonstrates best practices around some simple but key functionality of the ArcGIS Runtime. Using your organization's web maps, you can use Data Collection as-is, or extend it to meet your specific needs.
 
-![Screenshot of the data collection app for WPF, showing the Portland Tree Survey dataset with an identified feature popup](Documentation/img/anatomy-identified-feature.png)
+![Screenshot of the data collection app for WPF, showing the Portland Tree Survey dataset with an identified feature popup](docs/images/anatomy-identified-feature.png)
 
 ## Features
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -1,5 +1,11 @@
 # Release notes
 
+## 1.1.1
+
+* Support for .NET Core.
+* Resolves all compiler warnings.
+* Fixes broken image link in README.
+
 ## 1.1.0
 
 This is the third release of the Data Collection app for .NET, built on ArcGIS Runtime 100.7.

diff --git a/src/DataCollection.UWP/Package.appxmanifest b/src/DataCollection.UWP/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="a5fe2542-a748-4b21-8484-d65c71379b3e" Publisher="CN=esri" Version="1.1.0.0" />
+  <Identity Name="a5fe2542-a748-4b21-8484-d65c71379b3e" Publisher="CN=esri" Version="1.1.1.0" />
   <mp:PhoneIdentity PhoneProductId="a5fe2542-a748-4b21-8484-d65c71379b3e" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>DataCollection.UWP</DisplayName>

diff --git a/src/DataCollection.WPF/DataCollection.WPF (.NET Core).csproj b/src/DataCollection.WPF/DataCollection.WPF (.NET Core).csproj
@@ -8,6 +8,12 @@
     <DefineConstants>WPF;NET_CORE</DefineConstants>
     <DefaultItemExcludes>$(DefaultItemExcludes);netframework\**;obj\**;netcore\**;out\**</DefaultItemExcludes>
     <ApplicationIcon>Images/ArcGIS_Open_Source_apps.ico</ApplicationIcon>
+    <AssemblyVersion>1.1.1.0</AssemblyVersion>
+    <FileVersion>1.1.1.0</FileVersion>
+    <Version>1.1.1</Version>
+    <Authors />
+    <Company>Esri</Company>
+    <Product>Data Collection for .NET</Product>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/DataCollection.WPF/Properties/AssemblyInfo.cs b/src/DataCollection.WPF/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.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]