diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46167b69d..c40e25f6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,57 +2,57 @@ - + https://github.com/dotnet/core-setup - 7cf49f78deaae14948ce59fc6d9266365888f7b6 + 3fcf1dac5531a0a92ce53af4eae4fc42316a0ccf - + https://github.com/dotnet/core-setup - 7cf49f78deaae14948ce59fc6d9266365888f7b6 + 3fcf1dac5531a0a92ce53af4eae4fc42316a0ccf - + https://github.com/dotnet/core-setup - 7cf49f78deaae14948ce59fc6d9266365888f7b6 + 3fcf1dac5531a0a92ce53af4eae4fc42316a0ccf - + https://github.com/aspnet/AspNetCore - f4f5b16e9305d54d27aefe0076cf153efab7e119 + e69328b3d0bee7fd1777226d16e4d8f550acce75 - + https://github.com/aspnet/AspNetCore - f4f5b16e9305d54d27aefe0076cf153efab7e119 + e69328b3d0bee7fd1777226d16e4d8f550acce75 - + https://github.com/aspnet/AspNetCore - f4f5b16e9305d54d27aefe0076cf153efab7e119 + e69328b3d0bee7fd1777226d16e4d8f550acce75 - + https://github.com/aspnet/AspNetCore - f4f5b16e9305d54d27aefe0076cf153efab7e119 + e69328b3d0bee7fd1777226d16e4d8f550acce75 - + https://github.com/aspnet/AspNetCore - f4f5b16e9305d54d27aefe0076cf153efab7e119 + e69328b3d0bee7fd1777226d16e4d8f550acce75 - + https://github.com/aspnet/AspNetCore - f4f5b16e9305d54d27aefe0076cf153efab7e119 + e69328b3d0bee7fd1777226d16e4d8f550acce75 - + https://github.com/dotnet/templating - 326a2514f7162dfb8ec928f879336aa434576473 + b103c4a9c64f62b8d940cc651b41fe774435f478 - + https://github.com/dotnet/toolset - b7d29e3f68a9bd7a82e68459b538599baae4904b + be81e8e373471bdd43a096697807c55f9053a3c0 - + https://github.com/dotnet/sdk - bd8cce7843a5b3f431e1011b1ca061d378197d41 + ec9f5fc673f798dd6a89c7d11a4e62727837757c - + https://github.com/dotnet/cli - b52c9eb3862d88e685bbcfa9360ee5518b38bd9f + df36ae42215c0ec93ea493e6b5af45991b2c2c29 @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 0dd5e2025f0049c133a8706f40e4463b193e5d17 + a190d4865fe3c86a168ec49c4fc61c90c96ae051 diff --git a/eng/Versions.props b/eng/Versions.props index a24362758..66479a34b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,31 +12,31 @@ preview - 3.0.100-preview8.19367.9 + 3.0.100-preview8.19371.3 - 3.0.0-preview8.19367.2 - 3.0.0-preview8.19367.2 - 3.0.0-preview8.19367.2 - 3.0.0-preview8.19367.2 - 3.0.0-preview8.19367.2 - 3.0.0-preview8.19367.2 + 3.0.0-preview8.19371.5 + 3.0.0-preview8.19371.5 + 3.0.0-preview8.19371.5 + 3.0.0-preview8.19371.5 + 3.0.0-preview8.19371.5 + 3.0.0-preview8.19371.5 - 3.0.100-preview8.19367.2 + 3.0.100-preview8.19370.6 0.2.0 - 3.0.100-preview8.19367.2 + 3.0.100-preview8.19370.4 $(MicrosoftNETSdkPackageVersion) - 3.0.0-preview8-27917-01 + 3.0.0-preview8-27919-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -44,11 +44,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview8-27917-01 + 2.1.0-preview8-27919-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview8-27917-01 + 3.0.0-preview8-27919-09 $(MicrosoftWindowsDesktopAppPackageVersion) diff --git a/eng/build.yml b/eng/build.yml index 14140d7f4..c47ccad98 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -37,6 +37,7 @@ phases: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access - _DotNetPublishToBlobFeed: true + - _PushToVSFeed: true - _SignType: real - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed) @@ -98,6 +99,16 @@ phases: $(_AdditionalBuildParameters) displayName: Build + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT')) }}: + - task: NuGetCommand@2 + displayName: Push Visual Studio NuPkgs + inputs: + command: push + packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' + nuGetFeedType: external + publishFeedCredentials: 'DevDiv - VS package feed' + condition: and(succeeded(), eq(variables['_PushToVSFeed'], 'true'), eq(variables['_DotNetPublishToBlobFeed'], 'true'), or(eq(variables['_BuildArchitecture'], 'x64'), eq(variables['_BuildArchitecture'], 'x86'))) + - task: PublishTestResults@1 displayName: Publish Test Results inputs: diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh index fc72d1394..5f2e77f44 100644 --- a/eng/common/init-tools-native.sh +++ b/eng/common/init-tools-native.sh @@ -71,7 +71,7 @@ function ReadGlobalJsonNativeTools { local native_tools_list=$(echo $native_tools_section | awk -F"[{}]" '{print $2}') native_tools_list=${native_tools_list//[\" ]/} native_tools_list=${native_tools_list//,/$'\n'} - native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[:space:]')" + native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[[:space:]]')" local old_IFS=$IFS while read -r line; do diff --git a/eng/common/pipeline-logging-functions.sh b/eng/common/pipeline-logging-functions.sh index 6098f9a54..1c560a506 100644 --- a/eng/common/pipeline-logging-functions.sh +++ b/eng/common/pipeline-logging-functions.sh @@ -39,11 +39,11 @@ function Write-PipelineTaskError { return fi - message_type="error" - sourcepath='' - linenumber='' - columnnumber='' - error_code='' + local message_type="error" + local sourcepath='' + local linenumber='' + local columnnumber='' + local error_code='' while [[ $# -gt 0 ]]; do opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" @@ -76,7 +76,7 @@ function Write-PipelineTaskError { shift done - message="##vso[task.logissue" + local message="##vso[task.logissue" message="$message type=$message_type" @@ -100,3 +100,73 @@ function Write-PipelineTaskError { echo "$message" } +function Write-PipelineSetVariable { + if [[ "$ci" != true ]]; then + return + fi + + local name='' + local value='' + local secret=false + local as_output=false + local is_multi_job_variable=true + + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -name|-n) + name=$2 + shift + ;; + -value|-v) + value=$2 + shift + ;; + -secret|-s) + secret=true + ;; + -as_output|-a) + as_output=true + ;; + -is_multi_job_variable|-i) + is_multi_job_variable=$2 + shift + ;; + esac + shift + done + + value=${value/;/%3B} + value=${value/\\r/%0D} + value=${value/\\n/%0A} + value=${value/]/%5D} + + local message="##vso[task.setvariable variable=$name;isSecret=$secret;isOutput=$is_multi_job_variable]$value" + + if [[ "$as_output" == true ]]; then + $message + else + echo "$message" + fi +} + +function Write-PipelinePrependPath { + local prepend_path='' + + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -path|-p) + prepend_path=$2 + shift + ;; + esac + shift + done + + export PATH="$prepend_path:$PATH" + + if [[ "$ci" == true ]]; then + echo "##vso[task.prependpath]$prepend_path" + fi +} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/internal-servicing.yml b/eng/common/templates/post-build/channels/internal-servicing.yml index 50ad724fc..648e854e0 100644 --- a/eng/common/templates/post-build/channels/internal-servicing.yml +++ b/eng/common/templates/post-build/channels/internal-servicing.yml @@ -84,6 +84,7 @@ stages: /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) + /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' diff --git a/eng/common/templates/post-build/channels/public-release.yml b/eng/common/templates/post-build/channels/public-release.yml index 574cb1c2b..f6a7efdfe 100644 --- a/eng/common/templates/post-build/channels/public-release.yml +++ b/eng/common/templates/post-build/channels/public-release.yml @@ -84,6 +84,7 @@ stages: /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) + /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9abaac015..8fe2b11ad 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -169,7 +169,7 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc InstallDotNet $dotnetRoot $version $architecture } -function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { $installScript = GetDotNetInstallScript $dotnetRoot +function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ Version = $version diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 70d92cf85..0deb01c48 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -146,14 +146,10 @@ function InitializeDotNetCli { # Add dotnet to PATH. This prevents any bare invocation of dotnet in custom # build steps from using anything other than what we've downloaded. - export PATH="$dotnet_root:$PATH" + Write-PipelinePrependPath -path "$dotnet_root" - if [[ $ci == true ]]; then - # Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build - echo "##vso[task.prependpath]$dotnet_root" - echo "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP]0" - echo "##vso[task.setvariable variable=DOTNET_SKIP_FIRST_TIME_EXPERIENCE]1" - fi + Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" + Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" # return value _InitializeDotNetCli="$dotnet_root" @@ -387,7 +383,8 @@ mkdir -p "$toolset_dir" mkdir -p "$temp_dir" mkdir -p "$log_dir" -if [[ $ci == true ]]; then - export TEMP="$temp_dir" - export TMP="$temp_dir" -fi +Write-PipelineSetVariable -name "Artifacts" -value "$artifacts_dir" +Write-PipelineSetVariable -name "Artifacts.Toolset" -value "$toolset_dir" +Write-PipelineSetVariable -name "Artifacts.Log" -value "$log_dir" +Write-PipelineSetVariable -name "Temp" -value "$temp_dir" +Write-PipelineSetVariable -name "TMP" -value "$temp_dir" diff --git a/global.json b/global.json index d8f7766a9..52fdab3e2 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19366.4" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19369.2" } }