Fixed build pipelines

Covid19Radar/Covid19Radar.iOS/ExportOptions/AdHoc.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>compileBitcode</key>
+	<false/>
+	<key>destination</key>
+	<string>export</string>
+	<key>method</key>
+	<string>ad-hoc</string>
+	<key>signingCertificate</key>
+	<string>Apple Distribution</string>
+	<key>signingStyle</key>
+	<string>manual</string>
+	<key>stripSwiftSymbols</key>
+	<true/>
+	<key>thinning</key>
+	<string>&lt;none&gt;</string>
+</dict>
+</plist>

Covid19Radar/Covid19Radar.iOS/ExportOptions/Development.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>compileBitcode</key>
+	<false/>
+	<key>destination</key>
+	<string>export</string>
+	<key>method</key>
+	<string>development</string>
+	<key>signingCertificate</key>
+	<string>Apple Development</string>
+	<key>signingStyle</key>
+	<string>manual</string>
+	<key>stripSwiftSymbols</key>
+	<true/>
+	<key>thinning</key>
+	<string>&lt;none&gt;</string>
+</dict>
+</plist>

Covid19Radar/Covid19Radar.iOS/ExportOptions/Store.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>destination</key>
+	<string>export</string>
+	<key>manageAppVersionAndBuildNumber</key>
+	<true/>
+	<key>method</key>
+	<string>app-store</string>
+	<key>signingCertificate</key>
+	<string>Apple Distribution</string>
+	<key>signingStyle</key>
+	<string>manual</string>
+	<key>stripSwiftSymbols</key>
+	<true/>
+	<key>uploadSymbols</key>
+	<true/>
+</dict>
+</plist>

azure-pipelines/app/templates/build/android-build-adhoc-template.yml

@@ -33,11 +33,11 @@ steps:
 - script: |
     cd $(Build.ArtifactStagingDirectory)/
     ARCHIVE_FILE=`find *.apk | head -1`
-    mv $ARCHIVE_FILE jp.go.mhlw.covid19radar_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion).apk
+    mv $ARCHIVE_FILE covid19radar_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion).apk
     ls -la
   displayName: 'Change archive name'
 
 - task: PublishBuildArtifacts@1
   displayName: 'Publish APK'
   inputs:
-    ArtifactName: 'archives_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion)'
+    ArtifactName: 'android_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion)'

azure-pipelines/app/templates/build/android-build-development-template.yml

@@ -33,11 +33,11 @@ steps:
 - script: |
     cd $(Build.ArtifactStagingDirectory)/
     ARCHIVE_FILE=`find *.apk | head -1`
-    mv $ARCHIVE_FILE jp.go.mhlw.covid19radar_development_$(Environment)_v$(AppVersion)_$(buildVersion).apk
+    mv $ARCHIVE_FILE covid19radar_development_$(Environment)_v$(AppVersion)_$(buildVersion).apk
     ls -la
   displayName: 'Change archive name'
 
 - task: PublishBuildArtifacts@1
   displayName: 'Publish APK'
   inputs:
-    ArtifactName: 'archives_development_$(Environment)_v$(AppVersion)_$(buildVersion)'
+    ArtifactName: 'android_development_$(Environment)_v$(AppVersion)_$(buildVersion)'

azure-pipelines/app/templates/build/android-build-store-template.yml

@@ -33,11 +33,11 @@ steps:
 - script: |
     cd $(Build.ArtifactStagingDirectory)/
     ARCHIVE_FILE=`find *.apk | head -1`
-    mv $ARCHIVE_FILE jp.go.mhlw.covid19radar_store_$(Environment)_v$(AppVersion)_$(buildVersion).apk
+    mv $ARCHIVE_FILE covid19radar_store_$(Environment)_v$(AppVersion)_$(buildVersion).apk
     ls -la
   displayName: 'Change archive name'
 
 - task: PublishBuildArtifacts@1
   displayName: 'Publish APK'
   inputs:
-    ArtifactName: 'archives_store_$(Environment)_v$(AppVersion)_$(buildVersion)'
+    ArtifactName: 'android_store_$(Environment)_v$(AppVersion)_$(buildVersion)'

