From 9ead28cb25a1c63cbbfdf5385c3a1b4ef39aaa43 Mon Sep 17 00:00:00 2001
From: jbeisner <jbeisner@microsoft.com>
Date: Tue, 3 Jul 2018 18:43:33 +0000
Subject: [PATCH 1/2] "Microsoft.DotNet.MSBuildSdkResolver" and
 "Microsoft.DotNet.Cli.Utils" are delivered/published via 'CLI' not
 'Core-SDK'; use 'dotnet-install.sh' from 'dot.net'

---
 build/OutputDirectories.props                |  1 -
 build/Prepare.targets                        |  1 -
 build/Publish.targets                        |  6 ---
 build/Signing.proj                           | 12 +----
 build/publish/PublishNupkgToBlobFeed.targets | 46 --------------------
 run-build.sh                                 |  3 +-
 6 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 build/publish/PublishNupkgToBlobFeed.targets

diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props
index 9eae98ec3..b0b3d146d 100644
--- a/build/OutputDirectories.props
+++ b/build/OutputDirectories.props
@@ -28,7 +28,6 @@
       <DotnetInOutputDirectory>$(OutputDirectory)/dotnet$(ExeExtension)</DotnetInOutputDirectory>
       <GeneratedMSBuildExtensionsDirectory>$(IntermediateDirectory)/GeneratedMSBuildExtensions</GeneratedMSBuildExtensionsDirectory>
       <MSBuildExtensionsLayoutDirectory>$(IntermediateDirectory)/MSBuildExtensionsLayout</MSBuildExtensionsLayoutDirectory>
-      <SdkResolverOutputDirectory>$(MSBuildExtensionsLayoutDirectory)/MSBuildSdkResolver</SdkResolverOutputDirectory>
       <NextStagePropsPath>$(BaseOutputDirectory)/PreviousStage.props</NextStagePropsPath>
   </PropertyGroup>
 </Project>
diff --git a/build/Prepare.targets b/build/Prepare.targets
index 94dc80893..46a9938ac 100644
--- a/build/Prepare.targets
+++ b/build/Prepare.targets
@@ -80,7 +80,6 @@
   <Target Name="SetupRestoreSrcPackagesInputsOutputs">
     <ItemGroup>
       <RestoreSrcPackagesInput Include="$(RepoRoot)/src/**/*.csproj" />
-      <RestoreSrcPackagesInput Remove="%(RestoreSrcPackagesInput.Identity)" Condition="'%(RestoreSrcPackagesInput.Filename)' == 'Microsoft.DotNet.MSBuildSdkResolver' and '$(IncludeMSBuildSdkResolver)' != 'true'" />
     </ItemGroup>
   </Target>
 
diff --git a/build/Publish.targets b/build/Publish.targets
index 70819a6b1..ede740e3a 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -3,7 +3,6 @@
   <Import Condition=" '$(GeneratePropsFile)' != 'true' " Project="$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/publish/FinishBuild.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/publish/PublishContent.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)/publish/PublishNupkgToBlobFeed.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/publish/Badge.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/publish/Checksum.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/publish/RuntimeCoherence.targets" />
@@ -34,7 +33,6 @@
                              GenerateChecksums;
                              UploadArtifactsToAzure;
                              UploadChecksumsToAzure;
-                             PublishNupkgToBlobFeed;
                              PublishCliVersionBadge" />
 
   <Target Name="GatherItemsForPattern">
@@ -43,10 +41,6 @@
                      Condition=" '$(PublishNativeInstallers)' == 'true' "/>
       <ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)"
                      Condition=" '$(PublishArchives)' == 'true' "/>
-      <ForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg"
-                     Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " />
-      <ForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.MSBuildSdkResolver.*.nupkg"
-                     Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " />
       <ForPublishing Include="$(PackagesDirectory)/runtime.*.Microsoft.DotNet.SDK.*.symbols.nupkg" />
       <ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).*.nupkg"
                      Condition=" '$(OS)' == 'Windows_NT' "/>
diff --git a/build/Signing.proj b/build/Signing.proj
index 69b08f0c1..4f250061c 100644
--- a/build/Signing.proj
+++ b/build/Signing.proj
@@ -22,8 +22,6 @@
   <Target Name="SetSigningProperties">
     <Error Condition="'$(Rid)' == ''" Text="Missing required property 'Rid'." />
     <PropertyGroup>
-      <SdkResolverOutputDirectory>$(IntermediateDirectory)/MSBuildExtensionsLayout/MSBuildSdkResolver</SdkResolverOutputDirectory>
-
       <!-- The OutDir and IntermediateOutputPath properties are required by MicroBuild. MicroBuild only
            signs files that are under these paths. -->
       <OutDir Condition="'$(OutDir)' == ''">$(BaseOutputDirectory)</OutDir>
@@ -31,7 +29,7 @@
     </PropertyGroup>
   </Target>
 
