From b8af9afeae1c5980092b2d8b4e46b8c1a930ddde Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Jul 2021 21:42:23 +0000 Subject: [PATCH 1/7] [internal/release/5.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.6-servicing.21221.6 to 5.0.9-servicing.21365.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.6-servicing.21220.11 to 5.0.9-servicing.21359.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.6 to 5.0.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.6 to 5.0.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.6 to 5.0.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.6-servicing.21223.5 to 5.0.9-servicing.21365.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.6 to 5.0.9 (parent: Microsoft.NET.Sdk) - Microsoft.EntityFrameworkCore: from 5.0.6 to 5.0.9 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - dotnet-dev-certs: from 5.0.6-servicing.21223.5 to 5.0.9-servicing.21365.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.6-servicing.21223.5 to 5.0.9-servicing.21365.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.6 to 5.0.9 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.6-servicing.21221.3 to 5.0.9-servicing.21363.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.6 to 5.0.9 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.6-servicing.21221.8 to 5.0.9-servicing.21365.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 34 +++++++++++++++++++++ eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++--------- 3 files changed, 81 insertions(+), 47 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2e0cafd64..f262b6004 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,22 @@ + + + + + + + + + + + + + + + + @@ -21,6 +37,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0130e6520..771b53026 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 297185fc6039237591fb28a8a09fc01d2ea69ae6 + ab7f82ae74c0bcf6cc1d2ef17eb30c84f2f4d57a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 297185fc6039237591fb28a8a09fc01d2ea69ae6 + ab7f82ae74c0bcf6cc1d2ef17eb30c84f2f4d57a https://github.com/dotnet/windowsdesktop @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 208e377a5329ad6eb1db5e5fb9d4590fa50beadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 208e377a5329ad6eb1db5e5fb9d4590fa50beadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 208e377a5329ad6eb1db5e5fb9d4590fa50beadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 208e377a5329ad6eb1db5e5fb9d4590fa50beadd @@ -55,25 +55,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + c663adee8e64ba5d379fa0edfb8201984a7df7d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + c663adee8e64ba5d379fa0edfb8201984a7df7d0 - - https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 780af7091b186e1e0af288ebda44404accd4ea63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + c663adee8e64ba5d379fa0edfb8201984a7df7d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + c663adee8e64ba5d379fa0edfb8201984a7df7d0 https://github.com/dotnet/test-templates @@ -87,22 +87,22 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - - https://github.com/dotnet/sdk - 753a0d4f66c7c4310eb8b3790e9b72dc9e671cf2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + d348fd80c84fa7dddb3bc2a1fcfd0ab17fc1b4ff - - https://github.com/dotnet/sdk - 753a0d4f66c7c4310eb8b3790e9b72dc9e671cf2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + d348fd80c84fa7dddb3bc2a1fcfd0ab17fc1b4ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3b86fe34ae2ef405a49c19997f9f01ed63a2ad70 + c352dea1e3b0bb93896c861b439a41a0bb8fd90f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fe9dd395134709b5a53883b71c01447b5f132a06 + 494815295bf80b1e4610dc821b59ed0d50e92601 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a2b90ab30..4d552e08d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.6-servicing.21221.3 + 5.0.9-servicing.21363.2 - 5.0.6-servicing.21221.8 + 5.0.9-servicing.21365.4 @@ -43,20 +43,20 @@ - 5.0.6 + 5.0.9 5.0.0 5.0.0-rtm.20526.5 - 5.0.6-servicing.21223.5 - 5.0.6-servicing.21223.5 - 5.0.6-servicing.21223.5 + 5.0.9-servicing.21365.3 + 5.0.9-servicing.21365.3 + 5.0.9-servicing.21365.3 0.2.0 - 5.0.400-preview.21364.19 - 5.0.400-preview.21364.19 + 5.0.400-servicing.21366.12 + 5.0.400-servicing.21366.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,17 +67,17 @@ - 5.0.6-servicing.21220.11 - 5.0.6 - 5.0.6 + 5.0.9-servicing.21359.8 + 5.0.9 + 5.0.9 5.0.0 - 5.0.6 + 5.0.9 2.1.0 - 5.0.6-servicing.21221.6 - 5.0.6 + 5.0.9-servicing.21365.4 + 5.0.9 5.0.0 5.0.0-rtm.20520.1 From 43aa23ec45214dce1b0c8ca67448752577db4a2c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 17 Jul 2021 16:16:58 +0000 Subject: [PATCH 2/7] [internal/release/5.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-3.21359.6 to 3.11.0-4.21366.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 771b53026..30ef5a4ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d348fd80c84fa7dddb3bc2a1fcfd0ab17fc1b4ff + 51a3aad02f07743fac77930bc50987e02dfe5905 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d348fd80c84fa7dddb3bc2a1fcfd0ab17fc1b4ff + 51a3aad02f07743fac77930bc50987e02dfe5905 @@ -117,9 +117,9 @@ dc2ca1a2089983aa027e475998aa3a335bc247b7 linker - + https://github.com/dotnet/roslyn - c7ab50623cb6843cbb6e75c38c026f0c8be04f01 + dbce5adcfa3a1319c8b8fa03a4d3d35684211c4b https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 4d552e08d..aafbf45cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-servicing.21366.12 - 5.0.400-servicing.21366.12 + 5.0.400-servicing.21367.5 + 5.0.400-servicing.21367.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d61950f9bf5187f9869e9cc1867df98588d6164b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 26 Jul 2021 18:28:12 +0000 Subject: [PATCH 3/7] [internal/release/5.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-4.21366.5 to 3.11.0-4.21373.6 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.11.0-preview-21351-03 to 16.11.0 (parent: Microsoft.NET.Sdk) --- NuGet.config | 9 +++++++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index f262b6004..9a8ad7c31 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,27 @@ + + + + + @@ -41,18 +46,22 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30ef5a4ac..404bb240a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 51a3aad02f07743fac77930bc50987e02dfe5905 + b87df7565f0fa4b4eb7f3da747358b88a8dbc0da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 51a3aad02f07743fac77930bc50987e02dfe5905 + b87df7565f0fa4b4eb7f3da747358b88a8dbc0da @@ -117,13 +117,13 @@ dc2ca1a2089983aa027e475998aa3a335bc247b7 linker - + https://github.com/dotnet/roslyn - dbce5adcfa3a1319c8b8fa03a4d3d35684211c4b + bb3bdbbe0e46d1fe03cefd1ac84b45c473edaf83 - + https://github.com/dotnet/msbuild - 1d7ed8e3d8394d0effaee6d3395c28d9322aa9bb + 0538acc04cc2c953f220f9ec3f3764db1769defe https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index aafbf45cb..c4c8b87e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-servicing.21367.5 - 5.0.400-servicing.21367.5 + 5.0.400-servicing.21376.9 + 5.0.400-servicing.21376.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e4030d2343ee395f9357b3a05389bff2cdba3550 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 2 Aug 2021 15:31:29 -0700 Subject: [PATCH 4/7] Update branding for 5.0.401 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a2b90ab30..9796758df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 4 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From fd9df0646ed6f6541b989ac288f50ec9269c6cf7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Aug 2021 21:49:17 +0000 Subject: [PATCH 5/7] Update dependencies from https://github.com/dotnet/arcade build 20210727.1 (#11398) [release/5.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++--- eng/Versions.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 4 +-- eng/common/sdl/execute-all-sdl-tools.ps1 | 11 ++++++- eng/common/sdl/init-sdl.ps1 | 2 +- eng/common/sdl/push-gdn.ps1 | 31 ++++++++++++-------- eng/common/sdl/run-sdl.ps1 | 2 +- global.json | 2 +- 8 files changed, 39 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0130e6520..406bc9a2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9796758df..db29f1386 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21328.3 + 5.0.0-beta.21377.1 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index a40ee827a..3396cd527 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -15,8 +15,8 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - # Hard coding darc version till the next arcade-services roll out, cos this version has required API changes for darc add-build-to-channel - $darc = Get-Darc "1.1.0-beta.20418.1" + + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index b681d797c..b6a7de26b 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -32,7 +32,7 @@ try { $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true - $LASTEXITCODE = 0 + $global:LASTEXITCODE = 0 # `tools.ps1` checks $ci to perform some actions. Since the SDL # scripts don't necessarily execute in the same agent that run the @@ -82,13 +82,22 @@ try { if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) { & $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams + if ($LASTEXITCODE -ne 0) { + ExitWithExitCode $LASTEXITCODE + } } if ($SourceToolsList -and $SourceToolsList.Count -gt 0) { & $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams + if ($LASTEXITCODE -ne 0) { + ExitWithExitCode $LASTEXITCODE + } } if ($UpdateBaseline) { & (Join-Path $PSScriptRoot 'push-gdn.ps1') -Repository $RepoName -BranchName $BranchName -GdnFolder $GdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason 'Update baseline' + if ($LASTEXITCODE -ne 0) { + ExitWithExitCode $LASTEXITCODE + } } if ($TsaPublish) { diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index bb6a42971..ac1bc4b87 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -10,7 +10,7 @@ Param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true -$LASTEXITCODE = 0 +$global:LASTEXITCODE = 0 # `tools.ps1` checks $ci to perform some actions. Since the SDL # scripts don't necessarily execute in the same agent that run the diff --git a/eng/common/sdl/push-gdn.ps1 b/eng/common/sdl/push-gdn.ps1 index d8fd2d82a..c2eec7d92 100644 --- a/eng/common/sdl/push-gdn.ps1 +++ b/eng/common/sdl/push-gdn.ps1 @@ -9,7 +9,7 @@ Param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true -$LASTEXITCODE = 0 +$global:LASTEXITCODE = 0 try { # `tools.ps1` checks $ci to perform some actions. Since the SDL @@ -46,19 +46,26 @@ try { Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git add failed with exit code $LASTEXITCODE." ExitWithExitCode $LASTEXITCODE } - Write-Host "git -c user.email=`"dn-bot@microsoft.com`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`"" - git -c user.email="dn-bot@microsoft.com" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName" + # check if there are any staged changes (0 = no changes, 1 = changes) + # if we don't do this and there's nothing to commit `git commit` will return + # exit code 1 and we will fail + Write-Host "git diff --cached --exit-code" + git diff --cached --exit-code + Write-Host "git diff exit code: $LASTEXITCODE" if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git commit failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE + Write-Host "git -c user.email=`"dn-bot@microsoft.com`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`"" + git -c user.email="dn-bot@microsoft.com" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName" + if ($LASTEXITCODE -ne 0) { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git commit failed with exit code $LASTEXITCODE." + ExitWithExitCode $LASTEXITCODE + } + Write-Host 'git push' + git push + if ($LASTEXITCODE -ne 0) { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git push failed with exit code $LASTEXITCODE." + ExitWithExitCode $LASTEXITCODE + } } - Write-Host 'git push' - git push - if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git push failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE - } - # Return to the original directory Pop-Location } diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index fe95ab35a..3d9c87aba 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -13,7 +13,7 @@ Param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true -$LASTEXITCODE = 0 +$global:LASTEXITCODE = 0 try { # `tools.ps1` checks $ci to perform some actions. Since the SDL diff --git a/global.json b/global.json index a0a164ac3..2183619c0 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21328.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21377.1" } } From 50c38af403a9f8e29b901bc250005817e4935be6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Aug 2021 17:40:44 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/arcade build 20210809.4 (#11468) [release/5.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 406bc9a2d..5fe06f23c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - 37d6692a72171966d9d1d786f03577cd5a3b8c12 + 7b8e78dced9b93e5d69fabb9fbc9a2eb5de8e95a - + https://github.com/dotnet/arcade - 37d6692a72171966d9d1d786f03577cd5a3b8c12 + 7b8e78dced9b93e5d69fabb9fbc9a2eb5de8e95a https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index db29f1386..ae0eb9839 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21377.1 + 5.0.0-beta.21409.4 diff --git a/global.json b/global.json index 2183619c0..a566da290 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21377.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21409.4" } } From 17a9cb47cf7fd9880823f5add01fc7fbe761cf1e Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Aug 2021 15:59:07 -0700 Subject: [PATCH 7/7] Update Asp.Net 2.1/3.1 Template version (#11392) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index aef1047c4..704a1a124 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.17 + 3.1.18 3.2.1 4.8.0-rc2.19462.10 @@ -123,7 +123,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.21268.1 - 2.1.28 + 2.1.29