azure-pipelines/app/templates/build/ios-build-adhoc-template.yml

@@ -27,36 +27,49 @@ steps:
   inputs:
     solutionFile: Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
     configuration: Release
+    packageApp: false
     signingIdentity: 'Apple Distribution'
     signingProvisioningProfileID: 'cdc74b34-c91f-4bc9-8c5a-3e904ae2635e'
+    args: '/p:ArchiveOnBuild=true'
+
+- bash: |
+    XCARCHIVE_PATH=`find ~/Library/Developer/Xcode/Archives -name "*.xcarchive" | head -1`
+    echo "$XCARCHIVE_PATH"
+    echo "##vso[task.setvariable variable=xcarchivePath;]$XCARCHIVE_PATH"
+  displayName: Set Archive Path
+
+- script: |
+    EXPORT_OPTIONS=./Covid19Radar/Covid19Radar.iOS/ExportOptions/AdHoc.plist
+    plutil -insert 'provisioningProfiles' -json '{"$(APP_PACKAGE_NAME)":"$(iOS_ProfileName_AdHoc)"}' $EXPORT_OPTIONS
+    plutil -insert 'teamID' -string '$(iOS_TeamId)' $EXPORT_OPTIONS
+  displayName: Edit ExportOptions
+
+- script: |
+    EXPORT_OPTIONS=./Covid19Radar/Covid19Radar.iOS/ExportOptions/AdHoc.plist
+    xcodebuild -exportArchive -archivePath "$(xcarchivePath)" -exportPath ./Covid19Radar/Covid19Radar.iOS/ipa/ -exportOptionsPlist $EXPORT_OPTIONS
+  displayName: Export from xcarchive to ipa
 
 - task: CopyFiles@2
   displayName: 'Copy IPA to: Build.ArtifactStagingDirectory'
   inputs:
-    SourceFolder: Covid19Radar/Covid19Radar.iOS/bin/iPhone/Release
+    SourceFolder: ./Covid19Radar/Covid19Radar.iOS/ipa
     Contents: '*.ipa'
     TargetFolder: '$(Build.ArtifactStagingDirectory)'
 
 - script: |
-    mkdir -p symbols
-    find . -type d -name '*.dSYM' | xargs -J % cp -v -R % $(System.DefaultWorkingDirectory)/symbols
-  displayName: Copy symbol files to staging
-
-- task: CopyFiles@2
-  displayName: 'Copy symbols to: Build.ArtifactStagingDirectory'
-  inputs:
-    Contents: |
-      **/symbols/**/*
-    TargetFolder: '$(Build.ArtifactStagingDirectory)'
+    cp -r "$(xcarchivePath)" "$(Build.ArtifactStagingDirectory)"
+  displayName: "Copy archve to: Build.ArtifactStagingDirectory"
 
 - script: |
-    cd $(Build.ArtifactStagingDirectory)/
-    ARCHIVE_FILE=`find *.ipa | head -1`
-    mv $ARCHIVE_FILE jp.go.mhlw.covid19radar_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion).ipa
+    cd $(Build.ArtifactStagingDirectory)
+    IPA_FILE=`find *.ipa | head -1`
+    mv "$IPA_FILE" covid19radar_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion).ipa
+    ARCHIVE_FILE=`find *.xcarchive | head -1`
+    mv "$ARCHIVE_FILE" covid19radar_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion).xcarchive
     ls -la
   displayName: 'Change archive name'
 
 - task: PublishBuildArtifacts@1
   displayName: 'Publish IPA and symbols'
   inputs:
-    ArtifactName: 'archives_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion)'
+    ArtifactName: 'ios_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion)'

azure-pipelines/app/templates/build/ios-build-appstore-template.yml

@@ -27,36 +27,49 @@ steps:
   inputs:
     solutionFile: Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
     configuration: Release
+    packageApp: false
     signingIdentity: 'Apple Distribution'
     signingProvisioningProfileID: '5265b13d-3a36-4e43-b4b2-2b406d6de095'
