<configuration>\r
<fileset id="fileset1" name="nuget-agent" removed="false">\r
<file>file://$MODULE_DIR$/src/META-INF/build-agent-plugin-nuget.xml</file>\r
+ <file>file://$MODULE_DIR$/src/META-INF/build-agent-plugin-nuget-pack.xml</file>\r
<file>jar://$TeamCityDistribution$/buildAgent/lib/agent.jar!/META-INF/buildAgentSpring.xml</file>\r
<file>jar://$TeamCityDistribution$/buildAgent/lib/agent.jar!/META-INF/buildAgentPlugins.xml</file>\r
- <file>file://$MODULE_DIR$/src/META-INF/build-agent-plugin-nuget-pack.xml</file>\r
+ <file>file://$MODULE_DIR$/src/META-INF/build-agent-plugin-nuget-publish.xml</file>\r
+ <file>file://$MODULE_DIR$/src/META-INF/build-agent-plugin-nuget-install.xml</file>\r
</fileset>\r
</configuration>\r
</facet>\r
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+ xsi:schemaLocation="http://www.springframework.org/schema/beans\r
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
+ default-autowire="constructor">\r
+ <bean class="jetbrains.buildServer.nuget.agent.runner.install.PackagesInstallerRunner"/>\r
+ <bean class="jetbrains.buildServer.nuget.agent.runner.install.PackagesInstallerRunnerRegistrar"/>\r
+\r
+ <bean class="jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesWatcher"/>\r
+ <bean class="jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesInfoUploader"/>\r
+</beans>
\ No newline at end of file
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
default-autowire="constructor">\r
\r
- <bean class="jetbrains.buildServer.nuget.agent.pack.PackRunner"/>\r
- <bean class="jetbrains.buildServer.nuget.agent.pack.PackRunnerRegistrar"/>\r
+ <bean class="jetbrains.buildServer.nuget.agent.runner.pack.PackRunner"/>\r
+ <bean class="jetbrains.buildServer.nuget.agent.runner.pack.PackRunnerRegistrar"/>\r
\r
</beans>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+ xsi:schemaLocation="http://www.springframework.org/schema/beans\r
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
+ default-autowire="constructor">\r
+\r
+ <bean class="jetbrains.buildServer.nuget.agent.runner.publish.PackagesPublishRunner"/>\r
+ <bean class="jetbrains.buildServer.nuget.agent.runner.publish.PackagesPublishRunnerRegistrar"/>\r
+\r
+</beans>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>\r
-<!--suppress AutowiredDependenciesInspection -->\r
<beans xmlns="http://www.springframework.org/schema/beans"\r
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
xsi:schemaLocation="http://www.springframework.org/schema/beans\r
\r
<bean class="jetbrains.buildServer.nuget.agent.util.impl.CommandlineBuildProcessFactoryImpl"/>\r
\r
- <bean class="jetbrains.buildServer.nuget.agent.install.PackagesInstallerRunner"/>\r
- <bean class="jetbrains.buildServer.nuget.agent.install.PackagesInstallerRunnerRegistrar"/>\r
-\r
- <bean class="jetbrains.buildServer.nuget.agent.publish.PackagesPublishRunner"/>\r
- <bean class="jetbrains.buildServer.nuget.agent.publish.PackagesPublishRunnerRegistrar"/>\r
-\r
<bean class="jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl"/>\r
<bean class="jetbrains.buildServer.nuget.agent.commands.impl.LoggingNuGetActionFactoryImpl">\r
<constructor-arg>\r
\r
<bean class="jetbrains.buildServer.nuget.agent.parameters.impl.PackagesParametersFactoryImpl"/>\r
\r
- <bean class="jetbrains.buildServer.nuget.agent.install.impl.PackageUsagesImpl"/>\r
- <bean class="jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesConfigParser" />\r
- <bean class="jetbrains.buildServer.nuget.agent.install.impl.PackagesWatcher"/>\r
- <bean class="jetbrains.buildServer.nuget.agent.install.impl.PackagesInfoUploader"/>\r
- <bean class="jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesCollectorImpl"/>\r
+\r
+ <bean class="jetbrains.buildServer.nuget.agent.dependencies.impl.PackageUsagesImpl"/>\r
+ <bean class="jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesConfigParser" />\r
+ <bean class="jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesCollectorImpl"/>\r
+\r
</beans>
\ No newline at end of file
import jetbrains.buildServer.agent.BuildRunnerContext;\r
import jetbrains.buildServer.nuget.agent.commands.CommandFactory;\r
import jetbrains.buildServer.nuget.agent.commands.NuGetActionFactory;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
import jetbrains.buildServer.nuget.agent.parameters.*;\r
import jetbrains.buildServer.nuget.agent.util.BuildProcessBase;\r
import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install;\r
+package jetbrains.buildServer.nuget.agent.dependencies;\r
\r
import jetbrains.buildServer.nuget.common.PackageDependencies;\r
import org.jetbrains.annotations.NotNull;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install;\r
+package jetbrains.buildServer.nuget.agent.dependencies;\r
\r
import org.jetbrains.annotations.NotNull;\r
\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.dependencies.impl;\r
\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.NuGetPackagesCollectorEx;\r
import jetbrains.buildServer.nuget.common.PackageDependencies;\r
import jetbrains.buildServer.nuget.common.PackageInfo;\r
import org.jetbrains.annotations.NotNull;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.dependencies.impl;\r
\r
import com.intellij.openapi.diagnostic.Logger;\r
-import jetbrains.buildServer.nuget.agent.install.NuGetPackagesCollector;\r
+import jetbrains.buildServer.nuget.agent.dependencies.NuGetPackagesCollector;\r
import jetbrains.buildServer.util.StringUtil;\r
import jetbrains.buildServer.util.XmlXppAbstractParser;\r
import org.jetbrains.annotations.NotNull;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.dependencies.impl;\r
\r
import com.intellij.openapi.diagnostic.Logger;\r
-import jetbrains.buildServer.nuget.agent.install.NuGetPackagesCollector;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.NuGetPackagesCollector;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
import org.jetbrains.annotations.NotNull;\r
\r
import java.io.File;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install;\r
+package jetbrains.buildServer.nuget.agent.runner.install;\r
\r
import com.intellij.openapi.diagnostic.Logger;\r
import jetbrains.buildServer.RunBuildException;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install;\r
+package jetbrains.buildServer.nuget.agent.runner.install;\r
\r
import com.intellij.openapi.diagnostic.Logger;\r
import jetbrains.buildServer.RunBuildException;\r
import jetbrains.buildServer.agent.*;\r
import jetbrains.buildServer.nuget.agent.commands.NuGetActionFactory;\r
-import jetbrains.buildServer.nuget.agent.install.impl.InstallStages;\r
-import jetbrains.buildServer.nuget.agent.install.impl.InstallStagesImpl;\r
-import jetbrains.buildServer.nuget.agent.install.impl.PackagesInstallerBuilder;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.InstallStages;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.*;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.InstallStagesImpl;\r
import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesParametersFactory;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesInstallerBuilder;\r
import jetbrains.buildServer.nuget.agent.util.impl.CompositeBuildProcessImpl;\r
import jetbrains.buildServer.nuget.common.DotNetConstants;\r
import jetbrains.buildServer.nuget.common.PackagesConstants;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install;\r
+package jetbrains.buildServer.nuget.agent.runner.install;\r
\r
import jetbrains.buildServer.agent.impl.BuildRunnerRegistry;\r
import org.jetbrains.annotations.NotNull;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.runner.install.impl;\r
\r
import jetbrains.buildServer.nuget.agent.util.BuildProcessContinuation;\r
import org.jetbrains.annotations.NotNull;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.runner.install.impl;\r
\r
import jetbrains.buildServer.nuget.agent.util.BuildProcessContinuation;\r
import jetbrains.buildServer.nuget.agent.util.impl.CompositeBuildProcessImpl;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.runner.install.impl;\r
\r
-import jetbrains.buildServer.nuget.agent.install.NuGetPackagesCollector;\r
+import jetbrains.buildServer.nuget.agent.dependencies.NuGetPackagesCollector;\r
\r
/**\r
* Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.runner.install.impl;\r
\r
import jetbrains.buildServer.agent.AgentRunningBuild;\r
import jetbrains.buildServer.agent.artifacts.ArtifactsWatcher;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.runner.install.impl;\r
\r
import jetbrains.buildServer.RunBuildException;\r
import jetbrains.buildServer.agent.BuildRunnerContext;\r
import jetbrains.buildServer.nuget.agent.commands.NuGetActionFactory;\r
-import jetbrains.buildServer.nuget.agent.install.LocateNuGetConfigBuildProcess;\r
+import jetbrains.buildServer.nuget.agent.runner.install.LocateNuGetConfigBuildProcess;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
import jetbrains.buildServer.nuget.common.PackagesUpdateMode;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.install.impl;\r
+package jetbrains.buildServer.nuget.agent.runner.install.impl;\r
\r
import com.intellij.openapi.diagnostic.Logger;\r
import jetbrains.buildServer.agent.AgentLifeCycleAdapter;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.pack;\r
+package jetbrains.buildServer.nuget.agent.runner.pack;\r
\r
import com.intellij.openapi.diagnostic.Logger;\r
import jetbrains.buildServer.RunBuildException;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.pack;\r
+package jetbrains.buildServer.nuget.agent.runner.pack;\r
\r
import jetbrains.buildServer.agent.impl.BuildRunnerRegistry;\r
import org.jetbrains.annotations.NotNull;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.publish;\r
+package jetbrains.buildServer.nuget.agent.runner.publish;\r
\r
import com.intellij.openapi.diagnostic.Logger;\r
import com.intellij.openapi.util.SystemInfo;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.publish;\r
+package jetbrains.buildServer.nuget.agent.runner.publish;\r
\r
import com.intellij.openapi.diagnostic.Logger;\r
import jetbrains.buildServer.RunBuildException;\r
* limitations under the License.\r
*/\r
\r
-package jetbrains.buildServer.nuget.agent.publish;\r
+package jetbrains.buildServer.nuget.agent.runner.publish;\r
\r
import jetbrains.buildServer.agent.impl.BuildRunnerRegistry;\r
import org.jetbrains.annotations.NotNull;\r
import jetbrains.buildServer.RunBuildException;\r
import jetbrains.buildServer.agent.BuildFinishedStatus;\r
import jetbrains.buildServer.agent.BuildProgressLogger;\r
-import jetbrains.buildServer.nuget.agent.install.LocateNuGetConfigBuildProcess;\r
+import jetbrains.buildServer.nuget.agent.runner.install.LocateNuGetConfigBuildProcess;\r
import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
import jetbrains.buildServer.nuget.tests.util.BuildProcessTestCase;\r
import jetbrains.buildServer.util.FileUtil;\r
import jetbrains.buildServer.agent.BuildFinishedStatus;\r
import jetbrains.buildServer.agent.BuildRunnerContext;\r
import jetbrains.buildServer.nuget.agent.parameters.NuGetPublishParameters;\r
-import jetbrains.buildServer.nuget.agent.publish.MatchFilesBuildProcess;\r
+import jetbrains.buildServer.nuget.agent.runner.publish.MatchFilesBuildProcess;\r
import jetbrains.buildServer.nuget.tests.Strings;\r
import jetbrains.buildServer.nuget.tests.util.BuildProcessTestCase;\r
import jetbrains.buildServer.util.FileUtil;\r
import jetbrains.buildServer.agent.BuildRunnerContext;\r
import jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl;\r
import jetbrains.buildServer.nuget.agent.commands.impl.NuGetActionFactoryImpl;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
import jetbrains.buildServer.agent.BuildRunnerContext;\r
import jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl;\r
import jetbrains.buildServer.nuget.agent.commands.impl.NuGetActionFactoryImpl;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
import jetbrains.buildServer.nuget.agent.parameters.NuGetPackParameters;\r
import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
import org.jmock.Expectations;\r
public void test_custom_commandline() throws RunBuildException {\r
myExtra.add("arg1");\r
myExtra.add("arg2");\r
- m.checking(new Expectations(){{\r
- allowing(myPackParameters).packTool(); will(returnValue(false));\r
- allowing(myPackParameters).packSymbols(); will(returnValue(false));\r
+ m.checking(new Expectations() {{\r
+ allowing(myPackParameters).packTool();\r
+ will(returnValue(false));\r
+ allowing(myPackParameters).packSymbols();\r
+ will(returnValue(false));\r
\r
oneOf(myProcessFactory).executeCommandLine(ctx, myNuGet,\r
Arrays.asList(\r
package jetbrains.buildServer.nuget.tests.agent;\r
\r
import jetbrains.buildServer.BaseTestCase;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesCollectorImpl;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesConfigParser;\r
import jetbrains.buildServer.nuget.common.PackageInfo;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesCollectorImpl;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesConfigParser;\r
import jetbrains.buildServer.nuget.tests.integration.Paths;\r
import org.jetbrains.annotations.NotNull;\r
import org.testng.Assert;\r
import jetbrains.buildServer.agent.BuildRunnerContext;\r
import jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl;\r
import jetbrains.buildServer.nuget.agent.commands.impl.NuGetActionFactoryImpl;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
import jetbrains.buildServer.nuget.agent.parameters.NuGetPublishParameters;\r
import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
import org.jmock.Expectations;\r
import jetbrains.buildServer.agent.BuildRunnerContext;\r
import jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl;\r
import jetbrains.buildServer.nuget.agent.commands.impl.NuGetActionFactoryImpl;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
import jetbrains.buildServer.agent.BuildProcess;\r
import jetbrains.buildServer.agent.BuildRunnerContext;\r
import jetbrains.buildServer.nuget.agent.commands.NuGetActionFactory;\r
-import jetbrains.buildServer.nuget.agent.install.impl.InstallStages;\r
-import jetbrains.buildServer.nuget.agent.install.impl.PackagesInstallerBuilder;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.InstallStages;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.InstallStages;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesInstallerBuilder;\r
import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesInstallerBuilder;\r
import jetbrains.buildServer.nuget.agent.util.BuildProcessContinuation;\r
import jetbrains.buildServer.nuget.common.PackagesUpdateMode;\r
import org.jmock.Expectations;\r
import jetbrains.buildServer.agent.AgentLifeCycleListener;\r
import jetbrains.buildServer.agent.AgentRunningBuild;\r
import jetbrains.buildServer.agent.BuildFinishedStatus;\r
-import jetbrains.buildServer.agent.BuildRunnerContext;\r
import jetbrains.buildServer.agent.artifacts.ArtifactsWatcher;\r
-import jetbrains.buildServer.nuget.agent.install.NuGetPackagesCollector;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesCollectorImpl;\r
-import jetbrains.buildServer.nuget.agent.install.impl.PackagesInfoUploader;\r
-import jetbrains.buildServer.nuget.agent.install.impl.PackagesWatcher;\r
+import jetbrains.buildServer.nuget.agent.dependencies.NuGetPackagesCollector;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesCollectorImpl;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesInfoUploader;\r
+import jetbrains.buildServer.nuget.agent.runner.install.impl.PackagesWatcher;\r
import jetbrains.buildServer.nuget.common.PackageDependenciesStore;\r
import jetbrains.buildServer.util.EventDispatcher;\r
import org.hamcrest.BaseMatcher;\r
import jetbrains.buildServer.RunBuildException;\r
import jetbrains.buildServer.agent.BuildFinishedStatus;\r
import jetbrains.buildServer.agent.BuildProcess;\r
-import jetbrains.buildServer.nuget.agent.install.PackagesInstallerRunner;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesCollectorImpl;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesCollectorImpl;\r
+import jetbrains.buildServer.nuget.agent.runner.install.PackagesInstallerRunner;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
import jetbrains.buildServer.nuget.common.PackageInfo;\r
import jetbrains.buildServer.nuget.agent.commands.impl.CommandFactoryImpl;\r
import jetbrains.buildServer.nuget.agent.commands.impl.LoggingNuGetActionFactoryImpl;\r
import jetbrains.buildServer.nuget.agent.commands.impl.NuGetActionFactoryImpl;\r
-import jetbrains.buildServer.nuget.agent.install.NuGetPackagesCollector;\r
-import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesCollectorImpl;\r
-import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesConfigParser;\r
-import jetbrains.buildServer.nuget.agent.install.impl.PackageUsagesImpl;\r
+import jetbrains.buildServer.nuget.agent.dependencies.NuGetPackagesCollector;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesCollectorImpl;\r
+import jetbrains.buildServer.nuget.agent.dependencies.PackageUsages;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.NuGetPackagesConfigParser;\r
+import jetbrains.buildServer.nuget.agent.dependencies.impl.PackageUsagesImpl;\r
import jetbrains.buildServer.nuget.agent.parameters.*;\r
import jetbrains.buildServer.nuget.agent.util.BuildProcessBase;\r
import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
import jetbrains.buildServer.SimpleCommandLineProcessRunner;\r
import jetbrains.buildServer.agent.BuildFinishedStatus;\r
import jetbrains.buildServer.agent.BuildProcess;\r
-import jetbrains.buildServer.nuget.agent.pack.PackRunner;\r
+import jetbrains.buildServer.nuget.agent.runner.pack.PackRunner;\r
import jetbrains.buildServer.nuget.agent.parameters.NuGetPackParameters;\r
import jetbrains.buildServer.util.FileUtil;\r
import org.jetbrains.annotations.NotNull;\r
import jetbrains.buildServer.agent.BuildFinishedStatus;\r
import jetbrains.buildServer.agent.BuildProcess;\r
import jetbrains.buildServer.nuget.agent.parameters.NuGetPublishParameters;\r
-import jetbrains.buildServer.nuget.agent.publish.PackagesPublishRunner;\r
+import jetbrains.buildServer.nuget.agent.runner.publish.PackagesPublishRunner;\r
import jetbrains.buildServer.util.FileUtil;\r
import org.jetbrains.annotations.NotNull;\r
import org.jmock.Expectations;\r