From 825ca3438663e371689d2ee1618895498a1992df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Oct 2022 22:58:29 +0000 Subject: [PATCH 01/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221004.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22479.1 -> To Version 7.0.0-alpha.1.22504.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88799d2a1..16dd45ca5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,9 +206,9 @@ https://github.com/dotnet/arcade 720af493900b2f2bdc48e9ee12577983a5c9be36 - + https://github.com/dotnet/source-build-reference-packages - 27fbf63a91da8ef12b758fb642c039e8c1ab5d2a + 8366acfc3e0660ceef6bddbe7794044e5d503521 From 70bb35b3dfe71f62316554fac60a595b813d924a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Oct 2022 15:52:57 +0000 Subject: [PATCH 02/15] Update dependencies from https://github.com/dotnet/source-build-externals build 20221005.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22463.5 -> To Version 7.0.0-alpha.1.22505.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88799d2a1..715b95f39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,9 +181,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 6e9ede1f2771f59d80a4050c02d051bbbd457c77 + c47ba6c19d50081f90008da8bc61b3ac20348f20 From 223a0ebc50a1d31690a0e08c51c83ddd22bb273a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Oct 2022 23:10:39 +0000 Subject: [PATCH 03/15] Update dependencies from https://github.com/dotnet/arcade build 20221004.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22464.4 -> To Version 7.0.0-beta.22504.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/build.ps1 | 5 +++++ eng/common/init-tools-native.ps1 | 6 ++++-- global.json | 4 ++-- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88799d2a1..cd3ddf2e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 720af493900b2f2bdc48e9ee12577983a5c9be36 + 7b21b46b59a5731165568690f3d82d3486201040 - + https://github.com/dotnet/arcade - 720af493900b2f2bdc48e9ee12577983a5c9be36 + 7b21b46b59a5731165568690f3d82d3486201040 - + https://github.com/dotnet/arcade - 720af493900b2f2bdc48e9ee12577983a5c9be36 + 7b21b46b59a5731165568690f3d82d3486201040 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7f2604a60..6e70ddf3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22464.4 + 7.0.0-beta.22504.3 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242..e0420a642 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -66,6 +67,7 @@ function Print-Usage() { Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build" Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" Write-Host "" @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 8d48ec568..fbc67effc 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -98,11 +98,12 @@ try { Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." exit 1 } - $ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0] - if ([string]::IsNullOrWhiteSpace($ToolDirectory)) { + $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending) + if ($ToolDirectories -eq $null) { Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." exit 1 } + $ToolDirectory = $ToolDirectories[0] $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" if (-not (Test-Path -Path "$BinPathFile")) { Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." @@ -112,6 +113,7 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } diff --git a/global.json b/global.json index b1eb0b472..d599b7ce8 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22464.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22464.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22504.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22504.3" } } From 63cc82ff29733a9a15e93abe42f40f8e59c76d79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 01:50:54 +0000 Subject: [PATCH 04/15] Update dependencies from https://github.com/dotnet/sdk build 20221006.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22504.34 -> To Version 7.0.100-rtm.22506.24 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22480.10 -> To Version 7.0.0-rtm.22505.15 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++-------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59da854d8..70ba1d1a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,30 +22,30 @@ 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 https://github.com/dotnet/test-templates @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 7f13ceee7e1e876aa1a3086f5056b7dd8a7f67d3 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/sdk - 7f13ceee7e1e876aa1a3086f5056b7dd8a7f67d3 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/sdk - 7f13ceee7e1e876aa1a3086f5056b7dd8a7f67d3 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/sdk - 7f13ceee7e1e876aa1a3086f5056b7dd8a7f67d3 + 1015b43c834666023cfbd7fd933016dd2ef80745 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf a956caa0747c27f0b0776d845fafe0b05b2c7337 - + https://github.com/dotnet/fsharp - 7669e0a6dbeb872512c073c49c7661a71cfb6e07 + f07ccb1bc4325861cb4306733f59b23f6d4344f7 - + https://github.com/dotnet/fsharp - 7669e0a6dbeb872512c073c49c7661a71cfb6e07 + f07ccb1bc4325861cb4306733f59b23f6d4344f7 @@ -149,14 +149,14 @@ linker - + https://github.com/dotnet/roslyn - b189d3e226ef8b389560aaece38fa263e2cf1c15 + 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb - + https://github.com/dotnet/msbuild - e1930c2ee6b16a0c5afbdc53ec51dbdda4664f80 + 20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef diff --git a/eng/Versions.props b/eng/Versions.props index 3c2b803c0..14ef392eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,38 +50,38 @@ - 7.0.0-rtm.22503.15 - 7.0.0-rtm.22503.15 - 7.0.0-rtm.22503.15 - 7.0.0-rtm.22503.15 - 7.0.0-rtm.22503.15 - 7.0.0-rtm.22503.15 - 7.0.0-rtm.22503.15 + 7.0.0-rtm.22504.29 + 7.0.0-rtm.22504.29 + 7.0.0-rtm.22504.29 + 7.0.0-rtm.22504.29 + 7.0.0-rtm.22504.29 + 7.0.0-rtm.22504.29 + 7.0.0-rtm.22504.29 0.2.0 - 7.0.100-rtm.22504.34 - 7.0.100-rtm.22504.34 - 7.0.100-rtm.22504.34 + 7.0.100-rtm.22506.24 + 7.0.100-rtm.22506.24 + 7.0.100-rtm.22506.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22480.10 + 7.0.0-rtm.22505.15 - 7.0.0-rtm.22480.10 - 7.0.0-rtm.22480.10 - 7.0.0-rtm.22480.10 - 7.0.0-rtm.22480.10 - 7.0.0-rtm.22480.10 - 7.0.0-rtm.22480.10 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 2.1.0 From e6580e2e0e955c60eff06e62a0a988a1a7198c83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Oct 2022 08:08:00 -0500 Subject: [PATCH 05/15] [release/7.0.1xx] Update dependencies from dotnet/sdk (#14670) * Update dependencies from https://github.com/dotnet/sdk build 20221005.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22504.34 -> To Version 7.0.100-rtm.22505.9 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22480.10 -> To Version 7.0.0-rtm.22504.4 (parent: Microsoft.NET.Sdk * Remove backported runtime source-build patch * Update dependencies from https://github.com/dotnet/sdk build 20221006.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22504.34 -> To Version 7.0.100-rtm.22506.12 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22480.10 -> To Version 7.0.0-rtm.22505.15 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221006.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22504.34 -> To Version 7.0.100-rtm.22506.16 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22480.10 -> To Version 7.0.0-rtm.22505.15 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221006.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22504.34 -> To Version 7.0.100-rtm.22506.18 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22480.10 -> To Version 7.0.0-rtm.22505.15 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221006.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22504.34 -> To Version 7.0.100-rtm.22506.21 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22480.10 -> To Version 7.0.0-rtm.22505.15 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 76 +-- eng/Versions.props | 34 +- .../patches/runtime/0001-PR-76471.patch | 557 ------------------ 3 files changed, 55 insertions(+), 612 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-PR-76471.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59da854d8..821c34886 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,30 +22,30 @@ 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 - + https://github.com/dotnet/aspnetcore - a6d7c399f6f86f01c355281e24c1a8d6bcce5b17 + 2651d9202b0bf5fdd081930cd7a4438ced351410 https://github.com/dotnet/test-templates @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 7f13ceee7e1e876aa1a3086f5056b7dd8a7f67d3 + 48fcaf6b6b788c7673c3fb5ab16c7adf0186ee19 - + https://github.com/dotnet/sdk - 7f13ceee7e1e876aa1a3086f5056b7dd8a7f67d3 + 48fcaf6b6b788c7673c3fb5ab16c7adf0186ee19 - + https://github.com/dotnet/sdk - 7f13ceee7e1e876aa1a3086f5056b7dd8a7f67d3 + 48fcaf6b6b788c7673c3fb5ab16c7adf0186ee19 - + https://github.com/dotnet/sdk - 7f13ceee7e1e876aa1a3086f5056b7dd8a7f67d3 + 48fcaf6b6b788c7673c3fb5ab16c7adf0186ee19 @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - b189d3e226ef8b389560aaece38fa263e2cf1c15 + 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb diff --git a/eng/Versions.props b/eng/Versions.props index 3c2b803c0..5fee7bf86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,38 +50,38 @@ - 7.0.0-rtm.22503.15 - 7.0.0-rtm.22503.15 - 7.0.0-rtm.22503.15 - 7.0.0-rtm.22503.15 - 7.0.0-rtm.22503.15 - 7.0.0-rtm.22503.15 - 7.0.0-rtm.22503.15 + 7.0.0-rtm.22504.29 + 7.0.0-rtm.22504.29 + 7.0.0-rtm.22504.29 + 7.0.0-rtm.22504.29 + 7.0.0-rtm.22504.29 + 7.0.0-rtm.22504.29 + 7.0.0-rtm.22504.29 0.2.0 - 7.0.100-rtm.22504.34 - 7.0.100-rtm.22504.34 - 7.0.100-rtm.22504.34 + 7.0.100-rtm.22506.21 + 7.0.100-rtm.22506.21 + 7.0.100-rtm.22506.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22480.10 + 7.0.0-rtm.22505.15 - 7.0.0-rtm.22480.10 - 7.0.0-rtm.22480.10 - 7.0.0-rtm.22480.10 - 7.0.0-rtm.22480.10 - 7.0.0-rtm.22480.10 - 7.0.0-rtm.22480.10 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 2.1.0 diff --git a/src/SourceBuild/tarball/patches/runtime/0001-PR-76471.patch b/src/SourceBuild/tarball/patches/runtime/0001-PR-76471.patch deleted file mode 100644 index 19feca007..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-PR-76471.patch +++ /dev/null @@ -1,557 +0,0 @@ -From 371d1e5b10b3632289b5944fb36bdfd3c032b58e Mon Sep 17 00:00:00 2001 -From: Charles Stoner <10732005+cston@users.noreply.github.com> -Date: Tue, 20 Sep 2022 14:44:06 -0700 -Subject: [PATCH 1/6] Patches for scoped locals - -https://github.com/dotnet/roslyn/pull/64093 - -This change enforced that `scoped` on a local set the escape scope to -the current block where previously it was incorrectly setting to the -containing method. ---- - .../Reflection/RuntimeMethodInfo.CoreCLR.cs | 2 ++ - .../System/Reflection/DynamicInvokeInfo.cs | 14 ++++++++--- - .../src/System/Reflection/MethodBase.cs | 2 ++ - .../Reflection/RuntimeConstructorInfo.cs | 4 ++++ - .../System/Reflection/RuntimeMethodInfo.cs | 2 ++ - .../src/System/Text/Json/JsonHelpers.cs | 2 +- - .../Utf8JsonWriter.WriteProperties.String.cs | 24 +++++++++++-------- - 7 files changed, 36 insertions(+), 14 deletions(-) - -diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs -index c55ee607da773..4e1246b481b10 100644 ---- a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs -+++ b/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs -@@ -316,7 +316,9 @@ public override MethodImplAttributes GetMethodImplementationFlags() - Span shouldCopyBackParameters = new(ref argStorage._copyBack0, 1); - - StackAllocatedByRefs byrefStorage = default; -+#pragma warning disable 8500 - IntPtr* pByRefStorage = (IntPtr*)&byrefStorage; -+#pragma warning restore 8500 - - CheckArguments( - copyOfParameters, -diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/DynamicInvokeInfo.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/DynamicInvokeInfo.cs -index 234f8a16e9c5c..cc3d8c74a60b7 100644 ---- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/DynamicInvokeInfo.cs -+++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/DynamicInvokeInfo.cs -@@ -235,11 +235,15 @@ public DynamicInvokeInfo(MethodBase method, IntPtr invokeThunk) - StackAllocedArguments argStorage = default; - StackAllocatedByRefs byrefStorage = default; - -+#pragma warning disable 8500 - CheckArguments(ref argStorage._arg0!, (ByReference*)&byrefStorage, parameters, binderBundle); -+#pragma warning restore 8500 - - try - { -+#pragma warning disable 8500 - ret = ref RawCalliHelper.Call(InvokeThunk, (void*)methodToCall, ref thisArg, ref ret, &byrefStorage); -+#pragma warning restore 8500 - DebugAnnotations.PreviousCallContainsDebuggerStepInCode(); - } - catch (Exception e) when (wrapInTargetInvocationException) -@@ -268,7 +272,9 @@ public DynamicInvokeInfo(MethodBase method, IntPtr invokeThunk) - IntPtr* pStorage = stackalloc IntPtr[2 * argCount]; - NativeMemory.Clear(pStorage, (nuint)(2 * argCount) * (nuint)sizeof(IntPtr)); - -- ByReference* pByRefStorage = (ByReference*)(pStorage + argCount); -+#pragma warning disable 8500 -+ void* pByRefStorage = (ByReference*)(pStorage + argCount); -+#pragma warning restore 8500 - - RuntimeImports.GCFrameRegistration regArgStorage = new(pStorage, (uint)argCount, areByRefs: false); - RuntimeImports.GCFrameRegistration regByRefStorage = new(pByRefStorage, (uint)argCount, areByRefs: true); -@@ -326,7 +332,7 @@ public DynamicInvokeInfo(MethodBase method, IntPtr invokeThunk) - - private unsafe void CheckArguments( - ref object copyOfParameters, -- ByReference* byrefParameters, -+ void* byrefParameters, - object?[] parameters, - BinderBundle binderBundle) - { -@@ -398,8 +404,10 @@ public DynamicInvokeInfo(MethodBase method, IntPtr invokeThunk) - - Unsafe.Add(ref copyOfParameters, i) = arg!; - -- byrefParameters[i] = new ByReference(ref (argumentInfo.Transform & Transform.Reference) != 0 ? -+#pragma warning disable 8500 -+ ((ByReference*)byrefParameters)[i] = new ByReference(ref (argumentInfo.Transform & Transform.Reference) != 0 ? - ref Unsafe.As(ref Unsafe.Add(ref copyOfParameters, i)) : ref arg.GetRawData()); -+#pragma warning restore 8500 - } - } - -diff --git a/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBase.cs b/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBase.cs -index 13ff9e34df920..98069a70ef55b 100644 ---- a/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBase.cs -+++ b/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBase.cs -@@ -236,6 +236,7 @@ BindingFlags invokeAttr - shouldCopyBack[i] = copyBackArg; - copyOfParameters[i] = arg; - -+#pragma warning disable 8500 - if (isValueType) - { - #if !MONO // Temporary until Mono is updated. -@@ -254,6 +255,7 @@ BindingFlags invokeAttr - ByReference objRef = ByReference.Create(ref copyOfParameters[i]); - *(ByReference*)(byrefParameters + i) = objRef; - } -+#pragma warning restore 8500 - } - } - -diff --git a/src/libraries/System.Private.CoreLib/src/System/Reflection/RuntimeConstructorInfo.cs b/src/libraries/System.Private.CoreLib/src/System/Reflection/RuntimeConstructorInfo.cs -index b1f3222736a1a..1fd9c177ddb8a 100644 ---- a/src/libraries/System.Private.CoreLib/src/System/Reflection/RuntimeConstructorInfo.cs -+++ b/src/libraries/System.Private.CoreLib/src/System/Reflection/RuntimeConstructorInfo.cs -@@ -146,7 +146,9 @@ internal void ThrowNoInvokeException() - Span shouldCopyBackParameters = new(ref argStorage._copyBack0, argCount); - - StackAllocatedByRefs byrefStorage = default; -+#pragma warning disable 8500 - IntPtr* pByRefStorage = (IntPtr*)&byrefStorage; -+#pragma warning restore 8500 - - CheckArguments( - copyOfParameters, -@@ -299,7 +301,9 @@ public override object Invoke(BindingFlags invokeAttr, Binder? binder, object?[] - Span shouldCopyBackParameters = new(ref argStorage._copyBack0, argCount); - - StackAllocatedByRefs byrefStorage = default; -+#pragma warning disable 8500 - IntPtr* pByRefStorage = (IntPtr*)&byrefStorage; -+#pragma warning restore 8500 - - CheckArguments( - copyOfParameters, -diff --git a/src/libraries/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.cs b/src/libraries/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.cs -index 770a59d40eb91..bf534c58e70ed 100644 ---- a/src/libraries/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.cs -+++ b/src/libraries/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.cs -@@ -143,7 +143,9 @@ private void ThrowNoInvokeException() - Span shouldCopyBackParameters = new(ref argStorage._copyBack0, argCount); - - StackAllocatedByRefs byrefStorage = default; -+#pragma warning disable 8500 - IntPtr* pByRefStorage = (IntPtr*)&byrefStorage; -+#pragma warning restore 8500 - - CheckArguments( - copyOfParameters, -diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/JsonHelpers.cs b/src/libraries/System.Text.Json/src/System/Text/Json/JsonHelpers.cs -index 9e9adcd0a52ea..4706b64753c97 100644 ---- a/src/libraries/System.Text.Json/src/System/Text/Json/JsonHelpers.cs -+++ b/src/libraries/System.Text.Json/src/System/Text/Json/JsonHelpers.cs -@@ -15,7 +15,7 @@ internal static partial class JsonHelpers - /// Returns the span for the given reader. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] -- public static ReadOnlySpan GetSpan(this ref Utf8JsonReader reader) -+ public static ReadOnlySpan GetSpan(this scoped ref Utf8JsonReader reader) - { - return reader.HasValueSequence ? reader.ValueSequence.ToArray() : reader.ValueSpan; - } -diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.String.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.String.cs -index 65c6fd303c13c..7cd0e3b45a4a1 100644 ---- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.String.cs -+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.String.cs -@@ -112,12 +112,12 @@ private void WriteStringEscapeProperty(scoped ReadOnlySpan propertyName, i - Debug.Assert(int.MaxValue / JsonConstants.MaxExpansionFactorWhileEscaping >= propertyName.Length); - - char[]? propertyArray = null; -+ scoped Span escapedPropertyName; - - if (firstEscapeIndexProp != -1) - { - int length = JsonWriterHelper.GetMaxEscapedLength(propertyName.Length, firstEscapeIndexProp); - -- scoped Span escapedPropertyName; - if (length > JsonConstants.StackallocCharThreshold) - { - propertyArray = ArrayPool.Shared.Rent(length); -@@ -269,12 +269,12 @@ private void WriteStringEscapeProperty(scoped ReadOnlySpan utf8PropertyNam - Debug.Assert(int.MaxValue / JsonConstants.MaxExpansionFactorWhileEscaping >= utf8PropertyName.Length); - - byte[]? propertyArray = null; -+ scoped Span escapedPropertyName; - - if (firstEscapeIndexProp != -1) - { - int length = JsonWriterHelper.GetMaxEscapedLength(utf8PropertyName.Length, firstEscapeIndexProp); - -- scoped Span escapedPropertyName; - if (length > JsonConstants.StackallocByteThreshold) - { - propertyArray = ArrayPool.Shared.Rent(length); -@@ -1076,12 +1076,12 @@ private void WriteStringEscapePropertyOrValue(scoped ReadOnlySpan property - - char[]? valueArray = null; - char[]? propertyArray = null; -+ scoped Span escapedValue; - - if (firstEscapeIndexVal != -1) - { - int length = JsonWriterHelper.GetMaxEscapedLength(value.Length, firstEscapeIndexVal); - -- scoped Span escapedValue; - if (length > JsonConstants.StackallocCharThreshold) - { - valueArray = ArrayPool.Shared.Rent(length); -@@ -1096,11 +1096,12 @@ private void WriteStringEscapePropertyOrValue(scoped ReadOnlySpan property - value = escapedValue.Slice(0, written); - } - -+ scoped Span escapedPropertyName; -+ - if (firstEscapeIndexProp != -1) - { - int length = JsonWriterHelper.GetMaxEscapedLength(propertyName.Length, firstEscapeIndexProp); - -- scoped Span escapedPropertyName; - if (length > JsonConstants.StackallocCharThreshold) - { - propertyArray = ArrayPool.Shared.Rent(length); -@@ -1135,12 +1136,12 @@ private void WriteStringEscapePropertyOrValue(scoped ReadOnlySpan utf8Prop - - byte[]? valueArray = null; - byte[]? propertyArray = null; -+ scoped Span escapedValue; - - if (firstEscapeIndexVal != -1) - { - int length = JsonWriterHelper.GetMaxEscapedLength(utf8Value.Length, firstEscapeIndexVal); - -- scoped Span escapedValue; - if (length > JsonConstants.StackallocByteThreshold) - { - valueArray = ArrayPool.Shared.Rent(length); -@@ -1155,11 +1156,12 @@ private void WriteStringEscapePropertyOrValue(scoped ReadOnlySpan utf8Prop - utf8Value = escapedValue.Slice(0, written); - } - -+ scoped Span escapedPropertyName; -+ - if (firstEscapeIndexProp != -1) - { - int length = JsonWriterHelper.GetMaxEscapedLength(utf8PropertyName.Length, firstEscapeIndexProp); - -- scoped Span escapedPropertyName; - if (length > JsonConstants.StackallocByteThreshold) - { - propertyArray = ArrayPool.Shared.Rent(length); -@@ -1194,12 +1196,12 @@ private void WriteStringEscapePropertyOrValue(scoped ReadOnlySpan property - - byte[]? valueArray = null; - char[]? propertyArray = null; -+ scoped Span escapedValue; - - if (firstEscapeIndexVal != -1) - { - int length = JsonWriterHelper.GetMaxEscapedLength(utf8Value.Length, firstEscapeIndexVal); - -- scoped Span escapedValue; - if (length > JsonConstants.StackallocByteThreshold) - { - valueArray = ArrayPool.Shared.Rent(length); -@@ -1214,11 +1216,12 @@ private void WriteStringEscapePropertyOrValue(scoped ReadOnlySpan property - utf8Value = escapedValue.Slice(0, written); - } - -+ scoped Span escapedPropertyName; -+ - if (firstEscapeIndexProp != -1) - { - int length = JsonWriterHelper.GetMaxEscapedLength(propertyName.Length, firstEscapeIndexProp); - -- scoped Span escapedPropertyName; - if (length > JsonConstants.StackallocCharThreshold) - { - propertyArray = ArrayPool.Shared.Rent(length); -@@ -1253,12 +1256,12 @@ private void WriteStringEscapePropertyOrValue(scoped ReadOnlySpan utf8Prop - - char[]? valueArray = null; - byte[]? propertyArray = null; -+ scoped Span escapedValue; - - if (firstEscapeIndexVal != -1) - { - int length = JsonWriterHelper.GetMaxEscapedLength(value.Length, firstEscapeIndexVal); - -- scoped Span escapedValue; - if (length > JsonConstants.StackallocCharThreshold) - { - valueArray = ArrayPool.Shared.Rent(length); -@@ -1273,11 +1276,12 @@ private void WriteStringEscapePropertyOrValue(scoped ReadOnlySpan utf8Prop - value = escapedValue.Slice(0, written); - } - -+ scoped Span escapedPropertyName; -+ - if (firstEscapeIndexProp != -1) - { - int length = JsonWriterHelper.GetMaxEscapedLength(utf8PropertyName.Length, firstEscapeIndexProp); - -- scoped Span escapedPropertyName; - if (length > JsonConstants.StackallocByteThreshold) - { - propertyArray = ArrayPool.Shared.Rent(length); - -From 89c6bf4290c7d65ec4d9ffbe92015e4cbf6c4a16 Mon Sep 17 00:00:00 2001 -From: Jared Parsons -Date: Fri, 30 Sep 2022 09:49:03 -0700 -Subject: [PATCH 2/6] Make return and out equivalent for ref safety - -https://github.com/dotnet/roslyn/pull/64318 - -This change allows anything returnable from a method to be assigned to -an `out` parameter. In several places had to add `scoped` to `ref` to -inform compiler they could not be captured in an `out` parameter. ---- - .../System/Reflection/DynamicInvokeInfo.cs | 4 ++-- - .../src/System/Number.BigInteger.cs | 20 ++++++++++++------- - .../Number.NumberToFloatingPointBits.cs | 2 +- - .../RegexCaseEquivalences.cs | 2 +- - 4 files changed, 17 insertions(+), 11 deletions(-) - -diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/DynamicInvokeInfo.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/DynamicInvokeInfo.cs -index cc3d8c74a60b7..4f0106980837d 100644 ---- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/DynamicInvokeInfo.cs -+++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/DynamicInvokeInfo.cs -@@ -404,10 +404,10 @@ public DynamicInvokeInfo(MethodBase method, IntPtr invokeThunk) - - Unsafe.Add(ref copyOfParameters, i) = arg!; - --#pragma warning disable 8500 -+#pragma warning disable 8500, 9094 - ((ByReference*)byrefParameters)[i] = new ByReference(ref (argumentInfo.Transform & Transform.Reference) != 0 ? - ref Unsafe.As(ref Unsafe.Add(ref copyOfParameters, i)) : ref arg.GetRawData()); --#pragma warning restore 8500 -+#pragma warning restore 8500, 9094 - } - } - -diff --git a/src/libraries/System.Private.CoreLib/src/System/Number.BigInteger.cs b/src/libraries/System.Private.CoreLib/src/System/Number.BigInteger.cs -index c19e7d036b04b..f7e613f962829 100644 ---- a/src/libraries/System.Private.CoreLib/src/System/Number.BigInteger.cs -+++ b/src/libraries/System.Private.CoreLib/src/System/Number.BigInteger.cs -@@ -317,7 +317,7 @@ internal static partial class Number - private int _length; - private fixed uint _blocks[MaxBlockCount]; - -- public static void Add(ref BigInteger lhs, ref BigInteger rhs, out BigInteger result) -+ public static void Add(scoped ref BigInteger lhs, scoped ref BigInteger rhs, out BigInteger result) - { - // determine which operand has the smaller length - ref BigInteger large = ref (lhs._length < rhs._length) ? ref rhs : ref lhs; -@@ -369,7 +369,7 @@ public static void Add(ref BigInteger lhs, ref BigInteger rhs, out BigInteger re - } - } - -- public static int Compare(ref BigInteger lhs, ref BigInteger rhs) -+ public static int Compare(scoped ref BigInteger lhs, scoped ref BigInteger rhs) - { - Debug.Assert(unchecked((uint)(lhs._length)) <= MaxBlockCount); - Debug.Assert(unchecked((uint)(rhs._length)) <= MaxBlockCount); -@@ -427,7 +427,7 @@ public static uint CountSignificantBits(ref BigInteger value) - return (lastIndex * BitsPerBlock) + CountSignificantBits(value._blocks[lastIndex]); - } - -- public static void DivRem(ref BigInteger lhs, ref BigInteger rhs, out BigInteger quo, out BigInteger rem) -+ public static void DivRem(scoped ref BigInteger lhs, scoped ref BigInteger rhs, out BigInteger quo, out BigInteger rem) - { - // This is modified from the libraries BigIntegerCalculator.DivRem.cs implementation: - // https://github.com/dotnet/runtime/blob/main/src/libraries/System.Runtime.Numerics/src/System/Numerics/BigIntegerCalculator.DivRem.cs -@@ -558,6 +558,11 @@ public static void DivRem(ref BigInteger lhs, ref BigInteger rhs, out BigInteger - - if (digit > 0) - { -+ // rem and rhs have different lifetimes here and compiler is warning -+ // about potential for one to copy into the other. This is a place -+ // ref scoped parameters would alleviate. -+ // https://github.com/dotnet/roslyn/issues/64393 -+#pragma warning disable CS9080 - // Now it's time to subtract our current quotient - uint carry = SubtractDivisor(ref rem, n, ref rhs, digit); - -@@ -571,6 +576,7 @@ public static void DivRem(ref BigInteger lhs, ref BigInteger rhs, out BigInteger - - Debug.Assert(carry == 1); - } -+#pragma warning restore CS9080 - } - - // We have the digit! -@@ -693,7 +699,7 @@ public static uint HeuristicDivide(ref BigInteger dividend, ref BigInteger divis - return quotient; - } - -- public static void Multiply(ref BigInteger lhs, uint value, out BigInteger result) -+ public static void Multiply(scoped ref BigInteger lhs, uint value, out BigInteger result) - { - if (lhs._length <= 1) - { -@@ -739,7 +745,7 @@ public static void Multiply(ref BigInteger lhs, uint value, out BigInteger resul - } - } - -- public static void Multiply(ref BigInteger lhs, ref BigInteger rhs, out BigInteger result) -+ public static void Multiply(scoped ref BigInteger lhs, scoped ref BigInteger rhs, out BigInteger result) - { - if (lhs._length <= 1) - { -@@ -1032,7 +1038,7 @@ public void Multiply(uint value) - Multiply(ref this, value, out this); - } - -- public void Multiply(ref BigInteger value) -+ public void Multiply(scoped ref BigInteger value) - { - if (value._length <= 1) - { -@@ -1115,7 +1121,7 @@ public static void SetUInt64(out BigInteger result, ulong value) - } - } - -- public static void SetValue(out BigInteger result, ref BigInteger value) -+ public static void SetValue(out BigInteger result, scoped ref BigInteger value) - { - int rhsLength = value._length; - result._length = rhsLength; -diff --git a/src/libraries/System.Private.CoreLib/src/System/Number.NumberToFloatingPointBits.cs b/src/libraries/System.Private.CoreLib/src/System/Number.NumberToFloatingPointBits.cs -index e88014c3a9518..bec85ff737bab 100644 ---- a/src/libraries/System.Private.CoreLib/src/System/Number.NumberToFloatingPointBits.cs -+++ b/src/libraries/System.Private.CoreLib/src/System/Number.NumberToFloatingPointBits.cs -@@ -794,7 +794,7 @@ public FloatingPointInfo(ushort denormalMantissaBits, ushort exponentBits, int m - 0x8e679c2f5e44ff8f, 0x570f09eaa7ea7648 - }; - -- private static void AccumulateDecimalDigitsIntoBigInteger(ref NumberBuffer number, uint firstIndex, uint lastIndex, out BigInteger result) -+ private static void AccumulateDecimalDigitsIntoBigInteger(scoped ref NumberBuffer number, uint firstIndex, uint lastIndex, out BigInteger result) - { - BigInteger.SetZero(out result); - -diff --git a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCaseEquivalences.cs b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCaseEquivalences.cs -index 7c65c63e90dfb..72a61998b8ccf 100644 ---- a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCaseEquivalences.cs -+++ b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCaseEquivalences.cs -@@ -33,7 +33,7 @@ internal static partial class RegexCaseEquivalences - /// If is involved in case conversion, then equivalences will contain the - /// span of character which should be considered equal to in a case-insensitive comparison. - /// if is involved in case conversion; otherwise, -- public static bool TryFindCaseEquivalencesForCharWithIBehavior(char c, CultureInfo culture, ref RegexCaseBehavior mappingBehavior, out ReadOnlySpan equivalences) -+ public static bool TryFindCaseEquivalencesForCharWithIBehavior(char c, CultureInfo culture, scoped ref RegexCaseBehavior mappingBehavior, out ReadOnlySpan equivalences) - { - if ((c | 0x20) == 'i' || (c | 0x01) == '\u0131') - { - -From 2b96bc0edcf67fed4d18dc155e045bc9a4328c64 Mon Sep 17 00:00:00 2001 -From: Jared Parsons -Date: Fri, 30 Sep 2022 10:52:30 -0700 -Subject: [PATCH 3/6] Warnings on managed pointer types - -https://github.com/dotnet/roslyn/pull/64294 - -Compiler now issues warnings for pointer operations involving managed -types ---- - .../src/System/Reflection/Emit/DynamicMethod.cs | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/DynamicMethod.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/DynamicMethod.cs -index a2d74336bee2b..bf455a6b63f69 100644 ---- a/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/DynamicMethod.cs -+++ b/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/DynamicMethod.cs -@@ -504,6 +504,9 @@ Signature LazyCreateSignature() - Span shouldCopyBackParameters = new(ref argStorage._copyBack0, argCount); - - StackAllocatedByRefs byrefStorage = default; -+#pragma warning disable CS8500 -+ IntPtr* pByRefStorage = (IntPtr*)&byrefStorage; -+#pragma warning restore CS8500 - IntPtr* pByRefStorage = (IntPtr*)&byrefStorage; - - CheckArguments( - -From 28ada4a0580acc72a9e9f658b93b163017d23b63 Mon Sep 17 00:00:00 2001 -From: Jared Parsons -Date: Fri, 30 Sep 2022 10:26:17 -0700 -Subject: [PATCH 4/6] Update compiler version - ---- - eng/Versions.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index b839658f454ee..ff8f04758c364 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -53,7 +53,7 @@ - -- 4.4.0-3.22452.8 -+ 4.4.0-3.22479.16 - 0.2.0 - - 7.0.100-rc.1.22402.1 - -From cb7618ebf71639627549db8945097efe82b1a27c Mon Sep 17 00:00:00 2001 -From: Jared Parsons -Date: Fri, 30 Sep 2022 15:50:08 -0700 -Subject: [PATCH 5/6] Fixup - ---- - .../src/System/Reflection/Emit/DynamicMethod.cs | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/DynamicMethod.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/DynamicMethod.cs -index bf455a6b63f69..84bc2f8ebd3c4 100644 ---- a/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/DynamicMethod.cs -+++ b/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/DynamicMethod.cs -@@ -507,7 +507,6 @@ Signature LazyCreateSignature() - #pragma warning disable CS8500 - IntPtr* pByRefStorage = (IntPtr*)&byrefStorage; - #pragma warning restore CS8500 -- IntPtr* pByRefStorage = (IntPtr*)&byrefStorage; - - CheckArguments( - copyOfParameters, - -From 46af7972a57e3378e53ba98cec65bee61850f58b Mon Sep 17 00:00:00 2001 -From: Jared Parsons -Date: Fri, 30 Sep 2022 16:03:31 -0700 -Subject: [PATCH 6/6] Ref safety rules attribute - ---- - .../ILCompiler.Compiler.Tests.Assets.csproj | 1 + - .../ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.Assets/ILCompiler.Compiler.Tests.Assets.csproj b/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.Assets/ILCompiler.Compiler.Tests.Assets.csproj -index ea167e092b031..605d407443da2 100644 ---- a/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.Assets/ILCompiler.Compiler.Tests.Assets.csproj -+++ b/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.Assets/ILCompiler.Compiler.Tests.Assets.csproj -@@ -8,6 +8,7 @@ - netstandard2.0 - - true -+ noRefSafetyRulesAttribute=true - - - -diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj b/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj -index 5967b093841b1..b09ef31312661 100644 ---- a/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj -+++ b/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj -@@ -14,6 +14,7 @@ - x86;x64 - AnyCPU - true -+ noRefSafetyRulesAttribute=true - - - From 81e824d9e539afd9c57ff17fcb1d3a802d66e06a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 17:13:41 +0000 Subject: [PATCH 06/15] Update dependencies from https://github.com/dotnet/arcade build 20221007.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22464.4 -> To Version 7.0.0-beta.22507.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd3ddf2e7..a2e211bc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 7b21b46b59a5731165568690f3d82d3486201040 + c4f77b4e80e942941e73d70cec045eddbfd7b4eb - + https://github.com/dotnet/arcade - 7b21b46b59a5731165568690f3d82d3486201040 + c4f77b4e80e942941e73d70cec045eddbfd7b4eb - + https://github.com/dotnet/arcade - 7b21b46b59a5731165568690f3d82d3486201040 + c4f77b4e80e942941e73d70cec045eddbfd7b4eb https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 6e70ddf3c..648a5fd5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22504.3 + 7.0.0-beta.22507.2 diff --git a/global.json b/global.json index d599b7ce8..4ac53c9bc 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22504.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22504.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22507.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22507.2" } } From 860067bade6be3fbda19a3162abde99286c82df1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 09:00:08 -0500 Subject: [PATCH 07/15] [release/7.0.1xx] Update dependencies from dotnet/sdk (#14692) * Update dependencies from https://github.com/dotnet/sdk build 20221007.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.100-rtm.22507.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221007.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.100-rtm.22507.16 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221007.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.100-rtm.22507.19 * Update dependencies from https://github.com/dotnet/sdk build 20221007.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22507.19 -> To Version 7.0.100-rtm.22507.25 * Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 36 ++++++++--------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70ba1d1a1..7c0a9db85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e5f1b07e2b0e290412cca52d87508ce738882eff https://github.com/dotnet/llvm-project 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae @@ -53,9 +53,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae https://github.com/dotnet/aspnetcore @@ -103,39 +103,39 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + f22b2f81c736691aca92af4c425e41b219adc0e1 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + f22b2f81c736691aca92af4c425e41b219adc0e1 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + f22b2f81c736691aca92af4c425e41b219adc0e1 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + f22b2f81c736691aca92af4c425e41b219adc0e1 - + https://github.com/dotnet/winforms - 993983be2ce14ca67f7ff09b8b04e9b8391b3339 + b718d35e98c370ff27249f8f6c57325033a27c7e - + https://github.com/dotnet/wpf - a956caa0747c27f0b0776d845fafe0b05b2c7337 + 8091341440149a2ff67ed5af6efbb43c349ee537 - + https://github.com/dotnet/fsharp - f07ccb1bc4325861cb4306733f59b23f6d4344f7 + 532a074f9b304325d8bcd554ac73a1183b74a8f0 - + https://github.com/dotnet/fsharp - f07ccb1bc4325861cb4306733f59b23f6d4344f7 + 532a074f9b304325d8bcd554ac73a1183b74a8f0 @@ -154,9 +154,9 @@ 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb - + https://github.com/dotnet/msbuild - 20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef + 9e6f1455a81e01cb7780f1e8ed5041f20cd396a3 @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 77c2667993976295017e2759f075550bcf606fc1 + daca2015ce74956591df9c9dc7ee732af7863b42 - + https://github.com/dotnet/emsdk - 77c2667993976295017e2759f075550bcf606fc1 + daca2015ce74956591df9c9dc7ee732af7863b42 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 14ef392eb..47c98cda6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22476.8 + 7.0.0-rtm.22506.1 - 7.0.0-rtm.22476.6 + 7.0.0-rtm.22506.9 @@ -63,33 +63,33 @@ - 7.0.100-rtm.22506.24 - 7.0.100-rtm.22506.24 - 7.0.100-rtm.22506.24 + 7.0.100-rtm.22507.25 + 7.0.100-rtm.22507.25 + 7.0.100-rtm.22507.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22505.15 + 7.0.0-rtm.22507.1 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 2.1.0 - 7.0.0-rtm.22478.5 - 7.0.0-rtm.22478.5 - 7.0.0-rtm.22478.5 - 7.0.0-rtm.22478.5 + 7.0.0-rtm.22507.2 + 7.0.0-rtm.22507.2 + 7.0.0-rtm.22507.2 + 7.0.0-rtm.22507.2 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rtm.22476.2 - 7.0.0-rtm.22476.2 + 7.0.0-rtm.22504.3 + 7.0.0-rtm.22504.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 24a021275381d7ad78581c1c76173345bbc11778 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 5 Oct 2022 16:29:15 +0000 Subject: [PATCH 08/15] Condition sourcelink generation --- .../content/ArcadeOverrides/SourceBuildArcadeBuild.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets index eeea55fcc..6ee80ed90 100644 --- a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets +++ b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets @@ -86,9 +86,9 @@ $(InnerBuildArgs) /p:SourceBuiltBlobFeedDir=$(SourceBuiltBlobFeedDir) - $(InnerBuildArgs) /p:EnableSourceControlManagerQueries=false - $(InnerBuildArgs) /p:EnableSourceLink=false - $(InnerBuildArgs) /p:DeterministicSourcePaths=false + $(InnerBuildArgs) /p:EnableSourceControlManagerQueries=false + $(InnerBuildArgs) /p:EnableSourceLink=false + $(InnerBuildArgs) /p:DeterministicSourcePaths=false $(InnerBuildArgs) /p:DotNetBuildOffline=true $(InnerBuildArgs) /p:DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath) From 837b3a13610161b0e446c235d6e5c05e4a516b54 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Fri, 7 Oct 2022 16:25:20 +0000 Subject: [PATCH 09/15] Remove redundant arguments - these properties are set by repos based on value of DisableSourceLink property --- .../content/ArcadeOverrides/SourceBuildArcadeBuild.targets | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets index 6ee80ed90..94d7777c3 100644 --- a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets +++ b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets @@ -85,10 +85,6 @@ $(InnerBuildArgs) /p:SourceBuildOutputDir=$(SourceBuildOutputDir) $(InnerBuildArgs) /p:SourceBuiltBlobFeedDir=$(SourceBuiltBlobFeedDir) - - $(InnerBuildArgs) /p:EnableSourceControlManagerQueries=false - $(InnerBuildArgs) /p:EnableSourceLink=false - $(InnerBuildArgs) /p:DeterministicSourcePaths=false $(InnerBuildArgs) /p:DotNetBuildOffline=true $(InnerBuildArgs) /p:DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath) From dc021278a8054118b027aa766215fe6dfb18e550 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Oct 2022 11:20:50 -0500 Subject: [PATCH 10/15] Remove questionable license cleanup logic (#14681) --- .../Arcade/tools/SourceBuildArcadeTarball.targets | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 1a652650a..e7a9698c6 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -262,19 +262,8 @@ $(TarballSourceDir)runtime*\src\installer\pkg\**\*%(TarballSrcBinaryExtension.Identity)" /> + - - - - - - - - - - From e1d19eb3fa40813d1a6e2e45d4dc00b08cd835e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 18:13:26 +0000 Subject: [PATCH 11/15] Update dependencies from https://github.com/dotnet/sdk build 20221010.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c0a9db85..035010d46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - f22b2f81c736691aca92af4c425e41b219adc0e1 + 39b57e7c15ec09a0c230dade5f014d17be960b42 - + https://github.com/dotnet/sdk - f22b2f81c736691aca92af4c425e41b219adc0e1 + 39b57e7c15ec09a0c230dade5f014d17be960b42 - + https://github.com/dotnet/sdk - f22b2f81c736691aca92af4c425e41b219adc0e1 + 39b57e7c15ec09a0c230dade5f014d17be960b42 - + https://github.com/dotnet/sdk - f22b2f81c736691aca92af4c425e41b219adc0e1 + 39b57e7c15ec09a0c230dade5f014d17be960b42 @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb + 7971633700e06fdd0a46dbae78908582ee533c2a diff --git a/eng/Versions.props b/eng/Versions.props index 47c98cda6..481f4a2e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22507.25 - 7.0.100-rtm.22507.25 - 7.0.100-rtm.22507.25 + 7.0.100-rtm.22510.8 + 7.0.100-rtm.22510.8 + 7.0.100-rtm.22510.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18a6bff6a69ffebcdd18c171747ca1be30b6ef95 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Oct 2022 13:46:25 -0500 Subject: [PATCH 12/15] Fix source-build CI to not run tarball build when tarball creation fails (#14678) * Fix source-build CI to not run tarball build when tarball creation failed * Bad fix * Revert test patch --- .../templates/job/source-build-run-tarball-build.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index dd39d4e2d..60b39b652 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -1,9 +1,6 @@ # Builds a source-build tarball parameters: - # Custom condition to apply to the job - condition: true - # Dependent jobs that must be completed before this job will run dependsOn: @@ -30,7 +27,6 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - condition: ${{ parameters.condition }} dependsOn: ${{ parameters.dependsOn }} ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: excludeSdkContentTests: true @@ -78,7 +74,6 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: arm64 - condition: ${{ parameters.condition }} dependsOn: ${{ parameters.dependsOn }} ${{ if in(variables['Build.Reason'], 'PullRequest') }}: excludeSdkContentTests: true @@ -100,7 +95,7 @@ jobs: architecture: x64 # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. - condition: and(${{ parameters.condition }}, succeededOrFailed()) + condition: succeededOrFailed() dependsOn: Build_Tarball_x64 excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} From 5449eb59d38ec8e370b1db25aeff4ee007170ad3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 21:01:47 +0000 Subject: [PATCH 13/15] Update dependencies from https://github.com/dotnet/sdk build 20221010.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 035010d46..4f9afc01b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 39b57e7c15ec09a0c230dade5f014d17be960b42 + f9280d1aafb6735d0f2df431b4e05de365d0c793 - + https://github.com/dotnet/sdk - 39b57e7c15ec09a0c230dade5f014d17be960b42 + f9280d1aafb6735d0f2df431b4e05de365d0c793 - + https://github.com/dotnet/sdk - 39b57e7c15ec09a0c230dade5f014d17be960b42 + f9280d1aafb6735d0f2df431b4e05de365d0c793 - + https://github.com/dotnet/sdk - 39b57e7c15ec09a0c230dade5f014d17be960b42 + f9280d1aafb6735d0f2df431b4e05de365d0c793 diff --git a/eng/Versions.props b/eng/Versions.props index 481f4a2e5..71814b15e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22510.8 - 7.0.100-rtm.22510.8 - 7.0.100-rtm.22510.8 + 7.0.100-rtm.22510.10 + 7.0.100-rtm.22510.10 + 7.0.100-rtm.22510.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ffedce380ba93630a621475c2ed735ac8e4c155f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 23:29:44 +0000 Subject: [PATCH 14/15] Update dependencies from https://github.com/dotnet/sdk build 20221010.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.16 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f9afc01b..4ebae28fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - f9280d1aafb6735d0f2df431b4e05de365d0c793 + 047029f55d17036beb6461c894174127a8252810 - + https://github.com/dotnet/sdk - f9280d1aafb6735d0f2df431b4e05de365d0c793 + 047029f55d17036beb6461c894174127a8252810 - + https://github.com/dotnet/sdk - f9280d1aafb6735d0f2df431b4e05de365d0c793 + 047029f55d17036beb6461c894174127a8252810 - + https://github.com/dotnet/sdk - f9280d1aafb6735d0f2df431b4e05de365d0c793 + 047029f55d17036beb6461c894174127a8252810 diff --git a/eng/Versions.props b/eng/Versions.props index 71814b15e..6b908a727 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22510.10 - 7.0.100-rtm.22510.10 - 7.0.100-rtm.22510.10 + 7.0.100-rtm.22510.16 + 7.0.100-rtm.22510.16 + 7.0.100-rtm.22510.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26501197562333dacac457c8ae6d3ae430888cb0 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 10 Oct 2022 22:57:01 -0700 Subject: [PATCH 15/15] Revert changes to eng/folder from branch merge --- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 36 ++++++++-------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db22b2f35..6bfdd18a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + ae2bcebe032a50af14ac0b05efcaa8477b049834 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + ae2bcebe032a50af14ac0b05efcaa8477b049834 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + ae2bcebe032a50af14ac0b05efcaa8477b049834 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + ae2bcebe032a50af14ac0b05efcaa8477b049834 https://github.com/dotnet/llvm-project 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df @@ -53,9 +53,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df https://github.com/dotnet/aspnetcore @@ -103,39 +103,39 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/winforms - b718d35e98c370ff27249f8f6c57325033a27c7e + 993983be2ce14ca67f7ff09b8b04e9b8391b3339 - + https://github.com/dotnet/wpf - 8091341440149a2ff67ed5af6efbb43c349ee537 + a956caa0747c27f0b0776d845fafe0b05b2c7337 - + https://github.com/dotnet/fsharp - 532a074f9b304325d8bcd554ac73a1183b74a8f0 + f07ccb1bc4325861cb4306733f59b23f6d4344f7 - + https://github.com/dotnet/fsharp - 532a074f9b304325d8bcd554ac73a1183b74a8f0 + f07ccb1bc4325861cb4306733f59b23f6d4344f7 @@ -149,14 +149,14 @@ linker - + https://github.com/dotnet/roslyn - 7971633700e06fdd0a46dbae78908582ee533c2a + 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb - + https://github.com/dotnet/msbuild - 9e6f1455a81e01cb7780f1e8ed5041f20cd396a3 + 20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 77c2667993976295017e2759f075550bcf606fc1 - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 77c2667993976295017e2759f075550bcf606fc1 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 50bf2ac7b..3fcf24983 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22506.1 + 7.0.0-rtm.22476.8 - 7.0.0-rtm.22506.9 + 7.0.0-rtm.22476.6 @@ -63,33 +63,33 @@ - 7.0.100-rtm.22510.16 - 7.0.100-rtm.22510.16 - 7.0.100-rtm.22510.16 + 7.0.100-rtm.22506.24 + 7.0.100-rtm.22506.24 + 7.0.100-rtm.22506.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22507.1 + 7.0.0-rtm.22505.15 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 2.1.0 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 + 7.0.0-rtm.22478.5 + 7.0.0-rtm.22478.5 + 7.0.0-rtm.22478.5 + 7.0.0-rtm.22478.5 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rtm.22504.3 - 7.0.0-rtm.22504.3 + 7.0.0-rtm.22476.2 + 7.0.0-rtm.22476.2 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)