+    args: '/p:ArchiveOnBuild=true'
+
+- bash: |
+    XCARCHIVE_PATH=`find ~/Library/Developer/Xcode/Archives -name "*.xcarchive" | head -1`
+    echo "$XCARCHIVE_PATH"
+    echo "##vso[task.setvariable variable=xcarchivePath;]$XCARCHIVE_PATH"
+  displayName: Set Archive Path
+
+- script: |
+    EXPORT_OPTIONS=./Covid19Radar/Covid19Radar.iOS/ExportOptions/Store.plist
+    plutil -insert 'provisioningProfiles' -json '{"$(APP_PACKAGE_NAME)":"$(iOS_ProfileName_Store)"}' $EXPORT_OPTIONS
+    plutil -insert 'teamID' -string '$(iOS_TeamId)' $EXPORT_OPTIONS
+  displayName: Edit ExportOptions
+
+- script: |
+    EXPORT_OPTIONS=./Covid19Radar/Covid19Radar.iOS/ExportOptions/Store.plist
+    xcodebuild -exportArchive -archivePath "$(xcarchivePath)" -exportPath ./Covid19Radar/Covid19Radar.iOS/ipa/ -exportOptionsPlist $EXPORT_OPTIONS
+  displayName: Export from xcarchive to ipa
 
 - task: CopyFiles@2
   displayName: 'Copy IPA to: Build.ArtifactStagingDirectory'
   inputs:
-    SourceFolder: Covid19Radar/Covid19Radar.iOS/bin/iPhone/Release
+    SourceFolder: ./Covid19Radar/Covid19Radar.iOS/ipa
     Contents: '*.ipa'
     TargetFolder: '$(Build.ArtifactStagingDirectory)'
 
 - script: |
-    mkdir -p symbols
-    find . -type d -name '*.dSYM' | xargs -J % cp -v -R % $(System.DefaultWorkingDirectory)/symbols
-  displayName: Copy symbol files to staging
-
-- task: CopyFiles@2
-  displayName: 'Copy symbols to: Build.ArtifactStagingDirectory'
-  inputs:
-    Contents: |
-      **/symbols/**/*
-    TargetFolder: '$(Build.ArtifactStagingDirectory)'
+    cp -r "$(xcarchivePath)" "$(Build.ArtifactStagingDirectory)"
+  displayName: "Copy archve to: Build.ArtifactStagingDirectory"
 
 - script: |
-    cd $(Build.ArtifactStagingDirectory)/
-    ARCHIVE_FILE=`find *.ipa | head -1`
-    mv $ARCHIVE_FILE jp.go.mhlw.covid19radar_appstore_$(Environment)_v$(AppVersion)_$(buildVersion).ipa
+    cd $(Build.ArtifactStagingDirectory)
+    IPA_FILE=`find *.ipa | head -1`
+    mv "$IPA_FILE" covid19radar_store_$(Environment)_v$(AppVersion)_$(buildVersion).ipa
+    ARCHIVE_FILE=`find *.xcarchive | head -1`
+    mv "$ARCHIVE_FILE" covid19radar_store_$(Environment)_v$(AppVersion)_$(buildVersion).xcarchive
     ls -la
   displayName: 'Change archive name'
 
 - task: PublishBuildArtifacts@1
   displayName: 'Publish IPA and symbols'
   inputs:
-    ArtifactName: 'archives_appstore_$(Environment)_v$(AppVersion)_$(buildVersion)'
+    ArtifactName: 'ios_store_$(Environment)_v$(AppVersion)_$(buildVersion)'

azure-pipelines/app/templates/build/ios-build-development-template.yml

@@ -32,47 +32,61 @@ steps:
   inputs:
     solutionFile: Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
     configuration: Debug
-    args: '/p:DefineConstants=DEBUG=0'
+    packageApp: false
     signingIdentity: 'Apple Development'
     signingProvisioningProfileID: 'e673e188-1224-4218-9e18-c92103039c24'