-  <Target Name="PostCompileSign" DependsOnTargets="GetPostCompileSignFiles;GetSignSdkResolverContentsFiles;SignFiles" />
+  <Target Name="PostCompileSign" DependsOnTargets="GetPostCompileSignFiles;SignFiles" />
 
   <Target Name="GetPostCompileSignFiles">
     <ItemGroup>
@@ -80,14 +78,6 @@
   <!-- Keeping this target around so as not to break existing build definitions. -->
   <Target Name="SignSdkResolverContents" />
 
-  <Target Name="GetSignSdkResolverContentsFiles">
-    <ItemGroup>
-      <FilesToSign Include="$(SdkResolverOutputDirectory)/Microsoft.DotNet.MSBuildSdkResolver.dll">
-        <Authenticode>$(InternalCertificateId)</Authenticode>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
-
   <Target Name="SignMsiAndCab" DependsOnTargets="GetSignMsiAndCabFiles;SignFiles" />
 
   <Target Name="GetSignMsiAndCabFiles">
diff --git a/build/publish/PublishNupkgToBlobFeed.targets b/build/publish/PublishNupkgToBlobFeed.targets
deleted file mode 100644
index 272e08cc2..000000000
--- a/build/publish/PublishNupkgToBlobFeed.targets
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Target Name="GatherNupkgsForPublishing">
-    <ItemGroup>
-      <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg"
-                           Exclude="$(PackagesDirectory)/*.symbols.nupkg"
-                           Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " >
-        <ManifestArtifactData>NonShipping=true</ManifestArtifactData>
-      </NupkgsForPublishing>
-      <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.MSBuildSdkResolver.*.nupkg"
-                           Exclude="$(PackagesDirectory)/*.symbols.nupkg"
-                           Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " >
-        <ManifestArtifactData>NonShipping=true</ManifestArtifactData>
-      </NupkgsForPublishing>
-    </ItemGroup>
-
-    <ItemGroup>
-      <SymbolsNupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.MSBuildSdkResolver.*.symbols.nupkg"
-                                  Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " />
-      <SymbolsNupkgsForPublishing Include="$(PackagesDirectory)/runtime.*.Microsoft.DotNet.SDK.*.symbols.nupkg" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <AllNupkgsForPublishing Include="@(SymbolsNupkgsForPublishing);@(NupkgsForPublishing)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="PublishNupkgToBlobFeed" DependsOnTargets="GatherNupkgsForPublishing">
-    <Error Condition="'$(BlobFeedCloudDropAccessToken)' == ''" Text="Missing property BlobFeedCloudDropAccessToken." />
-    <Error Condition="'$(BlobFeedExpectedURL)' == ''" Text="Missing property BlobFeedExpectedURL." />
-
-    <Message Text="Publish NuPkgs to Blob feed started: $(BlobFeedExpectedURL)" />
-    <PushToBlobFeed ExpectedFeedUrl="$(BlobFeedExpectedURL)"
-                    AccountKey="$(BlobFeedCloudDropAccessToken)"
-                    ItemsToPush="@(AllNupkgsForPublishing)"
-                    ManifestBranch="$(BranchName)"
-                    ManifestBuildId="$(FullNugetVersion)"
-                    ManifestCommit="$(CommitHash)"
-                    ManifestName="$(BuildName)"
-                    ManifestBuildData="ProductVersion=$(FullNugetVersion)"
-                    Overwrite="false"
-                    PublishFlatContainer="false"
-                    SkipCreateManifest="$(IsNotOrchestratedPublish)" />
-  </Target>
-</Project>
diff --git a/run-build.sh b/run-build.sh
index 6a5f179b0..3c08dc14e 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -161,9 +161,8 @@ if [[ $archlower == 'arm'* ]]; then
     INSTALL_ARCHITECTURE="x64"
 fi
 
-# Workaround while the install script is not updated on the website.
 if [ "$STAGE0_SOURCE_DIR" == "" ]; then
-    (set -x ; curl -sSL "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh" | bash /dev/stdin --version "2.2.0-preview1-007799" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$INSTALL_ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS)
+    (set -x ; curl -sSL "https://dot.net/v1/dotnet-install.sh" | bash /dev/stdin --version "2.2.0-preview1-007799" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$INSTALL_ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS)
 else
     echo "Copying bootstrap cli from $STAGE0_SOURCE_DIR"
     cp -r $STAGE0_SOURCE_DIR/* "$DOTNET_INSTALL_DIR"

From 6c793107b6361dbbb177f4756a0b2a1db01d87eb Mon Sep 17 00:00:00 2001
From: jbeisner <jbeisner@microsoft.com>
Date: Tue, 3 Jul 2018 19:48:04 +0000
Subject: [PATCH 2/2] Unblocking Jenkins...

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 53d86256c..59c74f9a4 100644
--- a/README.md
+++ b/README.md
@@ -349,3 +349,4 @@ License
 -------
 
 By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula).
+