Remove cli-deps feed and publishing of deb-tool

cli-deps feed has been removed so cleaning up that feed as
well as removing the publishing of the deb-tool that published
to it.

Commit migrated from https://github.com/dotnet/core-setup/commit/7b00501c598504836dd6fbabe9b3b604a213cdd9

diff --git a/src/installer/buildpipeline/Core-Setup-Linux-BT.json b/src/installer/buildpipeline/Core-Setup-Linux-BT.json
index 793f5c9..9bca34b 100644 (file)
--- a/src/installer/buildpipeline/Core-Setup-Linux-BT.json
+++ b/src/installer/buildpipeline/Core-Setup-Linux-BT.json
@@ -279,7 +279,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishType=$(PB_PublishType) /p:PublishDebToolToFeed=true /p:CliNuGetFeedUrl=$(CLI_NUGET_FEED_URL) /p:CliNuGetApiKey=$(CLI_NUGET_API_KEY) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)",
+        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishType=$(PB_PublishType) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -1136,16 +1136,6 @@
     "PB_AdditionalMSBuildArguments": {
       "value": ""
     },
-    "CLI_NUGET_FEED_URL": {
-      "value": "https:%2F%2Fdotnet.myget.org/F/cli-deps/api/v2/package"
-    },
-    "CLI_NUGET_SYMBOLS_FEED_URL": {
-      "value": "https:%2F%2Fdotnet.myget.org/F/cli-deps/symbols/api/v2/package"
-    },
-    "CliNuGetApiKey": {
-      "value": null,
-      "isSecret": true
-    },
     "DistroSpecificMSBuildArguments": {
       "value": "/flp:v=diag /clp:v=detailed /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=false /p:ConfigurationGroup=$(BuildConfiguration) /p:OSGroup=Linux /p:OfficialBuildId=$(OfficialBuildId)"
     },

diff --git a/src/installer/publish/publish.proj b/src/installer/publish/publish.proj
index 7a0b0da..599dc60 100644 (file)
--- a/src/installer/publish/publish.proj
+++ b/src/installer/publish/publish.proj
@@ -24,7 +24,6 @@
     <BuildDependsOn Condition="$(PublishType.Contains('nopublishtype'))">
       $(BuildDependsOn);
       PublishDebFilesToDebianRepo;
-      PublishDebToolPackageToFeed;
       PublishFinalOutput;
     </BuildDependsOn>
   </PropertyGroup>
@@ -282,19 +281,6 @@
                     Overwrite="$(OverwriteOnPublish)"/>
   </Target>
 
-  <Target Name="PublishDebToolPackageToFeed"
-          Condition="'$(PublishDebToolToFeed)' == 'true' AND '$(CliNuGetFeedUrl)' != ''">
-    <Error Condition="'$(CliNuGetApiKey)' == ''" Text="Missing required property CliNuGetApiKey" />
-    <ItemGroup>
-      <DebToolPackages Include="$(PackageOutputPath)/dotnet-deb-tool.*.nupkg" />
-    </ItemGroup>
-    <PropertyGroup>
-      <NuGetPushCommand>$(DotnetToolCommand) nuget push --source $(CliNuGetFeedUrl) --api-key $(CliNuGetApiKey) --timeout $(NuGetPushTimeoutSeconds)</NuGetPushCommand>
-    </PropertyGroup>
-    <ExecWithRetriesForNuGetPush Command="$(NuGetPushCommand) %(DebToolPackages.Identity)"
-                                 IgnoredErrorMessagesWithConditional="@(IgnorableErrorMessages)" />
-  </Target>
-
   <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>

diff --git a/tools-local/scripts/dockerrun.sh b/tools-local/scripts/dockerrun.sh
index 4d5a3d8..e12467d 100644 (file)
--- a/tools-local/scripts/dockerrun.sh
+++ b/tools-local/scripts/dockerrun.sh
@@ -113,9 +113,6 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
     -e NUGET_SYMBOLS_FEED_URL \
     -e NUGET_API_KEY \
     -e GITHUB_PASSWORD \
-    -e CLI_NUGET_FEED_URL \
-    -e CLI_NUGET_SYMBOLS_FEED_URL \
-    -e CLI_NUGET_API_KEY \
     $DOTNET_BUILD_CONTAINER_TAG \
     $BUILD_COMMAND "$@"