Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update preinstallprovprofile.ts #13046

Merged
merged 5 commits into from
Jun 8, 2020
Merged

Update preinstallprovprofile.ts #13046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cef65b4
Update preinstallprovprofile.ts
jmartarelli Jun 2, 2020
d05f181
Merge branch 'master' into patch-1
jmartarelli Jun 6, 2020
054071b
Updating error message for file extension allowed.
jmartarelli Jun 6, 2020
6c900c9
Updating version on task.json (minor and patch)
jmartarelli Jun 6, 2020
ed70bbf
Updating version on task.loc.json
jmartarelli Jun 6, 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
5 changes: 3 additions & 2 deletions Tasks/InstallAppleProvisioningProfileV1/preinstallprovprofile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ async function run() {
let provProfilePath: string = await secureFileHelpers.downloadSecureFile(secureFileId);

if (tl.exist(provProfilePath)) {
if (!provProfilePath.endsWith(".mobileprovision")) {
if (!provProfilePath.endsWith(".mobileprovision") &&
!provProfilePath.endsWith(".provisionprofile")) {
throw new Error(tl.loc('InvalidMobileProvisionFileExtension'));
}
const info = await sign.installProvisioningProfile(provProfilePath);
Expand All @@ -49,4 +50,4 @@ async function run() {
}
}

run();
run();
8 changes: 4 additions & 4 deletions Tasks/InstallAppleProvisioningProfileV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 170,
"Patch": 2
"Minor": 171,
"Patch": 0
},
"runsOn": [
"Agent",
Expand Down Expand Up @@ -96,6 +96,6 @@
"messages": {
"InputProvisioningProfileNotFound": "Provisioning profile to be installed was not found at %s. Specify the full file path to a provisioning profile.",
"InstallRequiresMac": "Install Apple Provisioning Profile requires a macOS agent. Installing on Windows or Linux is not supported by Apple.",
"InvalidMobileProvisionFileExtension": "Provisioning profile file should have the extension '.mobileprovision'"
"InvalidMobileProvisionFileExtension": "Provisioning profile file should have the extension '.mobileprovision' or '.provisionprofile'"
}
}
}
6 changes: 3 additions & 3 deletions Tasks/InstallAppleProvisioningProfileV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 170,
"Patch": 2
"Minor": 171,
"Patch": 0
},
"runsOn": [
"Agent",
Expand Down Expand Up @@ -98,4 +98,4 @@
"InstallRequiresMac": "ms-resource:loc.messages.InstallRequiresMac",
"InvalidMobileProvisionFileExtension": "ms-resource:loc.messages.InvalidMobileProvisionFileExtension"
}
}
}