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). + 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 @@ $(OutputDirectory)/dotnet$(ExeExtension) $(IntermediateDirectory)/GeneratedMSBuildExtensions $(IntermediateDirectory)/MSBuildExtensionsLayout - $(MSBuildExtensionsLayoutDirectory)/MSBuildSdkResolver $(BaseOutputDirectory)/PreviousStage.props 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 @@ - 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 @@ - @@ -34,7 +33,6 @@ GenerateChecksums; UploadArtifactsToAzure; UploadChecksumsToAzure; - PublishNupkgToBlobFeed; PublishCliVersionBadge" /> @@ -43,10 +41,6 @@ Condition=" '$(PublishNativeInstallers)' == 'true' "/> - - 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 @@ - $(IntermediateDirectory)/MSBuildExtensionsLayout/MSBuildSdkResolver - $(BaseOutputDirectory) @@ -31,7 +29,7 @@ - + @@ -80,14 +78,6 @@ - - - - $(InternalCertificateId) - - - - 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 @@ - - - - - - - NonShipping=true - - - NonShipping=true - - - - - - - - - - - - - - - - - - - - - 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"