Update dependency versions of toolkit (#394)

Esri · Dec 15, 2021 · 3c60270 · 3c60270
1 parent d87ee8b
commit 3c60270
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 24 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,12 +1,9 @@
 <Project>
 
   <PropertyGroup>
-    <ArcGISRuntimeToolkitPackageVersion Condition="'$(ArcGISRuntimeToolkitPackageVersion)'==''">100.12.0</ArcGISRuntimeToolkitPackageVersion>
-    <ArcGISRuntimePackageVersion Condition="'$(ArcGISRuntimePackageVersion)'==''">100.12.0</ArcGISRuntimePackageVersion>
-    <XamarinFormsPackageVersion Condition="'$(XamarinFormsPackageVersion)'==''">5.0.0.1874</XamarinFormsPackageVersion>
-
-    <!-- Change target to .NET 6 for Update 13, and drop net3.1 and net5 -->
-    <BuildDotNet6 Condition="$(ArcGISRuntimePackageVersion.StartsWith('100.13.'))">true</BuildDotNet6>
+    <ArcGISRuntimeToolkitPackageVersion Condition="'$(ArcGISRuntimeToolkitPackageVersion)'==''">100.13.0</ArcGISRuntimeToolkitPackageVersion>
+    <ArcGISRuntimePackageVersion Condition="'$(ArcGISRuntimePackageVersion)'==''">100.13.0</ArcGISRuntimePackageVersion>
+    <XamarinFormsPackageVersion Condition="'$(XamarinFormsPackageVersion)'==''">5.0.0.2244</XamarinFormsPackageVersion>
 
     <!--Common package properties-->
     <Authors>Esri Inc.</Authors>
@@ -40,11 +37,9 @@
     <iOSTargetFramework>xamarinios10</iOSTargetFramework>
     <DotNetTargetFramework>net461</DotNetTargetFramework>
     <UWPTargetFramework>uap10.0.$(ArcGISRuntime_MinimumSupportedWindowsBuild)</UWPTargetFramework>
-    <NetCoreTargetFramework Condition="'$(BuildDotNet6)'!='true'">netcoreapp3.1</NetCoreTargetFramework>
-    <NetWindowsTargetFramework Condition="'$(BuildDotNet6)'!='true'">net5.0-windows10.0.18362.0</NetWindowsTargetFramework>
-    <NetWindowsTargetFramework Condition="'$(BuildDotNet6)'=='true'">net6.0-windows10.0.18362.0</NetWindowsTargetFramework>
-    <!--<NetAndroidTargetFramework Condition="'$(BuildDotNet6)'=='true'">net6.0-android31.0</NetAndroidTargetFramework>
-    <NetiOSTargetFramework Condition="'$(BuildDotNet6)'=='true'">net6.0-ios13.0</NetiOSTargetFramework>-->
+    <NetWindowsTargetFramework>net6.0-windows10.0.18362.0</NetWindowsTargetFramework>
+    <!--<NetAndroidTargetFramework>net6.0-android31.0</NetAndroidTargetFramework>
+    <NetiOSTargetFramework>net6.0-ios13.0</NetiOSTargetFramework>-->
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
 
     <!--Output paths-->

diff --git a/src/Esri.ArcGISRuntime.Toolkit.sln b/src/Esri.ArcGISRuntime.Toolkit.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.0.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31912.275
 MinimumVisualStudioVersion = 15.9.0.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Esri.ArcGISRuntime.Toolkit.Xamarin.Forms", "Toolkit.Forms\Esri.ArcGISRuntime.Toolkit.Xamarin.Forms.csproj", "{BC141500-2741-4F13-86DC-2FA002422C60}"
 EndProject

diff --git a/src/Toolkit.Forms/Esri.ArcGISRuntime.Toolkit.Xamarin.Forms.csproj b/src/Toolkit.Forms/Esri.ArcGISRuntime.Toolkit.Xamarin.Forms.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
-  <PropertyGroup Condition="$(XamarinFormsPackageVersion.StartsWith('5.0'))">
-    <AndroidTargetFramework>monoandroid10.0</AndroidTargetFramework>
-  </PropertyGroup>
-
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(iOSTargetFramework);$(UWPTargetFramework);$(AndroidTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;$(iOSTargetFramework);monoandroid10.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);$(UWPTargetFramework)</TargetFrameworks>
     <Authors>ESRI Inc.</Authors>
     <Description>ArcGIS Runtime controls and utilities for Xamarin.Forms apps (Android, iOS, and UWP).</Description>
     <PackageTags>ArcGIS Cartography Geo Geographic Geography Geolocation Geospatial GIS Latitude Location Longitude Map Mapping Maps Places Spatial 3D Android iOS UWP Xamarin.Forms Xamarin Mobile toolkit</PackageTags>

diff --git a/src/Toolkit.Preview/Toolkit.Preview/Esri.ArcGISRuntime.Toolkit.Preview.csproj b/src/Toolkit.Preview/Toolkit.Preview/Esri.ArcGISRuntime.Toolkit.Preview.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
 
   <PropertyGroup>
-    <TargetFrameworks>$(iOSTargetFramework);$(UWPTargetFramework);$(AndroidTargetFramework);$(DotNetTargetFramework);$(NetCoreTargetFramework);$(NetWindowsTargetFramework);$(NetAndroidTargetFramework);$(NetiOSTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>$(iOSTargetFramework);$(AndroidTargetFramework);$(NetAndroidTargetFramework);$(NetiOSTargetFramework)</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);$(DotNetTargetFramework);$(NetWindowsTargetFramework);$(UWPTargetFramework)</TargetFrameworks>
     <Description>Preview package containing new features under development in the Toolkit for ArcGIS Runtime SDK for .NET.</Description>
     <PackageTags>ArcGIS Cartography Geo Geographic Geography Geolocation Geospatial GIS Latitude Location Longitude Map Mapping Maps Places Spatial 3D UWP WPF Xamarin Android iOS toolkit</PackageTags>
     <RootNamespace>Esri.ArcGISRuntime.Toolkit.Preview</RootNamespace>
@@ -19,7 +20,7 @@
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == '$(NetCoreTargetFramework)' OR '$(TargetFramework)' == '$(NetWindowsTargetFramework)' OR '$(TargetFramework)' == '$(DotNetTargetFramework)'">
+  <PropertyGroup Condition="'$(TargetFramework)' == '$(NetWindowsTargetFramework)' OR '$(TargetFramework)' == '$(DotNetTargetFramework)'">
     <UseWpf>true</UseWpf>
   </PropertyGroup>
 

diff --git a/src/Toolkit/Toolkit/Esri.ArcGISRuntime.Toolkit.csproj b/src/Toolkit/Toolkit/Esri.ArcGISRuntime.Toolkit.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
 
   <PropertyGroup>
-    <TargetFrameworks>$(iOSTargetFramework);$(UWPTargetFramework);$(AndroidTargetFramework);$(DotNetTargetFramework);$(NetCoreTargetFramework);$(NetWindowsTargetFramework);$(NetAndroidTargetFramework);$(NetiOSTargetFramework);netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;$(iOSTargetFramework);$(AndroidTargetFramework);$(NetAndroidTargetFramework);$(NetiOSTargetFramework)</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);$(DotNetTargetFramework);$(NetWindowsTargetFramework);$(UWPTargetFramework)</TargetFrameworks>
     <Description>ArcGIS Runtime controls and utilities for Universal Windows Platform (UWP), Windows Presentation Foundation (WPF), Xamarin.Android, and Xamarin.iOS apps.</Description>
     <PackageTags>ArcGIS Cartography Geo Geographic Geography Geolocation Geospatial GIS Latitude Location Longitude Map Mapping Maps Places Spatial 3D UWP WPF Xamarin Android iOS toolkit</PackageTags>
     <RootNamespace>Esri.ArcGISRuntime.Toolkit</RootNamespace>
