diff --git a/.vsts-ci.iOS.yml b/.vsts-ci.iOS.yml
index b00fc1ee..6b9d658f 100644
--- a/.vsts-ci.iOS.yml
+++ b/.vsts-ci.iOS.yml
@@ -2,7 +2,10 @@ jobs:
- job: iOS
pool:
- vmImage: 'macOS-10.14'
+ name: Default
+ demands:
+ - Agent.OS -equals Darwin
+ - Xamarin.iOS -equals Latest
variables:
NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
@@ -11,8 +14,8 @@ jobs:
- checkout: self
clean: true
- - bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh 5_18_1"
- displayName: Select Xamarin Version
+ #- bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh 5_18_1"
+ # displayName: Select Xamarin Version
- bash: |
shopt -s nullglob
@@ -38,6 +41,16 @@ jobs:
inputs:
provProfileSecureFile: 'Uno_Calculator.mobileprovision'
+ - task: NuGetToolInstaller@0
+ inputs:
+ versionSpec: 4.9.1
+ checkLatest: false
+
+ - task: NuGetCommand@2
+ inputs:
+ command: 'restore'
+ restoreSolution: '$(build.sourcesdirectory)/src/Calculator.iOS/Calculator.iOS.csproj'
+
- bash: |
cd $(build.sourcesdirectory)/src/CalcManager
chmod +x build_ios.sh
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index bb8c9c12..3d63db3e 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -6,4 +6,3 @@ resources:
jobs:
- template: .vsts-ci.Windows.yml
- template: .vsts-ci.Linux.yml
-- template: .vsts-ci.iOS.yml
diff --git a/src/build/build.csproj b/src/build/build.csproj
index c680c913..ae8fabd2 100644
--- a/src/build/build.csproj
+++ b/src/build/build.csproj
@@ -6,7 +6,6 @@
false
Calculator
- true
@@ -18,20 +17,14 @@
-
-
-
-
-
-
+
+ Condition="'$(GITVERSION_InformationalVersion)'!=''">
- <_BuildNumber>$(PackageBuildNumber)
+ <_BuildNumber>$(_BuildNumber)
<_BuildNumber Condition="'$(BUILD_REPOSITORY_PROVIDER)' == 'TfsVersionControl'">$(BUILD_SOURCEVERSION.Substring(1))
@@ -49,7 +42,7 @@
<_BuildNumber Condition="$(BuildNumberOffset) != ''">$([MSBuild]::Add($(_BuildNumber), $(BuildNumberOffset)))
<_InformationalVersion>$(PackageInformationalVersion)
<_InformationalVersion Condition="'$(_InformationalVersion)' == ''">$(GITVERSION_InformationalVersion)
- <_AppVersion>$(PackageVersion)
+ <_AppVersion>$(_AppVersion)
<_AppVersion Condition="'$(_AppVersion)'==''">$(GitVersion_MajorMinorPatch)
@@ -67,12 +60,6 @@
<_AppVersion Condition="$(_AppVersion.Split('.').length) == 2">$(_AppVersion).0
-
-
- 0
- <_AppVersion>$(_AppVersion).$(AppRevision)
-
-
+
+
+ <_SourceBasePath>../$(AppName)
+ <_ManifestPath>$(_SourceBasePath).Android/Properties/AndroidManifest.xml
+ <_PlistFilePath>$(_SourceBasePath).iOS/Info.plist
+ <_AppxManifestPath>$(_SourceBasePath).UWP/Package.appxmanifest
+ <_AndroidNamespace>
+
+
+ <_WindowsNamespace>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_XmlUpdate Condition="Exists('$(_PlistFilePath)')"
+ XmlFileName="$(_PlistFilePath)"
+ XPath="//plist/dict/key[text() = 'CFBundleShortVersionString']/following-sibling::string[1]"
+ Value="$(_AppVersion)" />
+
+ <_XmlUpdate Condition="Exists('$(_PlistFilePath)')"
+ XmlFileName="$(_PlistFilePath)"
+ XPath="//plist/dict/key[text() = 'CFBundleVersion']/following-sibling::string[1]"
+ Value="$(_BuildNumber)" />
+
+
+
+ <_Major Include="$(_AppVersion.Split('.')[0])" />
+ <_Minor Include="$(_AppVersion.Split('.')[1])" />
+ <_Revision Include="$(_AppVersion.Split('.')[2])" />
+
+
+
+
+
+ <_UWPVersion>@(_Major).@(_Minor).$(_BuildNumber).@(_Revision)
+
+
+
;
- Console.WriteLine("Updating " + items.Count() + " nodes");
+ Log.LogMessage("Updating " + items.Count() + " nodes");
foreach (var item in items.ToArray())
{
@@ -172,66 +219,5 @@
-
-
- <_SourceBasePath>../$(AppName)
- <_ManifestPath>$(_SourceBasePath).Android/Properties/AndroidManifest.xml
- <_PlistFilePath>$(_SourceBasePath).Android/Info.plist
- <_AppxManifestPath>$(_SourceBasePath).Android/Package.appxmanifest
- <_AndroidNamespace>
-
-
- <_WindowsNamespace>
-
-
-
-
-
-
-
-
-
-
-
- <_XmlUpdate Condition="Exists('$(_PlistFilePath)')"
- XmlFileName="$(_PlistFilePath)"
- XPath="//plist/dict/key[text() = 'CFBundleShortVersionString']/following-sibling::string[1]"
- Value="$(PackageVersion)" />
-
- <_XmlUpdate Condition="Exists('$(_PlistFilePath)')"
- XmlFileName="$(_PlistFilePath)"
- XPath="//plist/dict/key[text() = 'CFBundleVersion']/following-sibling::string[1]"
- Value="$(PackageBuildNumber)" />
-
-
-
- <_Major Include="$(PackageVersion.Split('.')[0])" />
- <_Minor Include="$(PackageVersion.Split('.')[1])" />
- <_Revision Include="$(PackageVersion.Split('.')[3])" />
-
-
-
-
-
- <_UWPVersion>@(_Major).@(_Minor).$(PackageBuildNumber).@(_Revision)
-
-
-
-
-