Skip to content
This repository has been archived by the owner on Feb 24, 2023. It is now read-only.

5.10 Release Update #7

Merged
merged 3 commits into from
Dec 15, 2020
+48 −49
Merged

5.10 Release Update #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47a16d4
Remove WF dependency. Update WF namespace. Update mobile version. Min…
kewalker Dec 2, 2020
11ee14c
v1 for setup-xamarin.
kewalker Dec 3, 2020
ffd16e6
Swap in 5.10 package. Update ci.yml. Use xcode 12.x. Remove -warnAsEr…
kewalker Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
- uses: actions/checkout@v2

# Fixes error when using newer NuGet packages that require a minimum version of Xcode
- name: Use Xcode 11.x
uses: maxim-lobanov/setup-xamarin@v1.1
- name: Use Xcode 12.x
uses: maxim-lobanov/setup-xamarin@v1
with:
xcode-version: 11.x
xcode-version: 12.x

- name: Restore NuGet packages
run: msbuild -t:restore
Expand All @@ -55,5 +55,7 @@ jobs:
working-directory: Geocortex.Mobile.Samples/Geocortex.Mobile.Samples.UWP

- name: msbuild
run: msbuild -warnAsError
# TODO: Enable `-warnAsError` flag once XF is updated, and warnings aren't shown:
# https://developercommunity.visualstudio.com/content/problem/1251681/xamarinforms-application-warning.html
run: msbuild
working-directory: Geocortex.Mobile.Samples/Geocortex.Mobile.Samples.UWP
1 change: 1 addition & 0 deletions Geocortex.Mobile.Samples.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ Global
{669E92CC-2CEF-4DED-87BF-5EAA6EF151F2}.Debug|ARM.ActiveCfg = Debug|iPhone
{669E92CC-2CEF-4DED-87BF-5EAA6EF151F2}.Debug|iPhone.ActiveCfg = Debug|iPhone
{669E92CC-2CEF-4DED-87BF-5EAA6EF151F2}.Debug|iPhone.Build.0 = Debug|iPhone
{669E92CC-2CEF-4DED-87BF-5EAA6EF151F2}.Debug|iPhone.Deploy.0 = Debug|iPhone
{669E92CC-2CEF-4DED-87BF-5EAA6EF151F2}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{669E92CC-2CEF-4DED-87BF-5EAA6EF151F2}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{669E92CC-2CEF-4DED-87BF-5EAA6EF151F2}.Debug|x64.ActiveCfg = Debug|iPhone
Expand Down
12 changes: 7 additions & 5 deletions ...ex.Mobile.Samples/Geocortex.Mobile.Samples.Android/VertiGIS.Mobile.Samples.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,17 @@
<PackageReference Include="Esri.ArcGISRuntime.Xamarin.Forms">
<Version>100.9.0</Version>
</PackageReference>
<PackageReference Include="Geocortex.Workflow.Forms.Xamarin">
<Version>5.16.1.548</Version>
</PackageReference>
<PackageReference Include="MarkedNet">
<Version>2.1.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.CSharp">
<Version>4.6.0</Version>
<Version>4.7.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="VertiGIS.Mobile">
<Version>5.9.1</Version>
<Version>5.10.1</Version>
</PackageReference>
<PackageReference Include="Xam.Forms.MarkdownView">
<Version>0.6.1-pre</Version>
Expand Down Expand Up @@ -155,4 +152,9 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties TriggeredFromHotReload="False" />
</VisualStudio>
</ProjectExtensions>
</Project>
7 changes: 2 additions & 5 deletions Geocortex.Mobile.Samples/Geocortex.Mobile.Samples.UWP/VertiGIS.Mobile.Samples.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,20 +184,17 @@
<PackageReference Include="Esri.ArcGISRuntime.Xamarin.Forms">
<Version>100.9.0</Version>
</PackageReference>
<PackageReference Include="Geocortex.Workflow.Forms.Xamarin">
<Version>5.16.1.548</Version>
</PackageReference>
<PackageReference Include="MarkedNet">
<Version>2.1.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.CSharp">
<Version>4.6.0</Version>
<Version>4.7.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="VertiGIS.Mobile">
<Version>5.9.1</Version>
<Version>5.10.1</Version>
</PackageReference>
<PackageReference Include="Xam.Forms.MarkdownView">
<Version>0.6.1-pre</Version>
Expand Down
8 changes: 3 additions & 5 deletions Geocortex.Mobile.Samples/Geocortex.Mobile.Samples.iOS/VertiGIS.Mobile.Samples.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<DeviceSpecificBuild>true</DeviceSpecificBuild>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
<CodeAnalysisRuleSet />
<IOSDebugOverWiFi>true</IOSDebugOverWiFi>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
Expand Down Expand Up @@ -190,14 +191,11 @@
<PackageReference Include="Esri.ArcGISRuntime.Xamarin.iOS">
<Version>100.9.0</Version>
</PackageReference>
<PackageReference Include="Geocortex.Workflow.Forms.Xamarin">
<Version>5.16.1.548</Version>
</PackageReference>
<PackageReference Include="MarkedNet">
<Version>2.1.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.CSharp">
<Version>4.6.0</Version>
<Version>4.7.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
Expand All @@ -206,7 +204,7 @@
<Version>2.0.3</Version>
</PackageReference>
<PackageReference Include="VertiGIS.Mobile">
<Version>5.9.1</Version>
<Version>5.10.1</Version>
</PackageReference>
<PackageReference Include="Xam.Forms.MarkdownView">
<Version>0.6.1-pre</Version>
Expand Down
52 changes: 26 additions & 26 deletions Geocortex.Mobile.Samples/Geocortex.Mobile.Samples/Samples/App/GeocortexMobileViewer/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,42 +283,42 @@
"emphasizedButtonIcon": [ 255, 255, 255, 255 ],
"emphasizedButtonIconDisabled": [ 19, 85, 147, 255 ],
"emphasizedButtonIconHover": [ 26, 114, 196, 255 ],
"buttonBackground": [ 64, 64, 68, 255 ],
"buttonBackgroundDisabled": [ 114, 114, 121, 255 ],
"buttonBackground": [ 25, 25, 25, 255 ],
"buttonBackgroundDisabled": [ 44, 44, 44, 255 ],
"buttonBackgroundHover": [ 255, 255, 255, 255 ],
"buttonBorder": [ 196, 196, 201, 255 ],
"buttonBorderDisabled": [ 173, 173, 180, 255 ],
"buttonBorder": [ 161, 161, 161, 255 ],
"buttonBorderDisabled": [ 124, 124, 124, 255 ],
"buttonBorderHover": [ 26, 114, 196, 255 ],
"buttonForeground": [ 255, 255, 255, 255 ],
"buttonForegroundDisabled": [ 196, 196, 201, 255 ],
"buttonForegroundDisabled": [ 161, 161, 161, 255 ],
"buttonForegroundHover": [ 26, 114, 196, 255 ],
"buttonIcon": [ 255, 255, 255, 255 ],
"buttonIconDisabled": [ 196, 196, 201, 255 ],
"buttonIconDisabled": [ 161, 161, 161, 255 ],
"buttonIconHover": [ 26, 114, 196, 255 ],
"inputBorder": [ 196, 196, 201, 255 ],
"primaryAccent": [ 227, 239, 249, 255 ],
"primaryAccentDisabled": [ 130, 130, 138, 255 ],
"primaryAccentHover": [ 196, 196, 201, 255 ],
"primaryAccentLarge": [ 137, 184, 228, 255 ],
"primaryBackground": [ 81, 81, 86, 255 ],
"primaryBorder": [ 114, 114, 121, 255 ],
"inputBorder": [ 161, 161, 161, 255 ],
"primaryAccent": [ 97, 159, 217, 255 ],
"primaryAccentDisabled": [ 50, 50, 50, 255 ],
"primaryAccentHover": [ 161, 161, 161, 255 ],
"primaryAccentLarge": [ 60, 136, 207, 255 ],
"primaryBackground": [ 37, 37, 37, 255 ],
"primaryBorder": [ 44, 44, 44, 255 ],
"primaryForeground": [ 255, 255, 255, 255 ],
"primaryForegroundDisabled": [ 130, 130, 138, 255 ],
"secondaryBackground": [ 64, 64, 68, 255 ],
"secondaryBorder": [ 97, 97, 103, 255 ],
"secondaryForeground": [ 196, 196, 201, 255 ],
"tabPrimaryForeground": [ 196, 196, 201, 255 ],
"primaryForegroundDisabled": [ 50, 50, 50, 255 ],
"secondaryBackground": [ 25, 25, 25, 255 ],
"secondaryBorder": [ 37, 37, 37, 255 ],
"secondaryForeground": [ 161, 161, 161, 255 ],
"tabPrimaryForeground": [ 161, 161, 161, 255 ],
"tabSecondaryForeground": [ 255, 255, 255, 255 ],
"inlineTableHeaderBackground": [ 64, 64, 68, 255 ],
"inlineTableRowBackground": [ 97, 97, 103, 255 ],
"inlineTableBorder": [ 130, 130, 138, 255 ],
"inlineTableHeaderBackground": [ 25, 25, 25, 255 ],
"inlineTableRowBackground": [ 37, 37, 37, 255 ],
"inlineTableBorder": [ 50, 50, 50, 255 ],
"accentIconBackground": [ 255, 255, 255, 255 ],
"accentIconForeground": [ 26, 114, 196, 255 ],
"accentIconBackgroundHover": [ 255, 255, 255, 255 ],
"accentIconBorder": [ 255, 255, 255, 255 ],
"accentIconBorderHover": [ 255, 255, 255, 255 ],
"accentIconForegroundHover": [ 26, 114, 196, 255 ],
"disabledIconFill": [ 130, 130, 138, 255 ],
"disabledIconFill": [ 50, 50, 50, 255 ],
"alertAmberBackground": [ 191, 83, 0, 255 ],
"alertAmberBackgroundHover": [ 255, 255, 255, 255 ],
"alertAmberBorder": [ 191, 83, 0, 255 ],
Expand All @@ -327,10 +327,10 @@
"alertAmberForegroundHover": [ 191, 83, 0, 255 ],
"alertAmberIcon": [ 255, 255, 255, 255 ],
"alertAmberIconHover": [ 191, 83, 0, 255 ],
"alertBackgroundDisabled": [ 114, 114, 121, 255 ],
"alertBorderDisabled": [ 114, 114, 121, 255 ],
"alertForegroundDisabled": [ 196, 196, 201, 255 ],
"alertIconDisabled": [ 196, 196, 201, 255 ],
"alertBackgroundDisabled": [ 44, 44, 44, 255 ],
"alertBorderDisabled": [ 44, 44, 44, 255 ],
"alertForegroundDisabled": [ 161, 161, 161, 255 ],
"alertIconDisabled": [ 161, 161, 161, 255 ],
"alertGreenBackground": [ 0, 128, 64, 255 ],
"alertGreenBackgroundHover": [ 255, 255, 255, 255 ],
"alertGreenBorder": [ 0, 128, 64, 255 ],
Expand Down
2 changes: 1 addition & 1 deletion ...ples/Geocortex.Mobile.Samples/Samples/Workflow/CustomFormComponent/CustomFormComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using VertiGIS.Mobile.Infrastructure.UI;
using Geocortex.Workflow.Forms.Xamarin.Components;
using VertiGIS.Mobile.Workflow.Components;

namespace VertiGIS.Mobile.Samples.Samples.Workflow.CustomFormComponent
{
Expand Down
5 changes: 2 additions & 3 deletions Geocortex.Mobile.Samples/Geocortex.Mobile.Samples/VertiGIS.Mobile.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,10 @@
<ItemGroup>
<PackageReference Include="Esri.ArcGISRuntime" Version="100.9.0" />
<PackageReference Include="Esri.ArcGISRuntime.Xamarin.Forms" Version="100.9.0" />
<PackageReference Include="Geocortex.Workflow.Forms.Xamarin" Version="5.16.1.548" />
<PackageReference Include="MarkedNet" Version="2.1.2" />
<PackageReference Include="Microsoft.CSharp" Version="4.6.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="VertiGIS.Mobile" Version="5.9.1" />
<PackageReference Include="VertiGIS.Mobile" Version="5.10.1" />
<PackageReference Include="Xam.Forms.MarkdownView" Version="0.6.1-pre" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.1239" />
</ItemGroup>
Expand Down