@@ -19,7 +20,7 @@
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == '$(NetCoreTargetFramework)' OR '$(TargetFramework)' == '$(NetWindowsTargetFramework)' OR '$(IsDotNetFramework)' == 'true'">
+  <PropertyGroup Condition="'$(TargetFramework)' == '$(NetWindowsTargetFramework)' OR '$(IsDotNetFramework)' == 'true'">
     <UseWpf>true</UseWpf>
   </PropertyGroup>
 
@@ -29,7 +30,7 @@
 
   <ItemGroup Condition="'$(IsTargetingAndroid)' == 'true'">
     <PackageReference Include="Esri.ArcGISRuntime.Xamarin.Android" Version="$(ArcGISRuntimePackageVersion)" />
-    <PackageReference Include="Xamarin.Android.Support.Constraint.Layout" Version="1.1.2" Condition="'$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), &quot;net6.0&quot;))'!='true'" />
+    <PackageReference Include="Xamarin.Android.Support.Constraint.Layout" Version="2.0.1" Condition="'$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), &quot;net6.0&quot;))'!='true'" />
     <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.0.0.3" Condition="'$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), &quot;net6.0&quot;))'!='true'" />
     <PackageReference Include="Xamarin.AndroidX.ConstraintLayout" Version="2.1.1.2" Condition="'$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), &quot;net6.0&quot;))'=='true'" />
     <PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.3" Condition="'$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), &quot;net6.0&quot;))'=='true'" />

diff --git a/src/version.json b/src/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "100.12.0-{height}",
+  "version": "100.13.0-{height}",
   "publicReleaseRefSpec": [
     "^refs/tags/v\\d+\\.\\d+" // we release out of tags starting with vN.N
   ],