diff --git a/Localization.md b/Localization.md index 4186ab190..dbe682f53 100644 --- a/Localization.md +++ b/Localization.md @@ -15,7 +15,7 @@ We’re using an open localization platform to regularly integrate community fee * Go to https://www.transifex.com/microsoft-oss/teamexplorereverywhere/ * Select your requested language. * Click ![](./img/trans.png) -* Select a partucilar resource or choose "All resources" to see all strings in the product. +* Select a particular resource or choose "All resources" to see all strings in the product. ###Reviewing and voting on translations * Review the suggestions and vote ![](./img/1.png) , ![](./img/2.png) diff --git a/source/com.microsoft.tfs.client.clc/src/com/microsoft/tfs/client/clc/vc/commands/CommandResolve.java b/source/com.microsoft.tfs.client.clc/src/com/microsoft/tfs/client/clc/vc/commands/CommandResolve.java index a4abab1bb..233eb1985 100644 --- a/source/com.microsoft.tfs.client.clc/src/com/microsoft/tfs/client/clc/vc/commands/CommandResolve.java +++ b/source/com.microsoft.tfs.client.clc/src/com/microsoft/tfs/client/clc/vc/commands/CommandResolve.java @@ -12,7 +12,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import com.microsoft.alm.client.utils.StringUtil; import com.microsoft.tfs.client.clc.AcceptedOptionSet; import com.microsoft.tfs.client.clc.EnvironmentVariables; import com.microsoft.tfs.client.clc.ExitCode; @@ -56,6 +55,7 @@ import com.microsoft.tfs.core.util.FileEncoding; import com.microsoft.tfs.jni.FileSystemUtils; import com.microsoft.tfs.util.Check; +import com.microsoft.tfs.util.StringUtil; import com.microsoft.tfs.util.process.ProcessFinishedHandler; import com.microsoft.tfs.util.process.ProcessRunner; diff --git a/source/com.microsoft.tfs.client.common.ui.teambuild/src/com/microsoft/tfs/client/common/ui/teambuild/controls/BuildDefinitionTemplatesTable.java b/source/com.microsoft.tfs.client.common.ui.teambuild/src/com/microsoft/tfs/client/common/ui/teambuild/controls/BuildDefinitionTemplatesTable.java index 029f7a623..005b21601 100644 --- a/source/com.microsoft.tfs.client.common.ui.teambuild/src/com/microsoft/tfs/client/common/ui/teambuild/controls/BuildDefinitionTemplatesTable.java +++ b/source/com.microsoft.tfs.client.common.ui.teambuild/src/com/microsoft/tfs/client/common/ui/teambuild/controls/BuildDefinitionTemplatesTable.java @@ -9,14 +9,10 @@ import org.eclipse.swt.graphics.GC; import org.eclipse.swt.widgets.Composite; -import com.microsoft.alm.client.TeeClientHandler; import com.microsoft.alm.teamfoundation.build.webapi.BuildDefinitionTemplate; -import com.microsoft.alm.teamfoundation.distributedtask.webapi.TaskAgentHttpClient; -import com.microsoft.tfs.client.common.ui.TFSCommonUIClientPlugin; import com.microsoft.tfs.client.common.ui.framework.table.TableColumnData; import com.microsoft.tfs.client.common.ui.framework.table.TableControl; import com.microsoft.tfs.client.common.ui.teambuild.Messages; -import com.microsoft.tfs.core.TFSTeamProjectCollection; import com.microsoft.tfs.util.StringUtil; public class BuildDefinitionTemplatesTable extends TableControl { @@ -30,8 +26,6 @@ public class BuildDefinitionTemplatesTable extends TableControl { private static final int DESCRIPTION_COLUMN_NUM = 2; private final TableColumnData[] columnData; - private final TaskAgentHttpClient taskAgentClient; - public BuildDefinitionTemplatesTable(final Composite parent, final int style) { super(parent, (style | SWT.FULL_SELECTION) & ~SWT.MULTI & ~SWT.CHECK, BuildDefinitionTemplate.class, null); @@ -55,11 +49,6 @@ public BuildDefinitionTemplatesTable(final Composite parent, final int style) { setupTable(true, false, columnData); setUseViewerDefaults(); - - final TFSTeamProjectCollection connection = - TFSCommonUIClientPlugin.getDefault().getProductPlugin().getServerManager().getDefaultServer().getConnection(); - taskAgentClient = - new TaskAgentHttpClient(new TeeClientHandler(connection.getHTTPClient()), connection.getBaseURI()); } @Override diff --git a/source/com.microsoft.tfs.client.common.ui.teambuild/src/com/microsoft/tfs/client/common/ui/teambuild/teamexplorer/favorites/BuildFavoriteItem.java b/source/com.microsoft.tfs.client.common.ui.teambuild/src/com/microsoft/tfs/client/common/ui/teambuild/teamexplorer/favorites/BuildFavoriteItem.java index 205e7d5e2..07e32a9eb 100644 --- a/source/com.microsoft.tfs.client.common.ui.teambuild/src/com/microsoft/tfs/client/common/ui/teambuild/teamexplorer/favorites/BuildFavoriteItem.java +++ b/source/com.microsoft.tfs.client.common.ui.teambuild/src/com/microsoft/tfs/client/common/ui/teambuild/teamexplorer/favorites/BuildFavoriteItem.java @@ -108,7 +108,7 @@ private static BuildDefinition getBuildDefinitionFromFavorite( new BuildHttpClient(new TeeClientHandler(connection.getHTTPClient()), connection.getBaseURI()); final DefinitionReference definition = - buildClient.getDefinition(oldDefinition.getProject().getId(), oldDefinition.getId(), null, null); + buildClient.getDefinition(oldDefinition.getProject().getId(), oldDefinition.getId(), null, null, null); if (definition == null || !(definition instanceof BuildDefinition) || definition.getUri() == null) { throw new FavoritesException("Build favorite " + oldDefinition.getUri() + " does not exist."); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/source/com.microsoft.tfs.client.common.ui/src/com/microsoft/tfs/client/common/ui/wizard/common/WizardServerSelectionPage.java b/source/com.microsoft.tfs.client.common.ui/src/com/microsoft/tfs/client/common/ui/wizard/common/WizardServerSelectionPage.java index d7f1b8b1d..743077003 100644 --- a/source/com.microsoft.tfs.client.common.ui/src/com/microsoft/tfs/client/common/ui/wizard/common/WizardServerSelectionPage.java +++ b/source/com.microsoft.tfs.client.common.ui/src/com/microsoft/tfs/client/common/ui/wizard/common/WizardServerSelectionPage.java @@ -58,6 +58,7 @@ import com.microsoft.tfs.core.util.ServerURIUtils; import com.microsoft.tfs.core.util.URIUtils; import com.microsoft.tfs.util.Platform; +import com.microsoft.tfs.util.StringUtil; public class WizardServerSelectionPage extends ExtendedWizardPage { public static final String PAGE_NAME = "WizardServerSelectionPage"; //$NON-NLS-1$ @@ -65,6 +66,8 @@ public class WizardServerSelectionPage extends ExtendedWizardPage { private static final Log log = LogFactory.getLog(WizardServerSelectionPage.class); private static final int MAX_CREDENTIALS_RETRIES = 3; + private static final String TFS_URL_PROPERTY_NAME = + "Microsoft.VisualStudio.Services.Account.ServiceUrl.00025394-6065-48CA-87D9-7F5672854EF7"; //$NON-NLS-1$ private ServerTypeSelectControl serverTypeSelectControl; @@ -163,8 +166,8 @@ private List getUserAccounts(final Action deviceFlo final AccountHttpClient accountClient = new AccountHttpClient(clientHandler, URIUtils.VSTS_ROOT_URL); - final List accounts = accountClient.getAccounts(profile.getId()); - log.info("Accounts number = " + accounts.size()); //$NON-NLS-1$ + final List accounts = + accountClient.getAccounts(null, null, profile.getId(), null, TFS_URL_PROPERTY_NAME, null); return accounts; } @@ -214,19 +217,25 @@ private List getConfigurationServers( for (final Account account : accounts) { log.debug("Account name = " + account.getAccountName()); //$NON-NLS-1$ - log.debug("Account URI = " + account.getAccountUri()); //$NON-NLS-1$ - final String accountURI = "https://" + account.getAccountName() + ".visualstudio.com"; //$NON-NLS-1$ //$NON-NLS-2$ + if (account.getProperties() != null && account.getProperties().containsKey(TFS_URL_PROPERTY_NAME)) { - try { - final URI uri = URIUtils.newURI(accountURI); - final TFSConnection configurationServer = - openAccount(uri, CredentialsHelper.getOAuthCredentials(uri, deviceFlowCallback)); - if (configurationServer != null) { - configurationServers.add(configurationServer); + final String accountURL = account.getProperties().get(TFS_URL_PROPERTY_NAME).getValue(); + + if (!StringUtil.isNullOrEmpty(accountURL)) { + log.debug("Account URI = " + accountURL); //$NON-NLS-1$ + + try { + final URI uri = URIUtils.newURI(accountURL); + final TFSConnection configurationServer = + openAccount(uri, CredentialsHelper.getOAuthCredentials(uri, deviceFlowCallback)); + if (configurationServer != null) { + configurationServers.add(configurationServer); + } + } catch (final Exception e) { + log.error(e.getMessage(), e); + } } - } catch (final Exception e) { - log.error(e.getMessage(), e); } } diff --git a/source/com.microsoft.tfs.client.common/src/com/microsoft/tfs/client/common/credentials/CredentialsHelper.java b/source/com.microsoft.tfs.client.common/src/com/microsoft/tfs/client/common/credentials/CredentialsHelper.java index 01874a9fa..18b276c6a 100644 --- a/source/com.microsoft.tfs.client.common/src/com/microsoft/tfs/client/common/credentials/CredentialsHelper.java +++ b/source/com.microsoft.tfs.client.common/src/com/microsoft/tfs/client/common/credentials/CredentialsHelper.java @@ -25,7 +25,6 @@ import com.microsoft.alm.storage.InsecureInMemoryStore; import com.microsoft.alm.storage.SecretStore; import com.microsoft.alm.visualstudio.services.account.client.AccountHttpClient; -import com.microsoft.alm.visualstudio.services.delegatedauthorization.SessionToken; import com.microsoft.tfs.client.common.Messages; import com.microsoft.tfs.client.common.config.CommonClientConnectionAdvisor; import com.microsoft.tfs.core.TFSConnection; diff --git a/source/com.microsoft.tfs.core/.classpath b/source/com.microsoft.tfs.core/.classpath index 654160788..07549c55d 100644 --- a/source/com.microsoft.tfs.core/.classpath +++ b/source/com.microsoft.tfs.core/.classpath @@ -6,26 +6,18 @@ - - - - - - - - - - - - - + + + + - - - - - - + + + + + + + @@ -41,9 +33,15 @@ + - + + + + + + diff --git a/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF b/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF index 3781f59d0..f5cf5e782 100644 --- a/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF +++ b/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF @@ -4,15 +4,9 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: com.microsoft.tfs.core;singleton:=true Bundle-Version: 14.111.1.qualifier Bundle-ClassPath: com.microsoft.tfs.core.jar, - libs/AlmHttpClient-15.105.0.20161011/alm-vss-client-15.105.0-SNAPSHOT.jar, - libs/AlmHttpClient-15.105.0.20161011/alm-gallery-client-15.105.0-SNAPSHOT.jar, - libs/AlmHttpClient-15.105.0.20161011/alm-extensionmanagement-client-15.105.0-SNAPSHOT.jar, - libs/AlmHttpClient-15.105.0.20161011/alm-distributedtask-client-15.105.0-SNAPSHOT.jar, - libs/AlmHttpClient-15.105.0.20161011/alm-tfs-client-15.105.0-SNAPSHOT.jar, - libs/AlmHttpClient-15.105.0.20161011/alm-releasemanagement-client-15.105.0-SNAPSHOT.jar, + libs/AlmHttpClient-15.108.2/alm-vss-client-15.108.2-20161228.200110-6.jar, + libs/AlmHttpClient-15.108.2/alm-tfs-client-15.108.2-20161228.200220-6.jar, libs/hsqldb-1.8.0.10-ebcdic/hsqldb.jar, - libs/xerces-2.8.0/xercesImpl.jar, - libs/xerces-2.8.0/xml-apis.jar, libs/guava-12.0.1/guava-12.0.1.jar, libs/commons-codec-1.6/commons-codec-1.6.jar, libs/commons-io-2.4/commons-io-2.4.jar, @@ -81,7 +75,6 @@ Export-Package: ., com.microsoft.alm.teamfoundation.chat.webapi, com.microsoft.alm.teamfoundation.core.webapi, com.microsoft.alm.teamfoundation.core.webapi.types, - com.microsoft.alm.teamfoundation.distributedtask.webapi, com.microsoft.alm.teamfoundation.policy.webapi, com.microsoft.alm.teamfoundation.sourcecontrol.webapi, com.microsoft.alm.teamfoundation.sourcecontrol.webapi.internal, @@ -96,17 +89,11 @@ Export-Package: ., com.microsoft.alm.visualstudio.services.customerintelligence.webapi, com.microsoft.alm.visualstudio.services.delegatedauthorization, com.microsoft.alm.visualstudio.services.delegatedauthorization.client, - com.microsoft.alm.visualstudio.services.extensionmanagement.webapi, - com.microsoft.alm.visualstudio.services.extensionmanagement.webapi.acquisitionrequest, com.microsoft.alm.visualstudio.services.featureavailability, com.microsoft.alm.visualstudio.services.featureavailability.webapi, com.microsoft.alm.visualstudio.services.filecontainer, com.microsoft.alm.visualstudio.services.filecontainer.client, com.microsoft.alm.visualstudio.services.forminput, - com.microsoft.alm.visualstudio.services.gallery.webapi, - com.microsoft.alm.visualstudio.services.gallery.webapi.acquisitionoption, - com.microsoft.alm.visualstudio.services.gallery.webapi.acquisitionrequest, - com.microsoft.alm.visualstudio.services.gallery.webapi.commerce, com.microsoft.alm.visualstudio.services.identity, com.microsoft.alm.visualstudio.services.identity.client, com.microsoft.alm.visualstudio.services.identity.mru, @@ -115,10 +102,6 @@ Export-Package: ., com.microsoft.alm.visualstudio.services.operations, com.microsoft.alm.visualstudio.services.profile, com.microsoft.alm.visualstudio.services.profile.client, - com.microsoft.alm.visualstudio.services.releasemanagement.webapi, - com.microsoft.alm.visualstudio.services.releasemanagement.webapi.contracts, - com.microsoft.alm.visualstudio.services.releasemanagement.webapi.contracts.conditions, - com.microsoft.alm.visualstudio.services.releasemanagement.webapi.events, com.microsoft.alm.visualstudio.services.security, com.microsoft.alm.visualstudio.services.security.client, com.microsoft.alm.visualstudio.services.webapi, diff --git a/source/com.microsoft.tfs.core/build.properties b/source/com.microsoft.tfs.core/build.properties index cb08a592f..fa9072272 100644 --- a/source/com.microsoft.tfs.core/build.properties +++ b/source/com.microsoft.tfs.core/build.properties @@ -1,8 +1,6 @@ bin.includes = META-INF/,\ about.html,\ libs/hsqldb-1.8.0.10-ebcdic/hsqldb.jar,\ - libs/xerces-2.8.0/xercesImpl.jar,\ - libs/xerces-2.8.0/xml-apis.jar,\ com.microsoft.tfs.core.jar,\ plugin.properties,\ libs/guava-12.0.1/guava-12.0.1.jar,\ @@ -27,11 +25,8 @@ bin.includes = META-INF/,\ libs/java-auth-lib/auth-core-0.5.0.jar,\ libs/java-auth-lib/auth-providers-0.5.0.jar,\ libs/java-auth-lib/auth-secure-storage-0.5.0.jar,\ - libs/AlmHttpClient-15.105.0.20161011/alm-distributedtask-client-15.105.0-SNAPSHOT.jar,\ - libs/AlmHttpClient-15.105.0.20161011/alm-extensionmanagement-client-15.105.0-SNAPSHOT.jar,\ - libs/AlmHttpClient-15.105.0.20161011/alm-gallery-client-15.105.0-SNAPSHOT.jar,\ - libs/AlmHttpClient-15.105.0.20161011/alm-releasemanagement-client-15.105.0-SNAPSHOT.jar,\ - libs/AlmHttpClient-15.105.0.20161011/alm-tfs-client-15.105.0-SNAPSHOT.jar,\ - libs/AlmHttpClient-15.105.0.20161011/alm-vss-client-15.105.0-SNAPSHOT.jar + libs/AlmHttpClient-15.108.2/alm-vss-client-15.108.2-20161228.200110-6.jar,\ + libs/AlmHttpClient-15.108.2/alm-tfs-client-15.108.2-20161228.200220-6.jar source.com.microsoft.tfs.core.jar = src/,\ rest_core/ +src.excludes = tests/ diff --git a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-distributedtask-client-15.105.0-SNAPSHOT.jar b/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-distributedtask-client-15.105.0-SNAPSHOT.jar deleted file mode 100644 index 7b651a1ec..000000000 Binary files a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-distributedtask-client-15.105.0-SNAPSHOT.jar and /dev/null differ diff --git a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-extensionmanagement-client-15.105.0-SNAPSHOT.jar b/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-extensionmanagement-client-15.105.0-SNAPSHOT.jar deleted file mode 100644 index f320b6a04..000000000 Binary files a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-extensionmanagement-client-15.105.0-SNAPSHOT.jar and /dev/null differ diff --git a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-gallery-client-15.105.0-SNAPSHOT.jar b/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-gallery-client-15.105.0-SNAPSHOT.jar deleted file mode 100644 index 49016a1aa..000000000 Binary files a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-gallery-client-15.105.0-SNAPSHOT.jar and /dev/null differ diff --git a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-releasemanagement-client-15.105.0-SNAPSHOT.jar b/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-releasemanagement-client-15.105.0-SNAPSHOT.jar deleted file mode 100644 index 7988de9d3..000000000 Binary files a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-releasemanagement-client-15.105.0-SNAPSHOT.jar and /dev/null differ diff --git a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-tfs-client-15.105.0-SNAPSHOT.jar b/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-tfs-client-15.105.0-SNAPSHOT.jar deleted file mode 100644 index 403198e83..000000000 Binary files a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-tfs-client-15.105.0-SNAPSHOT.jar and /dev/null differ diff --git a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-vss-client-15.105.0-SNAPSHOT.jar b/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-vss-client-15.105.0-SNAPSHOT.jar deleted file mode 100644 index 11a6332c8..000000000 Binary files a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.105.0.20161011/alm-vss-client-15.105.0-SNAPSHOT.jar and /dev/null differ diff --git a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.108.2/alm-tfs-client-15.108.2-20161228.200220-6.jar b/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.108.2/alm-tfs-client-15.108.2-20161228.200220-6.jar new file mode 100644 index 000000000..0b7738a1e Binary files /dev/null and b/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.108.2/alm-tfs-client-15.108.2-20161228.200220-6.jar differ diff --git a/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.108.2/alm-vss-client-15.108.2-20161228.200110-6.jar b/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.108.2/alm-vss-client-15.108.2-20161228.200110-6.jar new file mode 100644 index 000000000..a22a0f13f Binary files /dev/null and b/source/com.microsoft.tfs.core/libs/AlmHttpClient-15.108.2/alm-vss-client-15.108.2-20161228.200110-6.jar differ diff --git a/source/com.microsoft.tfs.core/rest_core/com/microsoft/alm/client/TeeClientHandler.java b/source/com.microsoft.tfs.core/rest_core/com/microsoft/alm/client/TeeClientHandler.java index f07fb652a..8ce1d648b 100644 --- a/source/com.microsoft.tfs.core/rest_core/com/microsoft/alm/client/TeeClientHandler.java +++ b/source/com.microsoft.tfs.core/rest_core/com/microsoft/alm/client/TeeClientHandler.java @@ -22,6 +22,7 @@ import com.microsoft.alm.client.model.VssResourceNotFoundException; import com.microsoft.alm.client.model.VssServiceException; import com.microsoft.alm.client.utils.JsonHelper; +import com.microsoft.alm.client.VssRestClientHandler; import com.microsoft.alm.visualstudio.services.webapi.ApiResourceLocation; import com.microsoft.alm.visualstudio.services.webapi.ApiResourceLocationCollection; import com.microsoft.alm.visualstudio.services.webapi.ApiResourceVersion; diff --git a/source/com.microsoft.tfs.core/src/com.microsoft.tfs.core-version.properties b/source/com.microsoft.tfs.core/src/com.microsoft.tfs.core-version.properties index 3c2d1b099..1eca26547 100644 --- a/source/com.microsoft.tfs.core/src/com.microsoft.tfs.core-version.properties +++ b/source/com.microsoft.tfs.core/src/com.microsoft.tfs.core-version.properties @@ -1,6 +1,6 @@ # This file gets replaced at build-time with the correct numbers. # This version gets checked in so debugging/tfdev works. number.version.major=14 -number.version.minor=0 -number.version.service=4 +number.version.minor=111 +number.version.service=1 number.version.build=SNAPSHOT \ No newline at end of file