+    args: '/p:ArchiveOnBuild=true /p:DefineConstants=DEBUG=0'
   condition: and(succeeded(), eq('${{ parameters.isDefineDebug }}', 'false'))
 
 - task: XamariniOS@2
   displayName: 'Build Covid19Radar.iOS.csproj for DEBUG'
   inputs:
     solutionFile: Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
     configuration: Debug
+    packageApp: false
     signingIdentity: 'Apple Development'
     signingProvisioningProfileID: 'e673e188-1224-4218-9e18-c92103039c24'
+    args: '/p:ArchiveOnBuild=true'
   condition: and(succeeded(), eq('${{ parameters.isDefineDebug }}', 'true'))
 
+- bash: |
+    XCARCHIVE_PATH=`find ~/Library/Developer/Xcode/Archives -name "*.xcarchive" | head -1`
+    echo "$XCARCHIVE_PATH"
+    echo "##vso[task.setvariable variable=xcarchivePath;]$XCARCHIVE_PATH"
+  displayName: Set Archive Path
+
+- script: |
+    EXPORT_OPTIONS=./Covid19Radar/Covid19Radar.iOS/ExportOptions/Development.plist
+    plutil -insert 'provisioningProfiles' -json '{"$(APP_PACKAGE_NAME)":"$(iOS_ProfileName_Development)"}' $EXPORT_OPTIONS
+    plutil -insert 'teamID' -string '$(iOS_TeamId)' $EXPORT_OPTIONS
+  displayName: Edit ExportOptions
+
+- script: |
+    EXPORT_OPTIONS=./Covid19Radar/Covid19Radar.iOS/ExportOptions/Development.plist
+    xcodebuild -exportArchive -archivePath "$(xcarchivePath)" -exportPath ./Covid19Radar/Covid19Radar.iOS/ipa/ -exportOptionsPlist $EXPORT_OPTIONS
+  displayName: Export from xcarchive to ipa
+
 - task: CopyFiles@2
   displayName: 'Copy IPA to: Build.ArtifactStagingDirectory'
   inputs:
-    SourceFolder: Covid19Radar/Covid19Radar.iOS/bin/iPhone/Debug
+    SourceFolder: ./Covid19Radar/Covid19Radar.iOS/ipa
     Contents: '*.ipa'
     TargetFolder: '$(Build.ArtifactStagingDirectory)'
 
 - script: |
-    mkdir -p symbols
-    find . -type d -name '*.dSYM' | xargs -J % cp -v -R % $(System.DefaultWorkingDirectory)/symbols
-  displayName: Copy symbol files to staging
-
-- task: CopyFiles@2
-  displayName: 'Copy symbols to: Build.ArtifactStagingDirectory'
-  inputs:
-    Contents: |
-      **/symbols/**/*
-    TargetFolder: '$(Build.ArtifactStagingDirectory)'
+    cp -r "$(xcarchivePath)" "$(Build.ArtifactStagingDirectory)"
+  displayName: "Copy archve to: Build.ArtifactStagingDirectory"
 
 - script: |
-    cd $(Build.ArtifactStagingDirectory)/
-    ARCHIVE_FILE=`find *.ipa | head -1`
-    mv $ARCHIVE_FILE jp.go.mhlw.covid19radar_development_$(Environment)_v$(AppVersion)_$(buildVersion).ipa
+    cd $(Build.ArtifactStagingDirectory)
+    IPA_FILE=`find *.ipa | head -1`
+    mv "$IPA_FILE" covid19radar_development_$(Environment)_v$(AppVersion)_$(buildVersion).ipa
+    ARCHIVE_FILE=`find *.xcarchive | head -1`
+    mv "$ARCHIVE_FILE" covid19radar_development_$(Environment)_v$(AppVersion)_$(buildVersion).xcarchive
     ls -la
   displayName: 'Change archive name'
 
 - task: PublishBuildArtifacts@1
   displayName: 'Publish IPA and symbols'
   inputs:
-    ArtifactName: 'archives_development_$(Environment)_v$(AppVersion)_$(buildVersion)'
+    ArtifactName: 'ios_development_$(Environment)_v$(AppVersion)_$(buildVersion)'