From 92b0352978a2a2a96fea4f7f8bd72ed56e3e4c78 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 3 Oct 2022 14:15:13 -0700 Subject: [PATCH 001/654] 7.0.2xx Branding and downgrade the bundled version target to the October release version. --- eng/Versions.props | 4 ++-- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 00c9f8517..7f2604a60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,10 +7,10 @@ 7 0 - 1 + 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + preview $(VersionMajor).$(VersionMinor) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 18d05d5aa..275ec3a11 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -61,9 +61,9 @@ 30 - $([MSBuild]::Add($(VersionFeature), 31)) + $([MSBuild]::Add($(VersionFeature), 30)) 17 - $([MSBuild]::Add($(VersionFeature), 11)) + $([MSBuild]::Add($(VersionFeature), 10)) From 825ca3438663e371689d2ee1618895498a1992df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Oct 2022 22:58:29 +0000 Subject: [PATCH 002/654] 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 003/654] 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 004/654] 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 488ce8e72145da5ebfb38a712ebba08b55bf28d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 01:07:28 +0000 Subject: [PATCH 005/654] Update dependencies from https://github.com/dotnet/sdk build 20221006.26 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.200-preview.22506.26 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.22504.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59da854d8..f8305ead7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,30 +22,30 @@ 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 809b42196ea09700175785a25eace264995dde75 + 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 - + 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 + acb19973f8da35b666eb1675c14116c39338d862 - + https://github.com/dotnet/sdk - 7f13ceee7e1e876aa1a3086f5056b7dd8a7f67d3 + acb19973f8da35b666eb1675c14116c39338d862 - + https://github.com/dotnet/sdk - 7f13ceee7e1e876aa1a3086f5056b7dd8a7f67d3 + acb19973f8da35b666eb1675c14116c39338d862 - + https://github.com/dotnet/sdk - 7f13ceee7e1e876aa1a3086f5056b7dd8a7f67d3 + acb19973f8da35b666eb1675c14116c39338d862 @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - b189d3e226ef8b389560aaece38fa263e2cf1c15 + 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb diff --git a/eng/Versions.props b/eng/Versions.props index 40e358069..a629029c2 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.200-preview.22506.26 + 7.0.200-preview.22506.26 + 7.0.200-preview.22506.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22480.10 + 7.0.0-rtm.22504.4 - 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.22504.4 + 7.0.0-rtm.22504.4 + 7.0.0-rtm.22504.4 + 7.0.0-rtm.22504.4 + 7.0.0-rtm.22504.4 + 7.0.0-rtm.22504.4 2.1.0 From 81e824d9e539afd9c57ff17fcb1d3a802d66e06a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 17:13:41 +0000 Subject: [PATCH 006/654] 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 519c070d2fe4eb9697d5a44206ae5357cbec80fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 17:30:09 +0000 Subject: [PATCH 007/654] Update dependencies from https://github.com/dotnet/sdk build 20221007.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.200-preview.22507.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,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.22504.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8305ead7..62f04f82b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,20 +103,20 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk acb19973f8da35b666eb1675c14116c39338d862 - + https://github.com/dotnet/sdk acb19973f8da35b666eb1675c14116c39338d862 - + https://github.com/dotnet/sdk acb19973f8da35b666eb1675c14116c39338d862 - + https://github.com/dotnet/sdk acb19973f8da35b666eb1675c14116c39338d862 diff --git a/eng/Versions.props b/eng/Versions.props index a629029c2..2d93c5cb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22506.26 - 7.0.200-preview.22506.26 - 7.0.200-preview.22506.26 + 7.0.200-preview.22507.9 + 7.0.200-preview.22507.9 + 7.0.200-preview.22507.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6a94ac571d958ca6d81028ecd0bedb6b4e404c45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 17:44:31 +0000 Subject: [PATCH 008/654] Update dependencies from https://github.com/dotnet/sdk build 20221007.11 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.200-preview.22507.11 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.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.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.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.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++-------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62f04f82b..fc7c5b687 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + 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 @@ -103,39 +103,39 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - acb19973f8da35b666eb1675c14116c39338d862 + ab1f5f89b15ce6e54ca2bd4eef1685232c6d4c00 - + https://github.com/dotnet/sdk - acb19973f8da35b666eb1675c14116c39338d862 + ab1f5f89b15ce6e54ca2bd4eef1685232c6d4c00 - + https://github.com/dotnet/sdk - acb19973f8da35b666eb1675c14116c39338d862 + ab1f5f89b15ce6e54ca2bd4eef1685232c6d4c00 - + https://github.com/dotnet/sdk - acb19973f8da35b666eb1675c14116c39338d862 + ab1f5f89b15ce6e54ca2bd4eef1685232c6d4c00 - + https://github.com/dotnet/winforms - 993983be2ce14ca67f7ff09b8b04e9b8391b3339 + b718d35e98c370ff27249f8f6c57325033a27c7e - + https://github.com/dotnet/wpf - a956caa0747c27f0b0776d845fafe0b05b2c7337 + 8091341440149a2ff67ed5af6efbb43c349ee537 - + https://github.com/dotnet/fsharp - 7669e0a6dbeb872512c073c49c7661a71cfb6e07 + 20cfdba41b322f13ce5504f416cb74d5ffff678e - + https://github.com/dotnet/fsharp - 7669e0a6dbeb872512c073c49c7661a71cfb6e07 + 20cfdba41b322f13ce5504f416cb74d5ffff678e diff --git a/eng/Versions.props b/eng/Versions.props index 2d93c5cb5..012ba5ed8 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,9 +63,9 @@ - 7.0.200-preview.22507.9 - 7.0.200-preview.22507.9 - 7.0.200-preview.22507.9 + 7.0.200-preview.22507.11 + 7.0.200-preview.22507.11 + 7.0.200-preview.22507.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,10 +86,10 @@ - 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 From b968b4bfc990f70b94841cd9151ebf7c696bafcc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 20:03:05 +0000 Subject: [PATCH 009/654] Update dependencies from https://github.com/dotnet/sdk build 20221007.15 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.200-preview.22507.15 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.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.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.Net.Compilers.Toolset,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 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++++---------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc7c5b687..b37f4f765 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,30 +22,30 @@ 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 + b8a4363ecd194d4e7906648a505701a9d2b7aeae @@ -53,9 +53,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9 + b8a4363ecd194d4e7906648a505701a9d2b7aeae https://github.com/dotnet/aspnetcore @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - ab1f5f89b15ce6e54ca2bd4eef1685232c6d4c00 + 181e3f397666abb65be8a84f7e99dd3a88f1c386 - + https://github.com/dotnet/sdk - ab1f5f89b15ce6e54ca2bd4eef1685232c6d4c00 + 181e3f397666abb65be8a84f7e99dd3a88f1c386 - + https://github.com/dotnet/sdk - ab1f5f89b15ce6e54ca2bd4eef1685232c6d4c00 + 181e3f397666abb65be8a84f7e99dd3a88f1c386 - + https://github.com/dotnet/sdk - ab1f5f89b15ce6e54ca2bd4eef1685232c6d4c00 + 181e3f397666abb65be8a84f7e99dd3a88f1c386 @@ -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 012ba5ed8..f5a740c7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,25 +63,25 @@ - 7.0.200-preview.22507.11 - 7.0.200-preview.22507.11 - 7.0.200-preview.22507.11 + 7.0.200-preview.22507.15 + 7.0.200-preview.22507.15 + 7.0.200-preview.22507.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22504.4 + 7.0.0-rtm.22507.1 - 7.0.0-rtm.22504.4 - 7.0.0-rtm.22504.4 - 7.0.0-rtm.22504.4 - 7.0.0-rtm.22504.4 - 7.0.0-rtm.22504.4 - 7.0.0-rtm.22504.4 + 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 @@ -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 b9aea1bfb16a1bf8cab71abaf331b9b8f10f238f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 7 Oct 2022 13:17:32 -0700 Subject: [PATCH 010/654] Add dotnet root to the env script as tests we're running correctly in the IDE otherwise --- eng/restore-toolset.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1 index 94cbcbb6e..893a96111 100644 --- a/eng/restore-toolset.ps1 +++ b/eng/restore-toolset.ps1 @@ -29,6 +29,8 @@ set DOTNET_MULTILEVEL_LOOKUP=0 set PATH=$env:DOTNET_INSTALL_DIR;%PATH% set NUGET_PACKAGES=$env:NUGET_PACKAGES + +set DOTNET_ROOT=$env:DOTNET_INSTALL_DIR "@ Out-File -FilePath $scriptPath -InputObject $scriptContents -Encoding ASCII From 5065e3db37e86829ba0962b89692326a8261ae60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 21:28:12 +0000 Subject: [PATCH 011/654] Update dependencies from https://github.com/dotnet/sdk build 20221007.18 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.200-preview.22507.18 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.Net.Compilers.Toolset,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 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 21 ++++++++-------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 482cd4ffd..e2b76024c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,30 +22,30 @@ 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,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + 85a710726e869ee09668248bae3aa73126c370d6 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + 85a710726e869ee09668248bae3aa73126c370d6 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + 85a710726e869ee09668248bae3aa73126c370d6 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + 85a710726e869ee09668248bae3aa73126c370d6 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 8091341440149a2ff67ed5af6efbb43c349ee537 - + https://github.com/dotnet/fsharp - f07ccb1bc4325861cb4306733f59b23f6d4344f7 + 20cfdba41b322f13ce5504f416cb74d5ffff678e - + https://github.com/dotnet/fsharp - f07ccb1bc4325861cb4306733f59b23f6d4344f7 + 20cfdba41b322f13ce5504f416cb74d5ffff678e @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb + 8ff4712e295e3aaf80b9b815091d6e9b6e5d1dec diff --git a/eng/Versions.props b/eng/Versions.props index 330510ac9..68a6d27fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,26 +63,25 @@ - 7.0.100-rtm.22506.24 - 7.0.100-rtm.22506.24 - 7.0.100-rtm.22506.24 - + 7.0.200-preview.22507.18 + 7.0.200-preview.22507.18 + 7.0.200-preview.22507.18 $(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 From 265bb3622ec092b66481aab804e3bfaf4357d0dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 18:16:01 +0000 Subject: [PATCH 012/654] Update dependencies from https://github.com/dotnet/sdk build 20221010.7 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.200-preview.22510.7 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.Net.Compilers.Toolset,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 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2b76024c..b7dcf0da3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 85a710726e869ee09668248bae3aa73126c370d6 + cd7fb4b02342b8763bc631cf188e0c95c51b35f8 - + https://github.com/dotnet/sdk - 85a710726e869ee09668248bae3aa73126c370d6 + cd7fb4b02342b8763bc631cf188e0c95c51b35f8 - + https://github.com/dotnet/sdk - 85a710726e869ee09668248bae3aa73126c370d6 + cd7fb4b02342b8763bc631cf188e0c95c51b35f8 - + https://github.com/dotnet/sdk - 85a710726e869ee09668248bae3aa73126c370d6 + cd7fb4b02342b8763bc631cf188e0c95c51b35f8 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 8091341440149a2ff67ed5af6efbb43c349ee537 - + https://github.com/dotnet/fsharp - 20cfdba41b322f13ce5504f416cb74d5ffff678e + 507f1f4a712c52b322062397515ffdd7907d5cfa - + https://github.com/dotnet/fsharp - 20cfdba41b322f13ce5504f416cb74d5ffff678e + 507f1f4a712c52b322062397515ffdd7907d5cfa @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 8ff4712e295e3aaf80b9b815091d6e9b6e5d1dec + 790ffdff3099ca537fa6c0adfadb497f295ca19f diff --git a/eng/Versions.props b/eng/Versions.props index 68a6d27fb..7933943df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22507.18 - 7.0.200-preview.22507.18 - 7.0.200-preview.22507.18 + 7.0.200-preview.22510.7 + 7.0.200-preview.22510.7 + 7.0.200-preview.22510.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 144a2e4c33d149fd0550a837adff3126cc8591ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 22:32:04 +0000 Subject: [PATCH 013/654] Update dependencies from https://github.com/dotnet/sdk build 20221010.13 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.200-preview.22510.13 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.Net.Compilers.Toolset,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 --- 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 b7dcf0da3..4ea8ea58f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - cd7fb4b02342b8763bc631cf188e0c95c51b35f8 + c8672419d6b776fe77f063a33f77b39beec80b61 - + https://github.com/dotnet/sdk - cd7fb4b02342b8763bc631cf188e0c95c51b35f8 + c8672419d6b776fe77f063a33f77b39beec80b61 - + https://github.com/dotnet/sdk - cd7fb4b02342b8763bc631cf188e0c95c51b35f8 + c8672419d6b776fe77f063a33f77b39beec80b61 - + https://github.com/dotnet/sdk - cd7fb4b02342b8763bc631cf188e0c95c51b35f8 + c8672419d6b776fe77f063a33f77b39beec80b61 diff --git a/eng/Versions.props b/eng/Versions.props index 7933943df..039c57b45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22510.7 - 7.0.200-preview.22510.7 - 7.0.200-preview.22510.7 + 7.0.200-preview.22510.13 + 7.0.200-preview.22510.13 + 7.0.200-preview.22510.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c17fd2e79d35e81ae6e1636ef7a2dfa41d20f323 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 23:14:45 +0000 Subject: [PATCH 014/654] Update dependencies from https://github.com/dotnet/sdk build 20221010.14 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.200-preview.22510.14 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.Net.Compilers.Toolset,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 --- 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 4ea8ea58f..b6b06f97b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - c8672419d6b776fe77f063a33f77b39beec80b61 + e61f5a834629852c260c701a0747d234a11a2662 - + https://github.com/dotnet/sdk - c8672419d6b776fe77f063a33f77b39beec80b61 + e61f5a834629852c260c701a0747d234a11a2662 - + https://github.com/dotnet/sdk - c8672419d6b776fe77f063a33f77b39beec80b61 + e61f5a834629852c260c701a0747d234a11a2662 - + https://github.com/dotnet/sdk - c8672419d6b776fe77f063a33f77b39beec80b61 + e61f5a834629852c260c701a0747d234a11a2662 diff --git a/eng/Versions.props b/eng/Versions.props index 039c57b45..f24ba5b5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22510.13 - 7.0.200-preview.22510.13 - 7.0.200-preview.22510.13 + 7.0.200-preview.22510.14 + 7.0.200-preview.22510.14 + 7.0.200-preview.22510.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ae6656e2e428d7277b40cc991bb63e3f483aba43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Oct 2022 01:24:49 +0000 Subject: [PATCH 015/654] Update dependencies from https://github.com/dotnet/sdk build 20221010.18 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.200-preview.22510.18 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.Net.Compilers.Toolset,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 --- 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 b6b06f97b..0a0c08aaf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - e61f5a834629852c260c701a0747d234a11a2662 + 99a903c49a189d0abfd6dc0596196ad833476acf - + https://github.com/dotnet/sdk - e61f5a834629852c260c701a0747d234a11a2662 + 99a903c49a189d0abfd6dc0596196ad833476acf - + https://github.com/dotnet/sdk - e61f5a834629852c260c701a0747d234a11a2662 + 99a903c49a189d0abfd6dc0596196ad833476acf - + https://github.com/dotnet/sdk - e61f5a834629852c260c701a0747d234a11a2662 + 99a903c49a189d0abfd6dc0596196ad833476acf diff --git a/eng/Versions.props b/eng/Versions.props index f24ba5b5d..dae1f019a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22510.14 - 7.0.200-preview.22510.14 - 7.0.200-preview.22510.14 + 7.0.200-preview.22510.18 + 7.0.200-preview.22510.18 + 7.0.200-preview.22510.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d5a3b3065a0f48edfc31ea15ccd6a85b70db8538 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Oct 2022 03:38:03 +0000 Subject: [PATCH 016/654] Update dependencies from https://github.com/dotnet/sdk build 20221010.25 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.200-preview.22510.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.Net.Compilers.Toolset,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 --- 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 0a0c08aaf..4870deb86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 99a903c49a189d0abfd6dc0596196ad833476acf + f4ca693024a3d6805911b0e375bf50e2f27a8a6c - + https://github.com/dotnet/sdk - 99a903c49a189d0abfd6dc0596196ad833476acf + f4ca693024a3d6805911b0e375bf50e2f27a8a6c - + https://github.com/dotnet/sdk - 99a903c49a189d0abfd6dc0596196ad833476acf + f4ca693024a3d6805911b0e375bf50e2f27a8a6c - + https://github.com/dotnet/sdk - 99a903c49a189d0abfd6dc0596196ad833476acf + f4ca693024a3d6805911b0e375bf50e2f27a8a6c @@ -154,9 +154,9 @@ 790ffdff3099ca537fa6c0adfadb497f295ca19f - + https://github.com/dotnet/msbuild - 20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef + e2dabceb97d1630405c69131a903607fb8076ccd diff --git a/eng/Versions.props b/eng/Versions.props index dae1f019a..d1368544b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22510.18 - 7.0.200-preview.22510.18 - 7.0.200-preview.22510.18 + 7.0.200-preview.22510.25 + 7.0.200-preview.22510.25 + 7.0.200-preview.22510.25 $(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 017/654] 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) From cde25ccb288c828755be8af9437be9c90817af49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Oct 2022 10:50:02 +0000 Subject: [PATCH 018/654] Update dependencies from https://github.com/dotnet/sdk build 20221011.2 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.200-preview.22511.2 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.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.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.Net.Compilers.Toolset,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 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4870deb86..365738326 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,34 +57,34 @@ https://github.com/dotnet/runtime b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce https://github.com/dotnet/test-templates @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - f4ca693024a3d6805911b0e375bf50e2f27a8a6c + 428ecd73ac7dffe01627d057fc3f0c3e10233d56 - + https://github.com/dotnet/sdk - f4ca693024a3d6805911b0e375bf50e2f27a8a6c + 428ecd73ac7dffe01627d057fc3f0c3e10233d56 - + https://github.com/dotnet/sdk - f4ca693024a3d6805911b0e375bf50e2f27a8a6c + 428ecd73ac7dffe01627d057fc3f0c3e10233d56 - + https://github.com/dotnet/sdk - f4ca693024a3d6805911b0e375bf50e2f27a8a6c + 428ecd73ac7dffe01627d057fc3f0c3e10233d56 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 8091341440149a2ff67ed5af6efbb43c349ee537 - + https://github.com/dotnet/fsharp - 507f1f4a712c52b322062397515ffdd7907d5cfa + 121c81e8270d6d5514e85c0e5bad5691167354e1 - + https://github.com/dotnet/fsharp - 507f1f4a712c52b322062397515ffdd7907d5cfa + 121c81e8270d6d5514e85c0e5bad5691167354e1 @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 790ffdff3099ca537fa6c0adfadb497f295ca19f + 9774244e658159dce23e8d2ea168e5457db24e9a diff --git a/eng/Versions.props b/eng/Versions.props index d1368544b..ed64277f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,22 +50,22 @@ - 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 + 7.0.0-rtm.22510.6 + 7.0.0-rtm.22510.6 + 7.0.0-rtm.22510.6 + 7.0.0-rtm.22510.6 + 7.0.0-rtm.22510.6 + 7.0.0-rtm.22510.6 + 7.0.0-rtm.22510.6 0.2.0 - 7.0.200-preview.22510.25 - 7.0.200-preview.22510.25 - 7.0.200-preview.22510.25 + 7.0.200-preview.22511.2 + 7.0.200-preview.22511.2 + 7.0.200-preview.22511.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a563511698b1acc091009e439bb21aee39590d9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Oct 2022 16:21:36 +0000 Subject: [PATCH 019/654] Update dependencies from https://github.com/dotnet/sdk build 20221011.4 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.200-preview.22511.4 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.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.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.Net.Compilers.Toolset,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 --- 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 365738326..4233f3340 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 428ecd73ac7dffe01627d057fc3f0c3e10233d56 + d4d4b8694bf61a863aee62eb142f41e07642f8e9 - + https://github.com/dotnet/sdk - 428ecd73ac7dffe01627d057fc3f0c3e10233d56 + d4d4b8694bf61a863aee62eb142f41e07642f8e9 - + https://github.com/dotnet/sdk - 428ecd73ac7dffe01627d057fc3f0c3e10233d56 + d4d4b8694bf61a863aee62eb142f41e07642f8e9 - + https://github.com/dotnet/sdk - 428ecd73ac7dffe01627d057fc3f0c3e10233d56 + d4d4b8694bf61a863aee62eb142f41e07642f8e9 diff --git a/eng/Versions.props b/eng/Versions.props index ed64277f1..39d8ee1d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22511.2 - 7.0.200-preview.22511.2 - 7.0.200-preview.22511.2 + 7.0.200-preview.22511.4 + 7.0.200-preview.22511.4 + 7.0.200-preview.22511.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7452682aae229e63ff65a8590055a1dee951461e Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 11 Oct 2022 22:03:23 +0000 Subject: [PATCH 020/654] Remove backported roslyn patch --- ...uilt-version-of-ref-packs-and-don-t-.patch | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch deleted file mode 100644 index 1a9573cb5..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 15 Sep 2022 14:46:53 -0500 -Subject: [PATCH] Use the source-built version of ref packs and don't use app - host when building in source-build. - -Backport PR: https://github.com/dotnet/roslyn/pull/64055. - ---- - Directory.Build.targets | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index 8f38a48cd95..dfb4fd33c9a 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -1,5 +1,20 @@ - - -+ -+ -+ -+ 6.0.0 -+ -+ -+ 6.0.0 -+ -+ -+ -+ -+ -+ false -+ -+ - - - From 01a7768c3324d80afcfa169766ee50ff0fe146b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 00:24:52 +0000 Subject: [PATCH 021/654] Update dependencies from https://github.com/dotnet/sdk build 20221011.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.200-preview.22511.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.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.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.Net.Compilers.Toolset,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 --- 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 4233f3340..29c5086eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - d4d4b8694bf61a863aee62eb142f41e07642f8e9 + 7dcdb00a89e0335f41b31e5439ae4211afcc1025 - + https://github.com/dotnet/sdk - d4d4b8694bf61a863aee62eb142f41e07642f8e9 + 7dcdb00a89e0335f41b31e5439ae4211afcc1025 - + https://github.com/dotnet/sdk - d4d4b8694bf61a863aee62eb142f41e07642f8e9 + 7dcdb00a89e0335f41b31e5439ae4211afcc1025 - + https://github.com/dotnet/sdk - d4d4b8694bf61a863aee62eb142f41e07642f8e9 + 7dcdb00a89e0335f41b31e5439ae4211afcc1025 diff --git a/eng/Versions.props b/eng/Versions.props index 39d8ee1d8..0a12b524e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22511.4 - 7.0.200-preview.22511.4 - 7.0.200-preview.22511.4 + 7.0.200-preview.22511.10 + 7.0.200-preview.22511.10 + 7.0.200-preview.22511.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cdce83bedf1c445fb3e43579f8022fa4e1bf4729 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 04:58:42 +0000 Subject: [PATCH 022/654] Update dependencies from https://github.com/dotnet/sdk build 20221011.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.200-preview.22511.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.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.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.Net.Compilers.Toolset,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 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29c5086eb..789306a62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 7dcdb00a89e0335f41b31e5439ae4211afcc1025 + 7f71bfc2fafac369aef5fec5d1c8ab99a9be0db6 - + https://github.com/dotnet/sdk - 7dcdb00a89e0335f41b31e5439ae4211afcc1025 + 7f71bfc2fafac369aef5fec5d1c8ab99a9be0db6 - + https://github.com/dotnet/sdk - 7dcdb00a89e0335f41b31e5439ae4211afcc1025 + 7f71bfc2fafac369aef5fec5d1c8ab99a9be0db6 - + https://github.com/dotnet/sdk - 7dcdb00a89e0335f41b31e5439ae4211afcc1025 + 7f71bfc2fafac369aef5fec5d1c8ab99a9be0db6 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 8091341440149a2ff67ed5af6efbb43c349ee537 - + https://github.com/dotnet/fsharp - 121c81e8270d6d5514e85c0e5bad5691167354e1 + d565b6c1614beb124959a9a9fae7d9de1ecac790 - + https://github.com/dotnet/fsharp - 121c81e8270d6d5514e85c0e5bad5691167354e1 + d565b6c1614beb124959a9a9fae7d9de1ecac790 diff --git a/eng/Versions.props b/eng/Versions.props index 0a12b524e..638934833 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22511.10 - 7.0.200-preview.22511.10 - 7.0.200-preview.22511.10 + 7.0.200-preview.22511.16 + 7.0.200-preview.22511.16 + 7.0.200-preview.22511.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 314b750abd5c840153cf8671dd0700853442708c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 10:01:58 +0000 Subject: [PATCH 023/654] Update dependencies from https://github.com/dotnet/sdk build 20221012.1 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.200-preview.22512.1 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.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.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.Net.Compilers.Toolset,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 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 789306a62..9f8407a5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + c69f4f408ce81df54c6bee4738414c2cb0b88933 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + c69f4f408ce81df54c6bee4738414c2cb0b88933 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + c69f4f408ce81df54c6bee4738414c2cb0b88933 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + c69f4f408ce81df54c6bee4738414c2cb0b88933 https://github.com/dotnet/llvm-project @@ -103,31 +103,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 7f71bfc2fafac369aef5fec5d1c8ab99a9be0db6 + df42e4de7d111bb0c23c5a5649151b769b69e707 - + https://github.com/dotnet/sdk - 7f71bfc2fafac369aef5fec5d1c8ab99a9be0db6 + df42e4de7d111bb0c23c5a5649151b769b69e707 - + https://github.com/dotnet/sdk - 7f71bfc2fafac369aef5fec5d1c8ab99a9be0db6 + df42e4de7d111bb0c23c5a5649151b769b69e707 - + https://github.com/dotnet/sdk - 7f71bfc2fafac369aef5fec5d1c8ab99a9be0db6 + df42e4de7d111bb0c23c5a5649151b769b69e707 - + https://github.com/dotnet/winforms - b718d35e98c370ff27249f8f6c57325033a27c7e + f00404867c4415586a1a2c226bc0b08fde43bb5e - + https://github.com/dotnet/wpf - 8091341440149a2ff67ed5af6efbb43c349ee537 + 36a606bee876f89f0bb63b1422814735e0d914fb https://github.com/dotnet/fsharp @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 9774244e658159dce23e8d2ea168e5457db24e9a + f9e6ff2705883669cdaa1c806af08d46dec04c1e diff --git a/eng/Versions.props b/eng/Versions.props index 638934833..27e547714 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22506.1 + 7.0.0-rtm.22507.3 - 7.0.0-rtm.22506.9 + 7.0.0-rtm.22507.2 @@ -63,9 +63,9 @@ - 7.0.200-preview.22511.16 - 7.0.200-preview.22511.16 - 7.0.200-preview.22511.16 + 7.0.200-preview.22512.1 + 7.0.200-preview.22512.1 + 7.0.200-preview.22512.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,10 +86,10 @@ - 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.22511.1 + 7.0.0-rtm.22511.1 + 7.0.0 + 7.0.0 From c9d5b0ee2f24b4aae1f2f6bb1e498010c0c1e46c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 10:24:56 +0000 Subject: [PATCH 024/654] Update dependencies from https://github.com/dotnet/sdk build 20221012.6 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.200-preview.22512.6 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.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.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.Net.Compilers.Toolset,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 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f8407a5e..034a1ee5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,34 +57,34 @@ https://github.com/dotnet/runtime b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/aspnetcore - 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce + ed29a0c965359eab96ea6cc24e209f54aa543799 - + https://github.com/dotnet/aspnetcore - 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce + ed29a0c965359eab96ea6cc24e209f54aa543799 - + https://github.com/dotnet/aspnetcore - 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce + ed29a0c965359eab96ea6cc24e209f54aa543799 - + https://github.com/dotnet/aspnetcore - 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce + ed29a0c965359eab96ea6cc24e209f54aa543799 - + https://github.com/dotnet/aspnetcore - 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce + ed29a0c965359eab96ea6cc24e209f54aa543799 - + https://github.com/dotnet/aspnetcore - 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce + ed29a0c965359eab96ea6cc24e209f54aa543799 - + https://github.com/dotnet/aspnetcore - 29830cbc8ce7ae7b5afaca7dd10c90d55b5191ce + ed29a0c965359eab96ea6cc24e209f54aa543799 https://github.com/dotnet/test-templates @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - df42e4de7d111bb0c23c5a5649151b769b69e707 + 60f4f758d1484e8ee93cd9f0a7299a8934a4cb5f - + https://github.com/dotnet/sdk - df42e4de7d111bb0c23c5a5649151b769b69e707 + 60f4f758d1484e8ee93cd9f0a7299a8934a4cb5f - + https://github.com/dotnet/sdk - df42e4de7d111bb0c23c5a5649151b769b69e707 + 60f4f758d1484e8ee93cd9f0a7299a8934a4cb5f - + https://github.com/dotnet/sdk - df42e4de7d111bb0c23c5a5649151b769b69e707 + 60f4f758d1484e8ee93cd9f0a7299a8934a4cb5f @@ -154,9 +154,9 @@ f9e6ff2705883669cdaa1c806af08d46dec04c1e - + https://github.com/dotnet/msbuild - e2dabceb97d1630405c69131a903607fb8076ccd + a440ea9cf00113537cde999052649b4a8922c488 diff --git a/eng/Versions.props b/eng/Versions.props index 27e547714..e9112d81d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,22 +50,22 @@ - 7.0.0-rtm.22510.6 - 7.0.0-rtm.22510.6 - 7.0.0-rtm.22510.6 - 7.0.0-rtm.22510.6 - 7.0.0-rtm.22510.6 - 7.0.0-rtm.22510.6 - 7.0.0-rtm.22510.6 + 7.0.0-rtm.22511.13 + 7.0.0-rtm.22511.13 + 7.0.0-rtm.22511.13 + 7.0.0-rtm.22511.13 + 7.0.0-rtm.22511.13 + 7.0.0-rtm.22511.13 + 7.0.0-rtm.22511.13 0.2.0 - 7.0.200-preview.22512.1 - 7.0.200-preview.22512.1 - 7.0.200-preview.22512.1 + 7.0.200-preview.22512.6 + 7.0.200-preview.22512.6 + 7.0.200-preview.22512.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bf845118a11104631c0b5ede94979b953600d4f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 11:47:01 +0000 Subject: [PATCH 025/654] Update dependencies from https://github.com/dotnet/sdk build 20221012.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.200-preview.22512.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.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.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.Net.Compilers.Toolset,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 5 ++++ eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++--------- 3 files changed, 51 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index dbd29f96e..6d004c295 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 034a1ee5c..fed84e1ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,49 +3,49 @@ https://github.com/dotnet/windowsdesktop - c69f4f408ce81df54c6bee4738414c2cb0b88933 + 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 - + https://github.com/dotnet/windowsdesktop - c69f4f408ce81df54c6bee4738414c2cb0b88933 + 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 - + https://github.com/dotnet/windowsdesktop - c69f4f408ce81df54c6bee4738414c2cb0b88933 + 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 https://github.com/dotnet/windowsdesktop - c69f4f408ce81df54c6bee4738414c2cb0b88933 + 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 https://github.com/dotnet/llvm-project 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 @@ -53,9 +53,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 https://github.com/dotnet/aspnetcore @@ -103,31 +103,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 60f4f758d1484e8ee93cd9f0a7299a8934a4cb5f + 607a5efa918e18d64f6406f9b1c3123650a8efe2 - + https://github.com/dotnet/sdk - 60f4f758d1484e8ee93cd9f0a7299a8934a4cb5f + 607a5efa918e18d64f6406f9b1c3123650a8efe2 - + https://github.com/dotnet/sdk - 60f4f758d1484e8ee93cd9f0a7299a8934a4cb5f + 607a5efa918e18d64f6406f9b1c3123650a8efe2 - + https://github.com/dotnet/sdk - 60f4f758d1484e8ee93cd9f0a7299a8934a4cb5f + 607a5efa918e18d64f6406f9b1c3123650a8efe2 - + https://github.com/dotnet/winforms - f00404867c4415586a1a2c226bc0b08fde43bb5e + 631f7cf4c165b3a3da5ab8f8e974a00c0bf067d7 - + https://github.com/dotnet/wpf - 36a606bee876f89f0bb63b1422814735e0d914fb + fd949cc0bee03dece87b7430fbba99f150632b9d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e9112d81d..f821e3730 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22507.3 + 7.0.0-rtm.22511.7 - 7.0.0-rtm.22507.2 + 7.0.0-rtm.22511.4 @@ -63,31 +63,31 @@ - 7.0.200-preview.22512.6 - 7.0.200-preview.22512.6 - 7.0.200-preview.22512.6 + 7.0.200-preview.22512.10 + 7.0.200-preview.22512.10 + 7.0.200-preview.22512.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22507.1 + 7.0.0-rtm.22511.4 - 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.22511.4 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 2.1.0 - 7.0.0-rtm.22511.1 - 7.0.0-rtm.22511.1 + 7.0.0-rtm.22511.3 + 7.0.0-rtm.22511.3 7.0.0 7.0.0 From 730ae4eb737d9c1946357953fd200a52f6437e17 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 13:36:35 +0000 Subject: [PATCH 026/654] Update dependencies from https://github.com/dotnet/sdk build 20221012.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.200-preview.22512.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.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.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.Net.Compilers.Toolset,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 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fed84e1ae..87e2aa5b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 607a5efa918e18d64f6406f9b1c3123650a8efe2 + 72b55a2db3918d0e71b36db10195c33fe5f4266a - + https://github.com/dotnet/sdk - 607a5efa918e18d64f6406f9b1c3123650a8efe2 + 72b55a2db3918d0e71b36db10195c33fe5f4266a - + https://github.com/dotnet/sdk - 607a5efa918e18d64f6406f9b1c3123650a8efe2 + 72b55a2db3918d0e71b36db10195c33fe5f4266a - + https://github.com/dotnet/sdk - 607a5efa918e18d64f6406f9b1c3123650a8efe2 + 72b55a2db3918d0e71b36db10195c33fe5f4266a @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf fd949cc0bee03dece87b7430fbba99f150632b9d - + https://github.com/dotnet/fsharp - d565b6c1614beb124959a9a9fae7d9de1ecac790 + 406bbe675363ba96676a84491b24db7010ce88fe - + https://github.com/dotnet/fsharp - d565b6c1614beb124959a9a9fae7d9de1ecac790 + 406bbe675363ba96676a84491b24db7010ce88fe diff --git a/eng/Versions.props b/eng/Versions.props index f821e3730..674f61498 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22512.10 - 7.0.200-preview.22512.10 - 7.0.200-preview.22512.10 + 7.0.200-preview.22512.16 + 7.0.200-preview.22512.16 + 7.0.200-preview.22512.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f4c549308896b05879e3b99a1bdbc3de81d61521 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 16:37:13 +0000 Subject: [PATCH 027/654] Update dependencies from https://github.com/dotnet/arcade build 20221011.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22507.2 -> To Version 7.0.0-beta.22511.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 6bfdd18a4..b5374896e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - c4f77b4e80e942941e73d70cec045eddbfd7b4eb + f760da39566d1cfa90c89e38d8dfafb3d43f9cae - + https://github.com/dotnet/arcade - c4f77b4e80e942941e73d70cec045eddbfd7b4eb + f760da39566d1cfa90c89e38d8dfafb3d43f9cae - + https://github.com/dotnet/arcade - c4f77b4e80e942941e73d70cec045eddbfd7b4eb + f760da39566d1cfa90c89e38d8dfafb3d43f9cae https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3fcf24983..81ff71601 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22507.2 + 7.0.0-beta.22511.2 diff --git a/global.json b/global.json index 4ac53c9bc..e92de548b 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.22507.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22507.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22511.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22511.2" } } From ce3f3ef55fe42c3274793cff1659219307ba63ef Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 12 Oct 2022 10:02:54 -0700 Subject: [PATCH 028/654] Remove backported format patch --- ...ty-constraints-for-BeginScope-in-Sim.patch | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch diff --git a/src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch b/src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch deleted file mode 100644 index 2285f0472..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 16 May 2022 16:29:43 -0700 -Subject: [PATCH] Update nullability constraints for BeginScope in - SimpleConsoleLogger - -Workaround for: https://github.com/dotnet/format/issues/1609 ---- - src/Logging/SimpleConsoleLogger.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs -index fd8015c..2971595 100644 ---- a/src/Logging/SimpleConsoleLogger.cs -+++ b/src/Logging/SimpleConsoleLogger.cs -@@ -64,7 +64,7 @@ public bool IsEnabled(LogLevel logLevel) - return (int)logLevel >= (int)_minimalLogLevel; - } - -- public IDisposable BeginScope(TState state) -+ public IDisposable? BeginScope(TState state) where TState : notnull - { - return NullScope.Instance; - } From 6d10463332dca8407e666e73ad69ce5576a4ca95 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 23:43:30 +0000 Subject: [PATCH 029/654] Update dependencies from https://github.com/dotnet/sdk build 20221012.26 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.200-preview.22512.26 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.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.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.Net.Compilers.Toolset,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 (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 87e2aa5b5..7fdd18934 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 72b55a2db3918d0e71b36db10195c33fe5f4266a + 60d4b6eb0b041886a073e9abb58b983ef20034fd - + https://github.com/dotnet/sdk - 72b55a2db3918d0e71b36db10195c33fe5f4266a + 60d4b6eb0b041886a073e9abb58b983ef20034fd - + https://github.com/dotnet/sdk - 72b55a2db3918d0e71b36db10195c33fe5f4266a + 60d4b6eb0b041886a073e9abb58b983ef20034fd - + https://github.com/dotnet/sdk - 72b55a2db3918d0e71b36db10195c33fe5f4266a + 60d4b6eb0b041886a073e9abb58b983ef20034fd diff --git a/eng/Versions.props b/eng/Versions.props index 674f61498..29cffd7a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22512.16 - 7.0.200-preview.22512.16 - 7.0.200-preview.22512.16 + 7.0.200-preview.22512.26 + 7.0.200-preview.22512.26 + 7.0.200-preview.22512.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d3252f60b1f234c405f2cf3dce603b7331ba880c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 04:05:24 +0000 Subject: [PATCH 030/654] Update dependencies from https://github.com/dotnet/sdk build 20221012.32 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.200-preview.22512.32 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.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.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.Net.Compilers.Toolset,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 (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 7fdd18934..536c6277c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 60d4b6eb0b041886a073e9abb58b983ef20034fd + d1073f6df93d7d815d2dd0a7ab485337a8e9d2c5 - + https://github.com/dotnet/sdk - 60d4b6eb0b041886a073e9abb58b983ef20034fd + d1073f6df93d7d815d2dd0a7ab485337a8e9d2c5 - + https://github.com/dotnet/sdk - 60d4b6eb0b041886a073e9abb58b983ef20034fd + d1073f6df93d7d815d2dd0a7ab485337a8e9d2c5 - + https://github.com/dotnet/sdk - 60d4b6eb0b041886a073e9abb58b983ef20034fd + d1073f6df93d7d815d2dd0a7ab485337a8e9d2c5 diff --git a/eng/Versions.props b/eng/Versions.props index 29cffd7a3..a6dca4ace 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22512.26 - 7.0.200-preview.22512.26 - 7.0.200-preview.22512.26 + 7.0.200-preview.22512.32 + 7.0.200-preview.22512.32 + 7.0.200-preview.22512.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 63780136426b0dcfbe6d92f32940cf0e2b9530d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 08:10:22 +0000 Subject: [PATCH 031/654] Update dependencies from https://github.com/dotnet/sdk build 20221012.36 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.200-preview.22512.36 --- 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 536c6277c..6abd8b97b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - d1073f6df93d7d815d2dd0a7ab485337a8e9d2c5 + aa563949c40a4aa8c3ebe0485a540300c47c1db7 - + https://github.com/dotnet/sdk - d1073f6df93d7d815d2dd0a7ab485337a8e9d2c5 + aa563949c40a4aa8c3ebe0485a540300c47c1db7 - + https://github.com/dotnet/sdk - d1073f6df93d7d815d2dd0a7ab485337a8e9d2c5 + aa563949c40a4aa8c3ebe0485a540300c47c1db7 - + https://github.com/dotnet/sdk - d1073f6df93d7d815d2dd0a7ab485337a8e9d2c5 + aa563949c40a4aa8c3ebe0485a540300c47c1db7 diff --git a/eng/Versions.props b/eng/Versions.props index a6dca4ace..f56d9aa83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22512.32 - 7.0.200-preview.22512.32 - 7.0.200-preview.22512.32 + 7.0.200-preview.22512.36 + 7.0.200-preview.22512.36 + 7.0.200-preview.22512.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b20134e23ad46f2bbd5d6af442ced488339206f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 08:10:34 +0000 Subject: [PATCH 032/654] Update dependencies from https://github.com/dotnet/sdk build 20221012.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22512.36 -> To Version 7.0.200-preview.22512.40 --- 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 6abd8b97b..ca9a507ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - aa563949c40a4aa8c3ebe0485a540300c47c1db7 + 564200425d5bb0be45ec80804bc42d75d1f4d0ea - + https://github.com/dotnet/sdk - aa563949c40a4aa8c3ebe0485a540300c47c1db7 + 564200425d5bb0be45ec80804bc42d75d1f4d0ea - + https://github.com/dotnet/sdk - aa563949c40a4aa8c3ebe0485a540300c47c1db7 + 564200425d5bb0be45ec80804bc42d75d1f4d0ea - + https://github.com/dotnet/sdk - aa563949c40a4aa8c3ebe0485a540300c47c1db7 + 564200425d5bb0be45ec80804bc42d75d1f4d0ea diff --git a/eng/Versions.props b/eng/Versions.props index f56d9aa83..50ec34257 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22512.36 - 7.0.200-preview.22512.36 - 7.0.200-preview.22512.36 + 7.0.200-preview.22512.40 + 7.0.200-preview.22512.40 + 7.0.200-preview.22512.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 40d563778fa5649ec71e1f8c15fea843ab9dfa82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 08:10:48 +0000 Subject: [PATCH 033/654] 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.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.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.Net.Compilers.Toolset,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++--------- 3 files changed, 58 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6d004c295..493787d90 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,12 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca9a507ed..2bf62564f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,30 +22,30 @@ 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + eeabb53e8583c3d3056923dcd52c615265eb38ba - + https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + eeabb53e8583c3d3056923dcd52c615265eb38ba - + https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + eeabb53e8583c3d3056923dcd52c615265eb38ba - + https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + eeabb53e8583c3d3056923dcd52c615265eb38ba - + https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + eeabb53e8583c3d3056923dcd52c615265eb38ba - + https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + eeabb53e8583c3d3056923dcd52c615265eb38ba @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + eeabb53e8583c3d3056923dcd52c615265eb38ba - + https://github.com/dotnet/aspnetcore - ed29a0c965359eab96ea6cc24e209f54aa543799 + 122736b8fd5acf3e49e83016582702452c07f400 - + https://github.com/dotnet/aspnetcore - ed29a0c965359eab96ea6cc24e209f54aa543799 + 122736b8fd5acf3e49e83016582702452c07f400 - + https://github.com/dotnet/aspnetcore - ed29a0c965359eab96ea6cc24e209f54aa543799 + 122736b8fd5acf3e49e83016582702452c07f400 - + https://github.com/dotnet/aspnetcore - ed29a0c965359eab96ea6cc24e209f54aa543799 + 122736b8fd5acf3e49e83016582702452c07f400 - + https://github.com/dotnet/aspnetcore - ed29a0c965359eab96ea6cc24e209f54aa543799 + 122736b8fd5acf3e49e83016582702452c07f400 - + https://github.com/dotnet/aspnetcore - ed29a0c965359eab96ea6cc24e209f54aa543799 + 122736b8fd5acf3e49e83016582702452c07f400 - + https://github.com/dotnet/aspnetcore - ed29a0c965359eab96ea6cc24e209f54aa543799 + 122736b8fd5acf3e49e83016582702452c07f400 https://github.com/dotnet/test-templates @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf fd949cc0bee03dece87b7430fbba99f150632b9d - + https://github.com/dotnet/fsharp - 406bbe675363ba96676a84491b24db7010ce88fe + 664588e64eff5db2a2fcb44b8dbddfb0ce4bbbf1 - + https://github.com/dotnet/fsharp - 406bbe675363ba96676a84491b24db7010ce88fe + 664588e64eff5db2a2fcb44b8dbddfb0ce4bbbf1 @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 50ec34257..baf561aac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,13 +50,13 @@ - 7.0.0-rtm.22511.13 - 7.0.0-rtm.22511.13 - 7.0.0-rtm.22511.13 - 7.0.0-rtm.22511.13 - 7.0.0-rtm.22511.13 - 7.0.0-rtm.22511.13 - 7.0.0-rtm.22511.13 + 7.0.0-rtm.22512.14 + 7.0.0-rtm.22512.14 + 7.0.0-rtm.22512.14 + 7.0.0-rtm.22512.14 + 7.0.0-rtm.22512.14 + 7.0.0-rtm.22512.14 + 7.0.0-rtm.22512.14 0.2.0 @@ -72,16 +72,16 @@ - 7.0.0-rtm.22511.4 + 7.0.0 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 + 7.0.0-rtm.22512.2 + 7.0.0-rtm.22512.2 + 7.0.0 + 7.0.0 + 7.0.0 + 7.0.0 2.1.0 @@ -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 + 7.0.0 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From c72d666b2c2694d0f3071ee5d21012cf263a1855 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 09:44:59 +0000 Subject: [PATCH 034/654] Update dependencies from https://github.com/dotnet/sdk build 20221013.2 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.200-preview.22513.2 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.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.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.Net.Compilers.Toolset,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 14 +++++++------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 493787d90..8d725a065 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bf62564f..7590147d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + aa0a3e1e0157bfccefa89ac61c35cb6105d0902b - + https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + aa0a3e1e0157bfccefa89ac61c35cb6105d0902b - + https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + aa0a3e1e0157bfccefa89ac61c35cb6105d0902b https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + aa0a3e1e0157bfccefa89ac61c35cb6105d0902b https://github.com/dotnet/llvm-project @@ -103,31 +103,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 564200425d5bb0be45ec80804bc42d75d1f4d0ea + 8753e7fbd6380ae20decf2504000d1a572826d5f - + https://github.com/dotnet/sdk - 564200425d5bb0be45ec80804bc42d75d1f4d0ea + 8753e7fbd6380ae20decf2504000d1a572826d5f - + https://github.com/dotnet/sdk - 564200425d5bb0be45ec80804bc42d75d1f4d0ea + 8753e7fbd6380ae20decf2504000d1a572826d5f - + https://github.com/dotnet/sdk - 564200425d5bb0be45ec80804bc42d75d1f4d0ea + 8753e7fbd6380ae20decf2504000d1a572826d5f - + https://github.com/dotnet/winforms - 631f7cf4c165b3a3da5ab8f8e974a00c0bf067d7 + d2099bf6dbbe6347055debde2195ed182bf885c2 - + https://github.com/dotnet/wpf - fd949cc0bee03dece87b7430fbba99f150632b9d + 7af30078856aeb12ce5f732082b90b49aab26b2b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index baf561aac..04c9c1406 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22511.7 + 7.0.0-rtm.22512.6 - 7.0.0-rtm.22511.4 + 7.0.0-rtm.22512.9 @@ -63,9 +63,9 @@ - 7.0.200-preview.22512.40 - 7.0.200-preview.22512.40 - 7.0.200-preview.22512.40 + 7.0.200-preview.22513.2 + 7.0.200-preview.22513.2 + 7.0.200-preview.22513.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.0-rtm.22511.3 - 7.0.0-rtm.22511.3 + 7.0.0-rtm.22512.6 + 7.0.0-rtm.22512.6 7.0.0 7.0.0 From 1313e59437d8889f8008b594b6036e76c8448e11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 13:19:59 +0000 Subject: [PATCH 035/654] Update dependencies from https://github.com/dotnet/sdk build 20221013.5 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.200-preview.22513.5 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.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.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.Net.Compilers.Toolset,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 (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 7590147d7..ee4b1441b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 8753e7fbd6380ae20decf2504000d1a572826d5f + df044ed2e4126007d23a9d6797e20fc73449a645 - + https://github.com/dotnet/sdk - 8753e7fbd6380ae20decf2504000d1a572826d5f + df044ed2e4126007d23a9d6797e20fc73449a645 - + https://github.com/dotnet/sdk - 8753e7fbd6380ae20decf2504000d1a572826d5f + df044ed2e4126007d23a9d6797e20fc73449a645 - + https://github.com/dotnet/sdk - 8753e7fbd6380ae20decf2504000d1a572826d5f + df044ed2e4126007d23a9d6797e20fc73449a645 diff --git a/eng/Versions.props b/eng/Versions.props index 04c9c1406..8823e0318 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22513.2 - 7.0.200-preview.22513.2 - 7.0.200-preview.22513.2 + 7.0.200-preview.22513.5 + 7.0.200-preview.22513.5 + 7.0.200-preview.22513.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 27644ec236f0be9260c3f9dda20d65b3d16f53ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 14:34:24 +0000 Subject: [PATCH 036/654] Update dependencies from https://github.com/dotnet/sdk build 20221013.6 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.200-preview.22513.6 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.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.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.Net.Compilers.Toolset,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 (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 ee4b1441b..023c9ae0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - df044ed2e4126007d23a9d6797e20fc73449a645 + 11bcce26e1d75fae3f7e283fe31c4db6635ec0cc - + https://github.com/dotnet/sdk - df044ed2e4126007d23a9d6797e20fc73449a645 + 11bcce26e1d75fae3f7e283fe31c4db6635ec0cc - + https://github.com/dotnet/sdk - df044ed2e4126007d23a9d6797e20fc73449a645 + 11bcce26e1d75fae3f7e283fe31c4db6635ec0cc - + https://github.com/dotnet/sdk - df044ed2e4126007d23a9d6797e20fc73449a645 + 11bcce26e1d75fae3f7e283fe31c4db6635ec0cc diff --git a/eng/Versions.props b/eng/Versions.props index 8823e0318..574e412f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22513.5 - 7.0.200-preview.22513.5 - 7.0.200-preview.22513.5 + 7.0.200-preview.22513.6 + 7.0.200-preview.22513.6 + 7.0.200-preview.22513.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5ba97740fe852281bfa4d3b5f3407fd59138991b Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 13 Oct 2022 17:19:24 +0000 Subject: [PATCH 037/654] Remove backported source-build patch --- ...s-to-net7.0-TFM-with-shared-property.patch | 268 ------------------ 1 file changed, 268 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch diff --git a/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch b/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch deleted file mode 100644 index d875d0aeb..000000000 --- a/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch +++ /dev/null @@ -1,268 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Tue, 19 Jul 2022 14:47:28 -0700 -Subject: [PATCH] Update projects to net7.0 TFM with shared property, Only enable trimming for .NET Core - -Backport PR: https://github.com/dotnet/command-line-api/pull/1803 ---- - Directory.Build.props | 1 + - global.json | 7 ++++--- - .../System.CommandLine.ApiCompatibility.Tests.csproj | 2 +- - .../System.CommandLine.Benchmarks.csproj | 4 ++-- - .../System.CommandLine.DragonFruit.Tests.csproj | 2 +- - .../System.CommandLine.Generator.Tests.csproj | 2 +- - .../System.CommandLine.Hosting.Tests.csproj | 2 +- - .../System.CommandLine.NamingConventionBinder.Tests.csproj | 2 +- - .../System.CommandLine.Rendering.Tests.csproj | 2 +- - .../EndToEndTestApp/EndToEndTestApp.csproj | 2 +- - .../dotnet-suggest.Tests.csproj | 2 +- - src/System.CommandLine.Suggest/dotnet-suggest.csproj | 2 +- - .../System.CommandLine.Tests.csproj | 2 +- - .../TestApps/NativeAOT/NativeAOT.csproj | 4 ++-- - .../TestApps/Trimming/Trimming.csproj | 4 ++-- - src/System.CommandLine/System.CommandLine.csproj | 7 +++++-- - 16 files changed, 26 insertions(+), 21 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index c0c5f79a..901c57c7 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -9,6 +9,7 @@ - $(NoWarn);CS8714;CS8765;CS8600;CS8601;CS8602;CS8603;CS8604 - MIT - 10.0 -+ net7.0 - - - -diff --git a/global.json b/global.json -index 1c6fd268..f5bec611 100644 ---- a/global.json -+++ b/global.json -@@ -1,12 +1,13 @@ - { - "tools": { -- "dotnet": "6.0.100", -+ "dotnet": "7.0.100-preview.6.22352.1", - "runtimes": { - "dotnet": [ -- "5.0.10" -+ "5.0.17", -+ "6.0.7" - ] - }, -- "xcopy-msbuild": "16.10.0-preview2" -+ "xcopy-msbuild": "17.1.0" - }, - "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22168.2" -diff --git a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj -index 30bcd139..4cc48fde 100644 ---- a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj -+++ b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- net6.0 -+ $(TargetFrameworkForNETSDK) - false - - -diff --git a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj -index e54aabc4..185ba62a 100644 ---- a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj -+++ b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj -@@ -9,8 +9,8 @@ - false - - -- net461;net5.0;net6.0; -- net5.0;net6.0; -+ net461;net5.0;net6.0;net7.0 -+ net5.0;net6.0;net7.0 - - - False -diff --git a/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj b/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj -index 7eee0b38..e504f7e8 100644 ---- a/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj -+++ b/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ $(TargetFrameworkForNETSDK) - AutoGeneratedProgram - - true -diff --git a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj -index a423eb1e..20f0f410 100644 ---- a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj -+++ b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ $(TargetFrameworkForNETSDK) - $(TargetFrameworks);net462 - true - true -diff --git a/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj b/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj -index 328b4e12..8e2cd6ea 100644 ---- a/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj -+++ b/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj -@@ -1,7 +1,7 @@ -  - - -- net6.0 -+ $(TargetFrameworkForNETSDK) - $(TargetFrameworks);net462 - false - -diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj b/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj -index 43eb7c29..7bff1796 100644 ---- a/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj -+++ b/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ $(TargetFrameworkForNETSDK) - $(TargetFrameworks);net462 - 10 - -diff --git a/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj b/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj -index 1c116508..afd6dc6a 100644 ---- a/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj -+++ b/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- net6.0 -+ $(TargetFrameworkForNETSDK) - false - - -diff --git a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj -index 9a3eb54d..76add0d5 100644 ---- a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj -+++ b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj -@@ -6,7 +6,7 @@ - - - Exe -- net6.0 -+ $(TargetFrameworkForNETSDK) - - - -diff --git a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj -index da6abedf..f1711a10 100644 ---- a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj -+++ b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- net6.0 -+ $(TargetFrameworkForNETSDK) - - - -diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj -index fd825008..ce4bda1d 100644 ---- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj -+++ b/src/System.CommandLine.Suggest/dotnet-suggest.csproj -@@ -1,7 +1,7 @@ -  - - Exe -- net6.0 -+ $(TargetFrameworkForNETSDK) - true - true - dotnet-suggest -diff --git a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj -index c1988ec4..44b5c9fc 100644 ---- a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj -+++ b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ $(TargetFrameworkForNETSDK) - $(TargetFrameworks);net462 - false - -diff --git a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj -index b0036ed0..cc306fea 100644 ---- a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj -+++ b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj -@@ -2,13 +2,13 @@ - - - Exe -- net6.0 -+ $(TargetFrameworkForNETSDK) - - false - - - -- ..\..\..\System.CommandLine\bin\Release\net6.0\System.CommandLine.dll -+ ..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll - - - -diff --git a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj -index 6dcf8892..615b0764 100644 ---- a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj -+++ b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj -@@ -2,7 +2,7 @@ - - - Exe -- net6.0 -+ $(TargetFrameworkForNETSDK) - enable - enable - true -@@ -10,7 +10,7 @@ - - - -- ..\..\..\System.CommandLine\bin\Release\net6.0\System.CommandLine.dll -+ ..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll - - - -diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj -index 424053a6..37115d70 100644 ---- a/src/System.CommandLine/System.CommandLine.csproj -+++ b/src/System.CommandLine/System.CommandLine.csproj -@@ -3,7 +3,7 @@ - - true - System.CommandLine -- net6.0;netstandard2.0 -+ $(TargetFrameworkForNETSDK);netstandard2.0 - enable - true - 10 -@@ -15,9 +15,12 @@ - * Test and debug support - - true -+ true -+ -+ -+ - true - true -- true - - - From 08b71c2e64c0a46a1e5bdfde5aad9a09f06bacec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 16:00:31 +0000 Subject: [PATCH 038/654] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221013.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22504.2 -> To Version 7.0.0-alpha.1.22513.3 --- 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 023c9ae0c..2ad8cdc57 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 - 8366acfc3e0660ceef6bddbe7794044e5d503521 + 29cef6e67cbd7989db409037f0c1fe0af21384ad From 48e78256c966a1173db5ed9625faedf2372447de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 19:33:07 +0000 Subject: [PATCH 039/654] Update dependencies from https://github.com/dotnet/sdk build 20221013.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.200-preview.22513.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.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.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.Net.Compilers.Toolset,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 (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 2ad8cdc57..42cef0453 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 11bcce26e1d75fae3f7e283fe31c4db6635ec0cc + 6b71e50ba6f53c2bc6afc5ed6f6aa52c3c452abc - + https://github.com/dotnet/sdk - 11bcce26e1d75fae3f7e283fe31c4db6635ec0cc + 6b71e50ba6f53c2bc6afc5ed6f6aa52c3c452abc - + https://github.com/dotnet/sdk - 11bcce26e1d75fae3f7e283fe31c4db6635ec0cc + 6b71e50ba6f53c2bc6afc5ed6f6aa52c3c452abc - + https://github.com/dotnet/sdk - 11bcce26e1d75fae3f7e283fe31c4db6635ec0cc + 6b71e50ba6f53c2bc6afc5ed6f6aa52c3c452abc @@ -154,9 +154,9 @@ f9e6ff2705883669cdaa1c806af08d46dec04c1e - + https://github.com/dotnet/msbuild - a440ea9cf00113537cde999052649b4a8922c488 + b3bd0870cd7a5e3b570cc44bd9fa3624c3dd8312 diff --git a/eng/Versions.props b/eng/Versions.props index 574e412f3..33aa31e6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22513.6 - 7.0.200-preview.22513.6 - 7.0.200-preview.22513.6 + 7.0.200-preview.22513.10 + 7.0.200-preview.22513.10 + 7.0.200-preview.22513.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4c961841feac2e819d67325329c5e69a1bf7a337 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 00:09:05 +0000 Subject: [PATCH 040/654] Update dependencies from https://github.com/dotnet/sdk build 20221013.22 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.200-preview.22513.22 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.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.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.Net.Compilers.Toolset,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 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42cef0453..0c149c7cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,34 +57,34 @@ https://github.com/dotnet/runtime eeabb53e8583c3d3056923dcd52c615265eb38ba - + https://github.com/dotnet/aspnetcore - 122736b8fd5acf3e49e83016582702452c07f400 + c62788611f437190c2a8d82bd73d27a1bc83318c - + https://github.com/dotnet/aspnetcore - 122736b8fd5acf3e49e83016582702452c07f400 + c62788611f437190c2a8d82bd73d27a1bc83318c - + https://github.com/dotnet/aspnetcore - 122736b8fd5acf3e49e83016582702452c07f400 + c62788611f437190c2a8d82bd73d27a1bc83318c - + https://github.com/dotnet/aspnetcore - 122736b8fd5acf3e49e83016582702452c07f400 + c62788611f437190c2a8d82bd73d27a1bc83318c - + https://github.com/dotnet/aspnetcore - 122736b8fd5acf3e49e83016582702452c07f400 + c62788611f437190c2a8d82bd73d27a1bc83318c - + https://github.com/dotnet/aspnetcore - 122736b8fd5acf3e49e83016582702452c07f400 + c62788611f437190c2a8d82bd73d27a1bc83318c - + https://github.com/dotnet/aspnetcore - 122736b8fd5acf3e49e83016582702452c07f400 + c62788611f437190c2a8d82bd73d27a1bc83318c https://github.com/dotnet/test-templates @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 6b71e50ba6f53c2bc6afc5ed6f6aa52c3c452abc + dc7e6f0974cf21327343dbd328cc9355263f8085 - + https://github.com/dotnet/sdk - 6b71e50ba6f53c2bc6afc5ed6f6aa52c3c452abc + dc7e6f0974cf21327343dbd328cc9355263f8085 - + https://github.com/dotnet/sdk - 6b71e50ba6f53c2bc6afc5ed6f6aa52c3c452abc + dc7e6f0974cf21327343dbd328cc9355263f8085 - + https://github.com/dotnet/sdk - 6b71e50ba6f53c2bc6afc5ed6f6aa52c3c452abc + dc7e6f0974cf21327343dbd328cc9355263f8085 diff --git a/eng/Versions.props b/eng/Versions.props index 33aa31e6f..a94465aae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,22 +50,22 @@ - 7.0.0-rtm.22512.14 - 7.0.0-rtm.22512.14 - 7.0.0-rtm.22512.14 - 7.0.0-rtm.22512.14 - 7.0.0-rtm.22512.14 - 7.0.0-rtm.22512.14 - 7.0.0-rtm.22512.14 + 7.0.0-rtm.22513.3 + 7.0.0-rtm.22513.3 + 7.0.0-rtm.22513.3 + 7.0.0-rtm.22513.3 + 7.0.0-rtm.22513.3 + 7.0.0-rtm.22513.3 + 7.0.0-rtm.22513.3 0.2.0 - 7.0.200-preview.22513.10 - 7.0.200-preview.22513.10 - 7.0.200-preview.22513.10 + 7.0.200-preview.22513.22 + 7.0.200-preview.22513.22 + 7.0.200-preview.22513.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 76fa5cc8c8599ffb46a9cfc51f78bde525ce6c10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 04:52:34 +0000 Subject: [PATCH 041/654] Update dependencies from https://github.com/dotnet/sdk build 20221013.30 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.200-preview.22513.30 --- 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 0c149c7cc..57e835f77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - dc7e6f0974cf21327343dbd328cc9355263f8085 + 27469cb7382a9ac60728545db7125a2e7317388b - + https://github.com/dotnet/sdk - dc7e6f0974cf21327343dbd328cc9355263f8085 + 27469cb7382a9ac60728545db7125a2e7317388b - + https://github.com/dotnet/sdk - dc7e6f0974cf21327343dbd328cc9355263f8085 + 27469cb7382a9ac60728545db7125a2e7317388b - + https://github.com/dotnet/sdk - dc7e6f0974cf21327343dbd328cc9355263f8085 + 27469cb7382a9ac60728545db7125a2e7317388b diff --git a/eng/Versions.props b/eng/Versions.props index a94465aae..3d5ce00aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22513.22 - 7.0.200-preview.22513.22 - 7.0.200-preview.22513.22 + 7.0.200-preview.22513.30 + 7.0.200-preview.22513.30 + 7.0.200-preview.22513.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9ff8a8ca21e5b4bb642274fc79f3269bd33d2407 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 04:52:47 +0000 Subject: [PATCH 042/654] Update dependencies from https://github.com/dotnet/sdk build 20221013.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22513.30 -> To Version 7.0.200-preview.22513.34 --- 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 57e835f77..32be25af9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 27469cb7382a9ac60728545db7125a2e7317388b + 338928c584d77e7c576f050706c1aaacb2ea3c4e - + https://github.com/dotnet/sdk - 27469cb7382a9ac60728545db7125a2e7317388b + 338928c584d77e7c576f050706c1aaacb2ea3c4e - + https://github.com/dotnet/sdk - 27469cb7382a9ac60728545db7125a2e7317388b + 338928c584d77e7c576f050706c1aaacb2ea3c4e - + https://github.com/dotnet/sdk - 27469cb7382a9ac60728545db7125a2e7317388b + 338928c584d77e7c576f050706c1aaacb2ea3c4e diff --git a/eng/Versions.props b/eng/Versions.props index 3d5ce00aa..5e54a5d23 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22513.30 - 7.0.200-preview.22513.30 - 7.0.200-preview.22513.30 + 7.0.200-preview.22513.34 + 7.0.200-preview.22513.34 + 7.0.200-preview.22513.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 79174f2b67fa4ff732c3ffcca5aa5037968cb5d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 04:53:03 +0000 Subject: [PATCH 043/654] 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.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.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.Net.Compilers.Toolset,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 3 +-- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 12 ++++++------ 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8d725a065..cefad3836 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,10 +10,9 @@ - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32be25af9..bbbe14567 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,49 +3,49 @@ https://github.com/dotnet/windowsdesktop - aa0a3e1e0157bfccefa89ac61c35cb6105d0902b + b4cf0e49a0b5fa60426e759f98271dd4154cce33 - + https://github.com/dotnet/windowsdesktop - aa0a3e1e0157bfccefa89ac61c35cb6105d0902b + b4cf0e49a0b5fa60426e759f98271dd4154cce33 - + https://github.com/dotnet/windowsdesktop - aa0a3e1e0157bfccefa89ac61c35cb6105d0902b + b4cf0e49a0b5fa60426e759f98271dd4154cce33 https://github.com/dotnet/windowsdesktop - aa0a3e1e0157bfccefa89ac61c35cb6105d0902b + b4cf0e49a0b5fa60426e759f98271dd4154cce33 https://github.com/dotnet/llvm-project 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - eeabb53e8583c3d3056923dcd52c615265eb38ba + 075e74ed1356f2e5bb978ac541633ab46e34bf99 https://github.com/dotnet/runtime - eeabb53e8583c3d3056923dcd52c615265eb38ba + 075e74ed1356f2e5bb978ac541633ab46e34bf99 - + https://github.com/dotnet/runtime - eeabb53e8583c3d3056923dcd52c615265eb38ba + 075e74ed1356f2e5bb978ac541633ab46e34bf99 https://github.com/dotnet/runtime - eeabb53e8583c3d3056923dcd52c615265eb38ba + 075e74ed1356f2e5bb978ac541633ab46e34bf99 https://github.com/dotnet/runtime - eeabb53e8583c3d3056923dcd52c615265eb38ba + 075e74ed1356f2e5bb978ac541633ab46e34bf99 https://github.com/dotnet/runtime - eeabb53e8583c3d3056923dcd52c615265eb38ba + 075e74ed1356f2e5bb978ac541633ab46e34bf99 @@ -55,7 +55,7 @@ https://github.com/dotnet/runtime - eeabb53e8583c3d3056923dcd52c615265eb38ba + 075e74ed1356f2e5bb978ac541633ab46e34bf99 https://github.com/dotnet/aspnetcore @@ -121,13 +121,13 @@ 338928c584d77e7c576f050706c1aaacb2ea3c4e - + https://github.com/dotnet/winforms - d2099bf6dbbe6347055debde2195ed182bf885c2 + 75f2ee323552e510a6134704cb6b1b35afdbca5b - + https://github.com/dotnet/wpf - 7af30078856aeb12ce5f732082b90b49aab26b2b + 95ca32d5556ce76d672fa11397502cc2e6f5f627 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5e54a5d23..bd5a24c4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22512.6 + 7.0.0-rtm.22513.1 - 7.0.0-rtm.22512.9 + 7.0.0-rtm.22513.7 @@ -76,8 +76,8 @@ - 7.0.0-rtm.22512.2 - 7.0.0-rtm.22512.2 + 7.0.0-rtm.22513.5 + 7.0.0-rtm.22513.5 7.0.0 7.0.0 7.0.0 @@ -86,8 +86,8 @@ - 7.0.0-rtm.22512.6 - 7.0.0-rtm.22512.6 + 7.0.0-rtm.22513.5 + 7.0.0-rtm.22513.5 7.0.0 7.0.0 From 2995b720d643715bce32fb7aa9678198d62d9ed9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 07:48:56 +0000 Subject: [PATCH 044/654] Update dependencies from https://github.com/dotnet/sdk build 20221013.38 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.200-preview.22513.38 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.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.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.Net.Compilers.Toolset,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++++ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index cefad3836..85f620238 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbbe14567..8ec176e0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,34 +57,34 @@ https://github.com/dotnet/runtime 075e74ed1356f2e5bb978ac541633ab46e34bf99 - + https://github.com/dotnet/aspnetcore - c62788611f437190c2a8d82bd73d27a1bc83318c + d50065c4a4fe31a66a1cc2e1a31896d30464da13 - + https://github.com/dotnet/aspnetcore - c62788611f437190c2a8d82bd73d27a1bc83318c + d50065c4a4fe31a66a1cc2e1a31896d30464da13 - + https://github.com/dotnet/aspnetcore - c62788611f437190c2a8d82bd73d27a1bc83318c + d50065c4a4fe31a66a1cc2e1a31896d30464da13 - + https://github.com/dotnet/aspnetcore - c62788611f437190c2a8d82bd73d27a1bc83318c + d50065c4a4fe31a66a1cc2e1a31896d30464da13 - + https://github.com/dotnet/aspnetcore - c62788611f437190c2a8d82bd73d27a1bc83318c + d50065c4a4fe31a66a1cc2e1a31896d30464da13 - + https://github.com/dotnet/aspnetcore - c62788611f437190c2a8d82bd73d27a1bc83318c + d50065c4a4fe31a66a1cc2e1a31896d30464da13 - + https://github.com/dotnet/aspnetcore - c62788611f437190c2a8d82bd73d27a1bc83318c + d50065c4a4fe31a66a1cc2e1a31896d30464da13 https://github.com/dotnet/test-templates @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 338928c584d77e7c576f050706c1aaacb2ea3c4e + 860fd2fe19e6cf89edad6b0a56dcb87d41456e3e - + https://github.com/dotnet/sdk - 338928c584d77e7c576f050706c1aaacb2ea3c4e + 860fd2fe19e6cf89edad6b0a56dcb87d41456e3e - + https://github.com/dotnet/sdk - 338928c584d77e7c576f050706c1aaacb2ea3c4e + 860fd2fe19e6cf89edad6b0a56dcb87d41456e3e - + https://github.com/dotnet/sdk - 338928c584d77e7c576f050706c1aaacb2ea3c4e + 860fd2fe19e6cf89edad6b0a56dcb87d41456e3e diff --git a/eng/Versions.props b/eng/Versions.props index bd5a24c4c..5d1bb7f42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,22 +50,22 @@ - 7.0.0-rtm.22513.3 - 7.0.0-rtm.22513.3 - 7.0.0-rtm.22513.3 - 7.0.0-rtm.22513.3 - 7.0.0-rtm.22513.3 - 7.0.0-rtm.22513.3 - 7.0.0-rtm.22513.3 + 7.0.0 + 7.0.0 + 7.0.0-rtm.22513.7 + 7.0.0-rtm.22513.7 + 7.0.0-rtm.22513.7 + 7.0.0-rtm.22513.7 + 7.0.0-rtm.22513.7 0.2.0 - 7.0.200-preview.22513.34 - 7.0.200-preview.22513.34 - 7.0.200-preview.22513.34 + 7.0.200-preview.22513.38 + 7.0.200-preview.22513.38 + 7.0.200-preview.22513.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b1bf58bd1c3cf9124b3b3846a01e5d4068049d52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 10:51:15 +0000 Subject: [PATCH 045/654] Update dependencies from https://github.com/dotnet/sdk build 20221014.4 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.200-preview.22514.4 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.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.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.Net.Compilers.Toolset,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 10 +++++----- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 85f620238..064bf106b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ec176e0a..84fe2da0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,30 +22,30 @@ 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 075e74ed1356f2e5bb978ac541633ab46e34bf99 + cd2d83798383716204eb580eb5c89ef5b73b8ec2 https://github.com/dotnet/runtime - 075e74ed1356f2e5bb978ac541633ab46e34bf99 + cd2d83798383716204eb580eb5c89ef5b73b8ec2 - + https://github.com/dotnet/runtime - 075e74ed1356f2e5bb978ac541633ab46e34bf99 + cd2d83798383716204eb580eb5c89ef5b73b8ec2 https://github.com/dotnet/runtime - 075e74ed1356f2e5bb978ac541633ab46e34bf99 + cd2d83798383716204eb580eb5c89ef5b73b8ec2 https://github.com/dotnet/runtime - 075e74ed1356f2e5bb978ac541633ab46e34bf99 + cd2d83798383716204eb580eb5c89ef5b73b8ec2 https://github.com/dotnet/runtime - 075e74ed1356f2e5bb978ac541633ab46e34bf99 + cd2d83798383716204eb580eb5c89ef5b73b8ec2 @@ -55,7 +55,7 @@ https://github.com/dotnet/runtime - 075e74ed1356f2e5bb978ac541633ab46e34bf99 + cd2d83798383716204eb580eb5c89ef5b73b8ec2 https://github.com/dotnet/aspnetcore @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 860fd2fe19e6cf89edad6b0a56dcb87d41456e3e + 6908ddaba7b49b9e109e956d10c918ec759060c0 - + https://github.com/dotnet/sdk - 860fd2fe19e6cf89edad6b0a56dcb87d41456e3e + 6908ddaba7b49b9e109e956d10c918ec759060c0 - + https://github.com/dotnet/sdk - 860fd2fe19e6cf89edad6b0a56dcb87d41456e3e + 6908ddaba7b49b9e109e956d10c918ec759060c0 - + https://github.com/dotnet/sdk - 860fd2fe19e6cf89edad6b0a56dcb87d41456e3e + 6908ddaba7b49b9e109e956d10c918ec759060c0 diff --git a/eng/Versions.props b/eng/Versions.props index 5d1bb7f42..b1168bbcf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22513.38 - 7.0.200-preview.22513.38 - 7.0.200-preview.22513.38 + 7.0.200-preview.22514.4 + 7.0.200-preview.22514.4 + 7.0.200-preview.22514.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,8 +76,8 @@ - 7.0.0-rtm.22513.5 - 7.0.0-rtm.22513.5 + 7.0.0-rtm.22513.12 + 7.0.0-rtm.22513.12 7.0.0 7.0.0 7.0.0 From 31164151680785cb885b3b40114aa5535850e5c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 12:00:12 +0000 Subject: [PATCH 046/654] Update dependencies from https://github.com/dotnet/arcade build 20221013.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22513.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5374896e..a0d83c44f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - f760da39566d1cfa90c89e38d8dfafb3d43f9cae + 02e28316bf35d1028683ee313f0794776bff18d1 - + https://github.com/dotnet/arcade - f760da39566d1cfa90c89e38d8dfafb3d43f9cae + 02e28316bf35d1028683ee313f0794776bff18d1 - + https://github.com/dotnet/arcade - f760da39566d1cfa90c89e38d8dfafb3d43f9cae + 02e28316bf35d1028683ee313f0794776bff18d1 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 81ff71601..5961263a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22511.2 + 7.0.0-beta.22513.4 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index c35087a06..39be08d4b 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aba6308ad..449126943 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview - $defaultXCopyMSBuildVersion = '17.2.1' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview + $defaultXCopyMSBuildVersion = '17.3.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index e92de548b..b75566e99 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.1.22431.12", + "dotnet": "7.0.100-rc.2.22477.23", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22511.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22511.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22513.4" } } From c69453f12ba84a6d0ffc164a6bf8017dba98db64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 12:01:39 +0000 Subject: [PATCH 047/654] Update dependencies from https://github.com/dotnet/sdk build 20221014.6 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.200-preview.22514.6 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.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.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.Net.Compilers.Toolset,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 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 14 +++++++------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84fe2da0a..0f3c5bd18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://github.com/dotnet/windowsdesktop - b4cf0e49a0b5fa60426e759f98271dd4154cce33 + ad8863df2b95995aba3cb7a9fa9c9df69dd1dfde - + https://github.com/dotnet/windowsdesktop - b4cf0e49a0b5fa60426e759f98271dd4154cce33 + ad8863df2b95995aba3cb7a9fa9c9df69dd1dfde - + https://github.com/dotnet/windowsdesktop - b4cf0e49a0b5fa60426e759f98271dd4154cce33 + ad8863df2b95995aba3cb7a9fa9c9df69dd1dfde https://github.com/dotnet/windowsdesktop - b4cf0e49a0b5fa60426e759f98271dd4154cce33 + ad8863df2b95995aba3cb7a9fa9c9df69dd1dfde https://github.com/dotnet/llvm-project @@ -103,31 +103,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 6908ddaba7b49b9e109e956d10c918ec759060c0 + b39bc7ec664098ce9857913baff2956f196d3aa7 - + https://github.com/dotnet/sdk - 6908ddaba7b49b9e109e956d10c918ec759060c0 + b39bc7ec664098ce9857913baff2956f196d3aa7 - + https://github.com/dotnet/sdk - 6908ddaba7b49b9e109e956d10c918ec759060c0 + b39bc7ec664098ce9857913baff2956f196d3aa7 - + https://github.com/dotnet/sdk - 6908ddaba7b49b9e109e956d10c918ec759060c0 + b39bc7ec664098ce9857913baff2956f196d3aa7 - + https://github.com/dotnet/winforms - 75f2ee323552e510a6134704cb6b1b35afdbca5b + 672cc8c705697af4146629537abebcd483963375 - + https://github.com/dotnet/wpf - 95ca32d5556ce76d672fa11397502cc2e6f5f627 + 3924f4b0a8f46592f8c6e2aed3a2312ed72be913 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b1168bbcf..230a9eb0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22513.1 + 7.0.0-rtm.22513.12 - 7.0.0-rtm.22513.7 + 7.0.0-rtm.22513.11 @@ -63,9 +63,9 @@ - 7.0.200-preview.22514.4 - 7.0.200-preview.22514.4 - 7.0.200-preview.22514.4 + 7.0.200-preview.22514.6 + 7.0.200-preview.22514.6 + 7.0.200-preview.22514.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.0-rtm.22513.5 - 7.0.0-rtm.22513.5 + 7.0.0-rtm.22513.10 + 7.0.0-rtm.22513.10 7.0.0 7.0.0 From 7c4b05046ad63b61c3261c5d2bc24d1a1714749f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 19:21:22 +0000 Subject: [PATCH 048/654] Update dependencies from https://github.com/dotnet/sdk build 20221014.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.200-preview.22514.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.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.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.Net.Compilers.Toolset,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 (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 0f3c5bd18..3ffd72adb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - b39bc7ec664098ce9857913baff2956f196d3aa7 + 4427d9716d712c021d4aed974fb656893ffe21cd - + https://github.com/dotnet/sdk - b39bc7ec664098ce9857913baff2956f196d3aa7 + 4427d9716d712c021d4aed974fb656893ffe21cd - + https://github.com/dotnet/sdk - b39bc7ec664098ce9857913baff2956f196d3aa7 + 4427d9716d712c021d4aed974fb656893ffe21cd - + https://github.com/dotnet/sdk - b39bc7ec664098ce9857913baff2956f196d3aa7 + 4427d9716d712c021d4aed974fb656893ffe21cd diff --git a/eng/Versions.props b/eng/Versions.props index 230a9eb0f..bd5df27d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22514.6 - 7.0.200-preview.22514.6 - 7.0.200-preview.22514.6 + 7.0.200-preview.22514.10 + 7.0.200-preview.22514.10 + 7.0.200-preview.22514.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6b0a8bb0bc9cabbfe455b5ab5aa27a3a623aeee7 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 14 Oct 2022 15:09:49 -0500 Subject: [PATCH 049/654] Upgrade SourceBuild tasks to net7. --- src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj | 2 +- src/SourceBuild/Arcade/tools/BuildTasks.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj index 735289e70..2842d265d 100644 --- a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj +++ b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj @@ -1,6 +1,6 @@ - net5.0 + net7.0 false false disable diff --git a/src/SourceBuild/Arcade/tools/BuildTasks.props b/src/SourceBuild/Arcade/tools/BuildTasks.props index 4014b87ad..50f49046b 100644 --- a/src/SourceBuild/Arcade/tools/BuildTasks.props +++ b/src/SourceBuild/Arcade/tools/BuildTasks.props @@ -2,6 +2,6 @@ - $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net5.0\SourceBuild.Tasks.dll + $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net7.0\SourceBuild.Tasks.dll \ No newline at end of file From 505d78fc0ae45c649083328508e76fa1cf6cacb4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 20:37:19 +0000 Subject: [PATCH 050/654] Update dependencies from https://github.com/dotnet/sdk build 20221014.13 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.200 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.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.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.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 3 +++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 064bf106b..95ae94c14 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ffd72adb..9bed5e460 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 4427d9716d712c021d4aed974fb656893ffe21cd + e36658b7ad262e0cfdbd36c7e2ab26591e619906 - + https://github.com/dotnet/sdk - 4427d9716d712c021d4aed974fb656893ffe21cd + e36658b7ad262e0cfdbd36c7e2ab26591e619906 - + https://github.com/dotnet/sdk - 4427d9716d712c021d4aed974fb656893ffe21cd + e36658b7ad262e0cfdbd36c7e2ab26591e619906 - + https://github.com/dotnet/sdk - 4427d9716d712c021d4aed974fb656893ffe21cd + e36658b7ad262e0cfdbd36c7e2ab26591e619906 @@ -159,9 +159,9 @@ b3bd0870cd7a5e3b570cc44bd9fa3624c3dd8312 - + https://github.com/nuget/nuget.client - 1a082949ae5b6da7ca2cce047396c53ae1afdde7 + 125f673fd1cdb3cc012f62aa3ce764d2460b89eb diff --git a/eng/Versions.props b/eng/Versions.props index bd5df27d8..34b1ea1f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22514.10 - 7.0.200-preview.22514.10 - 7.0.200-preview.22514.10 + 7.0.200 + 7.0.200-preview.22514.13 + 7.0.200-preview.22514.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f50cd347adc6b2675b7d1870b69989137751887b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Oct 2022 00:47:02 +0000 Subject: [PATCH 051/654] Update dependencies from https://github.com/dotnet/arcade build 20221014.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22514.3 --- 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 a0d83c44f..011b8440e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3083cc93619dbb153fdb7907b332efa18908f039 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3083cc93619dbb153fdb7907b332efa18908f039 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3083cc93619dbb153fdb7907b332efa18908f039 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 5961263a7..88397f24c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22513.4 + 7.0.0-beta.22514.3 diff --git a/global.json b/global.json index b75566e99..df10494a7 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.22513.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22513.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22514.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22514.3" } } From bcc0fa8ec9a61f7b2b7ac32a2080e2a537d3cec4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Oct 2022 13:50:36 +0000 Subject: [PATCH 052/654] Update dependencies from https://github.com/dotnet/sdk build 20221017.3 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.200 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.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.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.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 95ae94c14..f9f82e514 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bed5e460..48a52d49b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - e36658b7ad262e0cfdbd36c7e2ab26591e619906 + d16d1159cbe2b8ec0e26ada47dd85b1f7dc31c33 - + https://github.com/dotnet/sdk - e36658b7ad262e0cfdbd36c7e2ab26591e619906 + d16d1159cbe2b8ec0e26ada47dd85b1f7dc31c33 - + https://github.com/dotnet/sdk - e36658b7ad262e0cfdbd36c7e2ab26591e619906 + d16d1159cbe2b8ec0e26ada47dd85b1f7dc31c33 - + https://github.com/dotnet/sdk - e36658b7ad262e0cfdbd36c7e2ab26591e619906 + d16d1159cbe2b8ec0e26ada47dd85b1f7dc31c33 diff --git a/eng/Versions.props b/eng/Versions.props index 34b1ea1f2..adb64bfeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22514.13 - 7.0.200-preview.22514.13 + 7.0.200-preview.22517.3 + 7.0.200-preview.22517.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a244096738d4d6fa803a13a580f92b0be9b580ed Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 17 Oct 2022 14:49:22 +0000 Subject: [PATCH 053/654] Remove backported source-build patch --- ...02-Look-for-msbuild-net7.0-artifacts.patch | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch deleted file mode 100644 index cf69f8b84..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Tue, 20 Sep 2022 10:10:29 -0700 -Subject: [PATCH] Look for msbuild net7.0 artifacts - -This patch can be removed once https://github.com/dotnet/msbuild/pull/7790 flows -into dotnet/sdk, at which point that repo will need this change. ---- - .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -index 03ea923734..3246138cf9 100644 ---- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -@@ -22,7 +22,7 @@ - - - -- $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll -+ $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll - - - From e965e10bd363dc47d12c7692f29db208dbe5bfbe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Oct 2022 19:11:11 +0000 Subject: [PATCH 054/654] Update dependencies from https://github.com/dotnet/sdk build 20221018.5 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.200 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.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.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.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index f9f82e514..10c519ac6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48a52d49b..72893fce6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - d16d1159cbe2b8ec0e26ada47dd85b1f7dc31c33 + d686df856d1f1992a650db64259f47e45954d33f - + https://github.com/dotnet/sdk - d16d1159cbe2b8ec0e26ada47dd85b1f7dc31c33 + d686df856d1f1992a650db64259f47e45954d33f - + https://github.com/dotnet/sdk - d16d1159cbe2b8ec0e26ada47dd85b1f7dc31c33 + d686df856d1f1992a650db64259f47e45954d33f - + https://github.com/dotnet/sdk - d16d1159cbe2b8ec0e26ada47dd85b1f7dc31c33 + d686df856d1f1992a650db64259f47e45954d33f @@ -154,9 +154,9 @@ f9e6ff2705883669cdaa1c806af08d46dec04c1e - + https://github.com/dotnet/msbuild - b3bd0870cd7a5e3b570cc44bd9fa3624c3dd8312 + ef7b9a5534e83ae3b75cc30e31c1a6db9d0ed0a6 diff --git a/eng/Versions.props b/eng/Versions.props index adb64bfeb..3bc8c19ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22517.3 - 7.0.200-preview.22517.3 + 7.0.200-preview.22518.5 + 7.0.200-preview.22518.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2065f59b06317b3101393e38257b5872a88a1be9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Oct 2022 13:10:09 +0000 Subject: [PATCH 055/654] Update dependencies from https://github.com/dotnet/sdk build 20221019.2 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 3 ++- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 10c519ac6..97da455c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,12 +12,13 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72893fce6..5936f732f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - d686df856d1f1992a650db64259f47e45954d33f + 8287d329d25b3f139fc72da31146948820668036 - + https://github.com/dotnet/sdk - d686df856d1f1992a650db64259f47e45954d33f + 8287d329d25b3f139fc72da31146948820668036 - + https://github.com/dotnet/sdk - d686df856d1f1992a650db64259f47e45954d33f + 8287d329d25b3f139fc72da31146948820668036 - + https://github.com/dotnet/sdk - d686df856d1f1992a650db64259f47e45954d33f + 8287d329d25b3f139fc72da31146948820668036 @@ -138,9 +138,9 @@ 664588e64eff5db2a2fcb44b8dbddfb0ce4bbbf1 - + https://github.com/microsoft/vstest - 576a7cc1b259976393cf576a6a9c5df967bb2b7d + bda34b1793ef6ddcd186b7088a6413692efb215e @@ -154,9 +154,9 @@ f9e6ff2705883669cdaa1c806af08d46dec04c1e - + https://github.com/dotnet/msbuild - ef7b9a5534e83ae3b75cc30e31c1a6db9d0ed0a6 + 771017a92b290fb9ca127f7ae33a37d35a9db188 diff --git a/eng/Versions.props b/eng/Versions.props index 3bc8c19ad..df9fae6cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22518.5 - 7.0.200-preview.22518.5 + 7.0.200-preview.22519.2 + 7.0.200-preview.22519.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-release-20220926-01 + 17.5.0-preview-20221018-02 From caa09ddc998fa4a4fa6c6a042387184f893aa370 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Oct 2022 21:39:48 +0000 Subject: [PATCH 056/654] Update dependencies from https://github.com/dotnet/sdk build 20221019.28 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97da455c4..3212146e3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5936f732f..7f6fd29ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 8287d329d25b3f139fc72da31146948820668036 + 682dc0e5f324834e6432c121d77be5cf41d19ebf - + https://github.com/dotnet/sdk - 8287d329d25b3f139fc72da31146948820668036 + 682dc0e5f324834e6432c121d77be5cf41d19ebf - + https://github.com/dotnet/sdk - 8287d329d25b3f139fc72da31146948820668036 + 682dc0e5f324834e6432c121d77be5cf41d19ebf - + https://github.com/dotnet/sdk - 8287d329d25b3f139fc72da31146948820668036 + 682dc0e5f324834e6432c121d77be5cf41d19ebf @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 3924f4b0a8f46592f8c6e2aed3a2312ed72be913 - + https://github.com/dotnet/fsharp - 664588e64eff5db2a2fcb44b8dbddfb0ce4bbbf1 + e707dc8b7a99f0f7c4dd0195709488464b557f77 - + https://github.com/dotnet/fsharp - 664588e64eff5db2a2fcb44b8dbddfb0ce4bbbf1 + e707dc8b7a99f0f7c4dd0195709488464b557f77 @@ -154,9 +154,9 @@ f9e6ff2705883669cdaa1c806af08d46dec04c1e - + https://github.com/dotnet/msbuild - 771017a92b290fb9ca127f7ae33a37d35a9db188 + 82a30d30731031f57ad95519836abc2772ab472a diff --git a/eng/Versions.props b/eng/Versions.props index df9fae6cc..e297aaefe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22519.2 - 7.0.200-preview.22519.2 + 7.0.200-preview.22519.28 + 7.0.200-preview.22519.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c3564a37333e85014a87e9e95fd0726548232502 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Oct 2022 23:06:53 +0000 Subject: [PATCH 057/654] Update dependencies from https://github.com/dotnet/sdk build 20221019.34 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3212146e3..4adcd0710 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f6fd29ab..dfbfc0579 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 682dc0e5f324834e6432c121d77be5cf41d19ebf + c8e3b1a72dfb6ea8e6873a514e02d42c8011e42d - + https://github.com/dotnet/sdk - 682dc0e5f324834e6432c121d77be5cf41d19ebf + c8e3b1a72dfb6ea8e6873a514e02d42c8011e42d - + https://github.com/dotnet/sdk - 682dc0e5f324834e6432c121d77be5cf41d19ebf + c8e3b1a72dfb6ea8e6873a514e02d42c8011e42d - + https://github.com/dotnet/sdk - 682dc0e5f324834e6432c121d77be5cf41d19ebf + c8e3b1a72dfb6ea8e6873a514e02d42c8011e42d diff --git a/eng/Versions.props b/eng/Versions.props index e297aaefe..cc3436e08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22519.28 - 7.0.200-preview.22519.28 + 7.0.200-preview.22519.34 + 7.0.200-preview.22519.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c13d3a2435d2748448fbcb69001adece2e09c7ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Oct 2022 00:22:03 +0000 Subject: [PATCH 058/654] Update dependencies from https://github.com/dotnet/sdk build 20221019.37 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4adcd0710..7e5375750 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfbfc0579..f8dfcedde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - c8e3b1a72dfb6ea8e6873a514e02d42c8011e42d + 7f9f1ea53ef6d035d6c7c464fc69099a4c422b66 - + https://github.com/dotnet/sdk - c8e3b1a72dfb6ea8e6873a514e02d42c8011e42d + 7f9f1ea53ef6d035d6c7c464fc69099a4c422b66 - + https://github.com/dotnet/sdk - c8e3b1a72dfb6ea8e6873a514e02d42c8011e42d + 7f9f1ea53ef6d035d6c7c464fc69099a4c422b66 - + https://github.com/dotnet/sdk - c8e3b1a72dfb6ea8e6873a514e02d42c8011e42d + 7f9f1ea53ef6d035d6c7c464fc69099a4c422b66 diff --git a/eng/Versions.props b/eng/Versions.props index cc3436e08..7daa9b9f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22519.34 - 7.0.200-preview.22519.34 + 7.0.200-preview.22519.37 + 7.0.200-preview.22519.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 548bada27445aa3b974f58218fc22dccb83b56c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Oct 2022 03:35:05 +0000 Subject: [PATCH 059/654] Update dependencies from https://github.com/dotnet/sdk build 20221019.42 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7e5375750..b8e6362b9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8dfcedde..7b5c6329d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 7f9f1ea53ef6d035d6c7c464fc69099a4c422b66 + fadcf7d5866d53850c10dd34b17b4fee15255c3e - + https://github.com/dotnet/sdk - 7f9f1ea53ef6d035d6c7c464fc69099a4c422b66 + fadcf7d5866d53850c10dd34b17b4fee15255c3e - + https://github.com/dotnet/sdk - 7f9f1ea53ef6d035d6c7c464fc69099a4c422b66 + fadcf7d5866d53850c10dd34b17b4fee15255c3e - + https://github.com/dotnet/sdk - 7f9f1ea53ef6d035d6c7c464fc69099a4c422b66 + fadcf7d5866d53850c10dd34b17b4fee15255c3e @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - f9e6ff2705883669cdaa1c806af08d46dec04c1e + 50b404de631906144f43261fa1abeae8f40b75ef diff --git a/eng/Versions.props b/eng/Versions.props index 7daa9b9f6..aa16c99f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22519.37 - 7.0.200-preview.22519.37 + 7.0.200-preview.22519.42 + 7.0.200-preview.22519.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d1a954d1be7c171a999cb8a08ce10bbeedc82392 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Oct 2022 21:33:01 +0000 Subject: [PATCH 060/654] Update dependencies from https://github.com/dotnet/sdk build 20221020.4 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 3 ++- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index b8e6362b9..dd23beefe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,13 +12,14 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b5c6329d..83a8499c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - fadcf7d5866d53850c10dd34b17b4fee15255c3e + 658fff9dd8dec643f7fc69d8dcb010693f61280d - + https://github.com/dotnet/sdk - fadcf7d5866d53850c10dd34b17b4fee15255c3e + 658fff9dd8dec643f7fc69d8dcb010693f61280d - + https://github.com/dotnet/sdk - fadcf7d5866d53850c10dd34b17b4fee15255c3e + 658fff9dd8dec643f7fc69d8dcb010693f61280d - + https://github.com/dotnet/sdk - fadcf7d5866d53850c10dd34b17b4fee15255c3e + 658fff9dd8dec643f7fc69d8dcb010693f61280d @@ -138,9 +138,9 @@ e707dc8b7a99f0f7c4dd0195709488464b557f77 - + https://github.com/microsoft/vstest - bda34b1793ef6ddcd186b7088a6413692efb215e + 9a5bb2faf130809253b28d7ad2d434d785901025 diff --git a/eng/Versions.props b/eng/Versions.props index aa16c99f5..0b884cebf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22519.42 - 7.0.200-preview.22519.42 + 7.0.200-preview.22520.4 + 7.0.200-preview.22520.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221018-02 + 17.5.0-preview-20221019-03 From a134b8b57f7370e50700d38ae2154faa0958741f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Oct 2022 07:22:54 +0000 Subject: [PATCH 061/654] Update dependencies from https://github.com/dotnet/sdk build 20221020.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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 3 ++- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd23beefe..d02bf272f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,6 +12,7 @@ + @@ -19,7 +20,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83a8499c6..49395a0bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 658fff9dd8dec643f7fc69d8dcb010693f61280d + d5ea697e6b0e861118eee267bc00ea3301632118 - + https://github.com/dotnet/sdk - 658fff9dd8dec643f7fc69d8dcb010693f61280d + d5ea697e6b0e861118eee267bc00ea3301632118 - + https://github.com/dotnet/sdk - 658fff9dd8dec643f7fc69d8dcb010693f61280d + d5ea697e6b0e861118eee267bc00ea3301632118 - + https://github.com/dotnet/sdk - 658fff9dd8dec643f7fc69d8dcb010693f61280d + d5ea697e6b0e861118eee267bc00ea3301632118 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 3924f4b0a8f46592f8c6e2aed3a2312ed72be913 - + https://github.com/dotnet/fsharp - e707dc8b7a99f0f7c4dd0195709488464b557f77 + b941491dc55d45de6a0af55e8c7848f8e688210e - + https://github.com/dotnet/fsharp - e707dc8b7a99f0f7c4dd0195709488464b557f77 + b941491dc55d45de6a0af55e8c7848f8e688210e @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 50b404de631906144f43261fa1abeae8f40b75ef + 9ec682f330b5a8779b4676a81f11718b5c8ef209 diff --git a/eng/Versions.props b/eng/Versions.props index 0b884cebf..cbece89aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22520.4 - 7.0.200-preview.22520.4 + 7.0.200-preview.22520.10 + 7.0.200-preview.22520.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3c30944e48b73563cd64a862d95f9c21c2dfadda Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:36:08 +0000 Subject: [PATCH 062/654] Update dependencies from https://github.com/dotnet/test-templates build 20221017.1 (#14810) [release/7.0.2xx] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 011b8440e..2b8f1a650 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,17 +90,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - aaaa0c1826f97a9dfcc67e94136bf01010b55f23 + f99547acd79b41467e0f77a5f918752f6645d0c4 - + https://github.com/dotnet/test-templates - aaaa0c1826f97a9dfcc67e94136bf01010b55f23 + f99547acd79b41467e0f77a5f918752f6645d0c4 - + https://github.com/dotnet/test-templates - aaaa0c1826f97a9dfcc67e94136bf01010b55f23 + f99547acd79b41467e0f77a5f918752f6645d0c4 diff --git a/eng/Versions.props b/eng/Versions.props index 88397f24c..7d7c8a315 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.0.2-beta4.22503.2 - 1.0.2-beta4.22503.2 - 1.0.2-beta4.22503.2 + 1.1.0-rc.22517.1 + 1.1.0-rc.22517.1 + 1.1.0-rc.22517.1 From 2cb9614f60e55d157183764878efb80dcdde96ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Oct 2022 18:24:20 +0000 Subject: [PATCH 063/654] Update dependencies from https://github.com/dotnet/sdk build 20221021.4 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index d02bf272f..284c024cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49395a0bb..38c63440c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - d5ea697e6b0e861118eee267bc00ea3301632118 + b9d4030324d63004063949600462230deb9ba02b - + https://github.com/dotnet/sdk - d5ea697e6b0e861118eee267bc00ea3301632118 + b9d4030324d63004063949600462230deb9ba02b - + https://github.com/dotnet/sdk - d5ea697e6b0e861118eee267bc00ea3301632118 + b9d4030324d63004063949600462230deb9ba02b - + https://github.com/dotnet/sdk - d5ea697e6b0e861118eee267bc00ea3301632118 + b9d4030324d63004063949600462230deb9ba02b @@ -129,18 +129,18 @@ https://github.com/dotnet/wpf 3924f4b0a8f46592f8c6e2aed3a2312ed72be913 - + https://github.com/dotnet/fsharp - b941491dc55d45de6a0af55e8c7848f8e688210e + 3b29890f7b78899f951ad3432579acf6e8c70611 - + https://github.com/dotnet/fsharp - b941491dc55d45de6a0af55e8c7848f8e688210e + 3b29890f7b78899f951ad3432579acf6e8c70611 - + https://github.com/microsoft/vstest - 9a5bb2faf130809253b28d7ad2d434d785901025 + 46ca47823c5f9ca1d2373be9eb29d6281286c42a diff --git a/eng/Versions.props b/eng/Versions.props index cbece89aa..114876857 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22520.10 - 7.0.200-preview.22520.10 + 7.0.200-preview.22521.4 + 7.0.200-preview.22521.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221019-03 + 17.5.0-preview-20221021-01 From eb3c4608451e2227fe3380de0b2ae48dee2ed9f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Oct 2022 04:21:40 +0000 Subject: [PATCH 064/654] Update dependencies from https://github.com/dotnet/sdk build 20221023.17 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 284c024cd..755d3f8f0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38c63440c..8ef3b7e92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - b9d4030324d63004063949600462230deb9ba02b + c665ce2c7888e7b7da94fb29720a0c331e162258 - + https://github.com/dotnet/sdk - b9d4030324d63004063949600462230deb9ba02b + c665ce2c7888e7b7da94fb29720a0c331e162258 - + https://github.com/dotnet/sdk - b9d4030324d63004063949600462230deb9ba02b + c665ce2c7888e7b7da94fb29720a0c331e162258 - + https://github.com/dotnet/sdk - b9d4030324d63004063949600462230deb9ba02b + c665ce2c7888e7b7da94fb29720a0c331e162258 @@ -154,9 +154,9 @@ 9ec682f330b5a8779b4676a81f11718b5c8ef209 - + https://github.com/dotnet/msbuild - 82a30d30731031f57ad95519836abc2772ab472a + 58c672337b92d9c9975a70ac445a3a4330fa2940 diff --git a/eng/Versions.props b/eng/Versions.props index 114876857..24f5af6a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22521.4 - 7.0.200-preview.22521.4 + 7.0.200-preview.22523.17 + 7.0.200-preview.22523.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 806fa1fd4d0a3d7e71c949ddb678f3bbfe5cd5f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Oct 2022 07:54:48 +0000 Subject: [PATCH 065/654] Update dependencies from https://github.com/dotnet/sdk build 20221023.25 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 755d3f8f0..830167fc3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ef3b7e92..5f58dcff7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - c665ce2c7888e7b7da94fb29720a0c331e162258 + 48ffc5eafc82ac566373f98795bc60f956102533 - + https://github.com/dotnet/sdk - c665ce2c7888e7b7da94fb29720a0c331e162258 + 48ffc5eafc82ac566373f98795bc60f956102533 - + https://github.com/dotnet/sdk - c665ce2c7888e7b7da94fb29720a0c331e162258 + 48ffc5eafc82ac566373f98795bc60f956102533 - + https://github.com/dotnet/sdk - c665ce2c7888e7b7da94fb29720a0c331e162258 + 48ffc5eafc82ac566373f98795bc60f956102533 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 3924f4b0a8f46592f8c6e2aed3a2312ed72be913 - + https://github.com/dotnet/fsharp - 3b29890f7b78899f951ad3432579acf6e8c70611 + 49a0e2e80922016533573f4e550a6ab199006396 - + https://github.com/dotnet/fsharp - 3b29890f7b78899f951ad3432579acf6e8c70611 + 49a0e2e80922016533573f4e550a6ab199006396 @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 9ec682f330b5a8779b4676a81f11718b5c8ef209 + fd84eaf4673772807d2e1c48bb084c92d1afb1d7 diff --git a/eng/Versions.props b/eng/Versions.props index 24f5af6a1..2b3006bbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22523.17 - 7.0.200-preview.22523.17 + 7.0.200-preview.22523.25 + 7.0.200-preview.22523.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 411ffbecaf355f27771106e86d3c184e84cc17c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Oct 2022 16:58:45 +0000 Subject: [PATCH 066/654] Update dependencies from https://github.com/dotnet/test-templates build 20221024.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.22517.1 -> To Version 1.1.0-rc.22524.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b8f1a650..531d3ce49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,17 +90,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - f99547acd79b41467e0f77a5f918752f6645d0c4 + c0e64dba6ef0b49e4b79a56422d6b9408be922e4 - + https://github.com/dotnet/test-templates - f99547acd79b41467e0f77a5f918752f6645d0c4 + c0e64dba6ef0b49e4b79a56422d6b9408be922e4 - + https://github.com/dotnet/test-templates - f99547acd79b41467e0f77a5f918752f6645d0c4 + c0e64dba6ef0b49e4b79a56422d6b9408be922e4 diff --git a/eng/Versions.props b/eng/Versions.props index 7d7c8a315..0148f4d97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22517.1 - 1.1.0-rc.22517.1 - 1.1.0-rc.22517.1 + 1.1.0-rc.22524.1 + 1.1.0-rc.22524.1 + 1.1.0-rc.22524.1 From e18cd4118319d39828dfdb1391b4a681cebb2a80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Oct 2022 17:14:14 +0000 Subject: [PATCH 067/654] Update dependencies from https://github.com/dotnet/sdk build 20221024.4 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 830167fc3..ae554977e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f58dcff7..c9fc7fa28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 48ffc5eafc82ac566373f98795bc60f956102533 + 317b48e7707791d731263de72ffe5db98328e37d - + https://github.com/dotnet/sdk - 48ffc5eafc82ac566373f98795bc60f956102533 + 317b48e7707791d731263de72ffe5db98328e37d - + https://github.com/dotnet/sdk - 48ffc5eafc82ac566373f98795bc60f956102533 + 317b48e7707791d731263de72ffe5db98328e37d - + https://github.com/dotnet/sdk - 48ffc5eafc82ac566373f98795bc60f956102533 + 317b48e7707791d731263de72ffe5db98328e37d @@ -138,9 +138,9 @@ 49a0e2e80922016533573f4e550a6ab199006396 - + https://github.com/microsoft/vstest - 46ca47823c5f9ca1d2373be9eb29d6281286c42a + d194886e7de0b6bb21a22e0b85472fa6a3b7793a @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - fd84eaf4673772807d2e1c48bb084c92d1afb1d7 + 5b2dc21addc64838eb810d0f45937df321c87d15 diff --git a/eng/Versions.props b/eng/Versions.props index 2b3006bbe..bb9e9854f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22523.25 - 7.0.200-preview.22523.25 + 7.0.200-preview.22524.4 + 7.0.200-preview.22524.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221021-01 + 17.5.0-preview-20221024-01 From e96866b952d2512ad86db4f56f344591aef71a60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Oct 2022 03:42:09 +0000 Subject: [PATCH 068/654] Update dependencies from https://github.com/dotnet/sdk build 20221024.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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 3 ++- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index ae554977e..cf868c802 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,6 +12,7 @@ + @@ -20,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9fc7fa28..4a2530f19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 317b48e7707791d731263de72ffe5db98328e37d + 12d3ab6b12f1193e8525f016c6ab6131e601b58f - + https://github.com/dotnet/sdk - 317b48e7707791d731263de72ffe5db98328e37d + 12d3ab6b12f1193e8525f016c6ab6131e601b58f - + https://github.com/dotnet/sdk - 317b48e7707791d731263de72ffe5db98328e37d + 12d3ab6b12f1193e8525f016c6ab6131e601b58f - + https://github.com/dotnet/sdk - 317b48e7707791d731263de72ffe5db98328e37d + 12d3ab6b12f1193e8525f016c6ab6131e601b58f @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 3924f4b0a8f46592f8c6e2aed3a2312ed72be913 - + https://github.com/dotnet/fsharp - 49a0e2e80922016533573f4e550a6ab199006396 + 82c00c7dbc2e8e3509c1bef0d04a7fc1b5e0b707 - + https://github.com/dotnet/fsharp - 49a0e2e80922016533573f4e550a6ab199006396 + 82c00c7dbc2e8e3509c1bef0d04a7fc1b5e0b707 diff --git a/eng/Versions.props b/eng/Versions.props index bb9e9854f..afe1e8ccc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22524.4 - 7.0.200-preview.22524.4 + 7.0.200-preview.22524.10 + 7.0.200-preview.22524.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cc5f738a256918dc0c65ae962a12aad4a19501ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Oct 2022 04:50:06 +0000 Subject: [PATCH 069/654] Update dependencies from https://github.com/dotnet/sdk build 20221024.11 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index cf868c802..c2bab063a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a2530f19..e09ba3334 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 12d3ab6b12f1193e8525f016c6ab6131e601b58f + c0817931cb45b6b3b0ece07164fa9fb207c10fea - + https://github.com/dotnet/sdk - 12d3ab6b12f1193e8525f016c6ab6131e601b58f + c0817931cb45b6b3b0ece07164fa9fb207c10fea - + https://github.com/dotnet/sdk - 12d3ab6b12f1193e8525f016c6ab6131e601b58f + c0817931cb45b6b3b0ece07164fa9fb207c10fea - + https://github.com/dotnet/sdk - 12d3ab6b12f1193e8525f016c6ab6131e601b58f + c0817931cb45b6b3b0ece07164fa9fb207c10fea @@ -154,9 +154,9 @@ 5b2dc21addc64838eb810d0f45937df321c87d15 - + https://github.com/dotnet/msbuild - 58c672337b92d9c9975a70ac445a3a4330fa2940 + 9f72f0ef257a71ae74c723ec749b3353d096536f diff --git a/eng/Versions.props b/eng/Versions.props index afe1e8ccc..5e211d47a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22524.10 - 7.0.200-preview.22524.10 + 7.0.200-preview.22524.11 + 7.0.200-preview.22524.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7f877f6fc9dc7175e9f82807b6bf18a897bb2510 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Oct 2022 07:44:58 +0000 Subject: [PATCH 070/654] Update dependencies from https://github.com/dotnet/sdk build 20221024.14 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index c2bab063a..052fa47e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e09ba3334..9f3de1b32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - c0817931cb45b6b3b0ece07164fa9fb207c10fea + 47fb36f62bea33fc4cf5a3dc6a96a13bade838e5 - + https://github.com/dotnet/sdk - c0817931cb45b6b3b0ece07164fa9fb207c10fea + 47fb36f62bea33fc4cf5a3dc6a96a13bade838e5 - + https://github.com/dotnet/sdk - c0817931cb45b6b3b0ece07164fa9fb207c10fea + 47fb36f62bea33fc4cf5a3dc6a96a13bade838e5 - + https://github.com/dotnet/sdk - c0817931cb45b6b3b0ece07164fa9fb207c10fea + 47fb36f62bea33fc4cf5a3dc6a96a13bade838e5 @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 5b2dc21addc64838eb810d0f45937df321c87d15 + 34530dacae1efc796937b41a0e1cf55fd93c7a10 diff --git a/eng/Versions.props b/eng/Versions.props index 5e211d47a..de37d6505 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22524.11 - 7.0.200-preview.22524.11 + 7.0.200-preview.22524.14 + 7.0.200-preview.22524.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4d748653ff85d6069a5e90a2dcc3f3ca8c49ec4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Oct 2022 17:04:48 +0000 Subject: [PATCH 071/654] Update dependencies from https://github.com/dotnet/sdk build 20221025.2 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 052fa47e9..de33678f2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f3de1b32..7499bd0ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 47fb36f62bea33fc4cf5a3dc6a96a13bade838e5 + ef7c954ba978e6d0435cacc3ad4bdf828ffd1bc0 - + https://github.com/dotnet/sdk - 47fb36f62bea33fc4cf5a3dc6a96a13bade838e5 + ef7c954ba978e6d0435cacc3ad4bdf828ffd1bc0 - + https://github.com/dotnet/sdk - 47fb36f62bea33fc4cf5a3dc6a96a13bade838e5 + ef7c954ba978e6d0435cacc3ad4bdf828ffd1bc0 - + https://github.com/dotnet/sdk - 47fb36f62bea33fc4cf5a3dc6a96a13bade838e5 + ef7c954ba978e6d0435cacc3ad4bdf828ffd1bc0 @@ -154,9 +154,9 @@ 34530dacae1efc796937b41a0e1cf55fd93c7a10 - + https://github.com/dotnet/msbuild - 9f72f0ef257a71ae74c723ec749b3353d096536f + 3b7246b650398f47b6028e2673b06902613dc46e diff --git a/eng/Versions.props b/eng/Versions.props index de37d6505..3ee957bd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22524.14 - 7.0.200-preview.22524.14 + 7.0.200-preview.22525.2 + 7.0.200-preview.22525.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f5944b57462bcf05b06ec101a201e42a59b2a39b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Oct 2022 19:37:47 +0000 Subject: [PATCH 072/654] Update dependencies from https://github.com/dotnet/sdk build 20221025.5 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index de33678f2..a905a845c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7499bd0ae..32500487e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - ef7c954ba978e6d0435cacc3ad4bdf828ffd1bc0 + 88ab744d22101bbcb0376a1c58f9bf2ad77b1f6f - + https://github.com/dotnet/sdk - ef7c954ba978e6d0435cacc3ad4bdf828ffd1bc0 + 88ab744d22101bbcb0376a1c58f9bf2ad77b1f6f - + https://github.com/dotnet/sdk - ef7c954ba978e6d0435cacc3ad4bdf828ffd1bc0 + 88ab744d22101bbcb0376a1c58f9bf2ad77b1f6f - + https://github.com/dotnet/sdk - ef7c954ba978e6d0435cacc3ad4bdf828ffd1bc0 + 88ab744d22101bbcb0376a1c58f9bf2ad77b1f6f diff --git a/eng/Versions.props b/eng/Versions.props index 3ee957bd8..f84e5d344 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22525.2 - 7.0.200-preview.22525.2 + 7.0.200-preview.22525.5 + 7.0.200-preview.22525.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7d5ecee4c5498c6dfc0ce224b7d93270bfc091a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Oct 2022 07:51:14 +0000 Subject: [PATCH 073/654] Update dependencies from https://github.com/dotnet/sdk build 20221025.11 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index a905a845c..94c5335ad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32500487e..a2591f46e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 88ab744d22101bbcb0376a1c58f9bf2ad77b1f6f + e0eccb019b7378f0df08c17fecf520b54882c3c0 - + https://github.com/dotnet/sdk - 88ab744d22101bbcb0376a1c58f9bf2ad77b1f6f + e0eccb019b7378f0df08c17fecf520b54882c3c0 - + https://github.com/dotnet/sdk - 88ab744d22101bbcb0376a1c58f9bf2ad77b1f6f + e0eccb019b7378f0df08c17fecf520b54882c3c0 - + https://github.com/dotnet/sdk - 88ab744d22101bbcb0376a1c58f9bf2ad77b1f6f + e0eccb019b7378f0df08c17fecf520b54882c3c0 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 3924f4b0a8f46592f8c6e2aed3a2312ed72be913 - + https://github.com/dotnet/fsharp - 82c00c7dbc2e8e3509c1bef0d04a7fc1b5e0b707 + 90f5b1ed0befe8337b923860d29dcd62d4735aef - + https://github.com/dotnet/fsharp - 82c00c7dbc2e8e3509c1bef0d04a7fc1b5e0b707 + 90f5b1ed0befe8337b923860d29dcd62d4735aef diff --git a/eng/Versions.props b/eng/Versions.props index f84e5d344..b6f1d4dc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22525.5 - 7.0.200-preview.22525.5 + 7.0.200-preview.22525.11 + 7.0.200-preview.22525.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8f53e752e4f1b4eb160a44bbecd88a7900af2fdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Oct 2022 11:40:25 +0000 Subject: [PATCH 074/654] Update dependencies from https://github.com/dotnet/sdk build 20221026.2 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 94c5335ad..38eee55e7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2591f46e..4074b0fa3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - e0eccb019b7378f0df08c17fecf520b54882c3c0 + f8665052aa74d06cb80114c29dafc7f679e7a130 - + https://github.com/dotnet/sdk - e0eccb019b7378f0df08c17fecf520b54882c3c0 + f8665052aa74d06cb80114c29dafc7f679e7a130 - + https://github.com/dotnet/sdk - e0eccb019b7378f0df08c17fecf520b54882c3c0 + f8665052aa74d06cb80114c29dafc7f679e7a130 - + https://github.com/dotnet/sdk - e0eccb019b7378f0df08c17fecf520b54882c3c0 + f8665052aa74d06cb80114c29dafc7f679e7a130 @@ -154,9 +154,9 @@ 34530dacae1efc796937b41a0e1cf55fd93c7a10 - + https://github.com/dotnet/msbuild - 3b7246b650398f47b6028e2673b06902613dc46e + 3777dcaf7edb3e86a070037ba53e742dd1872873 diff --git a/eng/Versions.props b/eng/Versions.props index b6f1d4dc3..a5deae0ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22525.11 - 7.0.200-preview.22525.11 + 7.0.200-preview.22526.2 + 7.0.200-preview.22526.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48ad8d408ff1a384ba3bc7dae9492066fd45d9d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Oct 2022 17:02:38 +0000 Subject: [PATCH 075/654] Update dependencies from https://github.com/dotnet/sdk build 20221026.3 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 38eee55e7..ce74fcb78 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4074b0fa3..be5d38bbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - f8665052aa74d06cb80114c29dafc7f679e7a130 + a8d0f4e1d5d6c8f3609635bec5cbdce42a5f7615 - + https://github.com/dotnet/sdk - f8665052aa74d06cb80114c29dafc7f679e7a130 + a8d0f4e1d5d6c8f3609635bec5cbdce42a5f7615 - + https://github.com/dotnet/sdk - f8665052aa74d06cb80114c29dafc7f679e7a130 + a8d0f4e1d5d6c8f3609635bec5cbdce42a5f7615 - + https://github.com/dotnet/sdk - f8665052aa74d06cb80114c29dafc7f679e7a130 + a8d0f4e1d5d6c8f3609635bec5cbdce42a5f7615 diff --git a/eng/Versions.props b/eng/Versions.props index a5deae0ed..bc0a45099 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22526.2 - 7.0.200-preview.22526.2 + 7.0.200-preview.22526.3 + 7.0.200-preview.22526.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4888c8c156c04621c9005fe2895c72ad3611a31d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Oct 2022 22:24:03 +0000 Subject: [PATCH 076/654] Update dependencies from https://github.com/dotnet/sdk build 20221026.5 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 3 ++- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce74fcb78..503f4a35e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,6 +12,7 @@ + @@ -21,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be5d38bbb..49c509997 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - a8d0f4e1d5d6c8f3609635bec5cbdce42a5f7615 + fab41e5a52ff01921122155137a38b804d0469ea - + https://github.com/dotnet/sdk - a8d0f4e1d5d6c8f3609635bec5cbdce42a5f7615 + fab41e5a52ff01921122155137a38b804d0469ea - + https://github.com/dotnet/sdk - a8d0f4e1d5d6c8f3609635bec5cbdce42a5f7615 + fab41e5a52ff01921122155137a38b804d0469ea - + https://github.com/dotnet/sdk - a8d0f4e1d5d6c8f3609635bec5cbdce42a5f7615 + fab41e5a52ff01921122155137a38b804d0469ea @@ -138,9 +138,9 @@ 90f5b1ed0befe8337b923860d29dcd62d4735aef - + https://github.com/microsoft/vstest - d194886e7de0b6bb21a22e0b85472fa6a3b7793a + 0b2ae532ae3f2eefea9a40bc95d341ab58c79ad0 diff --git a/eng/Versions.props b/eng/Versions.props index bc0a45099..c59c81c5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22526.3 - 7.0.200-preview.22526.3 + 7.0.200-preview.22526.5 + 7.0.200-preview.22526.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221024-01 + 17.5.0-preview-20221026-02 From d12ed331aaa05fbc10c00db085ff0db1e9a9d3ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Oct 2022 23:43:49 +0000 Subject: [PATCH 077/654] Update dependencies from https://github.com/dotnet/sdk build 20221026.6 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 503f4a35e..9dbd61034 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49c509997..fa488f7de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - fab41e5a52ff01921122155137a38b804d0469ea + 633c28c51fead37d722305fed38f93fd3be0870f - + https://github.com/dotnet/sdk - fab41e5a52ff01921122155137a38b804d0469ea + 633c28c51fead37d722305fed38f93fd3be0870f - + https://github.com/dotnet/sdk - fab41e5a52ff01921122155137a38b804d0469ea + 633c28c51fead37d722305fed38f93fd3be0870f - + https://github.com/dotnet/sdk - fab41e5a52ff01921122155137a38b804d0469ea + 633c28c51fead37d722305fed38f93fd3be0870f diff --git a/eng/Versions.props b/eng/Versions.props index c59c81c5e..bbbbf4480 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22526.5 - 7.0.200-preview.22526.5 + 7.0.200-preview.22526.6 + 7.0.200-preview.22526.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6218a60dc556332a67b83d13f4724afcad03a21d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Oct 2022 14:51:17 +0000 Subject: [PATCH 078/654] Update dependencies from https://github.com/dotnet/sdk build 20221027.2 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9dbd61034..362c02577 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa488f7de..4e684f2c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 633c28c51fead37d722305fed38f93fd3be0870f + e5b8ed6569adee45af3ab4c93e4ec1795b45aa73 - + https://github.com/dotnet/sdk - 633c28c51fead37d722305fed38f93fd3be0870f + e5b8ed6569adee45af3ab4c93e4ec1795b45aa73 - + https://github.com/dotnet/sdk - 633c28c51fead37d722305fed38f93fd3be0870f + e5b8ed6569adee45af3ab4c93e4ec1795b45aa73 - + https://github.com/dotnet/sdk - 633c28c51fead37d722305fed38f93fd3be0870f + e5b8ed6569adee45af3ab4c93e4ec1795b45aa73 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 3924f4b0a8f46592f8c6e2aed3a2312ed72be913 - + https://github.com/dotnet/fsharp - 90f5b1ed0befe8337b923860d29dcd62d4735aef + 32b9429e5822d3e76672d9752f7a20f681209de8 - + https://github.com/dotnet/fsharp - 90f5b1ed0befe8337b923860d29dcd62d4735aef + 32b9429e5822d3e76672d9752f7a20f681209de8 diff --git a/eng/Versions.props b/eng/Versions.props index bbbbf4480..7a449e038 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22526.6 - 7.0.200-preview.22526.6 + 7.0.200-preview.22527.2 + 7.0.200-preview.22527.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d43301abd62b729c4da7eb79f3a523debceb5936 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Oct 2022 20:00:07 +0000 Subject: [PATCH 079/654] Update dependencies from https://github.com/dotnet/sdk build 20221027.5 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 362c02577..17d01f1e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e684f2c0..9e28d681c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - e5b8ed6569adee45af3ab4c93e4ec1795b45aa73 + d4d618322625a9f843f45f7e0c62ef4cc5414393 - + https://github.com/dotnet/sdk - e5b8ed6569adee45af3ab4c93e4ec1795b45aa73 + d4d618322625a9f843f45f7e0c62ef4cc5414393 - + https://github.com/dotnet/sdk - e5b8ed6569adee45af3ab4c93e4ec1795b45aa73 + d4d618322625a9f843f45f7e0c62ef4cc5414393 - + https://github.com/dotnet/sdk - e5b8ed6569adee45af3ab4c93e4ec1795b45aa73 + d4d618322625a9f843f45f7e0c62ef4cc5414393 @@ -138,9 +138,9 @@ 32b9429e5822d3e76672d9752f7a20f681209de8 - + https://github.com/microsoft/vstest - 0b2ae532ae3f2eefea9a40bc95d341ab58c79ad0 + 86e33e8eb2e9702afc1dcc081b55ed089331aedb diff --git a/eng/Versions.props b/eng/Versions.props index 7a449e038..8a5e6e22b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22527.2 - 7.0.200-preview.22527.2 + 7.0.200-preview.22527.5 + 7.0.200-preview.22527.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221026-02 + 17.5.0-preview-20221026-01 From b41b527b4a78a03f122e79a1bbea67ffebe88ec6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Oct 2022 18:27:03 +0000 Subject: [PATCH 080/654] Update dependencies from https://github.com/dotnet/sdk build 20221028.4 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 17d01f1e1..3a58311d9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e28d681c..f677b3ef4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - d4d618322625a9f843f45f7e0c62ef4cc5414393 + 93518324b8437af87abe8c9f8dcf6e6141166d84 - + https://github.com/dotnet/sdk - d4d618322625a9f843f45f7e0c62ef4cc5414393 + 93518324b8437af87abe8c9f8dcf6e6141166d84 - + https://github.com/dotnet/sdk - d4d618322625a9f843f45f7e0c62ef4cc5414393 + 93518324b8437af87abe8c9f8dcf6e6141166d84 - + https://github.com/dotnet/sdk - d4d618322625a9f843f45f7e0c62ef4cc5414393 + 93518324b8437af87abe8c9f8dcf6e6141166d84 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 3924f4b0a8f46592f8c6e2aed3a2312ed72be913 - + https://github.com/dotnet/fsharp - 32b9429e5822d3e76672d9752f7a20f681209de8 + 79ff8fe968f7f66a25665772449e73f2c21c9efe - + https://github.com/dotnet/fsharp - 32b9429e5822d3e76672d9752f7a20f681209de8 + 79ff8fe968f7f66a25665772449e73f2c21c9efe @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 34530dacae1efc796937b41a0e1cf55fd93c7a10 + 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 diff --git a/eng/Versions.props b/eng/Versions.props index 8a5e6e22b..fb71cf146 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22527.5 - 7.0.200-preview.22527.5 + 7.0.200-preview.22528.4 + 7.0.200-preview.22528.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5151f3ad82ea72d3c811d67e70d9d3b4f8207cab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 Oct 2022 03:38:12 +0000 Subject: [PATCH 081/654] Update dependencies from https://github.com/dotnet/sdk build 20221030.2 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a58311d9..3a3b0ef25 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f677b3ef4..1f6a42255 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 93518324b8437af87abe8c9f8dcf6e6141166d84 + 0c83cbb9a3c6dfc651316dc465a7bee137c57170 - + https://github.com/dotnet/sdk - 93518324b8437af87abe8c9f8dcf6e6141166d84 + 0c83cbb9a3c6dfc651316dc465a7bee137c57170 - + https://github.com/dotnet/sdk - 93518324b8437af87abe8c9f8dcf6e6141166d84 + 0c83cbb9a3c6dfc651316dc465a7bee137c57170 - + https://github.com/dotnet/sdk - 93518324b8437af87abe8c9f8dcf6e6141166d84 + 0c83cbb9a3c6dfc651316dc465a7bee137c57170 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 3924f4b0a8f46592f8c6e2aed3a2312ed72be913 - + https://github.com/dotnet/fsharp - 79ff8fe968f7f66a25665772449e73f2c21c9efe + ccc97d83ecb8c0ad88585e8cdfaa4bd882b6f9cd - + https://github.com/dotnet/fsharp - 79ff8fe968f7f66a25665772449e73f2c21c9efe + ccc97d83ecb8c0ad88585e8cdfaa4bd882b6f9cd @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 + 785bc38801eac75a5342c3c639fcc5fd5156f263 diff --git a/eng/Versions.props b/eng/Versions.props index fb71cf146..8b7b0f951 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22528.4 - 7.0.200-preview.22528.4 + 7.0.200-preview.22530.2 + 7.0.200-preview.22530.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2666ae8f0af5b165dbc3c7f54e50e22d062d864d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 Oct 2022 13:54:52 +0000 Subject: [PATCH 082/654] Update dependencies from https://github.com/dotnet/test-templates build 20221031.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.22524.1 -> To Version 1.1.0-rc.22531.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 531d3ce49..7f96aff55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,17 +90,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - c0e64dba6ef0b49e4b79a56422d6b9408be922e4 + b145717da7bd7ba7a11d28487e35c29a0d3ca297 - + https://github.com/dotnet/test-templates - c0e64dba6ef0b49e4b79a56422d6b9408be922e4 + b145717da7bd7ba7a11d28487e35c29a0d3ca297 - + https://github.com/dotnet/test-templates - c0e64dba6ef0b49e4b79a56422d6b9408be922e4 + b145717da7bd7ba7a11d28487e35c29a0d3ca297 diff --git a/eng/Versions.props b/eng/Versions.props index 0148f4d97..a8fe461f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22524.1 - 1.1.0-rc.22524.1 - 1.1.0-rc.22524.1 + 1.1.0-rc.22531.1 + 1.1.0-rc.22531.1 + 1.1.0-rc.22531.1 From 02f8c059b9f3f64fbc221561588d4af3a765317f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 Oct 2022 19:21:54 +0000 Subject: [PATCH 083/654] Update dependencies from https://github.com/dotnet/sdk build 20221031.5 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a3b0ef25..609e06a14 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f6a42255..fe84e3999 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 0c83cbb9a3c6dfc651316dc465a7bee137c57170 + 10d7bb2cb7a20a04762e801fa302b01db294ad8b - + https://github.com/dotnet/sdk - 0c83cbb9a3c6dfc651316dc465a7bee137c57170 + 10d7bb2cb7a20a04762e801fa302b01db294ad8b - + https://github.com/dotnet/sdk - 0c83cbb9a3c6dfc651316dc465a7bee137c57170 + 10d7bb2cb7a20a04762e801fa302b01db294ad8b - + https://github.com/dotnet/sdk - 0c83cbb9a3c6dfc651316dc465a7bee137c57170 + 10d7bb2cb7a20a04762e801fa302b01db294ad8b diff --git a/eng/Versions.props b/eng/Versions.props index 8b7b0f951..45de6e8da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22530.2 - 7.0.200-preview.22530.2 + 7.0.200-preview.22531.5 + 7.0.200-preview.22531.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 62124919b9d4806c171b038e794f29405b900ea5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Nov 2022 14:35:23 +0000 Subject: [PATCH 084/654] Update dependencies from https://github.com/dotnet/test-templates build 20221101.2 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.22531.1 -> To Version 1.1.0-rc.22551.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f96aff55..9603979a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,17 +90,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - b145717da7bd7ba7a11d28487e35c29a0d3ca297 + 5982c9189073d655809dbd35af161c53f439ea18 - + https://github.com/dotnet/test-templates - b145717da7bd7ba7a11d28487e35c29a0d3ca297 + 5982c9189073d655809dbd35af161c53f439ea18 - + https://github.com/dotnet/test-templates - b145717da7bd7ba7a11d28487e35c29a0d3ca297 + 5982c9189073d655809dbd35af161c53f439ea18 diff --git a/eng/Versions.props b/eng/Versions.props index a8fe461f1..5d6f08367 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22531.1 - 1.1.0-rc.22531.1 - 1.1.0-rc.22531.1 + 1.1.0-rc.22551.2 + 1.1.0-rc.22551.2 + 1.1.0-rc.22551.2 From 70d66d1bdd1631bcda2de9c0fc7d9152a8df55d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Nov 2022 16:37:00 +0000 Subject: [PATCH 085/654] Update dependencies from https://github.com/dotnet/arcade build 20221031.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22514.3 -> To Version 7.0.0-beta.22531.4 --- 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 7f96aff55..f219e43f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 3083cc93619dbb153fdb7907b332efa18908f039 + e5703ddc4d3434bca1c86c9984a2162d9608093a - + https://github.com/dotnet/arcade - 3083cc93619dbb153fdb7907b332efa18908f039 + e5703ddc4d3434bca1c86c9984a2162d9608093a - + https://github.com/dotnet/arcade - 3083cc93619dbb153fdb7907b332efa18908f039 + e5703ddc4d3434bca1c86c9984a2162d9608093a https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a8fe461f1..8beb92649 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22514.3 + 7.0.0-beta.22531.4 diff --git a/global.json b/global.json index df10494a7..9f6b90beb 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.22514.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22514.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22531.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22531.4" } } From d06d05332c1f4f2f39eed74669980eb81b8d6115 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Nov 2022 19:32:25 +0000 Subject: [PATCH 086/654] Update dependencies from https://github.com/dotnet/test-templates build 20221101.3 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.22531.1 -> To Version 1.1.0-rc.22551.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9603979a7..d98605b3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,17 +90,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 5982c9189073d655809dbd35af161c53f439ea18 + ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 - + https://github.com/dotnet/test-templates - 5982c9189073d655809dbd35af161c53f439ea18 + ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 - + https://github.com/dotnet/test-templates - 5982c9189073d655809dbd35af161c53f439ea18 + ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 diff --git a/eng/Versions.props b/eng/Versions.props index 5d6f08367..5630679e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22551.2 - 1.1.0-rc.22551.2 - 1.1.0-rc.22551.2 + 1.1.0-rc.22551.3 + 1.1.0-rc.22551.3 + 1.1.0-rc.22551.3 From 761aab7e4af644a2cf7f900772e5814ca2738182 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Nov 2022 19:54:38 +0000 Subject: [PATCH 087/654] Update dependencies from https://github.com/dotnet/sdk build 20221101.2 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 609e06a14..91f281964 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe84e3999..9f5af89ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 10d7bb2cb7a20a04762e801fa302b01db294ad8b + 4200cb169be3cd5012fea66afae37d0826c1d2f9 - + https://github.com/dotnet/sdk - 10d7bb2cb7a20a04762e801fa302b01db294ad8b + 4200cb169be3cd5012fea66afae37d0826c1d2f9 - + https://github.com/dotnet/sdk - 10d7bb2cb7a20a04762e801fa302b01db294ad8b + 4200cb169be3cd5012fea66afae37d0826c1d2f9 - + https://github.com/dotnet/sdk - 10d7bb2cb7a20a04762e801fa302b01db294ad8b + 4200cb169be3cd5012fea66afae37d0826c1d2f9 @@ -138,9 +138,9 @@ ccc97d83ecb8c0ad88585e8cdfaa4bd882b6f9cd - + https://github.com/microsoft/vstest - 86e33e8eb2e9702afc1dcc081b55ed089331aedb + 5169afd0bab4d6b0c48bd4db1b609ff28ff84b3d diff --git a/eng/Versions.props b/eng/Versions.props index 45de6e8da..1c75e0cba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22531.5 - 7.0.200-preview.22531.5 + 7.0.200-preview.22551.2 + 7.0.200-preview.22551.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221026-01 + 17.5.0-preview-20221031-02 From 109245f0e99c60acd62f91d124b7bf9b10f31cf8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Nov 2022 00:50:59 +0000 Subject: [PATCH 088/654] Update dependencies from https://github.com/dotnet/sdk build 20221101.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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 91f281964..cc0692541 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f5af89ad..d199a2b78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 4200cb169be3cd5012fea66afae37d0826c1d2f9 + 32c6fface5020bd723ec71378baf85ca66838efc - + https://github.com/dotnet/sdk - 4200cb169be3cd5012fea66afae37d0826c1d2f9 + 32c6fface5020bd723ec71378baf85ca66838efc - + https://github.com/dotnet/sdk - 4200cb169be3cd5012fea66afae37d0826c1d2f9 + 32c6fface5020bd723ec71378baf85ca66838efc - + https://github.com/dotnet/sdk - 4200cb169be3cd5012fea66afae37d0826c1d2f9 + 32c6fface5020bd723ec71378baf85ca66838efc diff --git a/eng/Versions.props b/eng/Versions.props index 1c75e0cba..e36ff9901 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22551.2 - 7.0.200-preview.22551.2 + 7.0.200-preview.22551.10 + 7.0.200-preview.22551.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 20245adcfaeb2611d43379f3086c3e04433c555d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Nov 2022 18:44:39 +0000 Subject: [PATCH 089/654] Update dependencies from https://github.com/dotnet/sdk build 20221102.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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 11 +--- eng/Version.Details.xml | 116 ++++++++++++++++++++-------------------- eng/Versions.props | 48 ++++++++--------- 3 files changed, 83 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc0692541..b4c070cb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,13 @@ - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d199a2b78..c55a75d5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - ad8863df2b95995aba3cb7a9fa9c9df69dd1dfde + 50c77e366492856d6ac854e6b1a2e8ca4675aa12 - + https://github.com/dotnet/windowsdesktop - ad8863df2b95995aba3cb7a9fa9c9df69dd1dfde + 50c77e366492856d6ac854e6b1a2e8ca4675aa12 - + https://github.com/dotnet/windowsdesktop - ad8863df2b95995aba3cb7a9fa9c9df69dd1dfde + 50c77e366492856d6ac854e6b1a2e8ca4675aa12 - + https://github.com/dotnet/windowsdesktop - ad8863df2b95995aba3cb7a9fa9c9df69dd1dfde + 50c77e366492856d6ac854e6b1a2e8ca4675aa12 https://github.com/dotnet/llvm-project 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe - + https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe - + https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe - + https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe - + https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe - + https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe - - https://github.com/dotnet/aspnetcore - d50065c4a4fe31a66a1cc2e1a31896d30464da13 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + b12b77b241f0a093d53508c3cb2084860bd5339d - - https://github.com/dotnet/aspnetcore - d50065c4a4fe31a66a1cc2e1a31896d30464da13 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + b12b77b241f0a093d53508c3cb2084860bd5339d - - https://github.com/dotnet/aspnetcore - d50065c4a4fe31a66a1cc2e1a31896d30464da13 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + b12b77b241f0a093d53508c3cb2084860bd5339d - - https://github.com/dotnet/aspnetcore - d50065c4a4fe31a66a1cc2e1a31896d30464da13 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + b12b77b241f0a093d53508c3cb2084860bd5339d - - https://github.com/dotnet/aspnetcore - d50065c4a4fe31a66a1cc2e1a31896d30464da13 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + b12b77b241f0a093d53508c3cb2084860bd5339d - - https://github.com/dotnet/aspnetcore - d50065c4a4fe31a66a1cc2e1a31896d30464da13 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + b12b77b241f0a093d53508c3cb2084860bd5339d - - https://github.com/dotnet/aspnetcore - d50065c4a4fe31a66a1cc2e1a31896d30464da13 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + b12b77b241f0a093d53508c3cb2084860bd5339d https://github.com/dotnet/test-templates @@ -105,29 +105,29 @@ https://github.com/dotnet/sdk - 32c6fface5020bd723ec71378baf85ca66838efc + da42e679ea86007b80c4018c7f2ead4ee80e3a2a - + https://github.com/dotnet/sdk - 32c6fface5020bd723ec71378baf85ca66838efc + da42e679ea86007b80c4018c7f2ead4ee80e3a2a - + https://github.com/dotnet/sdk - 32c6fface5020bd723ec71378baf85ca66838efc + da42e679ea86007b80c4018c7f2ead4ee80e3a2a - + https://github.com/dotnet/sdk - 32c6fface5020bd723ec71378baf85ca66838efc + da42e679ea86007b80c4018c7f2ead4ee80e3a2a - + https://github.com/dotnet/winforms - 672cc8c705697af4146629537abebcd483963375 + 09d0a9536c37786c6e41520de9e66df86811be9b - + https://github.com/dotnet/wpf - 3924f4b0a8f46592f8c6e2aed3a2312ed72be913 + 7ac25017197ea1f7906e189d1479717c6fb12298 https://github.com/dotnet/fsharp @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 6625add9a3eadc2954af0311be35290cfefcddb0 - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 6625add9a3eadc2954af0311be35290cfefcddb0 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index e36ff9901..f31fde4d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22513.12 + 7.0.0-rc.2.22472.13 - 7.0.0-rtm.22513.11 + 7.0.0-rc.2.22472.9 @@ -50,13 +50,13 @@ - 7.0.0 - 7.0.0 - 7.0.0-rtm.22513.7 - 7.0.0-rtm.22513.7 - 7.0.0-rtm.22513.7 - 7.0.0-rtm.22513.7 - 7.0.0-rtm.22513.7 + 7.0.0-rc.2.22476.2 + 7.0.0-rc.2.22476.2 + 7.0.0-rc.2.22476.2 + 7.0.0-rc.2.22476.2 + 7.0.0-rc.2.22476.2 + 7.0.0-rc.2.22476.2 + 7.0.0-rc.2.22476.2 0.2.0 @@ -64,32 +64,32 @@ 7.0.200 - 7.0.200-preview.22551.10 - 7.0.200-preview.22551.10 + 7.0.200-preview.22552.19 + 7.0.200-preview.22552.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0 + 7.0.0-rc.2.22472.3 - 7.0.0-rtm.22513.12 - 7.0.0-rtm.22513.12 - 7.0.0 - 7.0.0 - 7.0.0 - 7.0.0 + 7.0.0-rc.2.22472.3 + 7.0.0-rc.2.22472.3 + 7.0.0-rc.2.22472.3 + 7.0.0-rc.2.22472.3 + 7.0.0-rc.2.22472.3 + 7.0.0-rc.2.22472.3 2.1.0 - 7.0.0-rtm.22513.10 - 7.0.0-rtm.22513.10 - 7.0.0 - 7.0.0 + 7.0.0-rc.2.22472.13 + 7.0.0-rc.2.22472.13 + 7.0.0-rc.2.22472.13 + 7.0.0-rc.2.22472.13 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0 - 7.0.0 + 7.0.0-rc.2.22465.1 + 7.0.0-rc.2.22465.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From e9304bdbb43fa36c4f5f6c6c49098d962ce4a985 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Nov 2022 22:37:37 +0000 Subject: [PATCH 090/654] Update dependencies from https://github.com/dotnet/sdk build 20221102.28 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index b4c070cb9..108f611c8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c55a75d5e..d0b672a30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - da42e679ea86007b80c4018c7f2ead4ee80e3a2a + 87918dce2e0abfaabd786cd67eb289e52d72113d - + https://github.com/dotnet/sdk - da42e679ea86007b80c4018c7f2ead4ee80e3a2a + 87918dce2e0abfaabd786cd67eb289e52d72113d - + https://github.com/dotnet/sdk - da42e679ea86007b80c4018c7f2ead4ee80e3a2a + 87918dce2e0abfaabd786cd67eb289e52d72113d - + https://github.com/dotnet/sdk - da42e679ea86007b80c4018c7f2ead4ee80e3a2a + 87918dce2e0abfaabd786cd67eb289e52d72113d diff --git a/eng/Versions.props b/eng/Versions.props index f31fde4d5..cb5eba0f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22552.19 - 7.0.200-preview.22552.19 + 7.0.200-preview.22552.28 + 7.0.200-preview.22552.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5c447b59a78ab7adfd7d1f504f660a84a4b5d689 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Nov 2022 06:48:10 +0000 Subject: [PATCH 091/654] Update dependencies from https://github.com/dotnet/sdk build 20221102.35 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 108f611c8..cdcae9887 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0b672a30..28b272873 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 87918dce2e0abfaabd786cd67eb289e52d72113d + 444f3c43b2acb12aa85eb48156fc5e6086102ac3 - + https://github.com/dotnet/sdk - 87918dce2e0abfaabd786cd67eb289e52d72113d + 444f3c43b2acb12aa85eb48156fc5e6086102ac3 - + https://github.com/dotnet/sdk - 87918dce2e0abfaabd786cd67eb289e52d72113d + 444f3c43b2acb12aa85eb48156fc5e6086102ac3 - + https://github.com/dotnet/sdk - 87918dce2e0abfaabd786cd67eb289e52d72113d + 444f3c43b2acb12aa85eb48156fc5e6086102ac3 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 7ac25017197ea1f7906e189d1479717c6fb12298 - + https://github.com/dotnet/fsharp - ccc97d83ecb8c0ad88585e8cdfaa4bd882b6f9cd + a934894437658f001c6388d33859da73a1ba2ba9 - + https://github.com/dotnet/fsharp - ccc97d83ecb8c0ad88585e8cdfaa4bd882b6f9cd + a934894437658f001c6388d33859da73a1ba2ba9 diff --git a/eng/Versions.props b/eng/Versions.props index cb5eba0f5..526d25ec4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22552.28 - 7.0.200-preview.22552.28 + 7.0.200-preview.22552.35 + 7.0.200-preview.22552.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9a90c6bc52119296c70132bf91859ff0a1eaa514 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Nov 2022 08:06:14 +0000 Subject: [PATCH 092/654] Update dependencies from https://github.com/dotnet/sdk build 20221102.37 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index cdcae9887..2bf657f2d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28b272873..cebe5200c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 444f3c43b2acb12aa85eb48156fc5e6086102ac3 + 0608f6d29ff679198344c22266d8e9d78d5da52c - + https://github.com/dotnet/sdk - 444f3c43b2acb12aa85eb48156fc5e6086102ac3 + 0608f6d29ff679198344c22266d8e9d78d5da52c - + https://github.com/dotnet/sdk - 444f3c43b2acb12aa85eb48156fc5e6086102ac3 + 0608f6d29ff679198344c22266d8e9d78d5da52c - + https://github.com/dotnet/sdk - 444f3c43b2acb12aa85eb48156fc5e6086102ac3 + 0608f6d29ff679198344c22266d8e9d78d5da52c @@ -138,9 +138,9 @@ a934894437658f001c6388d33859da73a1ba2ba9 - + https://github.com/microsoft/vstest - 5169afd0bab4d6b0c48bd4db1b609ff28ff84b3d + ac53aeb3053aa884919074fe4d61cb7634dda9aa diff --git a/eng/Versions.props b/eng/Versions.props index 526d25ec4..24e4a5d93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22552.35 - 7.0.200-preview.22552.35 + 7.0.200-preview.22552.37 + 7.0.200-preview.22552.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221031-02 + 17.5.0-preview-20221101-04 From 7d21c9dbffb1df79ade99c850bf73bbb6ecde1c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Nov 2022 19:19:23 +0000 Subject: [PATCH 093/654] Update dependencies from https://github.com/dotnet/sdk build 20221103.5 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2bf657f2d..b810d7b28 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cebe5200c..16369edef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 0608f6d29ff679198344c22266d8e9d78d5da52c + 1e15057b3d1c4ce2f4798685e2ae3bec34106699 - + https://github.com/dotnet/sdk - 0608f6d29ff679198344c22266d8e9d78d5da52c + 1e15057b3d1c4ce2f4798685e2ae3bec34106699 - + https://github.com/dotnet/sdk - 0608f6d29ff679198344c22266d8e9d78d5da52c + 1e15057b3d1c4ce2f4798685e2ae3bec34106699 - + https://github.com/dotnet/sdk - 0608f6d29ff679198344c22266d8e9d78d5da52c + 1e15057b3d1c4ce2f4798685e2ae3bec34106699 @@ -129,18 +129,18 @@ https://github.com/dotnet/wpf 7ac25017197ea1f7906e189d1479717c6fb12298 - + https://github.com/dotnet/fsharp - a934894437658f001c6388d33859da73a1ba2ba9 + 6ce6e32c744cdd7072d77fd5baf63eb61ec4d66d - + https://github.com/dotnet/fsharp - a934894437658f001c6388d33859da73a1ba2ba9 + 6ce6e32c744cdd7072d77fd5baf63eb61ec4d66d - + https://github.com/microsoft/vstest - ac53aeb3053aa884919074fe4d61cb7634dda9aa + eb9fca1710b0430741b279fccdfb24a72151a45b diff --git a/eng/Versions.props b/eng/Versions.props index 24e4a5d93..86d68a364 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22552.37 - 7.0.200-preview.22552.37 + 7.0.200-preview.22553.5 + 7.0.200-preview.22553.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221101-04 + 17.5.0-preview-20221102-03 From c97208da2a52c4b74ef74bd1410d54f3d45f81ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Nov 2022 06:53:14 +0000 Subject: [PATCH 094/654] Update dependencies from https://github.com/dotnet/sdk build 20221103.22 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index b810d7b28..7d5710c48 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16369edef..a4cab6f7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 1e15057b3d1c4ce2f4798685e2ae3bec34106699 + 075dde185ee23669d0a99238c79d1845b483dd81 - + https://github.com/dotnet/sdk - 1e15057b3d1c4ce2f4798685e2ae3bec34106699 + 075dde185ee23669d0a99238c79d1845b483dd81 - + https://github.com/dotnet/sdk - 1e15057b3d1c4ce2f4798685e2ae3bec34106699 + 075dde185ee23669d0a99238c79d1845b483dd81 - + https://github.com/dotnet/sdk - 1e15057b3d1c4ce2f4798685e2ae3bec34106699 + 075dde185ee23669d0a99238c79d1845b483dd81 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 7ac25017197ea1f7906e189d1479717c6fb12298 - + https://github.com/dotnet/fsharp - 6ce6e32c744cdd7072d77fd5baf63eb61ec4d66d + abd1cc91bc32b1007e7513c6cd55312e9a7835b4 - + https://github.com/dotnet/fsharp - 6ce6e32c744cdd7072d77fd5baf63eb61ec4d66d + abd1cc91bc32b1007e7513c6cd55312e9a7835b4 @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 785bc38801eac75a5342c3c639fcc5fd5156f263 + c9a6d5cf04904ebd2b1aaab0adb33df16c8e76a6 diff --git a/eng/Versions.props b/eng/Versions.props index 86d68a364..687e72954 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22553.5 - 7.0.200-preview.22553.5 + 7.0.200-preview.22553.22 + 7.0.200-preview.22553.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c09ec5eca29d4eaa8069c2ae58698ddcba983cf9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Nov 2022 18:51:52 +0000 Subject: [PATCH 095/654] Update dependencies from https://github.com/dotnet/sdk build 20221104.7 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7d5710c48..be78891d1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4cab6f7a..bcfe44bde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 075dde185ee23669d0a99238c79d1845b483dd81 + a990f3aa90e6143c0828c9098da0cba48393a3e1 - + https://github.com/dotnet/sdk - 075dde185ee23669d0a99238c79d1845b483dd81 + a990f3aa90e6143c0828c9098da0cba48393a3e1 - + https://github.com/dotnet/sdk - 075dde185ee23669d0a99238c79d1845b483dd81 + a990f3aa90e6143c0828c9098da0cba48393a3e1 - + https://github.com/dotnet/sdk - 075dde185ee23669d0a99238c79d1845b483dd81 + a990f3aa90e6143c0828c9098da0cba48393a3e1 diff --git a/eng/Versions.props b/eng/Versions.props index 687e72954..7568438df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22553.22 - 7.0.200-preview.22553.22 + 7.0.200-preview.22554.7 + 7.0.200-preview.22554.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9a7d9672f265b0061e41fbe6860ac6c164b66098 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 4 Nov 2022 21:50:21 +0000 Subject: [PATCH 096/654] Update source-build artifacts and tools to rc2 --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3b39a8de6..ed7b78b08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.100-rc.1 + 7.0.100-rc.2 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 8d6aba31b..8d9568376 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.1.22431.12" + "dotnet": "7.0.100-rc.2.22477.23" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 6f46cbec97a5d6d1b5a34aa031b8d339c8e43417 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Nov 2022 22:25:52 +0000 Subject: [PATCH 097/654] Update dependencies from https://github.com/dotnet/sdk build 20221104.12 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index be78891d1..74c3f607d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 180b74032..37aae5f0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - a990f3aa90e6143c0828c9098da0cba48393a3e1 + 00ddda7f8eac3b73e8accda1ff680ebe90afdb89 - + https://github.com/dotnet/sdk - a990f3aa90e6143c0828c9098da0cba48393a3e1 + 00ddda7f8eac3b73e8accda1ff680ebe90afdb89 - + https://github.com/dotnet/sdk - a990f3aa90e6143c0828c9098da0cba48393a3e1 + 00ddda7f8eac3b73e8accda1ff680ebe90afdb89 - + https://github.com/dotnet/sdk - a990f3aa90e6143c0828c9098da0cba48393a3e1 + 00ddda7f8eac3b73e8accda1ff680ebe90afdb89 diff --git a/eng/Versions.props b/eng/Versions.props index ed7b78b08..0906ce80c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22554.7 - 7.0.200-preview.22554.7 + 7.0.200-preview.22554.12 + 7.0.200-preview.22554.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 59302f09ea029318f3c33b989f8081c94ffea4d5 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 4 Nov 2022 22:32:47 +0000 Subject: [PATCH 098/654] Add source-build nowarns --- .../tarball/content/repos/Directory.Build.targets | 6 +++--- src/SourceBuild/tarball/content/repos/format.proj | 1 + src/SourceBuild/tarball/content/repos/installer.proj | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index 9a61647b4..7bf88fdd6 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -85,11 +85,11 @@ NewText="/p:RepoRoot="$repo_root/"" /> - + Outputs="$(RepoCompletedSemaphorePath)AddNoWarns.complete" > true + + CS9057 From 7a3c628f35a1427942ad3f7cb4473c4d3cd80bf7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Nov 2022 23:41:38 +0000 Subject: [PATCH 099/654] Update dependencies from https://github.com/dotnet/sdk build 20221104.14 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 74c3f607d..d4ee41748 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37aae5f0c..328da367b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 00ddda7f8eac3b73e8accda1ff680ebe90afdb89 + 75084bfbc629f0ae9931ff30dff6c03b68bdb544 - + https://github.com/dotnet/sdk - 00ddda7f8eac3b73e8accda1ff680ebe90afdb89 + 75084bfbc629f0ae9931ff30dff6c03b68bdb544 - + https://github.com/dotnet/sdk - 00ddda7f8eac3b73e8accda1ff680ebe90afdb89 + 75084bfbc629f0ae9931ff30dff6c03b68bdb544 - + https://github.com/dotnet/sdk - 00ddda7f8eac3b73e8accda1ff680ebe90afdb89 + 75084bfbc629f0ae9931ff30dff6c03b68bdb544 diff --git a/eng/Versions.props b/eng/Versions.props index 0906ce80c..6b9bb985c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22554.12 - 7.0.200-preview.22554.12 + 7.0.200-preview.22554.14 + 7.0.200-preview.22554.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7351c76790494521982755a00444700c8db07c11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Nov 2022 00:57:49 +0000 Subject: [PATCH 100/654] Update dependencies from https://github.com/dotnet/sdk build 20221104.21 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index d4ee41748..3b7fbaed9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 328da367b..cce0779df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 75084bfbc629f0ae9931ff30dff6c03b68bdb544 + 47f3a42a768c36c9c4378644371236520f77d163 - + https://github.com/dotnet/sdk - 75084bfbc629f0ae9931ff30dff6c03b68bdb544 + 47f3a42a768c36c9c4378644371236520f77d163 - + https://github.com/dotnet/sdk - 75084bfbc629f0ae9931ff30dff6c03b68bdb544 + 47f3a42a768c36c9c4378644371236520f77d163 - + https://github.com/dotnet/sdk - 75084bfbc629f0ae9931ff30dff6c03b68bdb544 + 47f3a42a768c36c9c4378644371236520f77d163 @@ -138,9 +138,9 @@ abd1cc91bc32b1007e7513c6cd55312e9a7835b4 - + https://github.com/microsoft/vstest - eb9fca1710b0430741b279fccdfb24a72151a45b + 02de16cd2915e7b34ffe91ab73432ba4faf4baf8 diff --git a/eng/Versions.props b/eng/Versions.props index 6b9bb985c..fe86fa216 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22554.14 - 7.0.200-preview.22554.14 + 7.0.200-preview.22554.21 + 7.0.200-preview.22554.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221102-03 + 17.5.0-preview-20221103-01 From 3839289598fa3cce1024a06f001228d8b8235490 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 6 Nov 2022 13:45:00 +0000 Subject: [PATCH 101/654] Update dependencies from https://github.com/dotnet/sdk build 20221106.1 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3b7fbaed9..5e5f9e258 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cce0779df..73ca9541a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 47f3a42a768c36c9c4378644371236520f77d163 + ecd6cc075b48076ad307ec637d7d22d25552989a - + https://github.com/dotnet/sdk - 47f3a42a768c36c9c4378644371236520f77d163 + ecd6cc075b48076ad307ec637d7d22d25552989a - + https://github.com/dotnet/sdk - 47f3a42a768c36c9c4378644371236520f77d163 + ecd6cc075b48076ad307ec637d7d22d25552989a - + https://github.com/dotnet/sdk - 47f3a42a768c36c9c4378644371236520f77d163 + ecd6cc075b48076ad307ec637d7d22d25552989a @@ -154,9 +154,9 @@ c9a6d5cf04904ebd2b1aaab0adb33df16c8e76a6 - + https://github.com/dotnet/msbuild - 3777dcaf7edb3e86a070037ba53e742dd1872873 + 3bcada934edfa09e5f68222411e3efeda407985c diff --git a/eng/Versions.props b/eng/Versions.props index fe86fa216..d2ea71ee6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22554.21 - 7.0.200-preview.22554.21 + 7.0.200-preview.22556.1 + 7.0.200-preview.22556.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48049bd6fd7f9342f7e3527fc5f50e5b146552b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Nov 2022 03:38:42 +0000 Subject: [PATCH 102/654] Update dependencies from https://github.com/dotnet/sdk build 20221106.4 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5e5f9e258..6f5d974c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73ca9541a..067d27e8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - ecd6cc075b48076ad307ec637d7d22d25552989a + 537c2eeb0fac00982b33ce3cbfb6a1f771dd52d1 - + https://github.com/dotnet/sdk - ecd6cc075b48076ad307ec637d7d22d25552989a + 537c2eeb0fac00982b33ce3cbfb6a1f771dd52d1 - + https://github.com/dotnet/sdk - ecd6cc075b48076ad307ec637d7d22d25552989a + 537c2eeb0fac00982b33ce3cbfb6a1f771dd52d1 - + https://github.com/dotnet/sdk - ecd6cc075b48076ad307ec637d7d22d25552989a + 537c2eeb0fac00982b33ce3cbfb6a1f771dd52d1 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 7ac25017197ea1f7906e189d1479717c6fb12298 - + https://github.com/dotnet/fsharp - abd1cc91bc32b1007e7513c6cd55312e9a7835b4 + 7326f5a34b73e3a3eead66ac394f61afc01d4623 - + https://github.com/dotnet/fsharp - abd1cc91bc32b1007e7513c6cd55312e9a7835b4 + 7326f5a34b73e3a3eead66ac394f61afc01d4623 diff --git a/eng/Versions.props b/eng/Versions.props index d2ea71ee6..dd261ddf4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22556.1 - 7.0.200-preview.22556.1 + 7.0.200-preview.22556.4 + 7.0.200-preview.22556.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cf4bbda4d9b0d531c251e2d07ef07542605899d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Nov 2022 11:21:01 +0000 Subject: [PATCH 103/654] Update dependencies from https://github.com/dotnet/sdk build 20221107.2 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6f5d974c3..149304400 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 067d27e8d..9403c8eca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 537c2eeb0fac00982b33ce3cbfb6a1f771dd52d1 + 56a680f7723e9a0689a5bff5babbd4a5e2d2550e - + https://github.com/dotnet/sdk - 537c2eeb0fac00982b33ce3cbfb6a1f771dd52d1 + 56a680f7723e9a0689a5bff5babbd4a5e2d2550e - + https://github.com/dotnet/sdk - 537c2eeb0fac00982b33ce3cbfb6a1f771dd52d1 + 56a680f7723e9a0689a5bff5babbd4a5e2d2550e - + https://github.com/dotnet/sdk - 537c2eeb0fac00982b33ce3cbfb6a1f771dd52d1 + 56a680f7723e9a0689a5bff5babbd4a5e2d2550e diff --git a/eng/Versions.props b/eng/Versions.props index dd261ddf4..e53430c0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22556.4 - 7.0.200-preview.22556.4 + 7.0.200-preview.22557.2 + 7.0.200-preview.22557.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f9ad90871096a759c4fe2582f9477e1fa86fd1d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Nov 2022 16:58:27 +0000 Subject: [PATCH 104/654] Update dependencies from https://github.com/dotnet/test-templates build 20221107.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.22551.3 -> To Version 1.1.0-rc.22557.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dec66aaef..b79af56ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,17 +90,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 + 43702d73671ea96728fed9adfb931ccfbb2cdc99 - + https://github.com/dotnet/test-templates - ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 + 43702d73671ea96728fed9adfb931ccfbb2cdc99 - + https://github.com/dotnet/test-templates - ca9eef3c1518234d96cc1c2828f1bdf90fc708f8 + 43702d73671ea96728fed9adfb931ccfbb2cdc99 diff --git a/eng/Versions.props b/eng/Versions.props index 156ac9455..84ac7196d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22551.3 - 1.1.0-rc.22551.3 - 1.1.0-rc.22551.3 + 1.1.0-rc.22557.1 + 1.1.0-rc.22557.1 + 1.1.0-rc.22557.1 From a447f8993dbc8912c7e45864eccb0eb3064bccca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Nov 2022 19:46:16 +0000 Subject: [PATCH 105/654] Update dependencies from https://github.com/dotnet/test-templates build 20221107.2 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.22551.3 -> To Version 1.1.0-rc.22557.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b79af56ee..02ca3e460 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,17 +90,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 43702d73671ea96728fed9adfb931ccfbb2cdc99 + 010fea877df1a96cfd39a8b5d602ad247cf5242b - + https://github.com/dotnet/test-templates - 43702d73671ea96728fed9adfb931ccfbb2cdc99 + 010fea877df1a96cfd39a8b5d602ad247cf5242b - + https://github.com/dotnet/test-templates - 43702d73671ea96728fed9adfb931ccfbb2cdc99 + 010fea877df1a96cfd39a8b5d602ad247cf5242b diff --git a/eng/Versions.props b/eng/Versions.props index 84ac7196d..e803e503e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22557.1 - 1.1.0-rc.22557.1 - 1.1.0-rc.22557.1 + 1.1.0-rc.22557.2 + 1.1.0-rc.22557.2 + 1.1.0-rc.22557.2 From b4898676e345983b0b4b9f05e4988b6e830834da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 06:43:35 +0000 Subject: [PATCH 106/654] Update dependencies from https://github.com/dotnet/sdk build 20221107.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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 149304400..94100af2f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9403c8eca..f9cccab16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 56a680f7723e9a0689a5bff5babbd4a5e2d2550e + 96b013db47b3eadcff70e61979e040a43e0122c1 - + https://github.com/dotnet/sdk - 56a680f7723e9a0689a5bff5babbd4a5e2d2550e + 96b013db47b3eadcff70e61979e040a43e0122c1 - + https://github.com/dotnet/sdk - 56a680f7723e9a0689a5bff5babbd4a5e2d2550e + 96b013db47b3eadcff70e61979e040a43e0122c1 - + https://github.com/dotnet/sdk - 56a680f7723e9a0689a5bff5babbd4a5e2d2550e + 96b013db47b3eadcff70e61979e040a43e0122c1 @@ -129,18 +129,18 @@ https://github.com/dotnet/wpf 7ac25017197ea1f7906e189d1479717c6fb12298 - + https://github.com/dotnet/fsharp - 7326f5a34b73e3a3eead66ac394f61afc01d4623 + a6a64706c78963cb033fd230f36518d3e773b725 - + https://github.com/dotnet/fsharp - 7326f5a34b73e3a3eead66ac394f61afc01d4623 + a6a64706c78963cb033fd230f36518d3e773b725 - + https://github.com/microsoft/vstest - 02de16cd2915e7b34ffe91ab73432ba4faf4baf8 + 6e064f9dbe9b824898a9e4c5a161f7886bf85a66 diff --git a/eng/Versions.props b/eng/Versions.props index e53430c0a..3ca07a1b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22557.2 - 7.0.200-preview.22557.2 + 7.0.200-preview.22557.19 + 7.0.200-preview.22557.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221103-01 + 17.5.0-preview-20221107-04 From 3dbd8d537300ada723b90ef873021fb3b316dcca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 18:55:45 +0000 Subject: [PATCH 107/654] Update dependencies from https://github.com/dotnet/arcade build 20221107.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22531.4 -> To Version 7.0.0-beta.22557.1 --- 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 02ca3e460..afb6c38e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - e5703ddc4d3434bca1c86c9984a2162d9608093a + dd38487d8af0ff04aa549142356cb0eaed11129b - + https://github.com/dotnet/arcade - e5703ddc4d3434bca1c86c9984a2162d9608093a + dd38487d8af0ff04aa549142356cb0eaed11129b - + https://github.com/dotnet/arcade - e5703ddc4d3434bca1c86c9984a2162d9608093a + dd38487d8af0ff04aa549142356cb0eaed11129b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e803e503e..e6fb084c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22531.4 + 7.0.0-beta.22557.1 diff --git a/global.json b/global.json index 9f6b90beb..d7ac65792 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.22531.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22531.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22557.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22557.1" } } From 5ae993e0936954d9675b427f98d3728446ba1cf5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 19:25:23 +0000 Subject: [PATCH 108/654] Update dependencies from https://github.com/dotnet/sdk build 20221108.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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 94100af2f..f40e0759b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9cccab16..b680b3a51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 96b013db47b3eadcff70e61979e040a43e0122c1 + 8d86d6f811bcc79295a40586ed4426661ca18f40 - + https://github.com/dotnet/sdk - 96b013db47b3eadcff70e61979e040a43e0122c1 + 8d86d6f811bcc79295a40586ed4426661ca18f40 - + https://github.com/dotnet/sdk - 96b013db47b3eadcff70e61979e040a43e0122c1 + 8d86d6f811bcc79295a40586ed4426661ca18f40 - + https://github.com/dotnet/sdk - 96b013db47b3eadcff70e61979e040a43e0122c1 + 8d86d6f811bcc79295a40586ed4426661ca18f40 diff --git a/eng/Versions.props b/eng/Versions.props index 3ca07a1b8..d50c4f061 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22557.19 - 7.0.200-preview.22557.19 + 7.0.200-preview.22558.10 + 7.0.200-preview.22558.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From be8002d255383b0f0ff0b32e263877c15294568d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 20:40:25 +0000 Subject: [PATCH 109/654] Update dependencies from https://github.com/dotnet/sdk build 20221108.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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index f40e0759b..9e9e9d519 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b680b3a51..b83a54e69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 8d86d6f811bcc79295a40586ed4426661ca18f40 + c1946b8796fb94083e0bde5f1e905ad0ea85e950 - + https://github.com/dotnet/sdk - 8d86d6f811bcc79295a40586ed4426661ca18f40 + c1946b8796fb94083e0bde5f1e905ad0ea85e950 - + https://github.com/dotnet/sdk - 8d86d6f811bcc79295a40586ed4426661ca18f40 + c1946b8796fb94083e0bde5f1e905ad0ea85e950 - + https://github.com/dotnet/sdk - 8d86d6f811bcc79295a40586ed4426661ca18f40 + c1946b8796fb94083e0bde5f1e905ad0ea85e950 @@ -138,9 +138,9 @@ a6a64706c78963cb033fd230f36518d3e773b725 - + https://github.com/microsoft/vstest - 6e064f9dbe9b824898a9e4c5a161f7886bf85a66 + 02296a2873652bc5911ae4b58d74f9faae03917d diff --git a/eng/Versions.props b/eng/Versions.props index d50c4f061..8a8ce79b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22558.10 - 7.0.200-preview.22558.10 + 7.0.200-preview.22558.16 + 7.0.200-preview.22558.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221107-04 + 17.5.0-preview-20221107-06 From 925b095e55030903b108974d981547918b2e7678 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 22:02:52 +0000 Subject: [PATCH 110/654] Update dependencies from https://github.com/dotnet/sdk build 20221108.18 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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9e9e9d519..12e14e78b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b83a54e69..12b7cbec3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - c1946b8796fb94083e0bde5f1e905ad0ea85e950 + f1dc358b371c5249407f050ec22e2a244ea6837a - + https://github.com/dotnet/sdk - c1946b8796fb94083e0bde5f1e905ad0ea85e950 + f1dc358b371c5249407f050ec22e2a244ea6837a - + https://github.com/dotnet/sdk - c1946b8796fb94083e0bde5f1e905ad0ea85e950 + f1dc358b371c5249407f050ec22e2a244ea6837a - + https://github.com/dotnet/sdk - c1946b8796fb94083e0bde5f1e905ad0ea85e950 + f1dc358b371c5249407f050ec22e2a244ea6837a diff --git a/eng/Versions.props b/eng/Versions.props index 8a8ce79b6..b5ee87602 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22558.16 - 7.0.200-preview.22558.16 + 7.0.200-preview.22558.18 + 7.0.200-preview.22558.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a910afa9d8182285a8213800b806d8a93e4353d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Nov 2022 00:20:34 +0000 Subject: [PATCH 111/654] Update dependencies from https://github.com/dotnet/sdk build 20221108.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.200 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.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.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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 12e14e78b..f1361bbff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12b7cbec3..f861a671c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - f1dc358b371c5249407f050ec22e2a244ea6837a + 9cd492bb8a3d8cbd256b369b151ae83f48b0a69f - + https://github.com/dotnet/sdk - f1dc358b371c5249407f050ec22e2a244ea6837a + 9cd492bb8a3d8cbd256b369b151ae83f48b0a69f - + https://github.com/dotnet/sdk - f1dc358b371c5249407f050ec22e2a244ea6837a + 9cd492bb8a3d8cbd256b369b151ae83f48b0a69f - + https://github.com/dotnet/sdk - f1dc358b371c5249407f050ec22e2a244ea6837a + 9cd492bb8a3d8cbd256b369b151ae83f48b0a69f diff --git a/eng/Versions.props b/eng/Versions.props index b5ee87602..2cb3b9eab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22558.18 - 7.0.200-preview.22558.18 + 7.0.200-preview.22558.19 + 7.0.200-preview.22558.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f8288d5d3d5d9f9f842f1d64eaf1d6c36d70fdee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Nov 2022 08:26:26 +0000 Subject: [PATCH 112/654] Update dependencies from https://github.com/dotnet/sdk build 20221108.33 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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index f1361bbff..15ddb6e6f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f861a671c..3519ff74a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 9cd492bb8a3d8cbd256b369b151ae83f48b0a69f + 99e8e7b28c9d2b321ec83d56ca70824dba5c4a2a - + https://github.com/dotnet/sdk - 9cd492bb8a3d8cbd256b369b151ae83f48b0a69f + 99e8e7b28c9d2b321ec83d56ca70824dba5c4a2a - + https://github.com/dotnet/sdk - 9cd492bb8a3d8cbd256b369b151ae83f48b0a69f + 99e8e7b28c9d2b321ec83d56ca70824dba5c4a2a - + https://github.com/dotnet/sdk - 9cd492bb8a3d8cbd256b369b151ae83f48b0a69f + 99e8e7b28c9d2b321ec83d56ca70824dba5c4a2a @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 7ac25017197ea1f7906e189d1479717c6fb12298 - + https://github.com/dotnet/fsharp - a6a64706c78963cb033fd230f36518d3e773b725 + d52c1a7fd204d8835b226e0be501da90c6142f14 - + https://github.com/dotnet/fsharp - a6a64706c78963cb033fd230f36518d3e773b725 + d52c1a7fd204d8835b226e0be501da90c6142f14 @@ -143,9 +143,9 @@ 02296a2873652bc5911ae4b58d74f9faae03917d - + https://github.com/dotnet/linker - 219e84c88def8276179f66282b2f7cb5f1d0d126 + 22376ee081ea791b4c8bfa82509f8e45af4bc629 linker @@ -154,9 +154,9 @@ c9a6d5cf04904ebd2b1aaab0adb33df16c8e76a6 - + https://github.com/dotnet/msbuild - 3bcada934edfa09e5f68222411e3efeda407985c + 15b127d2445d6b68429f1c31d9ff98fe4e1e728c diff --git a/eng/Versions.props b/eng/Versions.props index 2cb3b9eab..4d6892d48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22558.19 - 7.0.200-preview.22558.19 + 7.0.200-preview.22558.33 + 7.0.200-preview.22558.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 532f49d851181ca9cf24ba03395e0fa76c49af5b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Nov 2022 09:41:40 +0000 Subject: [PATCH 113/654] Update dependencies from https://github.com/dotnet/sdk build 20221109.2 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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 15ddb6e6f..02280fe1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3519ff74a..f18db148a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 99e8e7b28c9d2b321ec83d56ca70824dba5c4a2a + 4f929bc462171a10167d2464edbf279b83efff39 - + https://github.com/dotnet/sdk - 99e8e7b28c9d2b321ec83d56ca70824dba5c4a2a + 4f929bc462171a10167d2464edbf279b83efff39 - + https://github.com/dotnet/sdk - 99e8e7b28c9d2b321ec83d56ca70824dba5c4a2a + 4f929bc462171a10167d2464edbf279b83efff39 - + https://github.com/dotnet/sdk - 99e8e7b28c9d2b321ec83d56ca70824dba5c4a2a + 4f929bc462171a10167d2464edbf279b83efff39 diff --git a/eng/Versions.props b/eng/Versions.props index 4d6892d48..9fbc52356 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22558.33 - 7.0.200-preview.22558.33 + 7.0.200-preview.22559.2 + 7.0.200-preview.22559.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8128a812f5a89ab7be87841f65ba7b22a95748b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:57:07 -0800 Subject: [PATCH 114/654] Update dependencies from https://github.com/dotnet/arcade build 20221108.4 (#14940) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22557.1 -> To Version 7.0.0-beta.22558.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afb6c38e0..ff01f4301 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - dd38487d8af0ff04aa549142356cb0eaed11129b + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - dd38487d8af0ff04aa549142356cb0eaed11129b + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - dd38487d8af0ff04aa549142356cb0eaed11129b + 3f3c360819c5c092d0e4505a67dfe59a33fba557 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e6fb084c6..05157a23e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22557.1 + 7.0.0-beta.22558.4 diff --git a/global.json b/global.json index d7ac65792..dcb720a56 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.2.22477.23", + "dotnet": "7.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22557.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22557.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22558.4" } } From d9180eec40617ae3b74cbe7daee105d7fd5d8e88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 20:55:14 +0000 Subject: [PATCH 115/654] Update dependencies from https://github.com/dotnet/test-templates build 20221108.1 (#14920) [release/7.0.2xx] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff01f4301..f8e16bc24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,17 +90,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 010fea877df1a96cfd39a8b5d602ad247cf5242b + bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/test-templates - 010fea877df1a96cfd39a8b5d602ad247cf5242b + bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/test-templates - 010fea877df1a96cfd39a8b5d602ad247cf5242b + bb3695688177f5f80eeb3c0498168612e31549d5 diff --git a/eng/Versions.props b/eng/Versions.props index 05157a23e..77ed7e54d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22557.2 - 1.1.0-rc.22557.2 - 1.1.0-rc.22557.2 + 1.1.0-rc.22558.1 + 1.1.0-rc.22558.1 + 1.1.0-rc.22558.1 From cc2b612a27ac8a87cd69f839fb5ec653df4e7ce6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Nov 2022 23:52:26 +0000 Subject: [PATCH 116/654] Update dependencies from https://github.com/dotnet/sdk build 20221109.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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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-rc.2.22472.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 02280fe1f..0d6f21c45 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f18db148a..558e7d7ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 4f929bc462171a10167d2464edbf279b83efff39 + 8a57c254aee46e23062f78c4ebb6c5f555ec8a6a - + https://github.com/dotnet/sdk - 4f929bc462171a10167d2464edbf279b83efff39 + 8a57c254aee46e23062f78c4ebb6c5f555ec8a6a - + https://github.com/dotnet/sdk - 4f929bc462171a10167d2464edbf279b83efff39 + 8a57c254aee46e23062f78c4ebb6c5f555ec8a6a - + https://github.com/dotnet/sdk - 4f929bc462171a10167d2464edbf279b83efff39 + 8a57c254aee46e23062f78c4ebb6c5f555ec8a6a @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf 7ac25017197ea1f7906e189d1479717c6fb12298 - + https://github.com/dotnet/fsharp - d52c1a7fd204d8835b226e0be501da90c6142f14 + e601bf0b1c0fb7f28201b493329bb9881d9da319 - + https://github.com/dotnet/fsharp - d52c1a7fd204d8835b226e0be501da90c6142f14 + e601bf0b1c0fb7f28201b493329bb9881d9da319 diff --git a/eng/Versions.props b/eng/Versions.props index 9fbc52356..20711b68c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22559.2 - 7.0.200-preview.22559.2 + 7.0.200-preview.22559.16 + 7.0.200-preview.22559.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c4a11210a8d5ce1edb411d034cf2735802fe7876 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Nov 2022 01:35:21 +0000 Subject: [PATCH 117/654] Update dependencies from https://github.com/dotnet/sdk build 20221109.22 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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++- eng/Version.Details.xml | 128 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++-------- 3 files changed, 99 insertions(+), 89 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0d6f21c45..05b01de73 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,18 @@ + + + + + - + @@ -37,6 +42,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 558e7d7ea..96125e66c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - - https://github.com/dotnet/windowsdesktop - 50c77e366492856d6ac854e6b1a2e8ca4675aa12 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/windowsdesktop - 50c77e366492856d6ac854e6b1a2e8ca4675aa12 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/windowsdesktop - 50c77e366492856d6ac854e6b1a2e8ca4675aa12 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/windowsdesktop - 50c77e366492856d6ac854e6b1a2e8ca4675aa12 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f https://github.com/dotnet/llvm-project 78c9eaec7cec210dfaee9a0443d5816b59683697 - - https://github.com/dotnet/runtime - 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b12b77b241f0a093d53508c3cb2084860bd5339d + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b12b77b241f0a093d53508c3cb2084860bd5339d + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b12b77b241f0a093d53508c3cb2084860bd5339d + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b12b77b241f0a093d53508c3cb2084860bd5339d + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b12b77b241f0a093d53508c3cb2084860bd5339d + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b12b77b241f0a093d53508c3cb2084860bd5339d + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b12b77b241f0a093d53508c3cb2084860bd5339d + bb01bbf4433e27289b99001b7de6a582879d1835 https://github.com/dotnet/test-templates @@ -105,29 +105,29 @@ https://github.com/dotnet/sdk - 8a57c254aee46e23062f78c4ebb6c5f555ec8a6a + de08afd0d39ea1f37a7abe70d6702642ebef9567 - + https://github.com/dotnet/sdk - 8a57c254aee46e23062f78c4ebb6c5f555ec8a6a + de08afd0d39ea1f37a7abe70d6702642ebef9567 - + https://github.com/dotnet/sdk - 8a57c254aee46e23062f78c4ebb6c5f555ec8a6a + de08afd0d39ea1f37a7abe70d6702642ebef9567 - + https://github.com/dotnet/sdk - 8a57c254aee46e23062f78c4ebb6c5f555ec8a6a + de08afd0d39ea1f37a7abe70d6702642ebef9567 - - https://github.com/dotnet/winforms - 09d0a9536c37786c6e41520de9e66df86811be9b + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + e83409daa530605da4eb5f847c6740a520325d25 - - https://github.com/dotnet/wpf - 7ac25017197ea1f7906e189d1479717c6fb12298 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 636e2b7a00a434a354a126f510a56e16ce3c6bbc https://github.com/dotnet/fsharp @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6625add9a3eadc2954af0311be35290cfefcddb0 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 - + https://github.com/dotnet/emsdk - 6625add9a3eadc2954af0311be35290cfefcddb0 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 20711b68c..edce21ddb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rc.2.22472.13 + 7.0.0-rtm.22518.7 - 7.0.0-rc.2.22472.9 + 7.0.0-rtm.22518.2 @@ -50,13 +50,13 @@ - 7.0.0-rc.2.22476.2 - 7.0.0-rc.2.22476.2 - 7.0.0-rc.2.22476.2 - 7.0.0-rc.2.22476.2 - 7.0.0-rc.2.22476.2 - 7.0.0-rc.2.22476.2 - 7.0.0-rc.2.22476.2 + 7.0.0 + 7.0.0 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 0.2.0 @@ -64,32 +64,32 @@ 7.0.200 - 7.0.200-preview.22559.16 - 7.0.200-preview.22559.16 + 7.0.200-preview.22559.22 + 7.0.200-preview.22559.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rc.2.22472.3 + 7.0.0 - 7.0.0-rc.2.22472.3 - 7.0.0-rc.2.22472.3 - 7.0.0-rc.2.22472.3 - 7.0.0-rc.2.22472.3 - 7.0.0-rc.2.22472.3 - 7.0.0-rc.2.22472.3 + 7.0.0-rtm.22518.5 + 7.0.0-rtm.22518.5 + 7.0.0 + 7.0.0 + 7.0.0 + 7.0.0 2.1.0 - 7.0.0-rc.2.22472.13 - 7.0.0-rc.2.22472.13 - 7.0.0-rc.2.22472.13 - 7.0.0-rc.2.22472.13 + 7.0.0-rtm.22519.1 + 7.0.0-rtm.22519.1 + 7.0.0 + 7.0.0 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rc.2.22465.1 - 7.0.0-rc.2.22465.1 + 7.0.0 + 7.0.0 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 60162411b0ca2bc87bec1c89d641e6a556df7daa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Nov 2022 07:29:12 +0000 Subject: [PATCH 118/654] Update dependencies from https://github.com/dotnet/sdk build 20221109.25 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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 05b01de73..a62a009a0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96125e66c..f11ec4226 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - de08afd0d39ea1f37a7abe70d6702642ebef9567 + 5700e0be6bbc0afc9be2224ff398383719384e96 - + https://github.com/dotnet/sdk - de08afd0d39ea1f37a7abe70d6702642ebef9567 + 5700e0be6bbc0afc9be2224ff398383719384e96 - + https://github.com/dotnet/sdk - de08afd0d39ea1f37a7abe70d6702642ebef9567 + 5700e0be6bbc0afc9be2224ff398383719384e96 - + https://github.com/dotnet/sdk - de08afd0d39ea1f37a7abe70d6702642ebef9567 + 5700e0be6bbc0afc9be2224ff398383719384e96 @@ -129,13 +129,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - e601bf0b1c0fb7f28201b493329bb9881d9da319 + 126877797a797eeb17ddfb8d18904c18eca8aa5d - + https://github.com/dotnet/fsharp - e601bf0b1c0fb7f28201b493329bb9881d9da319 + 126877797a797eeb17ddfb8d18904c18eca8aa5d @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - c9a6d5cf04904ebd2b1aaab0adb33df16c8e76a6 + 09bf1ae4c8671b48bbf4e28f2a2d926de037d068 diff --git a/eng/Versions.props b/eng/Versions.props index edce21ddb..6ee2655c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22559.22 - 7.0.200-preview.22559.22 + 7.0.200-preview.22559.25 + 7.0.200-preview.22559.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6dba909770f50f34ec3b3cf230ac7dc66d6b0223 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Nov 2022 08:41:28 +0000 Subject: [PATCH 119/654] Update dependencies from https://github.com/dotnet/sdk build 20221109.30 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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index a62a009a0..9df1a98e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f11ec4226..dfe4cd7df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 5700e0be6bbc0afc9be2224ff398383719384e96 + 3c091784c0850141a6592ef43a0d15417241ae8e - + https://github.com/dotnet/sdk - 5700e0be6bbc0afc9be2224ff398383719384e96 + 3c091784c0850141a6592ef43a0d15417241ae8e - + https://github.com/dotnet/sdk - 5700e0be6bbc0afc9be2224ff398383719384e96 + 3c091784c0850141a6592ef43a0d15417241ae8e - + https://github.com/dotnet/sdk - 5700e0be6bbc0afc9be2224ff398383719384e96 + 3c091784c0850141a6592ef43a0d15417241ae8e diff --git a/eng/Versions.props b/eng/Versions.props index 6ee2655c7..330d8bb93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22559.25 - 7.0.200-preview.22559.25 + 7.0.200-preview.22559.30 + 7.0.200-preview.22559.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6dc17cd7c7cedc5501aa2a23d41250fbbdd8c794 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Nov 2022 01:25:26 +0000 Subject: [PATCH 120/654] Update dependencies from https://github.com/dotnet/sdk build 20221110.13 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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +----------- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9df1a98e0..0f1490e46 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,18 +7,13 @@ - - - - - - + @@ -42,11 +37,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfe4cd7df..e5ed388b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 3c091784c0850141a6592ef43a0d15417241ae8e + 3ad525fd2a5ea1be330fc0a51322d77698a0ce5c - + https://github.com/dotnet/sdk - 3c091784c0850141a6592ef43a0d15417241ae8e + 3ad525fd2a5ea1be330fc0a51322d77698a0ce5c - + https://github.com/dotnet/sdk - 3c091784c0850141a6592ef43a0d15417241ae8e + 3ad525fd2a5ea1be330fc0a51322d77698a0ce5c - + https://github.com/dotnet/sdk - 3c091784c0850141a6592ef43a0d15417241ae8e + 3ad525fd2a5ea1be330fc0a51322d77698a0ce5c @@ -129,13 +129,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 126877797a797eeb17ddfb8d18904c18eca8aa5d + 7e754450fe7056c1aa85ff4ae2f030e100dd5ded - + https://github.com/dotnet/fsharp - 126877797a797eeb17ddfb8d18904c18eca8aa5d + 7e754450fe7056c1aa85ff4ae2f030e100dd5ded diff --git a/eng/Versions.props b/eng/Versions.props index 330d8bb93..e5e8ed650 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22559.30 - 7.0.200-preview.22559.30 + 7.0.200-preview.22560.13 + 7.0.200-preview.22560.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6a8091ee09ac2eae026743b2a55cbc31ef752d98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Nov 2022 06:52:12 +0000 Subject: [PATCH 121/654] Update dependencies from https://github.com/dotnet/sdk build 20221110.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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0f1490e46..8533e8804 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5ed388b5..9ab871321 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 3ad525fd2a5ea1be330fc0a51322d77698a0ce5c + ba574343c4f0292130a02eef010ae2f3f6d48550 - + https://github.com/dotnet/sdk - 3ad525fd2a5ea1be330fc0a51322d77698a0ce5c + ba574343c4f0292130a02eef010ae2f3f6d48550 - + https://github.com/dotnet/sdk - 3ad525fd2a5ea1be330fc0a51322d77698a0ce5c + ba574343c4f0292130a02eef010ae2f3f6d48550 - + https://github.com/dotnet/sdk - 3ad525fd2a5ea1be330fc0a51322d77698a0ce5c + ba574343c4f0292130a02eef010ae2f3f6d48550 @@ -138,9 +138,9 @@ 7e754450fe7056c1aa85ff4ae2f030e100dd5ded - + https://github.com/microsoft/vstest - 02296a2873652bc5911ae4b58d74f9faae03917d + 4e8b9437a0a5a045f26615a1fbd9d1fc50f6d86f diff --git a/eng/Versions.props b/eng/Versions.props index e5e8ed650..430633d34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22560.13 - 7.0.200-preview.22560.13 + 7.0.200-preview.22560.16 + 7.0.200-preview.22560.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221107-06 + 17.5.0-preview-20221109-01 From c2b68e23038c9c2d2daa226685eabaf80d06282e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Nov 2022 14:17:39 +0000 Subject: [PATCH 122/654] Update dependencies from https://github.com/dotnet/sdk build 20221111.1 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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8533e8804..5886071fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ab871321..0731e06a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - ba574343c4f0292130a02eef010ae2f3f6d48550 + acb194fe588c49d3b124b7c96dea57382a5475eb - + https://github.com/dotnet/sdk - ba574343c4f0292130a02eef010ae2f3f6d48550 + acb194fe588c49d3b124b7c96dea57382a5475eb - + https://github.com/dotnet/sdk - ba574343c4f0292130a02eef010ae2f3f6d48550 + acb194fe588c49d3b124b7c96dea57382a5475eb - + https://github.com/dotnet/sdk - ba574343c4f0292130a02eef010ae2f3f6d48550 + acb194fe588c49d3b124b7c96dea57382a5475eb diff --git a/eng/Versions.props b/eng/Versions.props index 430633d34..1afc2aa60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22560.16 - 7.0.200-preview.22560.16 + 7.0.200-preview.22561.1 + 7.0.200-preview.22561.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 630c5bfb6cc283506c656a5af15302dd38f6ad0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Nov 2022 23:02:54 +0000 Subject: [PATCH 123/654] Update dependencies from https://github.com/dotnet/sdk build 20221111.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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 6 +++--- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5886071fc..d0eba5d63 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0731e06a8..37414c9d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - acb194fe588c49d3b124b7c96dea57382a5475eb + cb2f8e852ee3a9f78ccbf20038ea22c063ca2c1d - + https://github.com/dotnet/sdk - acb194fe588c49d3b124b7c96dea57382a5475eb + cb2f8e852ee3a9f78ccbf20038ea22c063ca2c1d - + https://github.com/dotnet/sdk - acb194fe588c49d3b124b7c96dea57382a5475eb + cb2f8e852ee3a9f78ccbf20038ea22c063ca2c1d - + https://github.com/dotnet/sdk - acb194fe588c49d3b124b7c96dea57382a5475eb + cb2f8e852ee3a9f78ccbf20038ea22c063ca2c1d @@ -129,18 +129,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 7e754450fe7056c1aa85ff4ae2f030e100dd5ded + e692bfec92213d771229e9adb16c915f0379c467 - + https://github.com/dotnet/fsharp - 7e754450fe7056c1aa85ff4ae2f030e100dd5ded + e692bfec92213d771229e9adb16c915f0379c467 - + https://github.com/microsoft/vstest - 4e8b9437a0a5a045f26615a1fbd9d1fc50f6d86f + 2d45edb6c73ac1c4b1f5fcbc7cfcb6bd1cf2ea6c @@ -154,9 +154,9 @@ 09bf1ae4c8671b48bbf4e28f2a2d926de037d068 - + https://github.com/dotnet/msbuild - 15b127d2445d6b68429f1c31d9ff98fe4e1e728c + 7a8b3369d4c368c01e9790fe26923e10829ca3a4 diff --git a/eng/Versions.props b/eng/Versions.props index 1afc2aa60..a5814591e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22561.1 - 7.0.200-preview.22561.1 + 7.0.200-preview.22561.16 + 7.0.200-preview.22561.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221109-01 + 17.5.0-preview-20221110-01 From f8fbbc0ee75a681ba6a001131e4e0b2880ae081b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 13 Nov 2022 01:24:09 +0000 Subject: [PATCH 124/654] Update dependencies from https://github.com/dotnet/sdk build 20221112.1 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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index d0eba5d63..6294ad78b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37414c9d0..70e5d36ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - cb2f8e852ee3a9f78ccbf20038ea22c063ca2c1d + e250cd7ba1ca927d3048c294578f2ff71e8c531e - + https://github.com/dotnet/sdk - cb2f8e852ee3a9f78ccbf20038ea22c063ca2c1d + e250cd7ba1ca927d3048c294578f2ff71e8c531e - + https://github.com/dotnet/sdk - cb2f8e852ee3a9f78ccbf20038ea22c063ca2c1d + e250cd7ba1ca927d3048c294578f2ff71e8c531e - + https://github.com/dotnet/sdk - cb2f8e852ee3a9f78ccbf20038ea22c063ca2c1d + e250cd7ba1ca927d3048c294578f2ff71e8c531e diff --git a/eng/Versions.props b/eng/Versions.props index a5814591e..f91d1fa7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22561.16 - 7.0.200-preview.22561.16 + 7.0.200-preview.22562.1 + 7.0.200-preview.22562.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6d7321475b6265490275aa30d1f8c7e8eab2b243 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Nov 2022 03:18:17 +0000 Subject: [PATCH 125/654] Update dependencies from https://github.com/dotnet/sdk build 20221113.1 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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6294ad78b..72d8fe942 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70e5d36ea..a2990a008 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - e250cd7ba1ca927d3048c294578f2ff71e8c531e + b0af0e2f9d4b17a21dacd0fbe320fd65e10fb8d4 - + https://github.com/dotnet/sdk - e250cd7ba1ca927d3048c294578f2ff71e8c531e + b0af0e2f9d4b17a21dacd0fbe320fd65e10fb8d4 - + https://github.com/dotnet/sdk - e250cd7ba1ca927d3048c294578f2ff71e8c531e + b0af0e2f9d4b17a21dacd0fbe320fd65e10fb8d4 - + https://github.com/dotnet/sdk - e250cd7ba1ca927d3048c294578f2ff71e8c531e + b0af0e2f9d4b17a21dacd0fbe320fd65e10fb8d4 @@ -138,9 +138,9 @@ e692bfec92213d771229e9adb16c915f0379c467 - + https://github.com/microsoft/vstest - 2d45edb6c73ac1c4b1f5fcbc7cfcb6bd1cf2ea6c + b61973970a544ea30d03ac35b6f5535adb64fd4c diff --git a/eng/Versions.props b/eng/Versions.props index f91d1fa7d..8d5855406 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22562.1 - 7.0.200-preview.22562.1 + 7.0.200-preview.22563.1 + 7.0.200-preview.22563.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221110-01 + 17.5.0-preview-20221111-01 From 3c306695f3baff29bc91e18ddb537c6984f17d86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Nov 2022 07:02:56 +0000 Subject: [PATCH 126/654] Update dependencies from https://github.com/dotnet/sdk build 20221113.4 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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 72d8fe942..a9e7088a0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2990a008..58222280f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - b0af0e2f9d4b17a21dacd0fbe320fd65e10fb8d4 + 0c96321822b5d5a5cd8484107e399ed33bf77167 - + https://github.com/dotnet/sdk - b0af0e2f9d4b17a21dacd0fbe320fd65e10fb8d4 + 0c96321822b5d5a5cd8484107e399ed33bf77167 - + https://github.com/dotnet/sdk - b0af0e2f9d4b17a21dacd0fbe320fd65e10fb8d4 + 0c96321822b5d5a5cd8484107e399ed33bf77167 - + https://github.com/dotnet/sdk - b0af0e2f9d4b17a21dacd0fbe320fd65e10fb8d4 + 0c96321822b5d5a5cd8484107e399ed33bf77167 @@ -154,9 +154,9 @@ 09bf1ae4c8671b48bbf4e28f2a2d926de037d068 - + https://github.com/dotnet/msbuild - 7a8b3369d4c368c01e9790fe26923e10829ca3a4 + d14b74d6f08ab7f2e17706359a38f8c22b569cb5 diff --git a/eng/Versions.props b/eng/Versions.props index 8d5855406..2b17ca545 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22563.1 - 7.0.200-preview.22563.1 + 7.0.200-preview.22563.4 + 7.0.200-preview.22563.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c193db389be8b61af5330e067763912b49936495 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Nov 2022 08:22:33 +0000 Subject: [PATCH 127/654] Update dependencies from https://github.com/dotnet/sdk build 20221113.8 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.200 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.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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index a9e7088a0..748c5ce59 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58222280f..0c64ece50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 0c96321822b5d5a5cd8484107e399ed33bf77167 + d85153e4538451d411a1eebb0ec4f06586306d1b - + https://github.com/dotnet/sdk - 0c96321822b5d5a5cd8484107e399ed33bf77167 + d85153e4538451d411a1eebb0ec4f06586306d1b - + https://github.com/dotnet/sdk - 0c96321822b5d5a5cd8484107e399ed33bf77167 + d85153e4538451d411a1eebb0ec4f06586306d1b - + https://github.com/dotnet/sdk - 0c96321822b5d5a5cd8484107e399ed33bf77167 + d85153e4538451d411a1eebb0ec4f06586306d1b @@ -129,13 +129,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - e692bfec92213d771229e9adb16c915f0379c467 + 9f7329d4b4deab97603643eaa6607779d03568f1 - + https://github.com/dotnet/fsharp - e692bfec92213d771229e9adb16c915f0379c467 + 9f7329d4b4deab97603643eaa6607779d03568f1 diff --git a/eng/Versions.props b/eng/Versions.props index 2b17ca545..08d3f4295 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22563.4 - 7.0.200-preview.22563.4 + 7.0.200-preview.22563.8 + 7.0.200-preview.22563.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 55168121bb3ddbe95be136bd5cd71cdc7198f262 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 14 Nov 2022 07:52:14 -0800 Subject: [PATCH 128/654] [automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#14723) * Adding ppc64le arch for source build (#14631) * Remove llvm-project from source-build as we have removed this dependency in runtime. (#14697) * Remove llvm-project from source-build as we have removed this dependency in runtime. * Add patch for the backport PR to get this to build for now. * Remove unneeded copy of this patch. * [release/7.0.1xx] Update dependencies from dotnet/sdk (#14705) [release/7.0.1xx] Update dependencies from dotnet/sdk - Remove backported command-line-api patch * Don't use the MSBuild server process for init-build.proj. (#14643) * Don't use the MSBuild server process for init-build.proj. This appears to fix an issue where our SdkResolver is not loaded because there are still lingering dotnet processes when we try to binplace the resolver DLL. * Address code review feedback. * Update patch backport comments and remove obsolete patch (#14710) * [release/7.0.1xx] .NET Source-Build 7.0.100-rc.2 October 2022 Updates (#14728) * Update source-build to 7.0 RC2 * Also update tarball global.json * Don't touch root global.json in case it is managed by automation * Add back source-build patch that is still required in this branch Co-authored-by: Swapnali911 Co-authored-by: Chris Rummel Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Jason Zhai --- Directory.Build.props | 1 + eng/Version.Details.xml | 5 - eng/Versions.props | 2 +- .../tarball/content/Directory.Build.props | 1 + src/SourceBuild/tarball/content/build.sh | 2 + src/SourceBuild/tarball/content/global.json | 2 +- .../tarball/content/repos/known-good.proj | 1 - .../tarball/content/repos/llvm-project.proj | 24 -- .../content/repos/runtime-portable.proj | 1 - .../tarball/content/repos/runtime.proj | 1 - ...m-LLVM-directory-to-root-directory-t.patch | 298 ------------------ .../0004-Add-SourceBuild.props.patch | 26 -- .../nuget-client/0002-Add-CA2213-NoWarn.patch | 23 -- ...ilt-assets-during-source-build-for-r.patch | 2 +- ...ObjWriter-dependency-in-source-build.patch | 40 +++ ...02-Look-for-msbuild-net7.0-artifacts.patch | 3 +- src/redist/targets/Crossgen.targets | 4 +- .../targets/GenerateBundledVersions.targets | 9 +- 18 files changed, 56 insertions(+), 389 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/repos/llvm-project.proj delete mode 100644 src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch delete mode 100644 src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch create mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch diff --git a/Directory.Build.props b/Directory.Build.props index 15c9d27b7..b87eeccca 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,6 +11,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) $(BuildArchitecture) + $(BuildArchitecture) x64 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8e16bc24..7f980082c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,11 +17,6 @@ https://github.com/dotnet/windowsdesktop ae2bcebe032a50af14ac0b05efcaa8477b049834 - - https://github.com/dotnet/llvm-project - 78c9eaec7cec210dfaee9a0443d5816b59683697 - - https://github.com/dotnet/runtime 5147f6fc78520db322118cc8287651cb54a506df diff --git a/eng/Versions.props b/eng/Versions.props index 77ed7e54d..ef9ce22a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.100-rc.1 + 7.0.100-rc.2 diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 61cc6ff67..860785575 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -19,6 +19,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) $(BuildArchitecture) + $(BuildArchitecture) x64 false diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index 0d6bbb91e..e899d2f80 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -178,6 +178,8 @@ if [ "$alternateTarget" == "true" ]; then "$CLI_ROOT/dotnet" $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll "$SCRIPT_ROOT/build.proj" /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log /clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@" else $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log $SCRIPT_ROOT/tools-local/init-build.proj /t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + # kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver + $CLI_ROOT/dotnet build-server shutdown $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/Build_$LogDateStamp.log $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@" fi diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 8d6aba31b..8d9568376 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.1.22431.12" + "dotnet": "7.0.100-rc.2.22477.23" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 937ab8f54..50720cc4c 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -33,7 +33,6 @@ - diff --git a/src/SourceBuild/tarball/content/repos/llvm-project.proj b/src/SourceBuild/tarball/content/repos/llvm-project.proj deleted file mode 100644 index addb0457c..000000000 --- a/src/SourceBuild/tarball/content/repos/llvm-project.proj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - $(BuildCommandArgs) /p:OutputRid=$(PortableRid) - $(ProjectDirectory)build$(ShellExtension) $(StandardSourceBuildArgs) $(BuildCommandArgs) - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false - - - - - - - - - - - - diff --git a/src/SourceBuild/tarball/content/repos/runtime-portable.proj b/src/SourceBuild/tarball/content/repos/runtime-portable.proj index 6c3939492..09b4625e9 100644 --- a/src/SourceBuild/tarball/content/repos/runtime-portable.proj +++ b/src/SourceBuild/tarball/content/repos/runtime-portable.proj @@ -9,7 +9,6 @@ - diff --git a/src/SourceBuild/tarball/content/repos/runtime.proj b/src/SourceBuild/tarball/content/repos/runtime.proj index 04ff19ab1..59ea1d6fc 100644 --- a/src/SourceBuild/tarball/content/repos/runtime.proj +++ b/src/SourceBuild/tarball/content/repos/runtime.proj @@ -18,7 +18,6 @@ - diff --git a/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch b/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch deleted file mode 100644 index 868911a22..000000000 --- a/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch +++ /dev/null @@ -1,298 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 10 Aug 2022 23:16:19 -0500 -Subject: [PATCH] Copy license form LLVM directory to root directory to satisfy - license checker. - -Backport PR: https://github.com/dotnet/llvm-project/pull/242. - ---- - LICENSE.TXT | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 279 insertions(+) - create mode 100644 LICENSE.TXT - -diff --git a/LICENSE.TXT b/LICENSE.TXT -new file mode 100644 -index 000000000000..fa6ac5400070 ---- /dev/null -+++ b/LICENSE.TXT -@@ -0,0 +1,279 @@ -+============================================================================== -+The LLVM Project is under the Apache License v2.0 with LLVM Exceptions: -+============================================================================== -+ -+ Apache License -+ Version 2.0, January 2004 -+ http://www.apache.org/licenses/ -+ -+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -+ -+ 1. Definitions. -+ -+ "License" shall mean the terms and conditions for use, reproduction, -+ and distribution as defined by Sections 1 through 9 of this document. -+ -+ "Licensor" shall mean the copyright owner or entity authorized by -+ the copyright owner that is granting the License. -+ -+ "Legal Entity" shall mean the union of the acting entity and all -+ other entities that control, are controlled by, or are under common -+ control with that entity. For the purposes of this definition, -+ "control" means (i) the power, direct or indirect, to cause the -+ direction or management of such entity, whether by contract or -+ otherwise, or (ii) ownership of fifty percent (50%) or more of the -+ outstanding shares, or (iii) beneficial ownership of such entity. -+ -+ "You" (or "Your") shall mean an individual or Legal Entity -+ exercising permissions granted by this License. -+ -+ "Source" form shall mean the preferred form for making modifications, -+ including but not limited to software source code, documentation -+ source, and configuration files. -+ -+ "Object" form shall mean any form resulting from mechanical -+ transformation or translation of a Source form, including but -+ not limited to compiled object code, generated documentation, -+ and conversions to other media types. -+ -+ "Work" shall mean the work of authorship, whether in Source or -+ Object form, made available under the License, as indicated by a -+ copyright notice that is included in or attached to the work -+ (an example is provided in the Appendix below). -+ -+ "Derivative Works" shall mean any work, whether in Source or Object -+ form, that is based on (or derived from) the Work and for which the -+ editorial revisions, annotations, elaborations, or other modifications -+ represent, as a whole, an original work of authorship. For the purposes -+ of this License, Derivative Works shall not include works that remain -+ separable from, or merely link (or bind by name) to the interfaces of, -+ the Work and Derivative Works thereof. -+ -+ "Contribution" shall mean any work of authorship, including -+ the original version of the Work and any modifications or additions -+ to that Work or Derivative Works thereof, that is intentionally -+ submitted to Licensor for inclusion in the Work by the copyright owner -+ or by an individual or Legal Entity authorized to submit on behalf of -+ the copyright owner. For the purposes of this definition, "submitted" -+ means any form of electronic, verbal, or written communication sent -+ to the Licensor or its representatives, including but not limited to -+ communication on electronic mailing lists, source code control systems, -+ and issue tracking systems that are managed by, or on behalf of, the -+ Licensor for the purpose of discussing and improving the Work, but -+ excluding communication that is conspicuously marked or otherwise -+ designated in writing by the copyright owner as "Not a Contribution." -+ -+ "Contributor" shall mean Licensor and any individual or Legal Entity -+ on behalf of whom a Contribution has been received by Licensor and -+ subsequently incorporated within the Work. -+ -+ 2. Grant of Copyright License. Subject to the terms and conditions of -+ this License, each Contributor hereby grants to You a perpetual, -+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable -+ copyright license to reproduce, prepare Derivative Works of, -+ publicly display, publicly perform, sublicense, and distribute the -+ Work and such Derivative Works in Source or Object form. -+ -+ 3. Grant of Patent License. Subject to the terms and conditions of -+ this License, each Contributor hereby grants to You a perpetual, -+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable -+ (except as stated in this section) patent license to make, have made, -+ use, offer to sell, sell, import, and otherwise transfer the Work, -+ where such license applies only to those patent claims licensable -+ by such Contributor that are necessarily infringed by their -+ Contribution(s) alone or by combination of their Contribution(s) -+ with the Work to which such Contribution(s) was submitted. If You -+ institute patent litigation against any entity (including a -+ cross-claim or counterclaim in a lawsuit) alleging that the Work -+ or a Contribution incorporated within the Work constitutes direct -+ or contributory patent infringement, then any patent licenses -+ granted to You under this License for that Work shall terminate -+ as of the date such litigation is filed. -+ -+ 4. Redistribution. You may reproduce and distribute copies of the -+ Work or Derivative Works thereof in any medium, with or without -+ modifications, and in Source or Object form, provided that You -+ meet the following conditions: -+ -+ (a) You must give any other recipients of the Work or -+ Derivative Works a copy of this License; and -+ -+ (b) You must cause any modified files to carry prominent notices -+ stating that You changed the files; and -+ -+ (c) You must retain, in the Source form of any Derivative Works -+ that You distribute, all copyright, patent, trademark, and -+ attribution notices from the Source form of the Work, -+ excluding those notices that do not pertain to any part of -+ the Derivative Works; and -+ -+ (d) If the Work includes a "NOTICE" text file as part of its -+ distribution, then any Derivative Works that You distribute must -+ include a readable copy of the attribution notices contained -+ within such NOTICE file, excluding those notices that do not -+ pertain to any part of the Derivative Works, in at least one -+ of the following places: within a NOTICE text file distributed -+ as part of the Derivative Works; within the Source form or -+ documentation, if provided along with the Derivative Works; or, -+ within a display generated by the Derivative Works, if and -+ wherever such third-party notices normally appear. The contents -+ of the NOTICE file are for informational purposes only and -+ do not modify the License. You may add Your own attribution -+ notices within Derivative Works that You distribute, alongside -+ or as an addendum to the NOTICE text from the Work, provided -+ that such additional attribution notices cannot be construed -+ as modifying the License. -+ -+ You may add Your own copyright statement to Your modifications and -+ may provide additional or different license terms and conditions -+ for use, reproduction, or distribution of Your modifications, or -+ for any such Derivative Works as a whole, provided Your use, -+ reproduction, and distribution of the Work otherwise complies with -+ the conditions stated in this License. -+ -+ 5. Submission of Contributions. Unless You explicitly state otherwise, -+ any Contribution intentionally submitted for inclusion in the Work -+ by You to the Licensor shall be under the terms and conditions of -+ this License, without any additional terms or conditions. -+ Notwithstanding the above, nothing herein shall supersede or modify -+ the terms of any separate license agreement you may have executed -+ with Licensor regarding such Contributions. -+ -+ 6. Trademarks. This License does not grant permission to use the trade -+ names, trademarks, service marks, or product names of the Licensor, -+ except as required for reasonable and customary use in describing the -+ origin of the Work and reproducing the content of the NOTICE file. -+ -+ 7. Disclaimer of Warranty. Unless required by applicable law or -+ agreed to in writing, Licensor provides the Work (and each -+ Contributor provides its Contributions) on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -+ implied, including, without limitation, any warranties or conditions -+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -+ PARTICULAR PURPOSE. You are solely responsible for determining the -+ appropriateness of using or redistributing the Work and assume any -+ risks associated with Your exercise of permissions under this License. -+ -+ 8. Limitation of Liability. In no event and under no legal theory, -+ whether in tort (including negligence), contract, or otherwise, -+ unless required by applicable law (such as deliberate and grossly -+ negligent acts) or agreed to in writing, shall any Contributor be -+ liable to You for damages, including any direct, indirect, special, -+ incidental, or consequential damages of any character arising as a -+ result of this License or out of the use or inability to use the -+ Work (including but not limited to damages for loss of goodwill, -+ work stoppage, computer failure or malfunction, or any and all -+ other commercial damages or losses), even if such Contributor -+ has been advised of the possibility of such damages. -+ -+ 9. Accepting Warranty or Additional Liability. While redistributing -+ the Work or Derivative Works thereof, You may choose to offer, -+ and charge a fee for, acceptance of support, warranty, indemnity, -+ or other liability obligations and/or rights consistent with this -+ License. However, in accepting such obligations, You may act only -+ on Your own behalf and on Your sole responsibility, not on behalf -+ of any other Contributor, and only if You agree to indemnify, -+ defend, and hold each Contributor harmless for any liability -+ incurred by, or claims asserted against, such Contributor by reason -+ of your accepting any such warranty or additional liability. -+ -+ END OF TERMS AND CONDITIONS -+ -+ APPENDIX: How to apply the Apache License to your work. -+ -+ To apply the Apache License to your work, attach the following -+ boilerplate notice, with the fields enclosed by brackets "[]" -+ replaced with your own identifying information. (Don't include -+ the brackets!) The text should be enclosed in the appropriate -+ comment syntax for the file format. We also recommend that a -+ file or class name and description of purpose be included on the -+ same "printed page" as the copyright notice for easier -+ identification within third-party archives. -+ -+ Copyright [yyyy] [name of copyright owner] -+ -+ Licensed under the Apache License, Version 2.0 (the "License"); -+ you may not use this file except in compliance with the License. -+ You may obtain a copy of the License at -+ -+ http://www.apache.org/licenses/LICENSE-2.0 -+ -+ Unless required by applicable law or agreed to in writing, software -+ distributed under the License is distributed on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ See the License for the specific language governing permissions and -+ limitations under the License. -+ -+ -+---- LLVM Exceptions to the Apache 2.0 License ---- -+ -+As an exception, if, as a result of your compiling your source code, portions -+of this Software are embedded into an Object form of such source code, you -+may redistribute such embedded portions in such Object form without complying -+with the conditions of Sections 4(a), 4(b) and 4(d) of the License. -+ -+In addition, if you combine or link compiled forms of this Software with -+software that is licensed under the GPLv2 ("Combined Software") and if a -+court of competent jurisdiction determines that the patent provision (Section -+3), the indemnity provision (Section 9) or other Section of the License -+conflicts with the conditions of the GPLv2, you may retroactively and -+prospectively choose to deem waived or otherwise exclude such Section(s) of -+the License, but only in their entirety and only with respect to the Combined -+Software. -+ -+============================================================================== -+Software from third parties included in the LLVM Project: -+============================================================================== -+The LLVM Project contains third party software which is under different license -+terms. All such code will be identified clearly using at least one of two -+mechanisms: -+1) It will be in a separate directory tree with its own `LICENSE.txt` or -+ `LICENSE` file at the top containing the specific license and restrictions -+ which apply to that software, or -+2) It will contain specific license and restriction terms at the top of every -+ file. -+ -+============================================================================== -+Legacy LLVM License (https://llvm.org/docs/DeveloperPolicy.html#legacy): -+============================================================================== -+University of Illinois/NCSA -+Open Source License -+ -+Copyright (c) 2003-2019 University of Illinois at Urbana-Champaign. -+All rights reserved. -+ -+Developed by: -+ -+ LLVM Team -+ -+ University of Illinois at Urbana-Champaign -+ -+ http://llvm.org -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy of -+this software and associated documentation files (the "Software"), to deal with -+the Software without restriction, including without limitation the rights to -+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -+of the Software, and to permit persons to whom the Software is furnished to do -+so, subject to the following conditions: -+ -+ * Redistributions of source code must retain the above copyright notice, -+ this list of conditions and the following disclaimers. -+ -+ * Redistributions in binary form must reproduce the above copyright notice, -+ this list of conditions and the following disclaimers in the -+ documentation and/or other materials provided with the distribution. -+ -+ * Neither the names of the LLVM Team, University of Illinois at -+ Urbana-Champaign, nor the names of its contributors may be used to -+ endorse or promote products derived from this Software without specific -+ prior written permission. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE -+SOFTWARE. -+ diff --git a/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch b/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch deleted file mode 100644 index 02d7b7b61..000000000 --- a/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 11 Aug 2022 01:08:46 -0500 -Subject: [PATCH] Add SourceBuild.props. - -Backport PR: https://github.com/dotnet/llvm-project/pull/242. - ---- - eng/SourceBuild.props | 8 ++++++++ - 1 file changed, 8 insertions(+) - create mode 100644 eng/SourceBuild.props - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -new file mode 100644 -index 000000000000..93e2809599f6 ---- /dev/null -+++ b/eng/SourceBuild.props -@@ -0,0 +1,8 @@ -+ -+ -+ -+ llvm-project -+ true -+ -+ -+ diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch deleted file mode 100644 index 4625e0e9a..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Mon, 25 Jul 2022 15:53:59 +0000 -Subject: [PATCH] Add CA2213 NoWarn - -Workaround until NuGet updates to build with latest .NET toolset. ---- - build/common.project.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/common.project.props b/build/common.project.props -index 93287fdde..9d1fb3bce 100644 ---- a/build/common.project.props -+++ b/build/common.project.props -@@ -52,7 +52,7 @@ - $(SolutionPackagesFolder)microsoft.dotnet.maestro.tasks\1.1.0-beta.21378.2\tools\netcoreapp3.1\Microsoft.DotNet.Maestro.Tasks.dll - $(NoWarn);NU5105;MSB3277 - -- $(NoWarn);CS1998;CA1416;CS0618;CS1574 -+ $(NoWarn);CS1998;CA1416;CS0618;CS1574;CA2213 - - - diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch index d1ae9b05d..eec487f1b 100644 --- a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch +++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch @@ -15,7 +15,7 @@ This is taking the approach used in previous versions of source-build: update th Contributes to https://github.com/dotnet/source-build/issues/2420 Contributes to https://github.com/dotnet/source-build/issues/2527 -Backport: https://github.com/dotnet/source-build/issues/2708 +Backport: https://github.com/dotnet/source-build/issues/3049 --- eng/Versions.props | 14 -------------- src/Directory.Build.targets | 5 +++-- diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch new file mode 100644 index 000000000..02e49eec9 --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch @@ -0,0 +1,40 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Mon, 26 Sep 2022 14:25:33 -0500 +Subject: Remove LLVM ObjWriter dependency in source-build + +Backport PR: https://github.com/dotnet/runtime/pull/76206. + +--- + src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props +index 8c4fce523906e..4fd1db03e8a48 100644 +--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props ++++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props +@@ -48,12 +48,14 @@ + + + true ++ ++ true + + + + + +- ++ + $(ObjWriterVersion) + + +@@ -62,7 +64,7 @@ + $(NetStandardLibraryVersion) + + +- ++ + PreserveNewest + false + false diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch index cf69f8b84..dd0d19c7a 100644 --- a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch +++ b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch @@ -3,8 +3,7 @@ From: Logan Bussell Date: Tue, 20 Sep 2022 10:10:29 -0700 Subject: [PATCH] Look for msbuild net7.0 artifacts -This patch can be removed once https://github.com/dotnet/msbuild/pull/7790 flows -into dotnet/sdk, at which point that repo will need this change. +Backport: https://github.com/dotnet/sdk/pull/28425 --- .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index c7a7642e4..da7d186a1 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,7 +1,7 @@ - + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 275ec3a11..c9718bef9 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -168,6 +168,7 @@ linux-bionic-arm64; linux-bionic-x64; linux-bionic-x86; + linux-ppc64le; "/> - + + @@ -444,7 +447,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" - RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackRuntimeIdentifiers="@(AspNetCore70RuntimePackRids, '%3B')" RuntimePackExcludedRuntimeIdentifiers="android" /> @@ -569,7 +572,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackVersion="$(_AspNet60TargetingPackVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" - RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackRuntimeIdentifiers="@(AspNetCore60RuntimePackRids, '%3B')" /> Date: Mon, 14 Nov 2022 17:50:14 +0000 Subject: [PATCH 129/654] Update dependencies from https://github.com/dotnet/sdk build 20221114.5 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.200 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 748c5ce59..d71f693c5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c64ece50..257de5bbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - d85153e4538451d411a1eebb0ec4f06586306d1b + b1e1cfbc26187bdf545dee1f55ae79d3f903bcf5 - + https://github.com/dotnet/sdk - d85153e4538451d411a1eebb0ec4f06586306d1b + b1e1cfbc26187bdf545dee1f55ae79d3f903bcf5 - + https://github.com/dotnet/sdk - d85153e4538451d411a1eebb0ec4f06586306d1b + b1e1cfbc26187bdf545dee1f55ae79d3f903bcf5 - + https://github.com/dotnet/sdk - d85153e4538451d411a1eebb0ec4f06586306d1b + b1e1cfbc26187bdf545dee1f55ae79d3f903bcf5 diff --git a/eng/Versions.props b/eng/Versions.props index 08d3f4295..74fd8c9d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22563.8 - 7.0.200-preview.22563.8 + 7.0.200-preview.22564.5 + 7.0.200-preview.22564.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0cf340bebe7e70dc4eeb7ca09e08977975d847a7 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 14 Nov 2022 10:50:10 -0800 Subject: [PATCH 130/654] Update asp.net templates (#14959) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ef9ce22a8..cbb0b3515 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.9 + 6.0.11 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -150,7 +150,7 @@ 3.1.27 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.29 + 3.1.31 3.2.1 4.8.0-rc2.19462.10 From d65224096102ef967676439fca55a04c90ebaed8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 14:20:29 -0800 Subject: [PATCH 131/654] Update dependencies from https://github.com/dotnet/arcade build 20221111.2 (#14982) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22558.4 -> To Version 7.0.0-beta.22561.2 Co-authored-by: dotnet-maestro[bot] --- 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 7f980082c..33c6137b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 3f3c360819c5c092d0e4505a67dfe59a33fba557 + f36ea231c234560514ede4c2747897a737ced28f - + https://github.com/dotnet/arcade - 3f3c360819c5c092d0e4505a67dfe59a33fba557 + f36ea231c234560514ede4c2747897a737ced28f - + https://github.com/dotnet/arcade - 3f3c360819c5c092d0e4505a67dfe59a33fba557 + f36ea231c234560514ede4c2747897a737ced28f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index cbb0b3515..9cd63ca22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22558.4 + 7.0.0-beta.22561.2 diff --git a/global.json b/global.json index dcb720a56..7cd0b9917 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.22558.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22558.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22561.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22561.2" } } From 7d8414480660927d8c640489d52551f0bd71f6e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Nov 2022 02:27:22 +0000 Subject: [PATCH 132/654] Update dependencies from https://github.com/dotnet/sdk build 20221114.18 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.200 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index d71f693c5..86daf9950 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 257de5bbd..9d38cfb8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - b1e1cfbc26187bdf545dee1f55ae79d3f903bcf5 + 22c1f98d8ba699f2c2a2840c08b49e1bdee9ab4c - + https://github.com/dotnet/sdk - b1e1cfbc26187bdf545dee1f55ae79d3f903bcf5 + 22c1f98d8ba699f2c2a2840c08b49e1bdee9ab4c - + https://github.com/dotnet/sdk - b1e1cfbc26187bdf545dee1f55ae79d3f903bcf5 + 22c1f98d8ba699f2c2a2840c08b49e1bdee9ab4c - + https://github.com/dotnet/sdk - b1e1cfbc26187bdf545dee1f55ae79d3f903bcf5 + 22c1f98d8ba699f2c2a2840c08b49e1bdee9ab4c diff --git a/eng/Versions.props b/eng/Versions.props index 74fd8c9d9..295e77538 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22564.5 - 7.0.200-preview.22564.5 + 7.0.200-preview.22564.18 + 7.0.200-preview.22564.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a6cc83b1a366cb882cc27b42a22a54b98e104982 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Nov 2022 08:03:35 +0000 Subject: [PATCH 133/654] Update dependencies from https://github.com/dotnet/sdk build 20221114.32 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.200 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.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.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,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 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 86daf9950..09e307a27 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d38cfb8b..a90a12159 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,20 +105,20 @@ https://github.com/dotnet/sdk - 22c1f98d8ba699f2c2a2840c08b49e1bdee9ab4c + 3f9beb17aec19fb589a86602e4452c2d0e3dde70 - + https://github.com/dotnet/sdk - 22c1f98d8ba699f2c2a2840c08b49e1bdee9ab4c + 3f9beb17aec19fb589a86602e4452c2d0e3dde70 - + https://github.com/dotnet/sdk - 22c1f98d8ba699f2c2a2840c08b49e1bdee9ab4c + 3f9beb17aec19fb589a86602e4452c2d0e3dde70 - + https://github.com/dotnet/sdk - 22c1f98d8ba699f2c2a2840c08b49e1bdee9ab4c + 3f9beb17aec19fb589a86602e4452c2d0e3dde70 diff --git a/eng/Versions.props b/eng/Versions.props index 295e77538..11dcaf433 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22564.18 - 7.0.200-preview.22564.18 + 7.0.200-preview.22564.32 + 7.0.200-preview.22564.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7ef132ab4ba6cde83a22315aec7a222d2937ad48 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 15 Nov 2022 15:12:30 +0000 Subject: [PATCH 134/654] Fixup source-build incorrect merges --- .../content/repos/Directory.Build.targets | 6 +-- .../tarball/content/repos/format.proj | 1 - .../tarball/content/repos/installer.proj | 2 - ...ObjWriter-dependency-in-source-build.patch | 40 ------------------- 4 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index 7bf88fdd6..9a61647b4 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -85,11 +85,11 @@ NewText="/p:RepoRoot="$repo_root/"" /> - + Outputs="$(RepoCompletedSemaphorePath)AddCommonNoWarns.complete" > true - - CS9057 diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch deleted file mode 100644 index 02e49eec9..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Mon, 26 Sep 2022 14:25:33 -0500 -Subject: Remove LLVM ObjWriter dependency in source-build - -Backport PR: https://github.com/dotnet/runtime/pull/76206. - ---- - src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -index 8c4fce523906e..4fd1db03e8a48 100644 ---- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -@@ -48,12 +48,14 @@ - - - true -+ -+ true - - - - - -- -+ - $(ObjWriterVersion) - - -@@ -62,7 +64,7 @@ - $(NetStandardLibraryVersion) - - -- -+ - PreserveNewest - false - false From 53540cb8710f39b461a524a46943fd6aec92b45a Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 15 Nov 2022 15:27:29 +0000 Subject: [PATCH 135/654] Update source-build version.details.xml metadata --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 818c4e814..aa94ca744 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,11 +60,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore bb01bbf4433e27289b99001b7de6a582879d1835 + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore bb01bbf4433e27289b99001b7de6a582879d1835 - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore From a1525e5c10a0193142364db6fc487ffff7b56b40 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 15 Nov 2022 16:21:26 +0000 Subject: [PATCH 136/654] Add aspnetcore patch to workaround roslyn-analyzers issue --- .../aspnetcore/0002-IDE0060-workaround.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch new file mode 100644 index 000000000..62a4f8d31 --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Fri, 12 Aug 2022 23:02:54 +0000 +Subject: [PATCH] IDE0060 workaround + +Backport: https://github.com/dotnet/roslyn-analyzers/issues/6228 +--- + src/Http/Routing/src/Matching/Ascii.cs | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/Http/Routing/src/Matching/Ascii.cs b/src/Http/Routing/src/Matching/Ascii.cs +index 081af0bb07..393a9eb65f 100644 +--- a/src/Http/Routing/src/Matching/Ascii.cs ++++ b/src/Http/Routing/src/Matching/Ascii.cs +@@ -12,7 +12,6 @@ internal static class Ascii + // and we know that the spans are the same length. + // + // Similar to https://github.com/dotnet/coreclr/blob/master/src/System.Private.CoreLib/shared/System/Globalization/CompareInfo.cs#L549 +- [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool AsciiIgnoreCaseEquals(ReadOnlySpan a, ReadOnlySpan b, int length) + { + // The caller should have checked the length. We enforce that here by THROWING if the From 4bca1bc2673fc4bb0c5406fa4588c728098e9572 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 15 Nov 2022 16:47:48 +0000 Subject: [PATCH 137/654] Source-build fixups --- .../content/repos/Directory.Build.targets | 6 ++--- .../tarball/content/repos/format.proj | 1 + .../tarball/content/repos/installer.proj | 2 ++ .../0003-Address-obsolete-errors.patch | 24 +++++++++++++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index 9a61647b4..7bf88fdd6 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -85,11 +85,11 @@ NewText="/p:RepoRoot="$repo_root/"" /> - + Outputs="$(RepoCompletedSemaphorePath)AddNoWarns.complete" > true + + CS9057 diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch new file mode 100644 index 000000000..b98759d70 --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Thu, 27 Oct 2022 02:47:08 +0000 +Subject: [PATCH] Address obsolete errors + +Backport: https://github.com/dotnet/aspnetcore/pull/44734 +--- + src/Servers/Kestrel/Core/src/KestrelServerOptions.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs +index f31880e891..fc6322dd41 100644 +--- a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs ++++ b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs +@@ -252,9 +252,6 @@ public class KestrelServerOptions + writer.WritePropertyName(nameof(AllowResponseHeaderCompression)); + writer.WriteBooleanValue(AllowResponseHeaderCompression); + +- writer.WritePropertyName(nameof(EnableAltSvc)); +- writer.WriteBooleanValue(EnableAltSvc); +- + writer.WritePropertyName(nameof(IsDevCertLoaded)); + writer.WriteBooleanValue(IsDevCertLoaded); + From c78b0f37fd51e5c163453900027677789d412bdd Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 15 Nov 2022 09:24:12 -0800 Subject: [PATCH 138/654] The mono manifests are 7.0.0 so updating to the final emsdk version as well. --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 495bd38bc..504b1db24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 77c2667993976295017e2759f075550bcf606fc1 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 - + https://github.com/dotnet/emsdk - 77c2667993976295017e2759f075550bcf606fc1 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 86478c56c..f3c106543 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -205,8 +205,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rtm.22476.2 - 7.0.0-rtm.22476.2 + 7.0.0 + 7.0.0 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 06b01a4bea8196eaa2d006ed47a88db183c3ab96 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 15 Nov 2022 17:47:50 +0000 Subject: [PATCH 139/654] Add dotnet/format patch --- ...ess-Microsoft.Build.Locator-prebuilt.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch diff --git a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch b/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch new file mode 100644 index 000000000..e8b8f38fd --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Tue, 15 Nov 2022 17:34:00 +0000 +Subject: [PATCH] Address Microsoft.Build.Locator prebuilt + +Backport: https://github.com/dotnet/format/issues/1759 +--- + Directory.Packages.props | 2 +- + eng/Versions.props | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index c4bf3cf..f7e85b2 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -10,7 +10,7 @@ + + + +- ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index fcd583b..2933963 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -14,6 +14,7 @@ + + + 17.3.0-preview-22302-02 ++ 1.5.5 + 3.3.3 + 7.0.0-rc.1.22426.10 + From e1bfaa2bc43bf409269ceceb5ca29afdb84d1e9e Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 15 Nov 2022 21:39:44 +0000 Subject: [PATCH 140/654] Update source-build previous artifacts --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b08adb31a..ac9d349c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.100-rc.2 + 7.0.100 From 0cb1ce3471959022c3e6e166d3a16526293ff53a Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 15 Nov 2022 23:27:29 +0000 Subject: [PATCH 141/654] Disable broken test - noted with follow-up issue --- .../Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs index 57b4e40b5..4c5a9c425 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -13,7 +13,7 @@ public class DotNetWatchTests : SmokeTests { public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [Fact] + //[Fact] - Renable with https://github.com/dotnet/source-build/issues/3123 public void WatchTests() { string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests)); From f1b93f9c617d31513c8385fdad0dd8f1134b45d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Nov 2022 03:06:54 +0000 Subject: [PATCH 142/654] Update dependencies from https://github.com/dotnet/sdk build 20221115.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 --- NuGet.config | 2 +- eng/Version.Details.xml | 15 +++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 996fccde3..5fd41e7d7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64318f153..3990c076f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,7 +17,6 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 417429fc040af552532bb07aad29e5e8639b840f - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 @@ -101,20 +100,20 @@ https://github.com/dotnet/sdk - 3f9beb17aec19fb589a86602e4452c2d0e3dde70 + de8c73ee1e9df2a4e862e3294a8712f5144c0ba4 - + https://github.com/dotnet/sdk - 3f9beb17aec19fb589a86602e4452c2d0e3dde70 + de8c73ee1e9df2a4e862e3294a8712f5144c0ba4 - + https://github.com/dotnet/sdk - 3f9beb17aec19fb589a86602e4452c2d0e3dde70 + de8c73ee1e9df2a4e862e3294a8712f5144c0ba4 - + https://github.com/dotnet/sdk - 3f9beb17aec19fb589a86602e4452c2d0e3dde70 + de8c73ee1e9df2a4e862e3294a8712f5144c0ba4 diff --git a/eng/Versions.props b/eng/Versions.props index ac9d349c0..fbb3927e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22564.32 - 7.0.200-preview.22564.32 + 7.0.200-preview.22565.15 + 7.0.200-preview.22565.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 77f620eee749e880655bd9a51f0cc69a00276e62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Nov 2022 10:50:57 +0000 Subject: [PATCH 143/654] Update dependencies from https://github.com/dotnet/sdk build 20221116.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5fd41e7d7..213cfb9f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3990c076f..40878df74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - de8c73ee1e9df2a4e862e3294a8712f5144c0ba4 + 64aaea464653b3834b016cd08e4a0a41bc797eff - + https://github.com/dotnet/sdk - de8c73ee1e9df2a4e862e3294a8712f5144c0ba4 + 64aaea464653b3834b016cd08e4a0a41bc797eff - + https://github.com/dotnet/sdk - de8c73ee1e9df2a4e862e3294a8712f5144c0ba4 + 64aaea464653b3834b016cd08e4a0a41bc797eff - + https://github.com/dotnet/sdk - de8c73ee1e9df2a4e862e3294a8712f5144c0ba4 + 64aaea464653b3834b016cd08e4a0a41bc797eff diff --git a/eng/Versions.props b/eng/Versions.props index fbb3927e0..75cfd28cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22565.15 - 7.0.200-preview.22565.15 + 7.0.200-preview.22566.1 + 7.0.200-preview.22566.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 45ccf282f63df54b070f651d57b465f755dae157 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Nov 2022 14:56:46 +0000 Subject: [PATCH 144/654] [release/7.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#14766) [release/7.0.2xx] Update dependencies from dotnet/source-build-reference-packages From aaec6611162fece0654fafa029bf63cbf3716308 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Nov 2022 16:41:45 +0000 Subject: [PATCH 145/654] Update dependencies from https://github.com/dotnet/sdk build 20221116.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.22563.3 -> To Version 12.5.0-beta.22565.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 213cfb9f6..6205a7fe4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40878df74..a21846b01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 64aaea464653b3834b016cd08e4a0a41bc797eff + 011a2d390877ec8b8ffc7dd54eba0b7d586da2ea - + https://github.com/dotnet/sdk - 64aaea464653b3834b016cd08e4a0a41bc797eff + 011a2d390877ec8b8ffc7dd54eba0b7d586da2ea - + https://github.com/dotnet/sdk - 64aaea464653b3834b016cd08e4a0a41bc797eff + 011a2d390877ec8b8ffc7dd54eba0b7d586da2ea - + https://github.com/dotnet/sdk - 64aaea464653b3834b016cd08e4a0a41bc797eff + 011a2d390877ec8b8ffc7dd54eba0b7d586da2ea @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 9f7329d4b4deab97603643eaa6607779d03568f1 + ef7f67efc861de61a40bee5aa88a0f5dff0e4b90 - + https://github.com/dotnet/fsharp - 9f7329d4b4deab97603643eaa6607779d03568f1 + ef7f67efc861de61a40bee5aa88a0f5dff0e4b90 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 09bf1ae4c8671b48bbf4e28f2a2d926de037d068 + cc6062cd438899ac810b3766a05b8db636e70225 diff --git a/eng/Versions.props b/eng/Versions.props index 75cfd28cc..3ec94c47f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22566.1 - 7.0.200-preview.22566.1 + 7.0.200-preview.22566.11 + 7.0.200-preview.22566.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 87e3cb1467bde2e342d66108db8e4311a9f76a46 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Nov 2022 18:11:28 +0000 Subject: [PATCH 146/654] Update dependencies from https://github.com/dotnet/sdk build 20221117.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6205a7fe4..feaf6b5e3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a21846b01..d6e98f792 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 011a2d390877ec8b8ffc7dd54eba0b7d586da2ea + 2fbab317612c64c84b18bdb5436555a3470f8744 - + https://github.com/dotnet/sdk - 011a2d390877ec8b8ffc7dd54eba0b7d586da2ea + 2fbab317612c64c84b18bdb5436555a3470f8744 - + https://github.com/dotnet/sdk - 011a2d390877ec8b8ffc7dd54eba0b7d586da2ea + 2fbab317612c64c84b18bdb5436555a3470f8744 - + https://github.com/dotnet/sdk - 011a2d390877ec8b8ffc7dd54eba0b7d586da2ea + 2fbab317612c64c84b18bdb5436555a3470f8744 diff --git a/eng/Versions.props b/eng/Versions.props index 3ec94c47f..7877c400d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22566.11 - 7.0.200-preview.22566.11 + 7.0.200-preview.22567.3 + 7.0.200-preview.22567.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84d158c8d52ae930e4e1f11af406a2ac2c55d6fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Nov 2022 19:51:06 +0000 Subject: [PATCH 147/654] Update dependencies from https://github.com/dotnet/sdk build 20221117.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-22564-01 -> To Version 17.5.0-preview-22567-01 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index feaf6b5e3..f19062652 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6e98f792..1238fe332 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 2fbab317612c64c84b18bdb5436555a3470f8744 + 359b48cb7e215461267cfe8274da20aa0c34ce00 - + https://github.com/dotnet/sdk - 2fbab317612c64c84b18bdb5436555a3470f8744 + 359b48cb7e215461267cfe8274da20aa0c34ce00 - + https://github.com/dotnet/sdk - 2fbab317612c64c84b18bdb5436555a3470f8744 + 359b48cb7e215461267cfe8274da20aa0c34ce00 - + https://github.com/dotnet/sdk - 2fbab317612c64c84b18bdb5436555a3470f8744 + 359b48cb7e215461267cfe8274da20aa0c34ce00 @@ -149,9 +149,9 @@ cc6062cd438899ac810b3766a05b8db636e70225 - + https://github.com/dotnet/msbuild - d14b74d6f08ab7f2e17706359a38f8c22b569cb5 + 100e592026e3fbcdb273e9d8349daad377b40886 diff --git a/eng/Versions.props b/eng/Versions.props index 7877c400d..5c4e87b3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22567.3 - 7.0.200-preview.22567.3 + 7.0.200-preview.22567.4 + 7.0.200-preview.22567.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0db7a44974a618c6cc46167a773af1e4f9d48378 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Nov 2022 03:09:33 +0000 Subject: [PATCH 148/654] Update dependencies from https://github.com/dotnet/sdk build 20221117.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-22567-01 -> To Version 17.5.0-preview-22567-05 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index f19062652..6f649c213 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1238fe332..89fad3389 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 359b48cb7e215461267cfe8274da20aa0c34ce00 + 000cd37fbe7730370f4f683a9d7ec7ce85959af4 - + https://github.com/dotnet/sdk - 359b48cb7e215461267cfe8274da20aa0c34ce00 + 000cd37fbe7730370f4f683a9d7ec7ce85959af4 - + https://github.com/dotnet/sdk - 359b48cb7e215461267cfe8274da20aa0c34ce00 + 000cd37fbe7730370f4f683a9d7ec7ce85959af4 - + https://github.com/dotnet/sdk - 359b48cb7e215461267cfe8274da20aa0c34ce00 + 000cd37fbe7730370f4f683a9d7ec7ce85959af4 @@ -149,9 +149,9 @@ cc6062cd438899ac810b3766a05b8db636e70225 - + https://github.com/dotnet/msbuild - 100e592026e3fbcdb273e9d8349daad377b40886 + 7037436dc4d2038407c8592b9e256f0cf777f20c diff --git a/eng/Versions.props b/eng/Versions.props index 5c4e87b3c..e27af3d00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22567.4 - 7.0.200-preview.22567.4 + 7.0.200-preview.22567.29 + 7.0.200-preview.22567.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 68c7fcd3769ba4aea8259ae625d3d74c28c3812b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Nov 2022 07:14:07 +0000 Subject: [PATCH 149/654] Update dependencies from https://github.com/dotnet/sdk build 20221117.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.22565.3 -> To Version 12.5.0-beta.22567.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6f649c213..06bace868 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89fad3389..813b5d356 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 000cd37fbe7730370f4f683a9d7ec7ce85959af4 + 6a23c1c889293dea64cfc2ac42e37b18222fff5d - + https://github.com/dotnet/sdk - 000cd37fbe7730370f4f683a9d7ec7ce85959af4 + 6a23c1c889293dea64cfc2ac42e37b18222fff5d - + https://github.com/dotnet/sdk - 000cd37fbe7730370f4f683a9d7ec7ce85959af4 + 6a23c1c889293dea64cfc2ac42e37b18222fff5d - + https://github.com/dotnet/sdk - 000cd37fbe7730370f4f683a9d7ec7ce85959af4 + 6a23c1c889293dea64cfc2ac42e37b18222fff5d @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - ef7f67efc861de61a40bee5aa88a0f5dff0e4b90 + 1b8c83ca6fd6f09aa1e5b5cb2cd5bfa376a92818 - + https://github.com/dotnet/fsharp - ef7f67efc861de61a40bee5aa88a0f5dff0e4b90 + 1b8c83ca6fd6f09aa1e5b5cb2cd5bfa376a92818 diff --git a/eng/Versions.props b/eng/Versions.props index e27af3d00..732185255 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22567.29 - 7.0.200-preview.22567.29 + 7.0.200-preview.22567.37 + 7.0.200-preview.22567.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 29a7697ae430254e12107c4f8cd38d867c80a67f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Nov 2022 17:18:36 +0000 Subject: [PATCH 150/654] Update dependencies from https://github.com/dotnet/sdk build 20221118.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates NuGet.Build.Tasks From Version 6.4.0-rc.117 -> To Version 6.5.0-preview.2.88 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 06bace868..d682fa648 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 813b5d356..1ce6e5305 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 6a23c1c889293dea64cfc2ac42e37b18222fff5d + 7d9224aacd318f96c482a867279227d4d9562626 - + https://github.com/dotnet/sdk - 6a23c1c889293dea64cfc2ac42e37b18222fff5d + 7d9224aacd318f96c482a867279227d4d9562626 - + https://github.com/dotnet/sdk - 6a23c1c889293dea64cfc2ac42e37b18222fff5d + 7d9224aacd318f96c482a867279227d4d9562626 - + https://github.com/dotnet/sdk - 6a23c1c889293dea64cfc2ac42e37b18222fff5d + 7d9224aacd318f96c482a867279227d4d9562626 @@ -154,9 +154,9 @@ 7037436dc4d2038407c8592b9e256f0cf777f20c - + https://github.com/nuget/nuget.client - 125f673fd1cdb3cc012f62aa3ce764d2460b89eb + 20371248661a98ddef1da9ac27e84f4dde45f1a7 diff --git a/eng/Versions.props b/eng/Versions.props index 732185255..15287eb4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22567.37 - 7.0.200-preview.22567.37 + 7.0.200-preview.22568.1 + 7.0.200-preview.22568.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f723e2840122dd2bcc09eade0fb305e70c223ee6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Nov 2022 20:52:20 +0000 Subject: [PATCH 151/654] Update dependencies from https://github.com/dotnet/sdk build 20221118.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates NuGet.Build.Tasks From Version 6.4.0-rc.117 -> To Version 6.5.0-preview.2.91 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index d682fa648..a48dfbcae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ce6e5305..6cd4820ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 7d9224aacd318f96c482a867279227d4d9562626 + cd16c473a5ccf2076816b4421b4604d0edd52e2a - + https://github.com/dotnet/sdk - 7d9224aacd318f96c482a867279227d4d9562626 + cd16c473a5ccf2076816b4421b4604d0edd52e2a - + https://github.com/dotnet/sdk - 7d9224aacd318f96c482a867279227d4d9562626 + cd16c473a5ccf2076816b4421b4604d0edd52e2a - + https://github.com/dotnet/sdk - 7d9224aacd318f96c482a867279227d4d9562626 + cd16c473a5ccf2076816b4421b4604d0edd52e2a @@ -154,9 +154,9 @@ 7037436dc4d2038407c8592b9e256f0cf777f20c - + https://github.com/nuget/nuget.client - 20371248661a98ddef1da9ac27e84f4dde45f1a7 + 340d447dfc6eaa0cb5d8c25df69fe7f235e37d62 diff --git a/eng/Versions.props b/eng/Versions.props index 15287eb4d..80c73f357 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22568.1 - 7.0.200-preview.22568.1 + 7.0.200-preview.22568.7 + 7.0.200-preview.22568.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b03a30766444ff815c1b6a854559d20ad6678c63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Nov 2022 22:11:19 +0000 Subject: [PATCH 152/654] Update dependencies from https://github.com/dotnet/sdk build 20221118.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates NuGet.Build.Tasks From Version 6.4.0-rc.117 -> To Version 6.5.0-preview.2.91 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index a48dfbcae..762d39e87 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cd4820ca..46e20f57a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - cd16c473a5ccf2076816b4421b4604d0edd52e2a + 48c7a4e3ff0bbb8cc13808934b144766c93a1abd - + https://github.com/dotnet/sdk - cd16c473a5ccf2076816b4421b4604d0edd52e2a + 48c7a4e3ff0bbb8cc13808934b144766c93a1abd - + https://github.com/dotnet/sdk - cd16c473a5ccf2076816b4421b4604d0edd52e2a + 48c7a4e3ff0bbb8cc13808934b144766c93a1abd - + https://github.com/dotnet/sdk - cd16c473a5ccf2076816b4421b4604d0edd52e2a + 48c7a4e3ff0bbb8cc13808934b144766c93a1abd diff --git a/eng/Versions.props b/eng/Versions.props index 80c73f357..8bd1a5887 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22568.7 - 7.0.200-preview.22568.7 + 7.0.200-preview.22568.13 + 7.0.200-preview.22568.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a71d9ecf039aa28bda78985a02d1b23773f6dbcc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Nov 2022 01:14:25 +0000 Subject: [PATCH 153/654] Update dependencies from https://github.com/dotnet/sdk build 20221118.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates NuGet.Build.Tasks From Version 6.4.0-rc.117 -> To Version 6.5.0-preview.2.91 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 762d39e87..df92ef45a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46e20f57a..edc795c55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 48c7a4e3ff0bbb8cc13808934b144766c93a1abd + bb6fabda8633a26f9a4364ee418b4ef4002f4637 - + https://github.com/dotnet/sdk - 48c7a4e3ff0bbb8cc13808934b144766c93a1abd + bb6fabda8633a26f9a4364ee418b4ef4002f4637 - + https://github.com/dotnet/sdk - 48c7a4e3ff0bbb8cc13808934b144766c93a1abd + bb6fabda8633a26f9a4364ee418b4ef4002f4637 - + https://github.com/dotnet/sdk - 48c7a4e3ff0bbb8cc13808934b144766c93a1abd + bb6fabda8633a26f9a4364ee418b4ef4002f4637 diff --git a/eng/Versions.props b/eng/Versions.props index 8bd1a5887..3b07677b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22568.13 - 7.0.200-preview.22568.13 + 7.0.200-preview.22568.25 + 7.0.200-preview.22568.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From df2279cc39a53577a2cc24f46b4cb781f620df9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 01:53:32 +0000 Subject: [PATCH 154/654] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221120.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22531.3 -> To Version 7.0.0-alpha.1.22570.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 813b5d356..c1db202ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,9 +201,9 @@ https://github.com/dotnet/arcade f36ea231c234560514ede4c2747897a737ced28f - + https://github.com/dotnet/source-build-reference-packages - 4f5672e90b7f908d96aad61a40b0e9b352518b1c + 2aa8a10cf23402f91c49b832f20773ac3d1506bb From 196135f9f394187fa946490ca17541eed080bfb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 06:48:29 +0000 Subject: [PATCH 155/654] Update dependencies from https://github.com/dotnet/sdk build 20221120.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22569.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index df92ef45a..7a5dbe2d5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edc795c55..8c658eed4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - bb6fabda8633a26f9a4364ee418b4ef4002f4637 + c8caf83c1052af2cb6173358ccf0b12eeee0f097 - + https://github.com/dotnet/sdk - bb6fabda8633a26f9a4364ee418b4ef4002f4637 + c8caf83c1052af2cb6173358ccf0b12eeee0f097 - + https://github.com/dotnet/sdk - bb6fabda8633a26f9a4364ee418b4ef4002f4637 + c8caf83c1052af2cb6173358ccf0b12eeee0f097 - + https://github.com/dotnet/sdk - bb6fabda8633a26f9a4364ee418b4ef4002f4637 + c8caf83c1052af2cb6173358ccf0b12eeee0f097 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 1b8c83ca6fd6f09aa1e5b5cb2cd5bfa376a92818 + 728f809b2bcbd0b1a944c0daef4306d250830195 - + https://github.com/dotnet/fsharp - 1b8c83ca6fd6f09aa1e5b5cb2cd5bfa376a92818 + 728f809b2bcbd0b1a944c0daef4306d250830195 diff --git a/eng/Versions.props b/eng/Versions.props index 3b07677b0..996cec379 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22568.25 - 7.0.200-preview.22568.25 + 7.0.200-preview.22570.5 + 7.0.200-preview.22570.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d238d9b6b6ffbc73ab200413d82656824edf5571 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 21 Nov 2022 23:25:59 +0000 Subject: [PATCH 156/654] Add patch for XDT prebuilt in nuget-client --- ...b.Xdt-package-version-for-source-bui.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Fix-Microsoft.Web.Xdt-package-version-for-source-bui.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Fix-Microsoft.Web.Xdt-package-version-for-source-bui.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Fix-Microsoft.Web.Xdt-package-version-for-source-bui.patch new file mode 100644 index 000000000..69517f31f --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Fix-Microsoft.Web.Xdt-package-version-for-source-bui.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Mon, 21 Nov 2022 22:32:04 +0000 +Subject: [PATCH] Fix Microsoft.Web.Xdt package version for source-build + +Backport: https://github.com/NuGet/Home/issues/12261 +--- + Directory.Packages.props | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index 8afa7dd31..2ee44858d 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -14,6 +14,7 @@ + 16.8.0 + + 16.11.0 ++ 3.0.0 + + + +@@ -56,7 +57,7 @@ + + + +- ++ + + + From d05c57e6ffef41d5f67326b7ff6fe53a79442f85 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 04:19:56 +0000 Subject: [PATCH 157/654] Update dependencies from https://github.com/dotnet/sdk build 20221121.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7a5dbe2d5..f4f16b785 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c658eed4..9e3621ea2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - c8caf83c1052af2cb6173358ccf0b12eeee0f097 + 6f912c8b8390af78fbfcb0e9571093c6623fa251 - + https://github.com/dotnet/sdk - c8caf83c1052af2cb6173358ccf0b12eeee0f097 + 6f912c8b8390af78fbfcb0e9571093c6623fa251 - + https://github.com/dotnet/sdk - c8caf83c1052af2cb6173358ccf0b12eeee0f097 + 6f912c8b8390af78fbfcb0e9571093c6623fa251 - + https://github.com/dotnet/sdk - c8caf83c1052af2cb6173358ccf0b12eeee0f097 + 6f912c8b8390af78fbfcb0e9571093c6623fa251 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 728f809b2bcbd0b1a944c0daef4306d250830195 + b714b84012aab3b682f6069c8c8780a5f2043dc7 - + https://github.com/dotnet/fsharp - 728f809b2bcbd0b1a944c0daef4306d250830195 + b714b84012aab3b682f6069c8c8780a5f2043dc7 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - cc6062cd438899ac810b3766a05b8db636e70225 + dc70a1ae8302b2407ff95b111bec759f7ba89cdc diff --git a/eng/Versions.props b/eng/Versions.props index 996cec379..824e4662c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22570.5 - 7.0.200-preview.22570.5 + 7.0.200-preview.22571.19 + 7.0.200-preview.22571.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 67b1b03638a3b999ad2d4b1eca1649f0bbe019c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 09:20:53 +0000 Subject: [PATCH 158/654] Update dependencies from https://github.com/dotnet/sdk build 20221122.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index f4f16b785..66370193e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e3621ea2..8a7eb4a73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 6f912c8b8390af78fbfcb0e9571093c6623fa251 + 567dcf158c5b7c6b51c4e1b286cabecbe3757b72 - + https://github.com/dotnet/sdk - 6f912c8b8390af78fbfcb0e9571093c6623fa251 + 567dcf158c5b7c6b51c4e1b286cabecbe3757b72 - + https://github.com/dotnet/sdk - 6f912c8b8390af78fbfcb0e9571093c6623fa251 + 567dcf158c5b7c6b51c4e1b286cabecbe3757b72 - + https://github.com/dotnet/sdk - 6f912c8b8390af78fbfcb0e9571093c6623fa251 + 567dcf158c5b7c6b51c4e1b286cabecbe3757b72 @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - dc70a1ae8302b2407ff95b111bec759f7ba89cdc + 2e846c4211610644773577d2aec8c584ae9412ff - + https://github.com/dotnet/msbuild - 7037436dc4d2038407c8592b9e256f0cf777f20c + 9e17d64748deb8670c4b18cf47b66811ca155ec8 diff --git a/eng/Versions.props b/eng/Versions.props index 824e4662c..79fdb8fae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22571.19 - 7.0.200-preview.22571.19 + 7.0.200-preview.22572.1 + 7.0.200-preview.22572.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8a0e85359bc20ba52eddd42b9b8fd15756ccd40a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 11:47:55 +0000 Subject: [PATCH 159/654] Update dependencies from https://github.com/dotnet/sdk build 20221122.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 66370193e..aa15e8443 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a7eb4a73..0fd9f10db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 567dcf158c5b7c6b51c4e1b286cabecbe3757b72 + db39e2ad2f4748063df4c0de3f0139c83c82a568 - + https://github.com/dotnet/sdk - 567dcf158c5b7c6b51c4e1b286cabecbe3757b72 + db39e2ad2f4748063df4c0de3f0139c83c82a568 - + https://github.com/dotnet/sdk - 567dcf158c5b7c6b51c4e1b286cabecbe3757b72 + db39e2ad2f4748063df4c0de3f0139c83c82a568 - + https://github.com/dotnet/sdk - 567dcf158c5b7c6b51c4e1b286cabecbe3757b72 + db39e2ad2f4748063df4c0de3f0139c83c82a568 diff --git a/eng/Versions.props b/eng/Versions.props index 79fdb8fae..02ec28ffe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22572.1 - 7.0.200-preview.22572.1 + 7.0.200-preview.22572.4 + 7.0.200-preview.22572.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c33583ab812f25a3630f612ed2b89ee19b4e9c9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 18:32:55 +0000 Subject: [PATCH 160/654] Update dependencies from https://github.com/dotnet/sdk build 20221122.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index aa15e8443..ec9ca7565 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fd9f10db..189b5c79b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - db39e2ad2f4748063df4c0de3f0139c83c82a568 + b7d04cbb8795b36ef6449de0356ee68b51ae6b6b - + https://github.com/dotnet/sdk - db39e2ad2f4748063df4c0de3f0139c83c82a568 + b7d04cbb8795b36ef6449de0356ee68b51ae6b6b - + https://github.com/dotnet/sdk - db39e2ad2f4748063df4c0de3f0139c83c82a568 + b7d04cbb8795b36ef6449de0356ee68b51ae6b6b - + https://github.com/dotnet/sdk - db39e2ad2f4748063df4c0de3f0139c83c82a568 + b7d04cbb8795b36ef6449de0356ee68b51ae6b6b @@ -133,9 +133,9 @@ b714b84012aab3b682f6069c8c8780a5f2043dc7 - + https://github.com/microsoft/vstest - b61973970a544ea30d03ac35b6f5535adb64fd4c + 0a8ba241d27fcf4f7123b607423025417041f90d diff --git a/eng/Versions.props b/eng/Versions.props index 02ec28ffe..45fd7c948 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22572.4 - 7.0.200-preview.22572.4 + 7.0.200-preview.22572.13 + 7.0.200-preview.22572.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221111-01 + 17.5.0-preview-20221121-03 From e36cff3a22d9d49c80f10b1cf19575a55e07ac92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 19:47:30 +0000 Subject: [PATCH 161/654] Update dependencies from https://github.com/dotnet/sdk build 20221122.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec9ca7565..431f836f2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 189b5c79b..f0692bb5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - b7d04cbb8795b36ef6449de0356ee68b51ae6b6b + d83916a020aacce22a770fe132d417c3dd7c1a94 - + https://github.com/dotnet/sdk - b7d04cbb8795b36ef6449de0356ee68b51ae6b6b + d83916a020aacce22a770fe132d417c3dd7c1a94 - + https://github.com/dotnet/sdk - b7d04cbb8795b36ef6449de0356ee68b51ae6b6b + d83916a020aacce22a770fe132d417c3dd7c1a94 - + https://github.com/dotnet/sdk - b7d04cbb8795b36ef6449de0356ee68b51ae6b6b + d83916a020aacce22a770fe132d417c3dd7c1a94 @@ -149,9 +149,9 @@ 2e846c4211610644773577d2aec8c584ae9412ff - + https://github.com/dotnet/msbuild - 9e17d64748deb8670c4b18cf47b66811ca155ec8 + 0ac748cca1b976fc51aab7908446800c34f48b02 diff --git a/eng/Versions.props b/eng/Versions.props index 45fd7c948..03f6b25ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22572.13 - 7.0.200-preview.22572.13 + 7.0.200-preview.22572.16 + 7.0.200-preview.22572.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44768c66c1514ac0c167478d9a4336ba99da6211 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Nov 2022 21:00:55 +0000 Subject: [PATCH 162/654] Update dependencies from https://github.com/dotnet/sdk build 20221122.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 431f836f2..debed0b5f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0692bb5c..88dd8aec6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - d83916a020aacce22a770fe132d417c3dd7c1a94 + fdd0be29e7335d4fb5c1782d3be1adfa13db859e - + https://github.com/dotnet/sdk - d83916a020aacce22a770fe132d417c3dd7c1a94 + fdd0be29e7335d4fb5c1782d3be1adfa13db859e - + https://github.com/dotnet/sdk - d83916a020aacce22a770fe132d417c3dd7c1a94 + fdd0be29e7335d4fb5c1782d3be1adfa13db859e - + https://github.com/dotnet/sdk - d83916a020aacce22a770fe132d417c3dd7c1a94 + fdd0be29e7335d4fb5c1782d3be1adfa13db859e @@ -154,9 +154,9 @@ 0ac748cca1b976fc51aab7908446800c34f48b02 - + https://github.com/nuget/nuget.client - 340d447dfc6eaa0cb5d8c25df69fe7f235e37d62 + fd6441e3b421c07609a2db1abcf2ce844168dfe8 diff --git a/eng/Versions.props b/eng/Versions.props index 03f6b25ac..6c431b751 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22572.16 - 7.0.200-preview.22572.16 + 7.0.200-preview.22572.18 + 7.0.200-preview.22572.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e78d3e7f54ed97aff7972c5c710a54afa29df3a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Nov 2022 06:50:25 +0000 Subject: [PATCH 163/654] Update dependencies from https://github.com/dotnet/sdk build 20221122.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22571.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index debed0b5f..f557e8954 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88dd8aec6..0f0800d57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - fdd0be29e7335d4fb5c1782d3be1adfa13db859e + 8411cf1178c3ea03f260f59a213f615e28f523eb - + https://github.com/dotnet/sdk - fdd0be29e7335d4fb5c1782d3be1adfa13db859e + 8411cf1178c3ea03f260f59a213f615e28f523eb - + https://github.com/dotnet/sdk - fdd0be29e7335d4fb5c1782d3be1adfa13db859e + 8411cf1178c3ea03f260f59a213f615e28f523eb - + https://github.com/dotnet/sdk - fdd0be29e7335d4fb5c1782d3be1adfa13db859e + 8411cf1178c3ea03f260f59a213f615e28f523eb @@ -149,9 +149,9 @@ 2e846c4211610644773577d2aec8c584ae9412ff - + https://github.com/dotnet/msbuild - 0ac748cca1b976fc51aab7908446800c34f48b02 + d797c48da13aaa4dc7ae440ed7603c990cd44317 diff --git a/eng/Versions.props b/eng/Versions.props index 6c431b751..11de36e2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22572.18 - 7.0.200-preview.22572.18 + 7.0.200-preview.22572.27 + 7.0.200-preview.22572.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ffbde59a62e68584a65e1a92f08d333dbf3f389c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Nov 2022 08:07:55 +0000 Subject: [PATCH 164/654] Update dependencies from https://github.com/dotnet/sdk build 20221122.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22572.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index f557e8954..3f99a11f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f0800d57..0b313b52c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 8411cf1178c3ea03f260f59a213f615e28f523eb + c830ab113a77feb30b1f2d21b41f2bb2fd0edd21 - + https://github.com/dotnet/sdk - 8411cf1178c3ea03f260f59a213f615e28f523eb + c830ab113a77feb30b1f2d21b41f2bb2fd0edd21 - + https://github.com/dotnet/sdk - 8411cf1178c3ea03f260f59a213f615e28f523eb + c830ab113a77feb30b1f2d21b41f2bb2fd0edd21 - + https://github.com/dotnet/sdk - 8411cf1178c3ea03f260f59a213f615e28f523eb + c830ab113a77feb30b1f2d21b41f2bb2fd0edd21 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - b714b84012aab3b682f6069c8c8780a5f2043dc7 + ffb3909124177abf1907ba725969849841c94725 - + https://github.com/dotnet/fsharp - b714b84012aab3b682f6069c8c8780a5f2043dc7 + ffb3909124177abf1907ba725969849841c94725 diff --git a/eng/Versions.props b/eng/Versions.props index 11de36e2e..c74df2a40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22572.27 - 7.0.200-preview.22572.27 + 7.0.200-preview.22572.28 + 7.0.200-preview.22572.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 222cad61e698a22477e68cde09dbc9feb658c825 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Nov 2022 21:11:53 +0000 Subject: [PATCH 165/654] Update dependencies from https://github.com/dotnet/sdk build 20221123.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22572.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3f99a11f5..bfcbcbf78 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b313b52c..0e5403f48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - c830ab113a77feb30b1f2d21b41f2bb2fd0edd21 + 137fba3a8ce064435e266aae82ed0777f476b14a - + https://github.com/dotnet/sdk - c830ab113a77feb30b1f2d21b41f2bb2fd0edd21 + 137fba3a8ce064435e266aae82ed0777f476b14a - + https://github.com/dotnet/sdk - c830ab113a77feb30b1f2d21b41f2bb2fd0edd21 + 137fba3a8ce064435e266aae82ed0777f476b14a - + https://github.com/dotnet/sdk - c830ab113a77feb30b1f2d21b41f2bb2fd0edd21 + 137fba3a8ce064435e266aae82ed0777f476b14a diff --git a/eng/Versions.props b/eng/Versions.props index c74df2a40..d5a0ef097 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22572.28 - 7.0.200-preview.22572.28 + 7.0.200-preview.22573.6 + 7.0.200-preview.22573.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3f994aca7e69275fd6996315e061cb69a400b30d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Nov 2022 23:40:27 +0000 Subject: [PATCH 166/654] Update dependencies from https://github.com/dotnet/sdk build 20221123.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22572.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index bfcbcbf78..c9d629c1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e5403f48..b94657c5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 137fba3a8ce064435e266aae82ed0777f476b14a + 7b218d5cc684fcb553243c99f44cf63f8c09219c - + https://github.com/dotnet/sdk - 137fba3a8ce064435e266aae82ed0777f476b14a + 7b218d5cc684fcb553243c99f44cf63f8c09219c - + https://github.com/dotnet/sdk - 137fba3a8ce064435e266aae82ed0777f476b14a + 7b218d5cc684fcb553243c99f44cf63f8c09219c - + https://github.com/dotnet/sdk - 137fba3a8ce064435e266aae82ed0777f476b14a + 7b218d5cc684fcb553243c99f44cf63f8c09219c @@ -154,9 +154,9 @@ d797c48da13aaa4dc7ae440ed7603c990cd44317 - + https://github.com/nuget/nuget.client - fd6441e3b421c07609a2db1abcf2ce844168dfe8 + 57d3a6d133442c4b0e0bfb7b05e1e00cca34258d diff --git a/eng/Versions.props b/eng/Versions.props index d5a0ef097..ffc79e4f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22573.6 - 7.0.200-preview.22573.6 + 7.0.200-preview.22573.9 + 7.0.200-preview.22573.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 378ad6b7a45f2e08ddbe7095cbff37af62bbac8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Nov 2022 03:52:55 +0000 Subject: [PATCH 167/654] Update dependencies from https://github.com/dotnet/sdk build 20221123.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22573.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index c9d629c1f..3a37477f3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b94657c5b..98d1a6465 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 7b218d5cc684fcb553243c99f44cf63f8c09219c + d0bbdc2dab2757ae04060072ed72902bdca604b2 - + https://github.com/dotnet/sdk - 7b218d5cc684fcb553243c99f44cf63f8c09219c + d0bbdc2dab2757ae04060072ed72902bdca604b2 - + https://github.com/dotnet/sdk - 7b218d5cc684fcb553243c99f44cf63f8c09219c + d0bbdc2dab2757ae04060072ed72902bdca604b2 - + https://github.com/dotnet/sdk - 7b218d5cc684fcb553243c99f44cf63f8c09219c + d0bbdc2dab2757ae04060072ed72902bdca604b2 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - ffb3909124177abf1907ba725969849841c94725 + 48aa68044db79a184e78ec317632f7037d5611ea - + https://github.com/dotnet/fsharp - ffb3909124177abf1907ba725969849841c94725 + 48aa68044db79a184e78ec317632f7037d5611ea diff --git a/eng/Versions.props b/eng/Versions.props index ffc79e4f2..02b6696b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22573.9 - 7.0.200-preview.22573.9 + 7.0.200-preview.22573.11 + 7.0.200-preview.22573.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3c7c680a3168364cfd17230a949101bcf1c051a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Nov 2022 07:25:51 +0000 Subject: [PATCH 168/654] Update dependencies from https://github.com/dotnet/sdk build 20221123.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22573.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a37477f3..d69bbf3d6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98d1a6465..fc2c839fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - d0bbdc2dab2757ae04060072ed72902bdca604b2 + 0b9563d1167586ff72c3fcfc0739609e5f6d25c9 - + https://github.com/dotnet/sdk - d0bbdc2dab2757ae04060072ed72902bdca604b2 + 0b9563d1167586ff72c3fcfc0739609e5f6d25c9 - + https://github.com/dotnet/sdk - d0bbdc2dab2757ae04060072ed72902bdca604b2 + 0b9563d1167586ff72c3fcfc0739609e5f6d25c9 - + https://github.com/dotnet/sdk - d0bbdc2dab2757ae04060072ed72902bdca604b2 + 0b9563d1167586ff72c3fcfc0739609e5f6d25c9 diff --git a/eng/Versions.props b/eng/Versions.props index 02b6696b7..55e3f4cf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22573.11 - 7.0.200-preview.22573.11 + 7.0.200-preview.22573.14 + 7.0.200-preview.22573.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bd9fce276be1f66f69392659e7e7050077ca360d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Nov 2022 09:50:51 +0000 Subject: [PATCH 169/654] Update dependencies from https://github.com/dotnet/sdk build 20221124.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22573.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index d69bbf3d6..a3d217036 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc2c839fa..c4da2c17b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 0b9563d1167586ff72c3fcfc0739609e5f6d25c9 + ec436771a3769c6f1a8e07d696d3d7b8c959715a - + https://github.com/dotnet/sdk - 0b9563d1167586ff72c3fcfc0739609e5f6d25c9 + ec436771a3769c6f1a8e07d696d3d7b8c959715a - + https://github.com/dotnet/sdk - 0b9563d1167586ff72c3fcfc0739609e5f6d25c9 + ec436771a3769c6f1a8e07d696d3d7b8c959715a - + https://github.com/dotnet/sdk - 0b9563d1167586ff72c3fcfc0739609e5f6d25c9 + ec436771a3769c6f1a8e07d696d3d7b8c959715a @@ -133,9 +133,9 @@ 48aa68044db79a184e78ec317632f7037d5611ea - + https://github.com/microsoft/vstest - 0a8ba241d27fcf4f7123b607423025417041f90d + f098763b32f8217d9d608ee2d690a0640d833cf3 diff --git a/eng/Versions.props b/eng/Versions.props index 55e3f4cf7..857305b0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22573.14 - 7.0.200-preview.22573.14 + 7.0.200-preview.22574.2 + 7.0.200-preview.22574.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221121-03 + 17.5.0-preview-20221122-02 From 604f6e5c59f58f3631a70c37ccab880db84278dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Nov 2022 14:34:41 +0000 Subject: [PATCH 170/654] Update dependencies from https://github.com/dotnet/arcade build 20221122.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22561.2 -> To Version 7.0.0-beta.22572.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/cross/toolchain.cmake | 7 +++++++ eng/common/sdk-task.ps1 | 2 +- eng/common/sdl/sdl.ps1 | 1 - eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1db202ab..a35d385fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 732185255..ce103d1e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22561.2 + 7.0.0-beta.22572.6 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 561576be9..964610524 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 39be08d4b..e10a59687 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 index 648c5068d..ac196e164 100644 --- a/eng/common/sdl/sdl.ps1 +++ b/eng/common/sdl/sdl.ps1 @@ -1,7 +1,6 @@ function Install-Gdn { param( - [Parameter(Mandatory=$true)] [string]$Path, # If omitted, install the latest version of Guardian, otherwise install that specific version. diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 449126943..021555cf3 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview - $defaultXCopyMSBuildVersion = '17.3.1' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview + $defaultXCopyMSBuildVersion = '17.4.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 7cd0b9917..632f780d8 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.22561.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22561.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22572.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22572.6" } } From 57ca68565ba0c9b107db42a4cf4c20df1000c925 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Nov 2022 21:42:50 +0000 Subject: [PATCH 171/654] Update dependencies from https://github.com/dotnet/sdk build 20221124.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22573.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index a3d217036..031a8f765 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4da2c17b..dba703ab9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - ec436771a3769c6f1a8e07d696d3d7b8c959715a + 087f5de9d79e11b632b183e3967bd0936e66f95c - + https://github.com/dotnet/sdk - ec436771a3769c6f1a8e07d696d3d7b8c959715a + 087f5de9d79e11b632b183e3967bd0936e66f95c - + https://github.com/dotnet/sdk - ec436771a3769c6f1a8e07d696d3d7b8c959715a + 087f5de9d79e11b632b183e3967bd0936e66f95c - + https://github.com/dotnet/sdk - ec436771a3769c6f1a8e07d696d3d7b8c959715a + 087f5de9d79e11b632b183e3967bd0936e66f95c @@ -133,9 +133,9 @@ 48aa68044db79a184e78ec317632f7037d5611ea - + https://github.com/microsoft/vstest - f098763b32f8217d9d608ee2d690a0640d833cf3 + 94cde14e9c35e1eaffe063acf7a191d1d24ad29a diff --git a/eng/Versions.props b/eng/Versions.props index 857305b0b..5165b5722 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22574.2 - 7.0.200-preview.22574.2 + 7.0.200-preview.22574.6 + 7.0.200-preview.22574.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221122-02 + 17.5.0-preview-20221123-03 From 5f756bdc84f70cf45059a6b5c7c4a6833d9f2814 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Nov 2022 08:13:56 +0000 Subject: [PATCH 172/654] Update dependencies from https://github.com/dotnet/sdk build 20221124.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22574.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 031a8f765..bc2d3e1f1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dba703ab9..8f6e727ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 087f5de9d79e11b632b183e3967bd0936e66f95c + 5de7f1e95bb7c67a83626d328e2813e60cd050e4 - + https://github.com/dotnet/sdk - 087f5de9d79e11b632b183e3967bd0936e66f95c + 5de7f1e95bb7c67a83626d328e2813e60cd050e4 - + https://github.com/dotnet/sdk - 087f5de9d79e11b632b183e3967bd0936e66f95c + 5de7f1e95bb7c67a83626d328e2813e60cd050e4 - + https://github.com/dotnet/sdk - 087f5de9d79e11b632b183e3967bd0936e66f95c + 5de7f1e95bb7c67a83626d328e2813e60cd050e4 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 48aa68044db79a184e78ec317632f7037d5611ea + 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a - + https://github.com/dotnet/fsharp - 48aa68044db79a184e78ec317632f7037d5611ea + 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a diff --git a/eng/Versions.props b/eng/Versions.props index 5165b5722..5f3cc12d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22574.6 - 7.0.200-preview.22574.6 + 7.0.200-preview.22574.9 + 7.0.200-preview.22574.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e82a8d809c3d1ec564a1814143cb00364a7d9414 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Nov 2022 10:45:20 +0000 Subject: [PATCH 173/654] Update dependencies from https://github.com/dotnet/sdk build 20221125.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22574.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc2d3e1f1..e3975fc83 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f6e727ec..0c64ffeb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 5de7f1e95bb7c67a83626d328e2813e60cd050e4 + fd78c3536ad886effd69142506606713d03f04f0 - + https://github.com/dotnet/sdk - 5de7f1e95bb7c67a83626d328e2813e60cd050e4 + fd78c3536ad886effd69142506606713d03f04f0 - + https://github.com/dotnet/sdk - 5de7f1e95bb7c67a83626d328e2813e60cd050e4 + fd78c3536ad886effd69142506606713d03f04f0 - + https://github.com/dotnet/sdk - 5de7f1e95bb7c67a83626d328e2813e60cd050e4 + fd78c3536ad886effd69142506606713d03f04f0 @@ -154,9 +154,9 @@ d797c48da13aaa4dc7ae440ed7603c990cd44317 - + https://github.com/nuget/nuget.client - 57d3a6d133442c4b0e0bfb7b05e1e00cca34258d + dfe13cc99d13de74f41e9cff35600a2c8958aac1 diff --git a/eng/Versions.props b/eng/Versions.props index 5f3cc12d3..b4819e909 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22574.9 - 7.0.200-preview.22574.9 + 7.0.200-preview.22575.1 + 7.0.200-preview.22575.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4d55695b1bd34955b3bdcc16736825617018e6c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 27 Nov 2022 12:14:29 +0000 Subject: [PATCH 174/654] Update dependencies from https://github.com/dotnet/sdk build 20221127.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22574.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3975fc83..b27f3622d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c64ffeb1..717dd4f32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - fd78c3536ad886effd69142506606713d03f04f0 + 44fb52d4ae49498301fc82f70c8fa8410ad99e89 - + https://github.com/dotnet/sdk - fd78c3536ad886effd69142506606713d03f04f0 + 44fb52d4ae49498301fc82f70c8fa8410ad99e89 - + https://github.com/dotnet/sdk - fd78c3536ad886effd69142506606713d03f04f0 + 44fb52d4ae49498301fc82f70c8fa8410ad99e89 - + https://github.com/dotnet/sdk - fd78c3536ad886effd69142506606713d03f04f0 + 44fb52d4ae49498301fc82f70c8fa8410ad99e89 @@ -133,9 +133,9 @@ 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a - + https://github.com/microsoft/vstest - 94cde14e9c35e1eaffe063acf7a191d1d24ad29a + 3382abccaeb3e529a02d0bd5ac22164d821e7ada diff --git a/eng/Versions.props b/eng/Versions.props index b4819e909..2a421b997 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22575.1 - 7.0.200-preview.22575.1 + 7.0.200-preview.22577.1 + 7.0.200-preview.22577.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221123-03 + 17.5.0-preview-20221125-02 From 6248e95dbd4091a8c987ce1de70eada203a23ee7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Nov 2022 03:17:04 +0000 Subject: [PATCH 175/654] Update dependencies from https://github.com/dotnet/sdk build 20221127.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22574.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index b27f3622d..122cebf1b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 717dd4f32..99fd03a8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 44fb52d4ae49498301fc82f70c8fa8410ad99e89 + aa83fc819cd466c77e1b47eccd9e793120d186cb - + https://github.com/dotnet/sdk - 44fb52d4ae49498301fc82f70c8fa8410ad99e89 + aa83fc819cd466c77e1b47eccd9e793120d186cb - + https://github.com/dotnet/sdk - 44fb52d4ae49498301fc82f70c8fa8410ad99e89 + aa83fc819cd466c77e1b47eccd9e793120d186cb - + https://github.com/dotnet/sdk - 44fb52d4ae49498301fc82f70c8fa8410ad99e89 + aa83fc819cd466c77e1b47eccd9e793120d186cb @@ -133,9 +133,9 @@ 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a - + https://github.com/microsoft/vstest - 3382abccaeb3e529a02d0bd5ac22164d821e7ada + 96de7ff03a297a0f96a1dc3e8586b3a9d08c74db diff --git a/eng/Versions.props b/eng/Versions.props index 2a421b997..0783a0fbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22577.1 - 7.0.200-preview.22577.1 + 7.0.200-preview.22577.4 + 7.0.200-preview.22577.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221125-02 + 17.5.0-preview-20221127-01 From 6e74a4405ec22cb9d15a71eb1bca379b4a180994 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 28 Nov 2022 10:57:14 -0600 Subject: [PATCH 176/654] Revert "Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221120.1" (#15029) This reverts commit df2279cc39a53577a2cc24f46b4cb781f620df9d. --- 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 a35d385fb..dd7b46b52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,9 +201,9 @@ https://github.com/dotnet/arcade 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/source-build-reference-packages - 2aa8a10cf23402f91c49b832f20773ac3d1506bb + 4f5672e90b7f908d96aad61a40b0e9b352518b1c From f93dc704fd473e79a2353122f443e2db997d6f6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 03:31:56 +0000 Subject: [PATCH 177/654] Update dependencies from https://github.com/dotnet/sdk build 20221128.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22578.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 122cebf1b..fc7747d9c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99fd03a8c..f0b1c75f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - aa83fc819cd466c77e1b47eccd9e793120d186cb + 9b9e6b0f8a0ceccb54e68a29798a341a45ea8dc3 - + https://github.com/dotnet/sdk - aa83fc819cd466c77e1b47eccd9e793120d186cb + 9b9e6b0f8a0ceccb54e68a29798a341a45ea8dc3 - + https://github.com/dotnet/sdk - aa83fc819cd466c77e1b47eccd9e793120d186cb + 9b9e6b0f8a0ceccb54e68a29798a341a45ea8dc3 - + https://github.com/dotnet/sdk - aa83fc819cd466c77e1b47eccd9e793120d186cb + 9b9e6b0f8a0ceccb54e68a29798a341a45ea8dc3 @@ -124,11 +124,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a - + https://github.com/dotnet/fsharp 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a diff --git a/eng/Versions.props b/eng/Versions.props index 0783a0fbe..446bd9018 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22577.4 - 7.0.200-preview.22577.4 + 7.0.200-preview.22578.11 + 7.0.200-preview.22578.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e8573cf845bb26862e0b520d75bb635d558be777 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 06:54:24 +0000 Subject: [PATCH 178/654] Update dependencies from https://github.com/dotnet/sdk build 20221128.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22578.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index fc7747d9c..4a090347b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0b1c75f0..e07d3b882 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 9b9e6b0f8a0ceccb54e68a29798a341a45ea8dc3 + 2839112bb1afb3bd28ec5b6253af1d180933357a - + https://github.com/dotnet/sdk - 9b9e6b0f8a0ceccb54e68a29798a341a45ea8dc3 + 2839112bb1afb3bd28ec5b6253af1d180933357a - + https://github.com/dotnet/sdk - 9b9e6b0f8a0ceccb54e68a29798a341a45ea8dc3 + 2839112bb1afb3bd28ec5b6253af1d180933357a - + https://github.com/dotnet/sdk - 9b9e6b0f8a0ceccb54e68a29798a341a45ea8dc3 + 2839112bb1afb3bd28ec5b6253af1d180933357a @@ -149,9 +149,9 @@ 2e846c4211610644773577d2aec8c584ae9412ff - + https://github.com/dotnet/msbuild - d797c48da13aaa4dc7ae440ed7603c990cd44317 + a9df31a0a20c15e3930336dd053487665a0f5fb9 diff --git a/eng/Versions.props b/eng/Versions.props index 446bd9018..0051232e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22578.11 - 7.0.200-preview.22578.11 + 7.0.200-preview.22578.15 + 7.0.200-preview.22578.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4268a657766566d6a769cb2a71588a2b326fcd89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 19:28:44 +0000 Subject: [PATCH 179/654] Update dependencies from https://github.com/dotnet/sdk build 20221129.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22578.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a090347b..34216f51a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e07d3b882..685ae63c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 2839112bb1afb3bd28ec5b6253af1d180933357a + 5b848ccc038abdcfdf00e14485fcd02eec394e4a - + https://github.com/dotnet/sdk - 2839112bb1afb3bd28ec5b6253af1d180933357a + 5b848ccc038abdcfdf00e14485fcd02eec394e4a - + https://github.com/dotnet/sdk - 2839112bb1afb3bd28ec5b6253af1d180933357a + 5b848ccc038abdcfdf00e14485fcd02eec394e4a - + https://github.com/dotnet/sdk - 2839112bb1afb3bd28ec5b6253af1d180933357a + 5b848ccc038abdcfdf00e14485fcd02eec394e4a diff --git a/eng/Versions.props b/eng/Versions.props index 0051232e9..b716bae7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22578.15 - 7.0.200-preview.22578.15 + 7.0.200-preview.22579.3 + 7.0.200-preview.22579.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 96c153bfeca0a3c9c778f54f66f6d2d1aa26f4cd Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 29 Nov 2022 12:08:59 -0800 Subject: [PATCH 180/654] Use non-stable branding (#15049) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ce103d1e4..457864707 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,7 +16,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release From 5e1b4055482351d76669f303db9fdb285b8d84b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Nov 2022 20:41:26 +0000 Subject: [PATCH 181/654] Update dependencies from https://github.com/dotnet/sdk build 20221129.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22578.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 34216f51a..9adef5443 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 685ae63c8..bb1769af6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 5b848ccc038abdcfdf00e14485fcd02eec394e4a + 15d88096965e07915a2bee61babe263a58f3e43f - + https://github.com/dotnet/sdk - 5b848ccc038abdcfdf00e14485fcd02eec394e4a + 15d88096965e07915a2bee61babe263a58f3e43f - + https://github.com/dotnet/sdk - 5b848ccc038abdcfdf00e14485fcd02eec394e4a + 15d88096965e07915a2bee61babe263a58f3e43f - + https://github.com/dotnet/sdk - 5b848ccc038abdcfdf00e14485fcd02eec394e4a + 15d88096965e07915a2bee61babe263a58f3e43f @@ -133,14 +133,14 @@ 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a - + https://github.com/microsoft/vstest - 96de7ff03a297a0f96a1dc3e8586b3a9d08c74db + a61ec9013bbadc3401a7ca3f17193d027b6ef4fe - + https://github.com/dotnet/linker - 22376ee081ea791b4c8bfa82509f8e45af4bc629 + 8db10f44053ed4cb95a99676ac7b8ccae681b79d linker diff --git a/eng/Versions.props b/eng/Versions.props index b716bae7a..7656fa689 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-preview.22579.3 - 7.0.200-preview.22579.3 + 7.0.200-preview.22579.9 + 7.0.200-preview.22579.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221127-01 + 17.5.0-preview-20221128-04 From 83c2e03297118712eb9a1e78a65791f664570010 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 01:48:39 +0000 Subject: [PATCH 182/654] Update dependencies from https://github.com/dotnet/sdk build 20221129.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200 -> To Version 7.0.200-preview.22579.38 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22567.5 -> To Version 12.5.0-beta.22578.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9adef5443..3d6b197f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb1769af6..26003ecbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 15d88096965e07915a2bee61babe263a58f3e43f + 09f538a82ca952920cb3a2a33e69d9f77b45c091 - + https://github.com/dotnet/sdk - 15d88096965e07915a2bee61babe263a58f3e43f + 09f538a82ca952920cb3a2a33e69d9f77b45c091 - + https://github.com/dotnet/sdk - 15d88096965e07915a2bee61babe263a58f3e43f + 09f538a82ca952920cb3a2a33e69d9f77b45c091 - + https://github.com/dotnet/sdk - 15d88096965e07915a2bee61babe263a58f3e43f + 09f538a82ca952920cb3a2a33e69d9f77b45c091 diff --git a/eng/Versions.props b/eng/Versions.props index 7656fa689..ba38097c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200 - 7.0.200-preview.22579.9 - 7.0.200-preview.22579.9 + 7.0.200-preview.22579.38 + 7.0.200-preview.22579.38 + 7.0.200-preview.22579.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0f45acfc094c13870f33793eea1a94dc3176db7d Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 29 Nov 2022 19:45:58 +0000 Subject: [PATCH 183/654] Update nuget-client patch with more props --- ...-version-properties-for-source-build.patch | 47 +++++++++++++++++++ ...b.Xdt-package-version-for-source-bui.patch | 31 ------------ 2 files changed, 47 insertions(+), 31 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Fix-Microsoft.Web.Xdt-package-version-for-source-bui.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch new file mode 100644 index 000000000..76a1abde5 --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch @@ -0,0 +1,47 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Mon, 21 Nov 2022 22:32:04 +0000 +Subject: [PATCH] Add package version properties for source-build + +Backport: https://github.com/NuGet/Home/issues/12261 +--- + Directory.Packages.props | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index 8afa7dd31..0c4eaecf5 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -9,11 +9,13 @@ + 17.2.0-preview-2-32304-091 + 16.153.0 + +- 17.3.1 ++ 17.3.1 + + 16.8.0 + + 16.11.0 ++ 3.0.0 ++ 4.5.0 + + + +@@ -56,7 +58,7 @@ + + + +- ++ + + + +@@ -66,7 +68,7 @@ + + + +- ++ + + + diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Fix-Microsoft.Web.Xdt-package-version-for-source-bui.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Fix-Microsoft.Web.Xdt-package-version-for-source-bui.patch deleted file mode 100644 index 69517f31f..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Fix-Microsoft.Web.Xdt-package-version-for-source-bui.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 21 Nov 2022 22:32:04 +0000 -Subject: [PATCH] Fix Microsoft.Web.Xdt package version for source-build - -Backport: https://github.com/NuGet/Home/issues/12261 ---- - Directory.Packages.props | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 8afa7dd31..2ee44858d 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -14,6 +14,7 @@ - 16.8.0 - - 16.11.0 -+ 3.0.0 - - - -@@ -56,7 +57,7 @@ - - - -- -+ - - - From cd889425aaa130357440b849d0c5d74bbb6db1f8 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 30 Nov 2022 01:50:24 +0000 Subject: [PATCH 184/654] Add CS9057 nowarn to nuget-client for source-build --- src/SourceBuild/tarball/content/repos/nuget-client.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/tarball/content/repos/nuget-client.proj b/src/SourceBuild/tarball/content/repos/nuget-client.proj index eccc1a738..586565cac 100644 --- a/src/SourceBuild/tarball/content/repos/nuget-client.proj +++ b/src/SourceBuild/tarball/content/repos/nuget-client.proj @@ -6,6 +6,7 @@ false true true + CS9057 From 3cdbf2ee6e95c10e1d13f4bc544722f3951a392d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 06:56:51 +0000 Subject: [PATCH 185/654] Update dependencies from https://github.com/dotnet/sdk build 20221129.55 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22579.38 -> To Version 7.0.200-preview.22579.55 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-22578-03 -> To Version 17.5.0-preview-22580-01 (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 3e2fd77f6..fa193dad2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 09f538a82ca952920cb3a2a33e69d9f77b45c091 + 3e557916d6c22f42acf204999f71593678f5d79a - + https://github.com/dotnet/sdk - 09f538a82ca952920cb3a2a33e69d9f77b45c091 + 3e557916d6c22f42acf204999f71593678f5d79a - + https://github.com/dotnet/sdk - 09f538a82ca952920cb3a2a33e69d9f77b45c091 + 3e557916d6c22f42acf204999f71593678f5d79a - + https://github.com/dotnet/sdk - 09f538a82ca952920cb3a2a33e69d9f77b45c091 + 3e557916d6c22f42acf204999f71593678f5d79a @@ -149,9 +149,9 @@ 2e846c4211610644773577d2aec8c584ae9412ff - + https://github.com/dotnet/msbuild - a9df31a0a20c15e3930336dd053487665a0f5fb9 + ee6f71d15eea77c970815d9105ab9520876c5042 diff --git a/eng/Versions.props b/eng/Versions.props index cf8c73573..61cdeb0d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22579.38 - 7.0.200-preview.22579.38 - 7.0.200-preview.22579.38 + 7.0.200-preview.22579.55 + 7.0.200-preview.22579.55 + 7.0.200-preview.22579.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1d7bc2b40d5797b8fbcf5eee30c8568a9e5a82e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 18:54:50 +0000 Subject: [PATCH 186/654] Update dependencies from https://github.com/dotnet/sdk build 20221130.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22579.55 -> To Version 7.0.200-preview.22580.20 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221128-04 -> To Version 17.5.0-preview-20221130-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa193dad2..f3564b12c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3e557916d6c22f42acf204999f71593678f5d79a + e1cbb5334067b2ecf98331dd93abb948069c4a02 - + https://github.com/dotnet/sdk - 3e557916d6c22f42acf204999f71593678f5d79a + e1cbb5334067b2ecf98331dd93abb948069c4a02 - + https://github.com/dotnet/sdk - 3e557916d6c22f42acf204999f71593678f5d79a + e1cbb5334067b2ecf98331dd93abb948069c4a02 - + https://github.com/dotnet/sdk - 3e557916d6c22f42acf204999f71593678f5d79a + e1cbb5334067b2ecf98331dd93abb948069c4a02 @@ -133,9 +133,9 @@ 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a - + https://github.com/microsoft/vstest - a61ec9013bbadc3401a7ca3f17193d027b6ef4fe + dbdb1f6f9007a288c904aa1f13485a3e57080fb6 diff --git a/eng/Versions.props b/eng/Versions.props index 61cdeb0d9..e5f16f3c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22579.55 - 7.0.200-preview.22579.55 - 7.0.200-preview.22579.55 + 7.0.200-preview.22580.20 + 7.0.200-preview.22580.20 + 7.0.200-preview.22580.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221128-04 + 17.5.0-preview-20221130-01 From b2509c0e8e07653140daf5347abaa4aaa8e7c50c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 22:47:41 +0000 Subject: [PATCH 187/654] Update dependencies from https://github.com/dotnet/arcade build 20221130.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22572.6 -> To Version 7.0.0-beta.22580.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/steps/source-build.yml | 6 ++++++ global.json | 4 ++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa193dad2..bbdacc4a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + 40307db5eec2e3bc2df44bacb8482969f20142e3 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + 40307db5eec2e3bc2df44bacb8482969f20142e3 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + 40307db5eec2e3bc2df44bacb8482969f20142e3 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 61cdeb0d9..094aa9ff2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22572.6 + 7.0.0-beta.22580.5 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 12a8ff94d..4624885e3 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/global.json b/global.json index 632f780d8..b0417dfe3 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.22572.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22572.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22580.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22580.5" } } From e857b740db31d8ef89b52fbfb61553be8e066ea8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 23:59:37 +0000 Subject: [PATCH 188/654] Update dependencies from https://github.com/dotnet/sdk build 20221130.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22580.20 -> To Version 7.0.200-preview.22580.38 --- 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 f3564b12c..d7dfe0704 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e1cbb5334067b2ecf98331dd93abb948069c4a02 + 866c1ac62e6385815d64248ecdcc2816066f9c0a - + https://github.com/dotnet/sdk - e1cbb5334067b2ecf98331dd93abb948069c4a02 + 866c1ac62e6385815d64248ecdcc2816066f9c0a - + https://github.com/dotnet/sdk - e1cbb5334067b2ecf98331dd93abb948069c4a02 + 866c1ac62e6385815d64248ecdcc2816066f9c0a - + https://github.com/dotnet/sdk - e1cbb5334067b2ecf98331dd93abb948069c4a02 + 866c1ac62e6385815d64248ecdcc2816066f9c0a diff --git a/eng/Versions.props b/eng/Versions.props index e5f16f3c4..26c81477b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22580.20 - 7.0.200-preview.22580.20 - 7.0.200-preview.22580.20 + 7.0.200-preview.22580.38 + 7.0.200-preview.22580.38 + 7.0.200-preview.22580.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ee279219b5e4531d62dfad339d6e7be04fb33950 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Dec 2022 06:50:53 +0000 Subject: [PATCH 189/654] Update dependencies from https://github.com/dotnet/sdk build 20221130.54 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22580.38 -> To Version 7.0.200-preview.22580.54 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.22578.1 -> To Version 12.5.0-beta.22580.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84644c7e9..39439677b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 866c1ac62e6385815d64248ecdcc2816066f9c0a + 2de3de4d26d207246c571ac1e6f5b7d70904204c - + https://github.com/dotnet/sdk - 866c1ac62e6385815d64248ecdcc2816066f9c0a + 2de3de4d26d207246c571ac1e6f5b7d70904204c - + https://github.com/dotnet/sdk - 866c1ac62e6385815d64248ecdcc2816066f9c0a + 2de3de4d26d207246c571ac1e6f5b7d70904204c - + https://github.com/dotnet/sdk - 866c1ac62e6385815d64248ecdcc2816066f9c0a + 2de3de4d26d207246c571ac1e6f5b7d70904204c @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a + 53f907e84e36a56e68e76fcc3aa5c12540363345 - + https://github.com/dotnet/fsharp - 5b3d9fd9e4fe1770fa44354f9391908d7288fc2a + 53f907e84e36a56e68e76fcc3aa5c12540363345 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 2e846c4211610644773577d2aec8c584ae9412ff + ea0b6351c129c7decd9bf76f4388239509e28e0d diff --git a/eng/Versions.props b/eng/Versions.props index 9658968c1..03ada8b42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22580.38 - 7.0.200-preview.22580.38 - 7.0.200-preview.22580.38 + 7.0.200-preview.22580.54 + 7.0.200-preview.22580.54 + 7.0.200-preview.22580.54 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b948404edf923f29aac6bb7b4f1a8f2ae11541c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Dec 2022 13:10:45 -0800 Subject: [PATCH 190/654] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221201.1 (#15076) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22531.3 -> To Version 7.0.0-alpha.1.22601.1 Co-authored-by: dotnet-maestro[bot] --- 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 39439677b..90804d251 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,9 +201,9 @@ https://github.com/dotnet/arcade 40307db5eec2e3bc2df44bacb8482969f20142e3 - + https://github.com/dotnet/source-build-reference-packages - 4f5672e90b7f908d96aad61a40b0e9b352518b1c + dbc9f7cf132118b8a82cc78c99143df07cf26058 From c67ece799f68295c637de963d1205320beadbdd0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Dec 2022 13:27:42 -0800 Subject: [PATCH 191/654] Update dependencies from https://github.com/dotnet/arcade build 20221201.3 (#15081) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22580.5 -> To Version 7.0.0-beta.22601.3 Co-authored-by: dotnet-maestro[bot] --- 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 90804d251..c36278bb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 40307db5eec2e3bc2df44bacb8482969f20142e3 + 06f4fb81b32083ab58523f1ea0555a3bcbda6066 - + https://github.com/dotnet/arcade - 40307db5eec2e3bc2df44bacb8482969f20142e3 + 06f4fb81b32083ab58523f1ea0555a3bcbda6066 - + https://github.com/dotnet/arcade - 40307db5eec2e3bc2df44bacb8482969f20142e3 + 06f4fb81b32083ab58523f1ea0555a3bcbda6066 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 03ada8b42..cc71574d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22580.5 + 7.0.0-beta.22601.3 diff --git a/global.json b/global.json index b0417dfe3..21355169e 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.22580.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22580.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22601.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22601.3" } } From 37821d04a6b3d741c7128fbf62f403ca365b4327 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 2 Dec 2022 14:02:14 -0800 Subject: [PATCH 192/654] Update the implicit versions to match the December release --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index b6c2a596e..14f9bc796 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -63,7 +63,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 10)) + 12 From cbeab0358072f807f9859931c1efeebc2d774fdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 14:30:43 -0800 Subject: [PATCH 193/654] Update dependencies from https://github.com/dotnet/arcade build 20221201.6 (#15088) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22601.3 -> To Version 7.0.0-beta.22601.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/tools.sh | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c36278bb5..9fbd46289 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 06f4fb81b32083ab58523f1ea0555a3bcbda6066 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 06f4fb81b32083ab58523f1ea0555a3bcbda6066 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 06f4fb81b32083ab58523f1ea0555a3bcbda6066 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index cc71574d1..fee3ddc5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22601.3 + 7.0.0-beta.22601.6 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index c110d0ed4..e9a7ed9af 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -511,7 +511,7 @@ global_json_file="${repo_root}global.json" # determine if global.json contains a "runtimes" entry global_json_has_runtimes=false if command -v jq &> /dev/null; then - if jq -er '. | select(has("runtimes"))' "$global_json_file" &> /dev/null; then + if jq -e '.tools | has("runtimes")' "$global_json_file" &> /dev/null; then global_json_has_runtimes=true fi elif [[ "$(cat "$global_json_file")" =~ \"runtimes\"[[:space:]\:]*\{ ]]; then diff --git a/global.json b/global.json index 21355169e..8d88943f3 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.22601.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22601.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22601.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22601.6" } } From 9cf321973e857ef4f9de6ebb609d7f7564cec9cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Dec 2022 01:16:03 +0000 Subject: [PATCH 194/654] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221208.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22601.1 -> To Version 7.0.0-alpha.1.22608.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 9fbd46289..7a0061b06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,9 +201,9 @@ https://github.com/dotnet/arcade c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/source-build-reference-packages - dbc9f7cf132118b8a82cc78c99143df07cf26058 + 9964206e0dd215eee4ed199b9041a94e16ba4c45 From 5bb11fee927ba5d340704eefdb29d2406179bcc6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 15:23:09 -0600 Subject: [PATCH 195/654] [release/7.0.2xx] Update dependencies from dotnet/sdk (#15115) * Update dependencies from https://github.com/dotnet/sdk build 20221209.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22580.54 -> To Version 7.0.200-preview.22609.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22580.6 -> To Version 12.5.0-beta.22608.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221211.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22580.54 -> To Version 7.0.200-preview.22611.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22580.6 -> To Version 12.5.0-beta.22608.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221212.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22580.54 -> To Version 7.0.200-preview.22612.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22580.6 -> To Version 12.5.0-beta.22608.3 (parent: Microsoft.NET.Sdk * Remove backported NuGet source-build patch * Add source-build patch to address NuGet prebuilt * Fix source-build patch Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 40 ++++++++-------- eng/Versions.props | 8 ++-- ...-version-properties-for-source-build.patch | 47 ------------------- ...geVersion-props-to-address-prebuilts.patch | 33 +++++++++++++ 4 files changed, 57 insertions(+), 71 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a0061b06..e742fad33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 2de3de4d26d207246c571ac1e6f5b7d70904204c + f1de6ee836ad96b92317646815bcb66793b98a7b - + https://github.com/dotnet/sdk - 2de3de4d26d207246c571ac1e6f5b7d70904204c + f1de6ee836ad96b92317646815bcb66793b98a7b - + https://github.com/dotnet/sdk - 2de3de4d26d207246c571ac1e6f5b7d70904204c + f1de6ee836ad96b92317646815bcb66793b98a7b - + https://github.com/dotnet/sdk - 2de3de4d26d207246c571ac1e6f5b7d70904204c + f1de6ee836ad96b92317646815bcb66793b98a7b @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 53f907e84e36a56e68e76fcc3aa5c12540363345 + ae1718567f2aab20df7ca07368b9f51d1c376a10 - + https://github.com/dotnet/fsharp - 53f907e84e36a56e68e76fcc3aa5c12540363345 + ae1718567f2aab20df7ca07368b9f51d1c376a10 - + https://github.com/microsoft/vstest - dbdb1f6f9007a288c904aa1f13485a3e57080fb6 + bedc83105652ba5638dfc1ec629f3402af65acd0 @@ -144,19 +144,19 @@ linker - + https://github.com/dotnet/roslyn - ea0b6351c129c7decd9bf76f4388239509e28e0d + 716366a3830293571eaaad9b1b2b3929b5216f42 - + https://github.com/dotnet/msbuild - ee6f71d15eea77c970815d9105ab9520876c5042 + 9c3057b5af56ef92ffde7d1b37dea8ddee74d8b1 - + https://github.com/nuget/nuget.client - dfe13cc99d13de74f41e9cff35600a2c8958aac1 + 31f2a1cb6fe3dababe67cdb84e9d6ddb9e3ace04 diff --git a/eng/Versions.props b/eng/Versions.props index fee3ddc5b..7900fc5f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22580.54 - 7.0.200-preview.22580.54 - 7.0.200-preview.22580.54 + 7.0.200-preview.22612.1 + 7.0.200-preview.22612.1 + 7.0.200-preview.22612.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221130-01 + 17.5.0-preview-20221209-03 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch deleted file mode 100644 index 76a1abde5..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 21 Nov 2022 22:32:04 +0000 -Subject: [PATCH] Add package version properties for source-build - -Backport: https://github.com/NuGet/Home/issues/12261 ---- - Directory.Packages.props | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 8afa7dd31..0c4eaecf5 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -9,11 +9,13 @@ - 17.2.0-preview-2-32304-091 - 16.153.0 - -- 17.3.1 -+ 17.3.1 - - 16.8.0 - - 16.11.0 -+ 3.0.0 -+ 4.5.0 - - - -@@ -56,7 +58,7 @@ - - - -- -+ - - - -@@ -66,7 +68,7 @@ - - - -- -+ - - - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch new file mode 100644 index 000000000..0bcfa0de5 --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Mon, 12 Dec 2022 19:30:59 +0000 +Subject: [PATCH] Define PackageVersion props to address prebuilts + +--- + Directory.Packages.props | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index e4b41a45f..245ffcc99 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -16,6 +16,8 @@ + 16.11.0 + + ++ 6.0.0 ++ 6.0.0 + 3.0.0 + 4.5.0 + +@@ -38,8 +40,8 @@ + + + +- +- ++ ++ + + + From eed7e45af2c38b7ca76b3e34474d273322e79a77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 16 Dec 2022 08:49:43 -0600 Subject: [PATCH 196/654] [release/7.0.2xx] Update dependencies from dotnet/sdk (#15122) Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 40 +++++++++---------- eng/Versions.props | 8 ++-- .../tarball/content/repos/known-good.proj | 2 +- .../repos/{razor-compiler.proj => razor.proj} | 0 .../tarball/content/repos/sdk.proj | 2 +- ...geVersion-props-to-address-prebuilts.patch | 33 --------------- ...-Exclude-Analyzers-from-source-build.patch | 23 +++++++++++ 7 files changed, 49 insertions(+), 59 deletions(-) rename src/SourceBuild/tarball/content/repos/{razor-compiler.proj => razor.proj} (100%) delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch create mode 100644 src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e742fad33..83c855a49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - f1de6ee836ad96b92317646815bcb66793b98a7b + bf20e1dc7aba0b8960f80ab9f25eb274c76a0b84 - + https://github.com/dotnet/sdk - f1de6ee836ad96b92317646815bcb66793b98a7b + bf20e1dc7aba0b8960f80ab9f25eb274c76a0b84 - + https://github.com/dotnet/sdk - f1de6ee836ad96b92317646815bcb66793b98a7b + bf20e1dc7aba0b8960f80ab9f25eb274c76a0b84 - + https://github.com/dotnet/sdk - f1de6ee836ad96b92317646815bcb66793b98a7b + bf20e1dc7aba0b8960f80ab9f25eb274c76a0b84 @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - ae1718567f2aab20df7ca07368b9f51d1c376a10 + f25ff0cfeaf09cc429a5594032d478443c2dba5d - + https://github.com/dotnet/fsharp - ae1718567f2aab20df7ca07368b9f51d1c376a10 + f25ff0cfeaf09cc429a5594032d478443c2dba5d - + https://github.com/microsoft/vstest - bedc83105652ba5638dfc1ec629f3402af65acd0 + d7b66728d22dd5cdee5fb1e2bc385f9f2cd03171 @@ -144,19 +144,19 @@ linker - + https://github.com/dotnet/roslyn - 716366a3830293571eaaad9b1b2b3929b5216f42 + c80d6495d55ebbd64372755d236d0e5971b2dfc7 - + https://github.com/dotnet/msbuild - 9c3057b5af56ef92ffde7d1b37dea8ddee74d8b1 + eb5ebc23a99af31731a6b6c403ceda0b44aa9966 - + https://github.com/nuget/nuget.client - 31f2a1cb6fe3dababe67cdb84e9d6ddb9e3ace04 + 0e7accb78d0df80cda1bffbcf1d522945e8a1112 diff --git a/eng/Versions.props b/eng/Versions.props index 7900fc5f2..38e6a1e82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22612.1 - 7.0.200-preview.22612.1 - 7.0.200-preview.22612.1 + 7.0.200-preview.22616.1 + 7.0.200-preview.22616.1 + 7.0.200-preview.22616.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221209-03 + 17.5.0-preview-20221214-01 diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 6f96a2fdf..7adea7e84 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -34,7 +34,7 @@ - + diff --git a/src/SourceBuild/tarball/content/repos/razor-compiler.proj b/src/SourceBuild/tarball/content/repos/razor.proj similarity index 100% rename from src/SourceBuild/tarball/content/repos/razor-compiler.proj rename to src/SourceBuild/tarball/content/repos/razor.proj diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index c18e00dd6..5d0fe449d 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -39,7 +39,7 @@ - + diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch deleted file mode 100644 index 0bcfa0de5..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Mon, 12 Dec 2022 19:30:59 +0000 -Subject: [PATCH] Define PackageVersion props to address prebuilts - ---- - Directory.Packages.props | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index e4b41a45f..245ffcc99 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -16,6 +16,8 @@ - 16.11.0 - - -+ 6.0.0 -+ 6.0.0 - 3.0.0 - 4.5.0 - -@@ -38,8 +40,8 @@ - - - -- -- -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch b/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch new file mode 100644 index 000000000..071ca05da --- /dev/null +++ b/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Fri, 16 Dec 2022 03:31:02 +0000 +Subject: [PATCH] Exclude Analyzers from source-build + +Backport: https://github.com/dotnet/razor/issues/8035 +--- + src/Compiler/Directory.Build.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Compiler/Directory.Build.props b/src/Compiler/Directory.Build.props +index e69a99bf3..f70902a08 100644 +--- a/src/Compiler/Directory.Build.props ++++ b/src/Compiler/Directory.Build.props +@@ -37,7 +37,7 @@ + $(WarningsNotAsErrors);xUnit1004 + + +- ++ + + + From 0b33a5b0bf64d96fb6ca224161e18bcd6148ef00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Dec 2022 21:15:50 +0000 Subject: [PATCH 197/654] Update dependencies from https://github.com/dotnet/sdk build 20221216.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22616.1 -> To Version 7.0.200-preview.22616.4 --- 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 83c855a49..64c4abf1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - bf20e1dc7aba0b8960f80ab9f25eb274c76a0b84 + 0b6a38195cb54571639a59a2ff3435a80c37eeda - + https://github.com/dotnet/sdk - bf20e1dc7aba0b8960f80ab9f25eb274c76a0b84 + 0b6a38195cb54571639a59a2ff3435a80c37eeda - + https://github.com/dotnet/sdk - bf20e1dc7aba0b8960f80ab9f25eb274c76a0b84 + 0b6a38195cb54571639a59a2ff3435a80c37eeda - + https://github.com/dotnet/sdk - bf20e1dc7aba0b8960f80ab9f25eb274c76a0b84 + 0b6a38195cb54571639a59a2ff3435a80c37eeda diff --git a/eng/Versions.props b/eng/Versions.props index 38e6a1e82..99e2648ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22616.1 - 7.0.200-preview.22616.1 - 7.0.200-preview.22616.1 + 7.0.200-preview.22616.4 + 7.0.200-preview.22616.4 + 7.0.200-preview.22616.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cb62aeefe39c7f1ed148161e64283fe2da3a57b2 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Dec 2022 17:33:58 -0600 Subject: [PATCH 198/654] re-enable dotnet-watch tests (#15148) --- .../Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs index 4c5a9c425..57b4e40b5 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -13,7 +13,7 @@ public class DotNetWatchTests : SmokeTests { public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - //[Fact] - Renable with https://github.com/dotnet/source-build/issues/3123 + [Fact] public void WatchTests() { string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests)); From ea67757dabbbc27754d5b9a19a66c5262935bb73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Dec 2022 10:57:43 +0000 Subject: [PATCH 199/654] Update dependencies from https://github.com/dotnet/sdk build 20221219.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22616.4 -> To Version 7.0.200-preview.22619.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.22615.1 -> To Version 12.5.0-beta.22616.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64c4abf1d..028cd5d60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0b6a38195cb54571639a59a2ff3435a80c37eeda + a5bb52a9991c4e664d0663a31bf72b746fbca399 - + https://github.com/dotnet/sdk - 0b6a38195cb54571639a59a2ff3435a80c37eeda + a5bb52a9991c4e664d0663a31bf72b746fbca399 - + https://github.com/dotnet/sdk - 0b6a38195cb54571639a59a2ff3435a80c37eeda + a5bb52a9991c4e664d0663a31bf72b746fbca399 - + https://github.com/dotnet/sdk - 0b6a38195cb54571639a59a2ff3435a80c37eeda + a5bb52a9991c4e664d0663a31bf72b746fbca399 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - f25ff0cfeaf09cc429a5594032d478443c2dba5d + 1c1ccfdc7c7bbd44ca4aac6d7efcc09f1fd1f5d8 - + https://github.com/dotnet/fsharp - f25ff0cfeaf09cc429a5594032d478443c2dba5d + 1c1ccfdc7c7bbd44ca4aac6d7efcc09f1fd1f5d8 diff --git a/eng/Versions.props b/eng/Versions.props index 99e2648ea..ae6d74290 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22616.4 - 7.0.200-preview.22616.4 - 7.0.200-preview.22616.4 + 7.0.200-preview.22619.2 + 7.0.200-preview.22619.2 + 7.0.200-preview.22619.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e400242bec234d2f5473c9302c5aeb9d1633efbb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Dec 2022 17:35:05 +0000 Subject: [PATCH 200/654] Update dependencies from https://github.com/dotnet/sdk build 20221219.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22616.4 -> To Version 7.0.200-preview.22619.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.22615.1 -> To Version 12.5.0-beta.22616.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 028cd5d60..20c98c0f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - a5bb52a9991c4e664d0663a31bf72b746fbca399 + 18a94b863fff1a8fa19a5126c3a189d6078e1fa1 - + https://github.com/dotnet/sdk - a5bb52a9991c4e664d0663a31bf72b746fbca399 + 18a94b863fff1a8fa19a5126c3a189d6078e1fa1 - + https://github.com/dotnet/sdk - a5bb52a9991c4e664d0663a31bf72b746fbca399 + 18a94b863fff1a8fa19a5126c3a189d6078e1fa1 - + https://github.com/dotnet/sdk - a5bb52a9991c4e664d0663a31bf72b746fbca399 + 18a94b863fff1a8fa19a5126c3a189d6078e1fa1 diff --git a/eng/Versions.props b/eng/Versions.props index ae6d74290..c701fea98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22619.2 - 7.0.200-preview.22619.2 - 7.0.200-preview.22619.2 + 7.0.200-preview.22619.4 + 7.0.200-preview.22619.4 + 7.0.200-preview.22619.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 20e7d2f2cfb4a23be269fa19dea1b6acc6b19e1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Dec 2022 07:08:50 +0000 Subject: [PATCH 201/654] Update dependencies from https://github.com/dotnet/sdk build 20221219.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22619.4 -> To Version 7.0.200-preview.22619.7 --- 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 20c98c0f2..3d421844a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 18a94b863fff1a8fa19a5126c3a189d6078e1fa1 + a506d75a39b7d6ce5d287752144ae3aa8d03f1b5 - + https://github.com/dotnet/sdk - 18a94b863fff1a8fa19a5126c3a189d6078e1fa1 + a506d75a39b7d6ce5d287752144ae3aa8d03f1b5 - + https://github.com/dotnet/sdk - 18a94b863fff1a8fa19a5126c3a189d6078e1fa1 + a506d75a39b7d6ce5d287752144ae3aa8d03f1b5 - + https://github.com/dotnet/sdk - 18a94b863fff1a8fa19a5126c3a189d6078e1fa1 + a506d75a39b7d6ce5d287752144ae3aa8d03f1b5 diff --git a/eng/Versions.props b/eng/Versions.props index c701fea98..6b71f4a98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22619.4 - 7.0.200-preview.22619.4 - 7.0.200-preview.22619.4 + 7.0.200-preview.22619.7 + 7.0.200-preview.22619.7 + 7.0.200-preview.22619.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1ee202ecf7834a3110fedb0b52dfbbaa1551e263 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Dec 2022 17:27:40 +0000 Subject: [PATCH 202/654] Update dependencies from https://github.com/dotnet/sdk build 20221220.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22619.7 -> To Version 7.0.200-preview.22620.3 --- 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 3d421844a..01393de64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - a506d75a39b7d6ce5d287752144ae3aa8d03f1b5 + 3a109af2ea30c1ccbb153903a5ec3a769b01f522 - + https://github.com/dotnet/sdk - a506d75a39b7d6ce5d287752144ae3aa8d03f1b5 + 3a109af2ea30c1ccbb153903a5ec3a769b01f522 - + https://github.com/dotnet/sdk - a506d75a39b7d6ce5d287752144ae3aa8d03f1b5 + 3a109af2ea30c1ccbb153903a5ec3a769b01f522 - + https://github.com/dotnet/sdk - a506d75a39b7d6ce5d287752144ae3aa8d03f1b5 + 3a109af2ea30c1ccbb153903a5ec3a769b01f522 diff --git a/eng/Versions.props b/eng/Versions.props index 6b71f4a98..644ab0e2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22619.7 - 7.0.200-preview.22619.7 - 7.0.200-preview.22619.7 + 7.0.200-preview.22620.3 + 7.0.200-preview.22620.3 + 7.0.200-preview.22620.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From af51cfb881921acf59b3032ac5419dab402d607d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Dec 2022 06:23:34 +0000 Subject: [PATCH 203/654] Update dependencies from https://github.com/dotnet/sdk build 20221220.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22620.3 -> To Version 7.0.200-preview.22620.6 Dependency coherency updates NuGet.Build.Tasks From Version 6.5.0-preview.3.130 -> To Version 6.5.0-preview.3.133 (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 01393de64..4344f4b26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3a109af2ea30c1ccbb153903a5ec3a769b01f522 + 8c8a939ced2f783ffe0b37385bb5983819633567 - + https://github.com/dotnet/sdk - 3a109af2ea30c1ccbb153903a5ec3a769b01f522 + 8c8a939ced2f783ffe0b37385bb5983819633567 - + https://github.com/dotnet/sdk - 3a109af2ea30c1ccbb153903a5ec3a769b01f522 + 8c8a939ced2f783ffe0b37385bb5983819633567 - + https://github.com/dotnet/sdk - 3a109af2ea30c1ccbb153903a5ec3a769b01f522 + 8c8a939ced2f783ffe0b37385bb5983819633567 @@ -154,9 +154,9 @@ eb5ebc23a99af31731a6b6c403ceda0b44aa9966 - + https://github.com/nuget/nuget.client - 0e7accb78d0df80cda1bffbcf1d522945e8a1112 + dccbd304b11103e08b97abf4cf4bcc1499d9235a diff --git a/eng/Versions.props b/eng/Versions.props index 644ab0e2b..8844fcddf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22620.3 - 7.0.200-preview.22620.3 - 7.0.200-preview.22620.3 + 7.0.200-preview.22620.6 + 7.0.200-preview.22620.6 + 7.0.200-preview.22620.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cfe6df86a3c270ddacce3694111600710c897964 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Dec 2022 07:48:16 +0000 Subject: [PATCH 204/654] Update dependencies from https://github.com/dotnet/sdk build 20221220.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22620.3 -> To Version 7.0.200-preview.22620.8 Dependency coherency updates Microsoft.Build,NuGet.Build.Tasks From Version 17.5.0-preview-22615-01 -> To Version 17.5.0-preview-22620-02 (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 4344f4b26..a77b69e1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 8c8a939ced2f783ffe0b37385bb5983819633567 + 6358351689d00e34bce0f23e9202142a1991c64c - + https://github.com/dotnet/sdk - 8c8a939ced2f783ffe0b37385bb5983819633567 + 6358351689d00e34bce0f23e9202142a1991c64c - + https://github.com/dotnet/sdk - 8c8a939ced2f783ffe0b37385bb5983819633567 + 6358351689d00e34bce0f23e9202142a1991c64c - + https://github.com/dotnet/sdk - 8c8a939ced2f783ffe0b37385bb5983819633567 + 6358351689d00e34bce0f23e9202142a1991c64c @@ -149,9 +149,9 @@ c80d6495d55ebbd64372755d236d0e5971b2dfc7 - + https://github.com/dotnet/msbuild - eb5ebc23a99af31731a6b6c403ceda0b44aa9966 + a6f6699d1f70bf79db82030938d2c5e52d1e4d2e diff --git a/eng/Versions.props b/eng/Versions.props index 8844fcddf..b933bb683 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22620.6 - 7.0.200-preview.22620.6 - 7.0.200-preview.22620.6 + 7.0.200-preview.22620.8 + 7.0.200-preview.22620.8 + 7.0.200-preview.22620.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a886fadd3138bf24fe6827497db2c53fc2e71779 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Dec 2022 11:11:28 +0000 Subject: [PATCH 205/654] Update dependencies from https://github.com/dotnet/sdk build 20221221.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22620.8 -> To Version 7.0.200-preview.22621.3 --- 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 a77b69e1b..c34d31e58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 6358351689d00e34bce0f23e9202142a1991c64c + 0da575b171995ecde2f038109440a75eab728de5 - + https://github.com/dotnet/sdk - 6358351689d00e34bce0f23e9202142a1991c64c + 0da575b171995ecde2f038109440a75eab728de5 - + https://github.com/dotnet/sdk - 6358351689d00e34bce0f23e9202142a1991c64c + 0da575b171995ecde2f038109440a75eab728de5 - + https://github.com/dotnet/sdk - 6358351689d00e34bce0f23e9202142a1991c64c + 0da575b171995ecde2f038109440a75eab728de5 diff --git a/eng/Versions.props b/eng/Versions.props index b933bb683..de337ac21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22620.8 - 7.0.200-preview.22620.8 - 7.0.200-preview.22620.8 + 7.0.200-preview.22621.3 + 7.0.200-preview.22621.3 + 7.0.200-preview.22621.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f5e44949c4ab4d8ad3721b4b79d6d2a704519347 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Dec 2022 12:42:12 +0000 Subject: [PATCH 206/654] Update dependencies from https://github.com/dotnet/sdk build 20221221.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22620.8 -> To Version 7.0.200-preview.22621.6 --- 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 c34d31e58..2f9a8f185 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0da575b171995ecde2f038109440a75eab728de5 + b48c07e438d5406659add23675a86a3e4663241a - + https://github.com/dotnet/sdk - 0da575b171995ecde2f038109440a75eab728de5 + b48c07e438d5406659add23675a86a3e4663241a - + https://github.com/dotnet/sdk - 0da575b171995ecde2f038109440a75eab728de5 + b48c07e438d5406659add23675a86a3e4663241a - + https://github.com/dotnet/sdk - 0da575b171995ecde2f038109440a75eab728de5 + b48c07e438d5406659add23675a86a3e4663241a diff --git a/eng/Versions.props b/eng/Versions.props index de337ac21..c698679c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22621.3 - 7.0.200-preview.22621.3 - 7.0.200-preview.22621.3 + 7.0.200-preview.22621.6 + 7.0.200-preview.22621.6 + 7.0.200-preview.22621.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2b4b87ed8db8c694dfd060728f27eed399767e89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Dec 2022 15:37:25 +0000 Subject: [PATCH 207/654] Update dependencies from https://github.com/dotnet/sdk build 20221221.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22620.8 -> To Version 7.0.200-preview.22621.7 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221214-01 -> To Version 17.5.0-release-20221220-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f9a8f185..b81a1081a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - b48c07e438d5406659add23675a86a3e4663241a + a1fb8fefab5a29688c547b0487d9660191025a67 - + https://github.com/dotnet/sdk - b48c07e438d5406659add23675a86a3e4663241a + a1fb8fefab5a29688c547b0487d9660191025a67 - + https://github.com/dotnet/sdk - b48c07e438d5406659add23675a86a3e4663241a + a1fb8fefab5a29688c547b0487d9660191025a67 - + https://github.com/dotnet/sdk - b48c07e438d5406659add23675a86a3e4663241a + a1fb8fefab5a29688c547b0487d9660191025a67 @@ -133,9 +133,9 @@ 1c1ccfdc7c7bbd44ca4aac6d7efcc09f1fd1f5d8 - + https://github.com/microsoft/vstest - d7b66728d22dd5cdee5fb1e2bc385f9f2cd03171 + be79eb4393631df7c6431ed1c0aa14c1bbaca731 diff --git a/eng/Versions.props b/eng/Versions.props index c698679c8..e500b6b51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22621.6 - 7.0.200-preview.22621.6 - 7.0.200-preview.22621.6 + 7.0.200-preview.22621.7 + 7.0.200-preview.22621.7 + 7.0.200-preview.22621.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221214-01 + 17.5.0-release-20221220-01 From 597ecefba311c623c7ee9838def30e6bff4f1e3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Dec 2022 03:31:43 +0000 Subject: [PATCH 208/654] Update dependencies from https://github.com/dotnet/sdk build 20221221.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22620.8 -> To Version 7.0.200-preview.22621.9 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221214-01 -> To Version 17.5.0-release-20221220-01 (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 b81a1081a..f7605fc08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - a1fb8fefab5a29688c547b0487d9660191025a67 + a882c894fb710f2fe23fdddceece54d9137f9fdf - + https://github.com/dotnet/sdk - a1fb8fefab5a29688c547b0487d9660191025a67 + a882c894fb710f2fe23fdddceece54d9137f9fdf - + https://github.com/dotnet/sdk - a1fb8fefab5a29688c547b0487d9660191025a67 + a882c894fb710f2fe23fdddceece54d9137f9fdf - + https://github.com/dotnet/sdk - a1fb8fefab5a29688c547b0487d9660191025a67 + a882c894fb710f2fe23fdddceece54d9137f9fdf diff --git a/eng/Versions.props b/eng/Versions.props index e500b6b51..ffcb57885 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22621.7 - 7.0.200-preview.22621.7 - 7.0.200-preview.22621.7 + 7.0.200-preview.22621.9 + 7.0.200-preview.22621.9 + 7.0.200-preview.22621.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15e440e238499809ded308a39e9146b52e9253ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Dec 2022 08:53:12 +0000 Subject: [PATCH 209/654] Update dependencies from https://github.com/dotnet/sdk build 20221225.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22621.9 -> To Version 7.0.200-preview.22625.2 --- 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 f7605fc08..829f7e191 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - a882c894fb710f2fe23fdddceece54d9137f9fdf + bb0e8b152664d8a569ac6d9a82850c6a02dd9119 - + https://github.com/dotnet/sdk - a882c894fb710f2fe23fdddceece54d9137f9fdf + bb0e8b152664d8a569ac6d9a82850c6a02dd9119 - + https://github.com/dotnet/sdk - a882c894fb710f2fe23fdddceece54d9137f9fdf + bb0e8b152664d8a569ac6d9a82850c6a02dd9119 - + https://github.com/dotnet/sdk - a882c894fb710f2fe23fdddceece54d9137f9fdf + bb0e8b152664d8a569ac6d9a82850c6a02dd9119 diff --git a/eng/Versions.props b/eng/Versions.props index ffcb57885..1ec435547 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22621.9 - 7.0.200-preview.22621.9 - 7.0.200-preview.22621.9 + 7.0.200-preview.22625.2 + 7.0.200-preview.22625.2 + 7.0.200-preview.22625.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2649a0972353819aa798b22a4df5a8241fc6df3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Dec 2022 10:51:01 +0000 Subject: [PATCH 210/654] Update dependencies from https://github.com/dotnet/sdk build 20221226.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22621.9 -> To Version 7.0.200-preview.22626.2 --- 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 829f7e191..10eca1f1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - bb0e8b152664d8a569ac6d9a82850c6a02dd9119 + cf927a14d471df97fe95b49ce964bd5e2979d662 - + https://github.com/dotnet/sdk - bb0e8b152664d8a569ac6d9a82850c6a02dd9119 + cf927a14d471df97fe95b49ce964bd5e2979d662 - + https://github.com/dotnet/sdk - bb0e8b152664d8a569ac6d9a82850c6a02dd9119 + cf927a14d471df97fe95b49ce964bd5e2979d662 - + https://github.com/dotnet/sdk - bb0e8b152664d8a569ac6d9a82850c6a02dd9119 + cf927a14d471df97fe95b49ce964bd5e2979d662 diff --git a/eng/Versions.props b/eng/Versions.props index 1ec435547..e0354b685 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22625.2 - 7.0.200-preview.22625.2 - 7.0.200-preview.22625.2 + 7.0.200-preview.22626.2 + 7.0.200-preview.22626.2 + 7.0.200-preview.22626.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 93f33b8b0147e807ca9876572ff731a85d464eec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Dec 2022 06:50:35 +0000 Subject: [PATCH 211/654] Update dependencies from https://github.com/dotnet/sdk build 20221226.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22626.2 -> To Version 7.0.200-preview.22626.6 Dependency coherency updates NuGet.Build.Tasks From Version 6.5.0-preview.3.133 -> To Version 6.5.0-preview.3.135 (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 10eca1f1d..aa1e2bb39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - cf927a14d471df97fe95b49ce964bd5e2979d662 + ab00ce8a4e633c1fadf64fdb9dc77b51df3dae51 - + https://github.com/dotnet/sdk - cf927a14d471df97fe95b49ce964bd5e2979d662 + ab00ce8a4e633c1fadf64fdb9dc77b51df3dae51 - + https://github.com/dotnet/sdk - cf927a14d471df97fe95b49ce964bd5e2979d662 + ab00ce8a4e633c1fadf64fdb9dc77b51df3dae51 - + https://github.com/dotnet/sdk - cf927a14d471df97fe95b49ce964bd5e2979d662 + ab00ce8a4e633c1fadf64fdb9dc77b51df3dae51 @@ -154,9 +154,9 @@ a6f6699d1f70bf79db82030938d2c5e52d1e4d2e - + https://github.com/nuget/nuget.client - dccbd304b11103e08b97abf4cf4bcc1499d9235a + c41113e9630905c11c0b67e8b9bd7ac2d98e96cc diff --git a/eng/Versions.props b/eng/Versions.props index e0354b685..acb33ebd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22626.2 - 7.0.200-preview.22626.2 - 7.0.200-preview.22626.2 + 7.0.200-preview.22626.6 + 7.0.200-preview.22626.6 + 7.0.200-preview.22626.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5b375572f904c7f3f449c2928ccc1a49dce88cee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Dec 2022 06:54:53 +0000 Subject: [PATCH 212/654] Update dependencies from https://github.com/dotnet/sdk build 20221227.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22626.6 -> To Version 7.0.200-preview.22627.2 Dependency coherency updates NuGet.Build.Tasks From Version 6.5.0-preview.3.135 -> To Version 6.5.0-preview.3.136 (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 aa1e2bb39..cae5c546d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ab00ce8a4e633c1fadf64fdb9dc77b51df3dae51 + 1545bd60ea67db70d83b2c003f5a5bb049bf44c2 - + https://github.com/dotnet/sdk - ab00ce8a4e633c1fadf64fdb9dc77b51df3dae51 + 1545bd60ea67db70d83b2c003f5a5bb049bf44c2 - + https://github.com/dotnet/sdk - ab00ce8a4e633c1fadf64fdb9dc77b51df3dae51 + 1545bd60ea67db70d83b2c003f5a5bb049bf44c2 - + https://github.com/dotnet/sdk - ab00ce8a4e633c1fadf64fdb9dc77b51df3dae51 + 1545bd60ea67db70d83b2c003f5a5bb049bf44c2 @@ -154,9 +154,9 @@ a6f6699d1f70bf79db82030938d2c5e52d1e4d2e - + https://github.com/nuget/nuget.client - c41113e9630905c11c0b67e8b9bd7ac2d98e96cc + 743503cb3c7e9ced2602ee2e29c38d63cc339451 diff --git a/eng/Versions.props b/eng/Versions.props index acb33ebd9..9682441f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22626.6 - 7.0.200-preview.22626.6 - 7.0.200-preview.22626.6 + 7.0.200-preview.22627.2 + 7.0.200-preview.22627.2 + 7.0.200-preview.22627.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 36af275959795e95e951561d8eb4386af8567890 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Dec 2022 09:54:07 +0000 Subject: [PATCH 213/654] Update dependencies from https://github.com/dotnet/sdk build 20221228.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22627.2 -> To Version 7.0.200-preview.22628.1 --- 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 cae5c546d..f2af56492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 1545bd60ea67db70d83b2c003f5a5bb049bf44c2 + 4954d0124d14ec30bb787bc14496bdaa5b92304c - + https://github.com/dotnet/sdk - 1545bd60ea67db70d83b2c003f5a5bb049bf44c2 + 4954d0124d14ec30bb787bc14496bdaa5b92304c - + https://github.com/dotnet/sdk - 1545bd60ea67db70d83b2c003f5a5bb049bf44c2 + 4954d0124d14ec30bb787bc14496bdaa5b92304c - + https://github.com/dotnet/sdk - 1545bd60ea67db70d83b2c003f5a5bb049bf44c2 + 4954d0124d14ec30bb787bc14496bdaa5b92304c diff --git a/eng/Versions.props b/eng/Versions.props index 9682441f3..d8fe7a330 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22627.2 - 7.0.200-preview.22627.2 - 7.0.200-preview.22627.2 + 7.0.200-preview.22628.1 + 7.0.200-preview.22628.1 + 7.0.200-preview.22628.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f31963b1b1aafe18e2789b5988eccfbb1ef95d7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Jan 2023 10:40:31 +0000 Subject: [PATCH 214/654] Update dependencies from https://github.com/dotnet/sdk build 20230103.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22628.1 -> To Version 7.0.200-preview.23053.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.22616.1 -> To Version 12.5.0-beta.23052.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2af56492..381a68ed2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 4954d0124d14ec30bb787bc14496bdaa5b92304c + 74dc50b8f16f1dfebad509290cbe87e5d16cc1a3 - + https://github.com/dotnet/sdk - 4954d0124d14ec30bb787bc14496bdaa5b92304c + 74dc50b8f16f1dfebad509290cbe87e5d16cc1a3 - + https://github.com/dotnet/sdk - 4954d0124d14ec30bb787bc14496bdaa5b92304c + 74dc50b8f16f1dfebad509290cbe87e5d16cc1a3 - + https://github.com/dotnet/sdk - 4954d0124d14ec30bb787bc14496bdaa5b92304c + 74dc50b8f16f1dfebad509290cbe87e5d16cc1a3 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 1c1ccfdc7c7bbd44ca4aac6d7efcc09f1fd1f5d8 + 1da4bc5f28db2d4eb34ac4864ee88844b6097484 - + https://github.com/dotnet/fsharp - 1c1ccfdc7c7bbd44ca4aac6d7efcc09f1fd1f5d8 + 1da4bc5f28db2d4eb34ac4864ee88844b6097484 diff --git a/eng/Versions.props b/eng/Versions.props index d8fe7a330..12e832a0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22628.1 - 7.0.200-preview.22628.1 - 7.0.200-preview.22628.1 + 7.0.200-preview.23053.1 + 7.0.200-preview.23053.1 + 7.0.200-preview.23053.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f5a2b0d0ad5db37c5a208fa2cb493df289edfd44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Jan 2023 06:57:16 +0000 Subject: [PATCH 215/654] Update dependencies from https://github.com/dotnet/sdk build 20230103.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23053.1 -> To Version 7.0.200-preview.23053.17 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-22620-02 -> To Version 17.5.0-preview-23054-01 (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 381a68ed2..75aa59ed1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 74dc50b8f16f1dfebad509290cbe87e5d16cc1a3 + efbdb20c16e6ef90a442c60964614a32521b5b3f - + https://github.com/dotnet/sdk - 74dc50b8f16f1dfebad509290cbe87e5d16cc1a3 + efbdb20c16e6ef90a442c60964614a32521b5b3f - + https://github.com/dotnet/sdk - 74dc50b8f16f1dfebad509290cbe87e5d16cc1a3 + efbdb20c16e6ef90a442c60964614a32521b5b3f - + https://github.com/dotnet/sdk - 74dc50b8f16f1dfebad509290cbe87e5d16cc1a3 + efbdb20c16e6ef90a442c60964614a32521b5b3f @@ -149,9 +149,9 @@ c80d6495d55ebbd64372755d236d0e5971b2dfc7 - + https://github.com/dotnet/msbuild - a6f6699d1f70bf79db82030938d2c5e52d1e4d2e + 955c4702845e2dd6ff468aa7da2613091acd3485 diff --git a/eng/Versions.props b/eng/Versions.props index 12e832a0b..2310cda02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23053.1 - 7.0.200-preview.23053.1 - 7.0.200-preview.23053.1 + 7.0.200-preview.23053.17 + 7.0.200-preview.23053.17 + 7.0.200-preview.23053.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0b661e5cf911e6efc157267d15c1c395bf5fdae9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Jan 2023 08:27:28 +0000 Subject: [PATCH 216/654] Update dependencies from https://github.com/dotnet/sdk build 20230103.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23053.1 -> To Version 7.0.200-preview.23053.22 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-22620-02 -> To Version 17.5.0-preview-23054-01 (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 75aa59ed1..c469efbec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - efbdb20c16e6ef90a442c60964614a32521b5b3f + d492ff815ae1b8f3a907d7cd9689b5b49df994af - + https://github.com/dotnet/sdk - efbdb20c16e6ef90a442c60964614a32521b5b3f + d492ff815ae1b8f3a907d7cd9689b5b49df994af - + https://github.com/dotnet/sdk - efbdb20c16e6ef90a442c60964614a32521b5b3f + d492ff815ae1b8f3a907d7cd9689b5b49df994af - + https://github.com/dotnet/sdk - efbdb20c16e6ef90a442c60964614a32521b5b3f + d492ff815ae1b8f3a907d7cd9689b5b49df994af diff --git a/eng/Versions.props b/eng/Versions.props index 2310cda02..8d0ac17fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23053.17 - 7.0.200-preview.23053.17 - 7.0.200-preview.23053.17 + 7.0.200-preview.23053.22 + 7.0.200-preview.23053.22 + 7.0.200-preview.23053.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 608f4f40dfb82fbd265c8f025ba8dc588c0142ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Jan 2023 09:56:41 +0000 Subject: [PATCH 217/654] Update dependencies from https://github.com/dotnet/sdk build 20230104.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23053.1 -> To Version 7.0.200-preview.23054.2 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-22620-02 -> To Version 17.5.0-preview-23054-01 (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 c469efbec..b522d1d29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d492ff815ae1b8f3a907d7cd9689b5b49df994af + 59d04e4b0846a5d3a22c5fc3c5f037cbcd9a5c08 - + https://github.com/dotnet/sdk - d492ff815ae1b8f3a907d7cd9689b5b49df994af + 59d04e4b0846a5d3a22c5fc3c5f037cbcd9a5c08 - + https://github.com/dotnet/sdk - d492ff815ae1b8f3a907d7cd9689b5b49df994af + 59d04e4b0846a5d3a22c5fc3c5f037cbcd9a5c08 - + https://github.com/dotnet/sdk - d492ff815ae1b8f3a907d7cd9689b5b49df994af + 59d04e4b0846a5d3a22c5fc3c5f037cbcd9a5c08 diff --git a/eng/Versions.props b/eng/Versions.props index 8d0ac17fe..cc65f6723 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23053.22 - 7.0.200-preview.23053.22 - 7.0.200-preview.23053.22 + 7.0.200-preview.23054.2 + 7.0.200-preview.23054.2 + 7.0.200-preview.23054.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ac41f3c1d1208915d38670d3d92213403073b981 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Jan 2023 11:23:24 +0000 Subject: [PATCH 218/654] Update dependencies from https://github.com/dotnet/sdk build 20230104.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23053.1 -> To Version 7.0.200-preview.23054.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.23052.7 -> To Version 12.5.0-beta.23053.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b522d1d29..73fbbfc03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 59d04e4b0846a5d3a22c5fc3c5f037cbcd9a5c08 + c9d928aa6be2fd9fcc544f4279e218f6a9c1d582 - + https://github.com/dotnet/sdk - 59d04e4b0846a5d3a22c5fc3c5f037cbcd9a5c08 + c9d928aa6be2fd9fcc544f4279e218f6a9c1d582 - + https://github.com/dotnet/sdk - 59d04e4b0846a5d3a22c5fc3c5f037cbcd9a5c08 + c9d928aa6be2fd9fcc544f4279e218f6a9c1d582 - + https://github.com/dotnet/sdk - 59d04e4b0846a5d3a22c5fc3c5f037cbcd9a5c08 + c9d928aa6be2fd9fcc544f4279e218f6a9c1d582 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 1da4bc5f28db2d4eb34ac4864ee88844b6097484 + 794b7c259d9646a7eb685dad865aa27da7940a21 - + https://github.com/dotnet/fsharp - 1da4bc5f28db2d4eb34ac4864ee88844b6097484 + 794b7c259d9646a7eb685dad865aa27da7940a21 diff --git a/eng/Versions.props b/eng/Versions.props index cc65f6723..0961e24cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23054.2 - 7.0.200-preview.23054.2 - 7.0.200-preview.23054.2 + 7.0.200-preview.23054.4 + 7.0.200-preview.23054.4 + 7.0.200-preview.23054.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 58ec8b7aad1c34006f7dc7f19d23ec1e5cd51175 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Jan 2023 16:39:13 +0000 Subject: [PATCH 219/654] Update dependencies from https://github.com/dotnet/sdk build 20230104.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23053.1 -> To Version 7.0.200-preview.23054.15 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.23052.7 -> To Version 12.5.0-beta.23053.5 (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 73fbbfc03..4ccee3bcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c9d928aa6be2fd9fcc544f4279e218f6a9c1d582 + 50bea4c09bf198b850bf7690d0f7e6916cf4114f - + https://github.com/dotnet/sdk - c9d928aa6be2fd9fcc544f4279e218f6a9c1d582 + 50bea4c09bf198b850bf7690d0f7e6916cf4114f - + https://github.com/dotnet/sdk - c9d928aa6be2fd9fcc544f4279e218f6a9c1d582 + 50bea4c09bf198b850bf7690d0f7e6916cf4114f - + https://github.com/dotnet/sdk - c9d928aa6be2fd9fcc544f4279e218f6a9c1d582 + 50bea4c09bf198b850bf7690d0f7e6916cf4114f diff --git a/eng/Versions.props b/eng/Versions.props index 0961e24cc..38d0becff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23054.4 - 7.0.200-preview.23054.4 - 7.0.200-preview.23054.4 + 7.0.200-preview.23054.15 + 7.0.200-preview.23054.15 + 7.0.200-preview.23054.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 87074a9a7f34d95af60250a306b206f7b6a09636 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Jan 2023 20:24:04 +0000 Subject: [PATCH 220/654] Update dependencies from https://github.com/dotnet/sdk build 20230104.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23054.15 -> To Version 7.0.200-preview.23054.21 --- 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 4ccee3bcd..14eaf2fef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 50bea4c09bf198b850bf7690d0f7e6916cf4114f + ee5e3119a6a05ddb698da13f7c23fcd1505ad663 - + https://github.com/dotnet/sdk - 50bea4c09bf198b850bf7690d0f7e6916cf4114f + ee5e3119a6a05ddb698da13f7c23fcd1505ad663 - + https://github.com/dotnet/sdk - 50bea4c09bf198b850bf7690d0f7e6916cf4114f + ee5e3119a6a05ddb698da13f7c23fcd1505ad663 - + https://github.com/dotnet/sdk - 50bea4c09bf198b850bf7690d0f7e6916cf4114f + ee5e3119a6a05ddb698da13f7c23fcd1505ad663 diff --git a/eng/Versions.props b/eng/Versions.props index 38d0becff..c768bcf2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23054.15 - 7.0.200-preview.23054.15 - 7.0.200-preview.23054.15 + 7.0.200-preview.23054.21 + 7.0.200-preview.23054.21 + 7.0.200-preview.23054.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0621b5e85a36214c36e12259f4aa6507a6ae26fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Jan 2023 23:01:46 +0000 Subject: [PATCH 221/654] Update dependencies from https://github.com/dotnet/sdk build 20230104.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23054.21 -> To Version 7.0.200-preview.23054.29 --- 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 14eaf2fef..05110bf03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ee5e3119a6a05ddb698da13f7c23fcd1505ad663 + e9b980c114e78936f80577358a1febb3f03819af - + https://github.com/dotnet/sdk - ee5e3119a6a05ddb698da13f7c23fcd1505ad663 + e9b980c114e78936f80577358a1febb3f03819af - + https://github.com/dotnet/sdk - ee5e3119a6a05ddb698da13f7c23fcd1505ad663 + e9b980c114e78936f80577358a1febb3f03819af - + https://github.com/dotnet/sdk - ee5e3119a6a05ddb698da13f7c23fcd1505ad663 + e9b980c114e78936f80577358a1febb3f03819af diff --git a/eng/Versions.props b/eng/Versions.props index c768bcf2d..e495e1550 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23054.21 - 7.0.200-preview.23054.21 - 7.0.200-preview.23054.21 + 7.0.200-preview.23054.29 + 7.0.200-preview.23054.29 + 7.0.200-preview.23054.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c90683b77d568f25f459439970a613008a684d64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Jan 2023 01:46:07 +0000 Subject: [PATCH 222/654] Update dependencies from https://github.com/dotnet/sdk build 20230104.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23054.21 -> To Version 7.0.200-preview.23054.33 --- 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 05110bf03..f4bd0b1c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e9b980c114e78936f80577358a1febb3f03819af + 95da759ac0e52c9b81758df52b183b028391f2ed - + https://github.com/dotnet/sdk - e9b980c114e78936f80577358a1febb3f03819af + 95da759ac0e52c9b81758df52b183b028391f2ed - + https://github.com/dotnet/sdk - e9b980c114e78936f80577358a1febb3f03819af + 95da759ac0e52c9b81758df52b183b028391f2ed - + https://github.com/dotnet/sdk - e9b980c114e78936f80577358a1febb3f03819af + 95da759ac0e52c9b81758df52b183b028391f2ed diff --git a/eng/Versions.props b/eng/Versions.props index e495e1550..f0cb6e983 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23054.29 - 7.0.200-preview.23054.29 - 7.0.200-preview.23054.29 + 7.0.200-preview.23054.33 + 7.0.200-preview.23054.33 + 7.0.200-preview.23054.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0a97afd97067fdfe379ec199a942a6919ab5e783 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 16:21:01 +0000 Subject: [PATCH 223/654] [release/7.0.2xx] Update dependencies from dotnet/sdk (#15198) [release/7.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.5.0-2.22613.14 to 4.5.0-3.23054.10 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.5.0-preview-23054-01 to 17.5.0-preview-23054-02 (parent: Microsoft.NET.Sdk) - Add nowarns for aspnetcore issues from building w/latest toolset --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 6 ++--- .../tarball/content/repos/aspnetcore.proj | 8 +++++-- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4bd0b1c9..bc7efd7f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 95da759ac0e52c9b81758df52b183b028391f2ed + ce460f6bb5d4bdb1e85b05c0156119881562d10f - + https://github.com/dotnet/sdk - 95da759ac0e52c9b81758df52b183b028391f2ed + ce460f6bb5d4bdb1e85b05c0156119881562d10f - + https://github.com/dotnet/sdk - 95da759ac0e52c9b81758df52b183b028391f2ed + ce460f6bb5d4bdb1e85b05c0156119881562d10f - + https://github.com/dotnet/sdk - 95da759ac0e52c9b81758df52b183b028391f2ed + ce460f6bb5d4bdb1e85b05c0156119881562d10f @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - c80d6495d55ebbd64372755d236d0e5971b2dfc7 + 4d9a89ae8a5262fa0b77780bb8887e31c1733d5e - + https://github.com/dotnet/msbuild - 955c4702845e2dd6ff468aa7da2613091acd3485 + 762ae6c6bbeb21471d4d685a061ed05b47cfcb05 diff --git a/eng/Versions.props b/eng/Versions.props index f0cb6e983..e7ac42e97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23054.33 - 7.0.200-preview.23054.33 - 7.0.200-preview.23054.33 + 7.0.200-preview.23054.44 + 7.0.200-preview.23054.44 + 7.0.200-preview.23054.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index c11f22f5c..ee6b65aae 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -24,8 +24,12 @@ - CS0618 + Requires https://github.com/dotnet/source-build/issues/2482 + CS8600 - Converting null literal or possible null value to non-nullable type. + Requires https://github.com/dotnet/aspnetcore/issues/45882. + CS8604 - Possible null reference argument for parameter. + Requires https://github.com/dotnet/aspnetcore/issues/45882. --> + CS0618;CA1825;CS8600;CS8604 From a50568f1a794d842a8ce0bbc48a6fd186fac4a16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Jan 2023 16:22:49 +0000 Subject: [PATCH 224/654] Update dependencies from https://github.com/dotnet/sdk build 20230105.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23054.44 -> To Version 7.0.200-preview.23055.8 --- 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 bc7efd7f5..82fc4a758 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ce460f6bb5d4bdb1e85b05c0156119881562d10f + d2bff699bf69283e54b586e8ae5613448636b8e2 - + https://github.com/dotnet/sdk - ce460f6bb5d4bdb1e85b05c0156119881562d10f + d2bff699bf69283e54b586e8ae5613448636b8e2 - + https://github.com/dotnet/sdk - ce460f6bb5d4bdb1e85b05c0156119881562d10f + d2bff699bf69283e54b586e8ae5613448636b8e2 - + https://github.com/dotnet/sdk - ce460f6bb5d4bdb1e85b05c0156119881562d10f + d2bff699bf69283e54b586e8ae5613448636b8e2 diff --git a/eng/Versions.props b/eng/Versions.props index e7ac42e97..383a89235 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23054.44 - 7.0.200-preview.23054.44 - 7.0.200-preview.23054.44 + 7.0.200-preview.23055.8 + 7.0.200-preview.23055.8 + 7.0.200-preview.23055.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cc4cd1662a8188a249e80712be5fb3ee0eb2b924 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Jan 2023 19:18:14 +0000 Subject: [PATCH 225/654] Update dependencies from https://github.com/dotnet/sdk build 20230105.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23055.8 -> To Version 7.0.200-preview.23055.11 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23054-02 -> To Version 17.5.0-preview-23055-01 (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 82fc4a758..3e1087702 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d2bff699bf69283e54b586e8ae5613448636b8e2 + 4e19557f340f8616f3833d2617759cc206e94321 - + https://github.com/dotnet/sdk - d2bff699bf69283e54b586e8ae5613448636b8e2 + 4e19557f340f8616f3833d2617759cc206e94321 - + https://github.com/dotnet/sdk - d2bff699bf69283e54b586e8ae5613448636b8e2 + 4e19557f340f8616f3833d2617759cc206e94321 - + https://github.com/dotnet/sdk - d2bff699bf69283e54b586e8ae5613448636b8e2 + 4e19557f340f8616f3833d2617759cc206e94321 @@ -149,9 +149,9 @@ 4d9a89ae8a5262fa0b77780bb8887e31c1733d5e - + https://github.com/dotnet/msbuild - 762ae6c6bbeb21471d4d685a061ed05b47cfcb05 + 472dea31dcf04acd0e6c0fa53a27dbc274903b16 diff --git a/eng/Versions.props b/eng/Versions.props index 383a89235..c8a8e34dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23055.8 - 7.0.200-preview.23055.8 - 7.0.200-preview.23055.8 + 7.0.200-preview.23055.11 + 7.0.200-preview.23055.11 + 7.0.200-preview.23055.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e644cbcaaa584d9971f8f906dc4dffa4d7571ac8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Jan 2023 20:46:15 +0000 Subject: [PATCH 226/654] Update dependencies from https://github.com/dotnet/sdk build 20230105.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23055.8 -> To Version 7.0.200-preview.23055.21 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23054-02 -> To Version 17.5.0-preview-23055-01 (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 3e1087702..b6dff2ea4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 4e19557f340f8616f3833d2617759cc206e94321 + af8f8f7aef4b625384903ac93a880f300492c254 - + https://github.com/dotnet/sdk - 4e19557f340f8616f3833d2617759cc206e94321 + af8f8f7aef4b625384903ac93a880f300492c254 - + https://github.com/dotnet/sdk - 4e19557f340f8616f3833d2617759cc206e94321 + af8f8f7aef4b625384903ac93a880f300492c254 - + https://github.com/dotnet/sdk - 4e19557f340f8616f3833d2617759cc206e94321 + af8f8f7aef4b625384903ac93a880f300492c254 diff --git a/eng/Versions.props b/eng/Versions.props index c8a8e34dd..7f51c87ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23055.11 - 7.0.200-preview.23055.11 - 7.0.200-preview.23055.11 + 7.0.200-preview.23055.21 + 7.0.200-preview.23055.21 + 7.0.200-preview.23055.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3a85f753df4d4a20fbd2cdf2d5630bc1cac63d88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Jan 2023 07:13:09 +0000 Subject: [PATCH 227/654] Update dependencies from https://github.com/dotnet/sdk build 20230105.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23055.21 -> To Version 7.0.200-preview.23055.38 --- 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 b6dff2ea4..11b8bbf50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - af8f8f7aef4b625384903ac93a880f300492c254 + 895bdadaad00b8298aba185e8291872334a3ad0a - + https://github.com/dotnet/sdk - af8f8f7aef4b625384903ac93a880f300492c254 + 895bdadaad00b8298aba185e8291872334a3ad0a - + https://github.com/dotnet/sdk - af8f8f7aef4b625384903ac93a880f300492c254 + 895bdadaad00b8298aba185e8291872334a3ad0a - + https://github.com/dotnet/sdk - af8f8f7aef4b625384903ac93a880f300492c254 + 895bdadaad00b8298aba185e8291872334a3ad0a diff --git a/eng/Versions.props b/eng/Versions.props index 7f51c87ee..6dedde1b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23055.21 - 7.0.200-preview.23055.21 - 7.0.200-preview.23055.21 + 7.0.200-preview.23055.38 + 7.0.200-preview.23055.38 + 7.0.200-preview.23055.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 291c3727e7f4385391f5af3c82c6d0b4ff4a30c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Jan 2023 08:36:03 +0000 Subject: [PATCH 228/654] Update dependencies from https://github.com/dotnet/sdk build 20230105.46 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23055.21 -> To Version 7.0.200-preview.23055.46 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23053.5 -> To Version 12.5.0-beta.23055.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11b8bbf50..45e6c5aa1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 895bdadaad00b8298aba185e8291872334a3ad0a + 1b873c3a35c2602154bff3bd43853ad86a13da5e - + https://github.com/dotnet/sdk - 895bdadaad00b8298aba185e8291872334a3ad0a + 1b873c3a35c2602154bff3bd43853ad86a13da5e - + https://github.com/dotnet/sdk - 895bdadaad00b8298aba185e8291872334a3ad0a + 1b873c3a35c2602154bff3bd43853ad86a13da5e - + https://github.com/dotnet/sdk - 895bdadaad00b8298aba185e8291872334a3ad0a + 1b873c3a35c2602154bff3bd43853ad86a13da5e @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 794b7c259d9646a7eb685dad865aa27da7940a21 + 3808a0effad9cb26cc270797d530915b4b227b8f - + https://github.com/dotnet/fsharp - 794b7c259d9646a7eb685dad865aa27da7940a21 + 3808a0effad9cb26cc270797d530915b4b227b8f @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 4d9a89ae8a5262fa0b77780bb8887e31c1733d5e + 3b317155d717b4cde3be22d906022f4384985a35 diff --git a/eng/Versions.props b/eng/Versions.props index 6dedde1b2..6e77e97d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23055.38 - 7.0.200-preview.23055.38 - 7.0.200-preview.23055.38 + 7.0.200-preview.23055.46 + 7.0.200-preview.23055.46 + 7.0.200-preview.23055.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f68137df0f7979d55cbe789a89102e7e209d92c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Jan 2023 10:02:25 +0000 Subject: [PATCH 229/654] Update dependencies from https://github.com/dotnet/sdk build 20230106.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23055.21 -> To Version 7.0.200-preview.23056.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23053.5 -> To Version 12.5.0-beta.23055.3 (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 45e6c5aa1..b3545a166 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 1b873c3a35c2602154bff3bd43853ad86a13da5e + 4b69142a6b6dc8c0384596ae2c54918c18408464 - + https://github.com/dotnet/sdk - 1b873c3a35c2602154bff3bd43853ad86a13da5e + 4b69142a6b6dc8c0384596ae2c54918c18408464 - + https://github.com/dotnet/sdk - 1b873c3a35c2602154bff3bd43853ad86a13da5e + 4b69142a6b6dc8c0384596ae2c54918c18408464 - + https://github.com/dotnet/sdk - 1b873c3a35c2602154bff3bd43853ad86a13da5e + 4b69142a6b6dc8c0384596ae2c54918c18408464 @@ -149,9 +149,9 @@ 3b317155d717b4cde3be22d906022f4384985a35 - + https://github.com/dotnet/msbuild - 472dea31dcf04acd0e6c0fa53a27dbc274903b16 + d89d4bc91a0c4cf5087c4a0ed2e88b03407eba97 diff --git a/eng/Versions.props b/eng/Versions.props index 6e77e97d4..631c5df04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23055.46 - 7.0.200-preview.23055.46 - 7.0.200-preview.23055.46 + 7.0.200-preview.23056.1 + 7.0.200-preview.23056.1 + 7.0.200-preview.23056.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 091169cef31569b34eab91490202b2136d9ca366 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Jan 2023 11:22:51 +0000 Subject: [PATCH 230/654] Update dependencies from https://github.com/dotnet/sdk build 20230106.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23055.21 -> To Version 7.0.200-preview.23056.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23053.5 -> To Version 12.5.0-beta.23055.3 (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 b3545a166..1453a1505 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 4b69142a6b6dc8c0384596ae2c54918c18408464 + 504ff940256b784264330d8c14441c963d8a6e6d - + https://github.com/dotnet/sdk - 4b69142a6b6dc8c0384596ae2c54918c18408464 + 504ff940256b784264330d8c14441c963d8a6e6d - + https://github.com/dotnet/sdk - 4b69142a6b6dc8c0384596ae2c54918c18408464 + 504ff940256b784264330d8c14441c963d8a6e6d - + https://github.com/dotnet/sdk - 4b69142a6b6dc8c0384596ae2c54918c18408464 + 504ff940256b784264330d8c14441c963d8a6e6d @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 3b317155d717b4cde3be22d906022f4384985a35 + 7f58562b0af1968736bc5f405b80ba58df475453 diff --git a/eng/Versions.props b/eng/Versions.props index 631c5df04..27d5a4510 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23056.1 - 7.0.200-preview.23056.1 - 7.0.200-preview.23056.1 + 7.0.200-preview.23056.2 + 7.0.200-preview.23056.2 + 7.0.200-preview.23056.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 357123f6eb17ffd069ae977a13081bd89f287938 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Jan 2023 20:37:31 +0000 Subject: [PATCH 231/654] Update dependencies from https://github.com/dotnet/sdk build 20230106.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23055.21 -> To Version 7.0.200-preview.23056.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23053.5 -> To Version 12.5.0-beta.23055.3 (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 1453a1505..d5d29c433 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 504ff940256b784264330d8c14441c963d8a6e6d + 4870b7b7f7ce4eeba152f9050b07fb7ec776ec62 - + https://github.com/dotnet/sdk - 504ff940256b784264330d8c14441c963d8a6e6d + 4870b7b7f7ce4eeba152f9050b07fb7ec776ec62 - + https://github.com/dotnet/sdk - 504ff940256b784264330d8c14441c963d8a6e6d + 4870b7b7f7ce4eeba152f9050b07fb7ec776ec62 - + https://github.com/dotnet/sdk - 504ff940256b784264330d8c14441c963d8a6e6d + 4870b7b7f7ce4eeba152f9050b07fb7ec776ec62 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 7f58562b0af1968736bc5f405b80ba58df475453 + e5390ea70c8cb9dbda25a9fb58abe0fc8eea1521 diff --git a/eng/Versions.props b/eng/Versions.props index 27d5a4510..9e393b1f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23056.2 - 7.0.200-preview.23056.2 - 7.0.200-preview.23056.2 + 7.0.200-preview.23056.10 + 7.0.200-preview.23056.10 + 7.0.200-preview.23056.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dd6eef4eb14dab2c101a457d737559dd5284cbe6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Jan 2023 23:10:02 +0000 Subject: [PATCH 232/654] Update dependencies from https://github.com/dotnet/sdk build 20230106.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23055.21 -> To Version 7.0.200-preview.23056.20 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23053.5 -> To Version 12.5.0-beta.23055.3 (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 d5d29c433..3468828ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 4870b7b7f7ce4eeba152f9050b07fb7ec776ec62 + a272e364ed9bfe34d5ac6d7835183564df1c6e24 - + https://github.com/dotnet/sdk - 4870b7b7f7ce4eeba152f9050b07fb7ec776ec62 + a272e364ed9bfe34d5ac6d7835183564df1c6e24 - + https://github.com/dotnet/sdk - 4870b7b7f7ce4eeba152f9050b07fb7ec776ec62 + a272e364ed9bfe34d5ac6d7835183564df1c6e24 - + https://github.com/dotnet/sdk - 4870b7b7f7ce4eeba152f9050b07fb7ec776ec62 + a272e364ed9bfe34d5ac6d7835183564df1c6e24 diff --git a/eng/Versions.props b/eng/Versions.props index 9e393b1f1..8fdc8e4bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23056.10 - 7.0.200-preview.23056.10 - 7.0.200-preview.23056.10 + 7.0.200-preview.23056.20 + 7.0.200-preview.23056.20 + 7.0.200-preview.23056.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 96acf3df6a4b7e01d26deb4361e9456a662e5086 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Jan 2023 00:40:37 +0000 Subject: [PATCH 233/654] Update dependencies from https://github.com/dotnet/sdk build 20230106.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23055.21 -> To Version 7.0.200-preview.23056.23 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23053.5 -> To Version 12.5.0-beta.23055.3 (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 3468828ee..a34be9ad2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - a272e364ed9bfe34d5ac6d7835183564df1c6e24 + daffb20d3dc958f159ad69b14aec73a58f26a9b8 - + https://github.com/dotnet/sdk - a272e364ed9bfe34d5ac6d7835183564df1c6e24 + daffb20d3dc958f159ad69b14aec73a58f26a9b8 - + https://github.com/dotnet/sdk - a272e364ed9bfe34d5ac6d7835183564df1c6e24 + daffb20d3dc958f159ad69b14aec73a58f26a9b8 - + https://github.com/dotnet/sdk - a272e364ed9bfe34d5ac6d7835183564df1c6e24 + daffb20d3dc958f159ad69b14aec73a58f26a9b8 diff --git a/eng/Versions.props b/eng/Versions.props index 8fdc8e4bc..92654f764 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23056.20 - 7.0.200-preview.23056.20 - 7.0.200-preview.23056.20 + 7.0.200-preview.23056.23 + 7.0.200-preview.23056.23 + 7.0.200-preview.23056.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0fadd51333f95c9ed62e78ef391ca9ca466860e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Jan 2023 03:21:26 +0000 Subject: [PATCH 234/654] Update dependencies from https://github.com/dotnet/sdk build 20230108.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23055.21 -> To Version 7.0.200-preview.23058.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23053.5 -> To Version 12.5.0-beta.23056.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a34be9ad2..51197f54d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - daffb20d3dc958f159ad69b14aec73a58f26a9b8 + c44d1d8202e75965eb93a65bcdc32e3c703a51a3 - + https://github.com/dotnet/sdk - daffb20d3dc958f159ad69b14aec73a58f26a9b8 + c44d1d8202e75965eb93a65bcdc32e3c703a51a3 - + https://github.com/dotnet/sdk - daffb20d3dc958f159ad69b14aec73a58f26a9b8 + c44d1d8202e75965eb93a65bcdc32e3c703a51a3 - + https://github.com/dotnet/sdk - daffb20d3dc958f159ad69b14aec73a58f26a9b8 + c44d1d8202e75965eb93a65bcdc32e3c703a51a3 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 3808a0effad9cb26cc270797d530915b4b227b8f + 8fdf58a63cc05a964a57f66a4ab8924984c13042 - + https://github.com/dotnet/fsharp - 3808a0effad9cb26cc270797d530915b4b227b8f + 8fdf58a63cc05a964a57f66a4ab8924984c13042 diff --git a/eng/Versions.props b/eng/Versions.props index 92654f764..161fdadb3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23056.23 - 7.0.200-preview.23056.23 - 7.0.200-preview.23056.23 + 7.0.200-preview.23058.2 + 7.0.200-preview.23058.2 + 7.0.200-preview.23058.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3adc4b3a4909729e6ae4351e82b91d9c0aacec7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Jan 2023 10:59:46 +0000 Subject: [PATCH 235/654] Update dependencies from https://github.com/dotnet/sdk build 20230109.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23058.2 -> To Version 7.0.200-preview.23059.1 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23056-01 -> To Version 17.5.0-preview-23059-01 (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 51197f54d..c16638b08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c44d1d8202e75965eb93a65bcdc32e3c703a51a3 + c555f7426ed97ae74894503160cdb6002c0c2bb3 - + https://github.com/dotnet/sdk - c44d1d8202e75965eb93a65bcdc32e3c703a51a3 + c555f7426ed97ae74894503160cdb6002c0c2bb3 - + https://github.com/dotnet/sdk - c44d1d8202e75965eb93a65bcdc32e3c703a51a3 + c555f7426ed97ae74894503160cdb6002c0c2bb3 - + https://github.com/dotnet/sdk - c44d1d8202e75965eb93a65bcdc32e3c703a51a3 + c555f7426ed97ae74894503160cdb6002c0c2bb3 @@ -149,9 +149,9 @@ e5390ea70c8cb9dbda25a9fb58abe0fc8eea1521 - + https://github.com/dotnet/msbuild - d89d4bc91a0c4cf5087c4a0ed2e88b03407eba97 + ab3d68e815ba13916d6d3a653445d71ad238c723 diff --git a/eng/Versions.props b/eng/Versions.props index 161fdadb3..e04387b11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23058.2 - 7.0.200-preview.23058.2 - 7.0.200-preview.23058.2 + 7.0.200-preview.23059.1 + 7.0.200-preview.23059.1 + 7.0.200-preview.23059.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From be05d68507752f4031c095fc1d60025af5b3c819 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Jan 2023 18:57:20 +0000 Subject: [PATCH 236/654] Update dependencies from https://github.com/dotnet/sdk build 20230109.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23059.1 -> To Version 7.0.200-preview.23059.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23056.1 -> To Version 12.5.0-beta.23059.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c16638b08..6efa18bab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c555f7426ed97ae74894503160cdb6002c0c2bb3 + 29f49e57504d61d1f50ce40bc06463d51f0993e3 - + https://github.com/dotnet/sdk - c555f7426ed97ae74894503160cdb6002c0c2bb3 + 29f49e57504d61d1f50ce40bc06463d51f0993e3 - + https://github.com/dotnet/sdk - c555f7426ed97ae74894503160cdb6002c0c2bb3 + 29f49e57504d61d1f50ce40bc06463d51f0993e3 - + https://github.com/dotnet/sdk - c555f7426ed97ae74894503160cdb6002c0c2bb3 + 29f49e57504d61d1f50ce40bc06463d51f0993e3 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 8fdf58a63cc05a964a57f66a4ab8924984c13042 + c9d55e3bd87a29dadf5744550ce8fee63dba0b5e - + https://github.com/dotnet/fsharp - 8fdf58a63cc05a964a57f66a4ab8924984c13042 + c9d55e3bd87a29dadf5744550ce8fee63dba0b5e diff --git a/eng/Versions.props b/eng/Versions.props index e04387b11..4e99f079e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23059.1 - 7.0.200-preview.23059.1 - 7.0.200-preview.23059.1 + 7.0.200-preview.23059.5 + 7.0.200-preview.23059.5 + 7.0.200-preview.23059.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9f50808abc171d8bf6130723ba0a88413d632289 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Jan 2023 02:24:02 +0000 Subject: [PATCH 237/654] Update dependencies from https://github.com/dotnet/sdk build 20230109.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23059.1 -> To Version 7.0.200-preview.23059.28 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23056.1 -> To Version 12.5.0-beta.23059.11 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6efa18bab..e67932bc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 29f49e57504d61d1f50ce40bc06463d51f0993e3 + 5839d5e92b444d06ff6df610667174fb020bb101 - + https://github.com/dotnet/sdk - 29f49e57504d61d1f50ce40bc06463d51f0993e3 + 5839d5e92b444d06ff6df610667174fb020bb101 - + https://github.com/dotnet/sdk - 29f49e57504d61d1f50ce40bc06463d51f0993e3 + 5839d5e92b444d06ff6df610667174fb020bb101 - + https://github.com/dotnet/sdk - 29f49e57504d61d1f50ce40bc06463d51f0993e3 + 5839d5e92b444d06ff6df610667174fb020bb101 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - c9d55e3bd87a29dadf5744550ce8fee63dba0b5e + 1607c540c369f9ae32a48dd72e7952148b084a2a - + https://github.com/dotnet/fsharp - c9d55e3bd87a29dadf5744550ce8fee63dba0b5e + 1607c540c369f9ae32a48dd72e7952148b084a2a diff --git a/eng/Versions.props b/eng/Versions.props index 4e99f079e..116e18df8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23059.5 - 7.0.200-preview.23059.5 - 7.0.200-preview.23059.5 + 7.0.200-preview.23059.28 + 7.0.200-preview.23059.28 + 7.0.200-preview.23059.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 76bcb170e4f828c4b6191251952ac1f98c7683c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Jan 2023 10:16:14 +0000 Subject: [PATCH 238/654] Update dependencies from https://github.com/dotnet/sdk build 20230110.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23059.1 -> To Version 7.0.200-preview.23060.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23056.1 -> To Version 12.5.0-beta.23059.11 (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 e67932bc1..0b07a18f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 5839d5e92b444d06ff6df610667174fb020bb101 + 3605277a9324189c35b0da271e10a2386d6f6d06 - + https://github.com/dotnet/sdk - 5839d5e92b444d06ff6df610667174fb020bb101 + 3605277a9324189c35b0da271e10a2386d6f6d06 - + https://github.com/dotnet/sdk - 5839d5e92b444d06ff6df610667174fb020bb101 + 3605277a9324189c35b0da271e10a2386d6f6d06 - + https://github.com/dotnet/sdk - 5839d5e92b444d06ff6df610667174fb020bb101 + 3605277a9324189c35b0da271e10a2386d6f6d06 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - e5390ea70c8cb9dbda25a9fb58abe0fc8eea1521 + 8ad2e6240cb7426d83f1b45241f8f33bddf3d474 diff --git a/eng/Versions.props b/eng/Versions.props index 116e18df8..ab98126a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23059.28 - 7.0.200-preview.23059.28 - 7.0.200-preview.23059.28 + 7.0.200-preview.23060.2 + 7.0.200-preview.23060.2 + 7.0.200-preview.23060.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6266583998d29c1711ffd0b2e6a477271e80c37b Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Jan 2023 14:12:25 -0800 Subject: [PATCH 239/654] [7.0.2xx] Update Asp.Net templates --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ab98126a4..42c637a7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.11 + 6.0.13 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -150,7 +150,7 @@ 3.1.27 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.31 + 3.1.32 3.2.1 4.8.0-rc2.19462.10 From bd560c838607fc408341a9926bbe9d048599dd49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 07:29:56 +0000 Subject: [PATCH 240/654] Update dependencies from https://github.com/dotnet/sdk build 20230110.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23060.29 --- 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 0b07a18f4..7c8510771 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 diff --git a/eng/Versions.props b/eng/Versions.props index ab98126a4..c9ff714f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 + 7.0.200-preview.23060.29 + 7.0.200-preview.23060.29 + 7.0.200-preview.23060.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c440b14c6b6fd3615d0a405f1c015ffa30fb8779 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 14:04:00 +0000 Subject: [PATCH 241/654] Update dependencies from https://github.com/dotnet/sdk build 20230111.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.6 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 7c8510771..0c81aa436 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 + 3775f55d55278c31dff6303dbc21675c8974415e - + https://github.com/dotnet/sdk - d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 + 3775f55d55278c31dff6303dbc21675c8974415e - + https://github.com/dotnet/sdk - d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 + 3775f55d55278c31dff6303dbc21675c8974415e - + https://github.com/dotnet/sdk - d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 + 3775f55d55278c31dff6303dbc21675c8974415e @@ -149,9 +149,9 @@ 8ad2e6240cb7426d83f1b45241f8f33bddf3d474 - + https://github.com/dotnet/msbuild - ab3d68e815ba13916d6d3a653445d71ad238c723 + 040e2a90ee794997fc9716487280a54b0ad8fe2a diff --git a/eng/Versions.props b/eng/Versions.props index c9ff714f8..d17412fa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23060.29 - 7.0.200-preview.23060.29 - 7.0.200-preview.23060.29 + 7.0.200-preview.23061.6 + 7.0.200-preview.23061.6 + 7.0.200-preview.23061.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ead77ef2f84c57355f2fdeec270f5678f7e68464 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 17:43:31 +0000 Subject: [PATCH 242/654] Update dependencies from https://github.com/dotnet/arcade build 20230110.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22601.6 -> To Version 7.0.0-beta.23060.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b07a18f4..76a6cf0f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - c01ccbc9554b39205750bf5bda7aad29f89bc0c9 + ac5977ebf05451c1adcf24a15d16263e4d25fd0c - + https://github.com/dotnet/arcade - c01ccbc9554b39205750bf5bda7aad29f89bc0c9 + ac5977ebf05451c1adcf24a15d16263e4d25fd0c - + https://github.com/dotnet/arcade - c01ccbc9554b39205750bf5bda7aad29f89bc0c9 + ac5977ebf05451c1adcf24a15d16263e4d25fd0c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ab98126a4..8e8442c3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22601.6 + 7.0.0-beta.23060.4 diff --git a/global.json b/global.json index 8d88943f3..c4142c606 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100", + "dotnet": "7.0.102", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22601.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22601.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23060.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23060.4" } } From 2ea1e293fc6775b510818c10cd171e395496a46c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 19:18:25 +0000 Subject: [PATCH 243/654] Update dependencies from https://github.com/dotnet/sdk build 20230111.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.14 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 0c81aa436..b8a0a8695 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3775f55d55278c31dff6303dbc21675c8974415e + c2bd68458f383e37fe68edf269f4364c63d08de1 - + https://github.com/dotnet/sdk - 3775f55d55278c31dff6303dbc21675c8974415e + c2bd68458f383e37fe68edf269f4364c63d08de1 - + https://github.com/dotnet/sdk - 3775f55d55278c31dff6303dbc21675c8974415e + c2bd68458f383e37fe68edf269f4364c63d08de1 - + https://github.com/dotnet/sdk - 3775f55d55278c31dff6303dbc21675c8974415e + c2bd68458f383e37fe68edf269f4364c63d08de1 diff --git a/eng/Versions.props b/eng/Versions.props index d17412fa4..0a706cabd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.6 - 7.0.200-preview.23061.6 - 7.0.200-preview.23061.6 + 7.0.200-preview.23061.14 + 7.0.200-preview.23061.14 + 7.0.200-preview.23061.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4c4d12dc907f5b439660ff5c3f5ffe157d675fa9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 02:58:39 +0000 Subject: [PATCH 244/654] Update dependencies from https://github.com/dotnet/sdk build 20230111.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.33 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 b8a0a8695..dc0e5b652 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c2bd68458f383e37fe68edf269f4364c63d08de1 + ca0e775a64eb7542710d72aea1439528be1a6a03 - + https://github.com/dotnet/sdk - c2bd68458f383e37fe68edf269f4364c63d08de1 + ca0e775a64eb7542710d72aea1439528be1a6a03 - + https://github.com/dotnet/sdk - c2bd68458f383e37fe68edf269f4364c63d08de1 + ca0e775a64eb7542710d72aea1439528be1a6a03 - + https://github.com/dotnet/sdk - c2bd68458f383e37fe68edf269f4364c63d08de1 + ca0e775a64eb7542710d72aea1439528be1a6a03 diff --git a/eng/Versions.props b/eng/Versions.props index 0a706cabd..6da7deb96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.14 - 7.0.200-preview.23061.14 - 7.0.200-preview.23061.14 + 7.0.200-preview.23061.33 + 7.0.200-preview.23061.33 + 7.0.200-preview.23061.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b891269556e9e6fa4de1c2d2b4b5ced1156aadce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 05:00:50 +0000 Subject: [PATCH 245/654] Update dependencies from https://github.com/dotnet/sdk build 20230111.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.40 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 dc0e5b652..b1e919104 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ca0e775a64eb7542710d72aea1439528be1a6a03 + ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 - + https://github.com/dotnet/sdk - ca0e775a64eb7542710d72aea1439528be1a6a03 + ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 - + https://github.com/dotnet/sdk - ca0e775a64eb7542710d72aea1439528be1a6a03 + ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 - + https://github.com/dotnet/sdk - ca0e775a64eb7542710d72aea1439528be1a6a03 + ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 diff --git a/eng/Versions.props b/eng/Versions.props index 6da7deb96..b3cc36385 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.33 - 7.0.200-preview.23061.33 - 7.0.200-preview.23061.33 + 7.0.200-preview.23061.40 + 7.0.200-preview.23061.40 + 7.0.200-preview.23061.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9ace0008ecaca153d9fe5bf4582b8e6cfbfff33b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 08:15:42 +0000 Subject: [PATCH 246/654] Update dependencies from https://github.com/dotnet/sdk build 20230111.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.44 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 b1e919104..da9fca008 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 + 03336daeccdb35c6ff09384e00ad4cc3e49b8323 - + https://github.com/dotnet/sdk - ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 + 03336daeccdb35c6ff09384e00ad4cc3e49b8323 - + https://github.com/dotnet/sdk - ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 + 03336daeccdb35c6ff09384e00ad4cc3e49b8323 - + https://github.com/dotnet/sdk - ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 + 03336daeccdb35c6ff09384e00ad4cc3e49b8323 diff --git a/eng/Versions.props b/eng/Versions.props index b3cc36385..1a72807f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.40 - 7.0.200-preview.23061.40 - 7.0.200-preview.23061.40 + 7.0.200-preview.23061.44 + 7.0.200-preview.23061.44 + 7.0.200-preview.23061.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e216c822d42f6bfa3c0454160a90be9112abd5c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 17:45:18 +0000 Subject: [PATCH 247/654] Update dependencies from https://github.com/dotnet/sdk build 20230112.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.3 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 da9fca008..5c027e560 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 03336daeccdb35c6ff09384e00ad4cc3e49b8323 + bbc0390753596357eb32e64d286c2e13c7db9b10 - + https://github.com/dotnet/sdk - 03336daeccdb35c6ff09384e00ad4cc3e49b8323 + bbc0390753596357eb32e64d286c2e13c7db9b10 - + https://github.com/dotnet/sdk - 03336daeccdb35c6ff09384e00ad4cc3e49b8323 + bbc0390753596357eb32e64d286c2e13c7db9b10 - + https://github.com/dotnet/sdk - 03336daeccdb35c6ff09384e00ad4cc3e49b8323 + bbc0390753596357eb32e64d286c2e13c7db9b10 diff --git a/eng/Versions.props b/eng/Versions.props index 1a72807f6..f5857d80f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.44 - 7.0.200-preview.23061.44 - 7.0.200-preview.23061.44 + 7.0.200-preview.23062.3 + 7.0.200-preview.23062.3 + 7.0.200-preview.23062.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e441d9346cde48a3c66d1f350400673a95279490 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 19:04:08 +0000 Subject: [PATCH 248/654] Update dependencies from https://github.com/dotnet/sdk build 20230112.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.5 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 5c027e560..f45181138 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - bbc0390753596357eb32e64d286c2e13c7db9b10 + 66df4df0bb20880b8b05c2561f2c359bd51adbd4 - + https://github.com/dotnet/sdk - bbc0390753596357eb32e64d286c2e13c7db9b10 + 66df4df0bb20880b8b05c2561f2c359bd51adbd4 - + https://github.com/dotnet/sdk - bbc0390753596357eb32e64d286c2e13c7db9b10 + 66df4df0bb20880b8b05c2561f2c359bd51adbd4 - + https://github.com/dotnet/sdk - bbc0390753596357eb32e64d286c2e13c7db9b10 + 66df4df0bb20880b8b05c2561f2c359bd51adbd4 diff --git a/eng/Versions.props b/eng/Versions.props index f5857d80f..21402f4d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.3 - 7.0.200-preview.23062.3 - 7.0.200-preview.23062.3 + 7.0.200-preview.23062.5 + 7.0.200-preview.23062.5 + 7.0.200-preview.23062.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ab538d4fd200cd7280ee85b02670c7fceb1ddaae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 21:20:30 +0000 Subject: [PATCH 249/654] Update dependencies from https://github.com/dotnet/sdk build 20230112.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.9 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (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 f45181138..891161048 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 66df4df0bb20880b8b05c2561f2c359bd51adbd4 + 21eb0272e92284189614cb2a9cf7315503d062be - + https://github.com/dotnet/sdk - 66df4df0bb20880b8b05c2561f2c359bd51adbd4 + 21eb0272e92284189614cb2a9cf7315503d062be - + https://github.com/dotnet/sdk - 66df4df0bb20880b8b05c2561f2c359bd51adbd4 + 21eb0272e92284189614cb2a9cf7315503d062be - + https://github.com/dotnet/sdk - 66df4df0bb20880b8b05c2561f2c359bd51adbd4 + 21eb0272e92284189614cb2a9cf7315503d062be diff --git a/eng/Versions.props b/eng/Versions.props index 21402f4d1..b7e6615a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.5 - 7.0.200-preview.23062.5 - 7.0.200-preview.23062.5 + 7.0.200-preview.23062.9 + 7.0.200-preview.23062.9 + 7.0.200-preview.23062.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 82f25c9509c452db9f269ca5e15a1d661bb8dea8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 22:40:38 +0000 Subject: [PATCH 250/654] Update dependencies from https://github.com/dotnet/sdk build 20230112.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.10 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (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 891161048..7f2b1bb9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 21eb0272e92284189614cb2a9cf7315503d062be + 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 - + https://github.com/dotnet/sdk - 21eb0272e92284189614cb2a9cf7315503d062be + 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 - + https://github.com/dotnet/sdk - 21eb0272e92284189614cb2a9cf7315503d062be + 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 - + https://github.com/dotnet/sdk - 21eb0272e92284189614cb2a9cf7315503d062be + 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 @@ -138,9 +138,9 @@ be79eb4393631df7c6431ed1c0aa14c1bbaca731 - + https://github.com/dotnet/linker - 8db10f44053ed4cb95a99676ac7b8ccae681b79d + 19fa656d35252ccf926e6a6d783b16a2f094aaef linker diff --git a/eng/Versions.props b/eng/Versions.props index b7e6615a3..f752fe129 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.9 - 7.0.200-preview.23062.9 - 7.0.200-preview.23062.9 + 7.0.200-preview.23062.10 + 7.0.200-preview.23062.10 + 7.0.200-preview.23062.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1eb3d97259a71cdeddaf8c756ed508a8e7316203 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 23:57:00 +0000 Subject: [PATCH 251/654] Update dependencies from https://github.com/dotnet/sdk build 20230112.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.16 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (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 7f2b1bb9e..497bc78ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 + 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 - + https://github.com/dotnet/sdk - 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 + 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 - + https://github.com/dotnet/sdk - 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 + 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 - + https://github.com/dotnet/sdk - 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 + 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 diff --git a/eng/Versions.props b/eng/Versions.props index f752fe129..9bbe7bcb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.10 - 7.0.200-preview.23062.10 - 7.0.200-preview.23062.10 + 7.0.200-preview.23062.16 + 7.0.200-preview.23062.16 + 7.0.200-preview.23062.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d6f80c92c911395a353ddeebbd778c584cd22bd4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 05:11:31 +0000 Subject: [PATCH 252/654] Update dependencies from https://github.com/dotnet/sdk build 20230112.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.25 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (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 497bc78ad..cce8b62d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 + 28ad007682ca03e88375a4e85465e18bb365fe5b - + https://github.com/dotnet/sdk - 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 + 28ad007682ca03e88375a4e85465e18bb365fe5b - + https://github.com/dotnet/sdk - 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 + 28ad007682ca03e88375a4e85465e18bb365fe5b - + https://github.com/dotnet/sdk - 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 + 28ad007682ca03e88375a4e85465e18bb365fe5b diff --git a/eng/Versions.props b/eng/Versions.props index 9bbe7bcb4..8698406fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.16 - 7.0.200-preview.23062.16 - 7.0.200-preview.23062.16 + 7.0.200-preview.23062.25 + 7.0.200-preview.23062.25 + 7.0.200-preview.23062.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e61ed353ea9af93d88207d43e66f903159022b38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 10:19:56 +0000 Subject: [PATCH 253/654] Update dependencies from https://github.com/dotnet/sdk build 20230112.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.35 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cce8b62d6..55bce1024 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 28ad007682ca03e88375a4e85465e18bb365fe5b + db99dbac0861ce9aeced6182d5ca62cecbce3e78 - + https://github.com/dotnet/sdk - 28ad007682ca03e88375a4e85465e18bb365fe5b + db99dbac0861ce9aeced6182d5ca62cecbce3e78 - + https://github.com/dotnet/sdk - 28ad007682ca03e88375a4e85465e18bb365fe5b + db99dbac0861ce9aeced6182d5ca62cecbce3e78 - + https://github.com/dotnet/sdk - 28ad007682ca03e88375a4e85465e18bb365fe5b + db99dbac0861ce9aeced6182d5ca62cecbce3e78 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + 9abb456f29f254da028126cb09ad10751a01eebf - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + 9abb456f29f254da028126cb09ad10751a01eebf diff --git a/eng/Versions.props b/eng/Versions.props index 8698406fb..0935a692f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.25 - 7.0.200-preview.23062.25 - 7.0.200-preview.23062.25 + 7.0.200-preview.23062.35 + 7.0.200-preview.23062.35 + 7.0.200-preview.23062.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 90a0a9becefb3c3e05f4ff2910b906b0242b345d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 11:46:11 +0000 Subject: [PATCH 254/654] Update dependencies from https://github.com/dotnet/sdk build 20230113.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23063.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (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 55bce1024..1c004b66f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - db99dbac0861ce9aeced6182d5ca62cecbce3e78 + 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 - + https://github.com/dotnet/sdk - db99dbac0861ce9aeced6182d5ca62cecbce3e78 + 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 - + https://github.com/dotnet/sdk - db99dbac0861ce9aeced6182d5ca62cecbce3e78 + 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 - + https://github.com/dotnet/sdk - db99dbac0861ce9aeced6182d5ca62cecbce3e78 + 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 diff --git a/eng/Versions.props b/eng/Versions.props index 0935a692f..836a41d7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.35 - 7.0.200-preview.23062.35 - 7.0.200-preview.23062.35 + 7.0.200-preview.23063.2 + 7.0.200-preview.23063.2 + 7.0.200-preview.23063.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 269f3acab7b406bdffba963ff0ec1c30e8bb6020 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 13 Jan 2023 15:14:29 +0000 Subject: [PATCH 255/654] Remove obsolete source-build format patch --- ...ess-Microsoft.Build.Locator-prebuilt.patch | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch diff --git a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch b/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch deleted file mode 100644 index e8b8f38fd..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 15 Nov 2022 17:34:00 +0000 -Subject: [PATCH] Address Microsoft.Build.Locator prebuilt - -Backport: https://github.com/dotnet/format/issues/1759 ---- - Directory.Packages.props | 2 +- - eng/Versions.props | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index c4bf3cf..f7e85b2 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -10,7 +10,7 @@ - - - -- -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index fcd583b..2933963 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -14,6 +14,7 @@ - - - 17.3.0-preview-22302-02 -+ 1.5.5 - 3.3.3 - 7.0.0-rc.1.22426.10 - From 87d18781bc811664ede0aa0f28918ec47ae92257 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 13 Jan 2023 15:22:57 +0000 Subject: [PATCH 256/654] Update sdk version used to build source-build --- src/SourceBuild/tarball/content/global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 1bf480e4e..01432c896 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100" + "dotnet": "7.0.102" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From b8e7c828f7439a4ca7783425675bab33cf90e238 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 18:04:03 +0000 Subject: [PATCH 257/654] Update dependencies from https://github.com/dotnet/sdk build 20230113.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23063.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (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 1c004b66f..3eadeab0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 + 9acbc4db3fa18e9839189580622be7258f81c9d5 - + https://github.com/dotnet/sdk - 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 + 9acbc4db3fa18e9839189580622be7258f81c9d5 - + https://github.com/dotnet/sdk - 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 + 9acbc4db3fa18e9839189580622be7258f81c9d5 - + https://github.com/dotnet/sdk - 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 + 9acbc4db3fa18e9839189580622be7258f81c9d5 diff --git a/eng/Versions.props b/eng/Versions.props index 836a41d7d..79b8fe7f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23063.2 - 7.0.200-preview.23063.2 - 7.0.200-preview.23063.2 + 7.0.200-preview.23063.9 + 7.0.200-preview.23063.9 + 7.0.200-preview.23063.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2b1cb59467de25a9b54bbfb738a5ff504bb0fbaf Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jan 2023 15:42:18 -0800 Subject: [PATCH 258/654] Branding for 7.0.3xx --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8b3a57153..b0aa91ba5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 7 0 - 2 + 3 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) preview From 55be7a1a68f6890836eb0b85b0a39a0eeb1c5b4f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jan 2023 15:43:08 -0800 Subject: [PATCH 259/654] Stable branding for 7.0.2xx GA --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8b3a57153..9b5a4f514 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,13 +10,13 @@ 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release From 8fd65d532ef21cac4c66b2c6edde7fdfa9dff1ac Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jan 2023 15:44:57 -0800 Subject: [PATCH 260/654] Update implicit versions --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 14f9bc796..391078d3c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -63,7 +63,7 @@ 30 32 17 - 12 + $([MSBuild]::Add($(VersionFeature), 14)) From d6c8188ab4709d53d5bbab4b56c8281f0365e689 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jan 2023 15:45:51 -0800 Subject: [PATCH 261/654] Update implicit versions for Jan release --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 14f9bc796..5ecb3a19f 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -63,7 +63,7 @@ 30 32 17 - 12 + 13 From 21ac75ca743098b72357129d76cdeccf46aed696 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Jan 2023 00:45:09 +0000 Subject: [PATCH 262/654] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230113.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22608.2 -> To Version 7.0.0-alpha.1.23063.1 --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76a6cf0f0..a738cbcb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,7 +201,7 @@ https://github.com/dotnet/arcade ac5977ebf05451c1adcf24a15d16263e4d25fd0c - + https://github.com/dotnet/source-build-reference-packages 9964206e0dd215eee4ed199b9041a94e16ba4c45 From 4947b377272c5bb19d025339e5e4b65a363cdc47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Jan 2023 00:56:52 +0000 Subject: [PATCH 263/654] Update dependencies from https://github.com/dotnet/sdk build 20230113.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23063.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 6 +++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76a6cf0f0..6f6e83710 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + 375cc692d9740d79f3ac3091c5c70611e10ec2f3 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + 375cc692d9740d79f3ac3091c5c70611e10ec2f3 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + 375cc692d9740d79f3ac3091c5c70611e10ec2f3 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + 375cc692d9740d79f3ac3091c5c70611e10ec2f3 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + 9abb456f29f254da028126cb09ad10751a01eebf - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + 9abb456f29f254da028126cb09ad10751a01eebf @@ -138,20 +138,20 @@ be79eb4393631df7c6431ed1c0aa14c1bbaca731 - + https://github.com/dotnet/linker - 8db10f44053ed4cb95a99676ac7b8ccae681b79d + 19fa656d35252ccf926e6a6d783b16a2f094aaef linker - + https://github.com/dotnet/roslyn - 8ad2e6240cb7426d83f1b45241f8f33bddf3d474 + 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 - + https://github.com/dotnet/msbuild - ab3d68e815ba13916d6d3a653445d71ad238c723 + 040e2a90ee794997fc9716487280a54b0ad8fe2a diff --git a/eng/Versions.props b/eng/Versions.props index b0aa91ba5..e394e6f22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 + 7.0.300-preview.23063.18 + 7.0.300-preview.23063.18 + 7.0.300-preview.23063.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 46b46bcd143d28a35232bf596bba523e1c9ddd20 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Jan 2023 07:07:08 +0000 Subject: [PATCH 264/654] Update dependencies from https://github.com/dotnet/sdk build 20230115.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23065.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (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 6f6e83710..5eea736ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 375cc692d9740d79f3ac3091c5c70611e10ec2f3 + c377c4648da3cdfcf61e3618d0b801ae7d55207d - + https://github.com/dotnet/sdk - 375cc692d9740d79f3ac3091c5c70611e10ec2f3 + c377c4648da3cdfcf61e3618d0b801ae7d55207d - + https://github.com/dotnet/sdk - 375cc692d9740d79f3ac3091c5c70611e10ec2f3 + c377c4648da3cdfcf61e3618d0b801ae7d55207d - + https://github.com/dotnet/sdk - 375cc692d9740d79f3ac3091c5c70611e10ec2f3 + c377c4648da3cdfcf61e3618d0b801ae7d55207d @@ -149,9 +149,9 @@ 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 - + https://github.com/dotnet/msbuild - 040e2a90ee794997fc9716487280a54b0ad8fe2a + 0432271a348e62885c16583c9bb451c8d5b9e8d9 diff --git a/eng/Versions.props b/eng/Versions.props index e394e6f22..908b3efe1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23063.18 - 7.0.300-preview.23063.18 - 7.0.300-preview.23063.18 + 7.0.300-preview.23065.5 + 7.0.300-preview.23065.5 + 7.0.300-preview.23065.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7f3f9f2c189b03f7296a386394cc54bf02d6e276 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Jan 2023 08:29:14 +0000 Subject: [PATCH 265/654] Update dependencies from https://github.com/dotnet/sdk build 20230115.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23065.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5eea736ed..f36828441 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c377c4648da3cdfcf61e3618d0b801ae7d55207d + 0907ee0d8243a06739beb8c322f61e09bd6d84cd - + https://github.com/dotnet/sdk - c377c4648da3cdfcf61e3618d0b801ae7d55207d + 0907ee0d8243a06739beb8c322f61e09bd6d84cd - + https://github.com/dotnet/sdk - c377c4648da3cdfcf61e3618d0b801ae7d55207d + 0907ee0d8243a06739beb8c322f61e09bd6d84cd - + https://github.com/dotnet/sdk - c377c4648da3cdfcf61e3618d0b801ae7d55207d + 0907ee0d8243a06739beb8c322f61e09bd6d84cd @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 9abb456f29f254da028126cb09ad10751a01eebf + 9f03ca4d15dd50b7592131502bd8cd7fa854b9bc - + https://github.com/dotnet/fsharp - 9abb456f29f254da028126cb09ad10751a01eebf + 9f03ca4d15dd50b7592131502bd8cd7fa854b9bc diff --git a/eng/Versions.props b/eng/Versions.props index 908b3efe1..d223af488 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23065.5 - 7.0.300-preview.23065.5 - 7.0.300-preview.23065.5 + 7.0.300-preview.23065.8 + 7.0.300-preview.23065.8 + 7.0.300-preview.23065.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b8860d19e4478202ae3e2c881f153d254a2f349f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Jan 2023 09:55:55 +0000 Subject: [PATCH 266/654] Update dependencies from https://github.com/dotnet/sdk build 20230116.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23066.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.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 f36828441..3a0f28e70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0907ee0d8243a06739beb8c322f61e09bd6d84cd + d7c6af36c625491bb06823cbfa9b1e0554f19fc3 - + https://github.com/dotnet/sdk - 0907ee0d8243a06739beb8c322f61e09bd6d84cd + d7c6af36c625491bb06823cbfa9b1e0554f19fc3 - + https://github.com/dotnet/sdk - 0907ee0d8243a06739beb8c322f61e09bd6d84cd + d7c6af36c625491bb06823cbfa9b1e0554f19fc3 - + https://github.com/dotnet/sdk - 0907ee0d8243a06739beb8c322f61e09bd6d84cd + d7c6af36c625491bb06823cbfa9b1e0554f19fc3 @@ -149,9 +149,9 @@ 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 - + https://github.com/dotnet/msbuild - 0432271a348e62885c16583c9bb451c8d5b9e8d9 + 6b6879045dfe421da2a79816bef6688eed4c6075 diff --git a/eng/Versions.props b/eng/Versions.props index d223af488..7ed57c659 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23065.8 - 7.0.300-preview.23065.8 - 7.0.300-preview.23065.8 + 7.0.300-preview.23066.2 + 7.0.300-preview.23066.2 + 7.0.300-preview.23066.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 901a6db49c2a74029c89daa2f1a76da78d55125c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Jan 2023 18:30:50 +0000 Subject: [PATCH 267/654] Update dependencies from https://github.com/dotnet/sdk build 20230116.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23066.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a0f28e70..65525b492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d7c6af36c625491bb06823cbfa9b1e0554f19fc3 + 7b16096588876d39e63e2525230ea0e4e4b54674 - + https://github.com/dotnet/sdk - d7c6af36c625491bb06823cbfa9b1e0554f19fc3 + 7b16096588876d39e63e2525230ea0e4e4b54674 - + https://github.com/dotnet/sdk - d7c6af36c625491bb06823cbfa9b1e0554f19fc3 + 7b16096588876d39e63e2525230ea0e4e4b54674 - + https://github.com/dotnet/sdk - d7c6af36c625491bb06823cbfa9b1e0554f19fc3 + 7b16096588876d39e63e2525230ea0e4e4b54674 @@ -133,9 +133,9 @@ 9f03ca4d15dd50b7592131502bd8cd7fa854b9bc - + https://github.com/microsoft/vstest - be79eb4393631df7c6431ed1c0aa14c1bbaca731 + eb05f0dec14e85a87ce98d2cd8a92b64d92c99c1 diff --git a/eng/Versions.props b/eng/Versions.props index 7ed57c659..c5115f131 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23066.2 - 7.0.300-preview.23066.2 - 7.0.300-preview.23066.2 + 7.0.300-preview.23066.9 + 7.0.300-preview.23066.9 + 7.0.300-preview.23066.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-release-20221220-01 + 17.6.0-preview-20230110-03 From 05b55311c9557eeecb8399135ea0fb9cc1d6264a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jan 2023 11:48:18 +0000 Subject: [PATCH 268/654] Update dependencies from https://github.com/dotnet/sdk build 20230117.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23067.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.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 65525b492..2e1fb2795 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7b16096588876d39e63e2525230ea0e4e4b54674 + 0b5ec7053b5a7998369a6774c80dbbafff64dd57 - + https://github.com/dotnet/sdk - 7b16096588876d39e63e2525230ea0e4e4b54674 + 0b5ec7053b5a7998369a6774c80dbbafff64dd57 - + https://github.com/dotnet/sdk - 7b16096588876d39e63e2525230ea0e4e4b54674 + 0b5ec7053b5a7998369a6774c80dbbafff64dd57 - + https://github.com/dotnet/sdk - 7b16096588876d39e63e2525230ea0e4e4b54674 + 0b5ec7053b5a7998369a6774c80dbbafff64dd57 diff --git a/eng/Versions.props b/eng/Versions.props index c5115f131..d7814a8b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23066.9 - 7.0.300-preview.23066.9 - 7.0.300-preview.23066.9 + 7.0.300-preview.23067.2 + 7.0.300-preview.23067.2 + 7.0.300-preview.23067.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18f77e75eaf06fed2eeabbf1fc56dbd78a408a7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jan 2023 13:09:34 +0000 Subject: [PATCH 269/654] Update dependencies from https://github.com/dotnet/sdk build 20230117.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23067.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.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 2e1fb2795..d67005fd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0b5ec7053b5a7998369a6774c80dbbafff64dd57 + ff304dc6cb6920a9a3048b1c61ad20e000e0f00b - + https://github.com/dotnet/sdk - 0b5ec7053b5a7998369a6774c80dbbafff64dd57 + ff304dc6cb6920a9a3048b1c61ad20e000e0f00b - + https://github.com/dotnet/sdk - 0b5ec7053b5a7998369a6774c80dbbafff64dd57 + ff304dc6cb6920a9a3048b1c61ad20e000e0f00b - + https://github.com/dotnet/sdk - 0b5ec7053b5a7998369a6774c80dbbafff64dd57 + ff304dc6cb6920a9a3048b1c61ad20e000e0f00b @@ -149,9 +149,9 @@ 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 - + https://github.com/dotnet/msbuild - 6b6879045dfe421da2a79816bef6688eed4c6075 + 7711999070e51442c3e527f576159828f01cb3bf diff --git a/eng/Versions.props b/eng/Versions.props index d7814a8b5..1c3894c2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23067.2 - 7.0.300-preview.23067.2 - 7.0.300-preview.23067.2 + 7.0.300-preview.23067.3 + 7.0.300-preview.23067.3 + 7.0.300-preview.23067.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7c3bbf3ff0982464f0e4fa9b2311d89f74d6255b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jan 2023 21:13:47 +0000 Subject: [PATCH 270/654] Update dependencies from https://github.com/dotnet/sdk build 20230117.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23067.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d67005fd8..5b88176ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ff304dc6cb6920a9a3048b1c61ad20e000e0f00b + 73949520b05bad9cd654d25ac126656ebd2707b0 - + https://github.com/dotnet/sdk - ff304dc6cb6920a9a3048b1c61ad20e000e0f00b + 73949520b05bad9cd654d25ac126656ebd2707b0 - + https://github.com/dotnet/sdk - ff304dc6cb6920a9a3048b1c61ad20e000e0f00b + 73949520b05bad9cd654d25ac126656ebd2707b0 - + https://github.com/dotnet/sdk - ff304dc6cb6920a9a3048b1c61ad20e000e0f00b + 73949520b05bad9cd654d25ac126656ebd2707b0 @@ -133,9 +133,9 @@ 9f03ca4d15dd50b7592131502bd8cd7fa854b9bc - + https://github.com/microsoft/vstest - eb05f0dec14e85a87ce98d2cd8a92b64d92c99c1 + 5e9c3debd9d0007c53e7510ac030ea5e8fc483f4 diff --git a/eng/Versions.props b/eng/Versions.props index 1c3894c2a..190877e22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23067.3 - 7.0.300-preview.23067.3 - 7.0.300-preview.23067.3 + 7.0.300-preview.23067.10 + 7.0.300-preview.23067.10 + 7.0.300-preview.23067.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230110-03 + 17.6.0-preview-20230117-02 From 6b6a21b4e31e804f1104e554eb0109cce8b798a4 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 17 Jan 2023 13:40:03 -0800 Subject: [PATCH 271/654] Disable source-build tarball build in CI --- .vsts-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index eb2acb8c9..266784afc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -334,10 +334,11 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball + # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml From b6530bdf354b603033d0e0b06ef9e34cc7d890ce Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 17 Jan 2023 13:40:03 -0800 Subject: [PATCH 272/654] Disable source-build tarball build in CI --- .vsts-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index eb2acb8c9..266784afc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -334,10 +334,11 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball + # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml From df86982e14fd8c483336ed754f1f40152b66fdd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Jan 2023 06:58:39 +0000 Subject: [PATCH 273/654] Update dependencies from https://github.com/dotnet/sdk build 20230117.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23067.10 -> To Version 7.0.300-preview.23067.31 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23064.1 -> To Version 12.5.0-beta.23067.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b615a722..16e5d29df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 73949520b05bad9cd654d25ac126656ebd2707b0 + eb80d061694dc32a282e43c02e8f984e5e7c7f84 - + https://github.com/dotnet/sdk - 73949520b05bad9cd654d25ac126656ebd2707b0 + eb80d061694dc32a282e43c02e8f984e5e7c7f84 - + https://github.com/dotnet/sdk - 73949520b05bad9cd654d25ac126656ebd2707b0 + eb80d061694dc32a282e43c02e8f984e5e7c7f84 - + https://github.com/dotnet/sdk - 73949520b05bad9cd654d25ac126656ebd2707b0 + eb80d061694dc32a282e43c02e8f984e5e7c7f84 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 9f03ca4d15dd50b7592131502bd8cd7fa854b9bc + 6ebe669cd147075a2e66699cf4e1b1a338f89fe5 - + https://github.com/dotnet/fsharp - 9f03ca4d15dd50b7592131502bd8cd7fa854b9bc + 6ebe669cd147075a2e66699cf4e1b1a338f89fe5 diff --git a/eng/Versions.props b/eng/Versions.props index 190877e22..ae909e818 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23067.10 - 7.0.300-preview.23067.10 - 7.0.300-preview.23067.10 + 7.0.300-preview.23067.31 + 7.0.300-preview.23067.31 + 7.0.300-preview.23067.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c905c1d9447874017b330a284798ecc151f5a824 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Jan 2023 11:30:22 +0000 Subject: [PATCH 274/654] Update dependencies from https://github.com/dotnet/sdk build 20230118.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23067.10 -> To Version 7.0.300-preview.23068.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.23064.1 -> To Version 12.5.0-beta.23067.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 16e5d29df..e2d2b72a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - eb80d061694dc32a282e43c02e8f984e5e7c7f84 + b3d3ae6773f6015c1b0713de52bb66d2152c3da9 - + https://github.com/dotnet/sdk - eb80d061694dc32a282e43c02e8f984e5e7c7f84 + b3d3ae6773f6015c1b0713de52bb66d2152c3da9 - + https://github.com/dotnet/sdk - eb80d061694dc32a282e43c02e8f984e5e7c7f84 + b3d3ae6773f6015c1b0713de52bb66d2152c3da9 - + https://github.com/dotnet/sdk - eb80d061694dc32a282e43c02e8f984e5e7c7f84 + b3d3ae6773f6015c1b0713de52bb66d2152c3da9 @@ -149,9 +149,9 @@ 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 - + https://github.com/dotnet/msbuild - 7711999070e51442c3e527f576159828f01cb3bf + 98924b86bbc19aff3360f9cc3a2922df6a5c5d6a diff --git a/eng/Versions.props b/eng/Versions.props index ae909e818..47414d52b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23067.31 - 7.0.300-preview.23067.31 - 7.0.300-preview.23067.31 + 7.0.300-preview.23068.2 + 7.0.300-preview.23068.2 + 7.0.300-preview.23068.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ee182e1fe73882d75f3d2ebbe0778b30353c64ff Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 Jan 2023 20:56:35 +0000 Subject: [PATCH 275/654] Merged PR 28926: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.0-rtm.22519.1 to 7.0.3-servicing.23072.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.0-rtm.22519.1 to 7.0.3-servicing.23072.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.0-rtm.22518.5 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23062.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23062.18 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23062.18 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23062.18 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23062.18 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.0-rtm.22518.7 to 7.0.2-servicing.22606.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.0-rtm.22518.2 to 7.0.3-servicing.23061.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.FSharp.Compiler**: from 12.5.0-beta.23059.11 to 12.5.0-beta.23069.2 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.1-beta.23059.11 to 7.0.200-beta.23069.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 7.0.100-1.22579.2 to 7.0.100-1... --- .vsts-ci.yml | 9 +- NuGet.config | 9 ++ eng/Version.Details.xml | 128 +++++++++--------- eng/Versions.props | 48 +++---- ...solvePackageFileConflicts-workaround.patch | 23 ---- 5 files changed, 102 insertions(+), 115 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch diff --git a/.vsts-ci.yml b/.vsts-ci.yml index eb2acb8c9..266784afc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -334,10 +334,11 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball + # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml diff --git a/NuGet.config b/NuGet.config index 3d6b197f7..0148533a5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,19 @@ + + + + + @@ -36,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76a6cf0f0..8bbe10d4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de https://github.com/dotnet/test-templates @@ -98,39 +98,39 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - - https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 91d3f08648bb0b76b5354ff737e1a3ade221cb4a - - https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 91d3f08648bb0b76b5354ff737e1a3ade221cb4a - - https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 91d3f08648bb0b76b5354ff737e1a3ade221cb4a - - https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 91d3f08648bb0b76b5354ff737e1a3ade221cb4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e83409daa530605da4eb5f847c6740a520325d25 + 8b06c27c9b81f33e69f8d5155fe69693f661fa3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 636e2b7a00a434a354a126f510a56e16ce3c6bbc + 69a9b7a08dabcaa9ca39eb2ce4c6051d729ce899 - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + e391694876e891d2cdc4089e62fe7b1138d8294e - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + e391694876e891d2cdc4089e62fe7b1138d8294e @@ -138,20 +138,20 @@ be79eb4393631df7c6431ed1c0aa14c1bbaca731 - + https://github.com/dotnet/linker - 8db10f44053ed4cb95a99676ac7b8ccae681b79d + 19fa656d35252ccf926e6a6d783b16a2f094aaef linker - + https://github.com/dotnet/roslyn - 8ad2e6240cb7426d83f1b45241f8f33bddf3d474 + 5964d1a8e82d7a6e27b3b31bc1d6e44d0a2127b4 - + https://github.com/dotnet/msbuild - ab3d68e815ba13916d6d3a653445d71ad238c723 + 040e2a90ee794997fc9716487280a54b0ad8fe2a @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 8b3a57153..543ff5ef3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22518.7 + 7.0.2-servicing.22606.8 - 7.0.0-rtm.22518.2 + 7.0.3-servicing.23061.11 @@ -50,22 +50,22 @@ - 7.0.0 - 7.0.0 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 + 7.0.3 + 7.0.3 + 7.0.3-servicing.23062.18 + 7.0.3-servicing.23062.18 + 7.0.3-servicing.23062.18 + 7.0.3-servicing.23062.18 + 7.0.3-servicing.23062.18 0.2.0 - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 + 7.0.200 + 7.0.200-rtm.23073.5 + 7.0.200-rtm.23073.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,20 +76,20 @@ - 7.0.0-rtm.22518.5 - 7.0.0-rtm.22518.5 - 7.0.0 - 7.0.0 - 7.0.0 - 7.0.0 + 7.0.3-servicing.23069.10 + 7.0.3-servicing.23069.10 + 7.0.3 + 7.0.3 + 7.0.3 + 7.0.3 2.1.0 - 7.0.0-rtm.22519.1 - 7.0.0-rtm.22519.1 - 7.0.0 - 7.0.0 + 7.0.3-servicing.23072.2 + 7.0.3-servicing.23072.2 + 7.0.3 + 7.0.3 @@ -205,8 +205,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0 - 7.0.0 + 7.0.3 + 7.0.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch deleted file mode 100644 index ab355630e..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 11 Nov 2022 21:10:54 +0000 -Subject: [PATCH] ResolvePackageFileConflicts workaround - ---- - .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -index 3b5d2ae950..f92fb421fe 100644 ---- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - -+ -+ -+ - - - From 9ee490fe01623cc6bd109cba4b9d34ced31ed6ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Jan 2023 20:59:20 +0000 Subject: [PATCH 276/654] Update dependencies from https://github.com/dotnet/arcade build 20230123.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23060.4 -> To Version 7.0.0-beta.23073.6 --- 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 e2d2b72a7..973aa491b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5f8519337c864af63b8692754ca0fa971bfc55d4 - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5f8519337c864af63b8692754ca0fa971bfc55d4 - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5f8519337c864af63b8692754ca0fa971bfc55d4 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 47414d52b..98d291b72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23060.4 + 7.0.0-beta.23073.6 diff --git a/global.json b/global.json index c4142c606..0d15a2c1f 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.23060.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23060.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23073.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23073.6" } } From 92790e6ec9811a1e6269f81d4dd2fcfbc1740e2d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 15:21:09 +0000 Subject: [PATCH 277/654] Merged PR 29090: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.3-servicing.23072.2 to 7.0.3-servicing.23073.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.3-servicing.23072.2 to 7.0.3-servicing.23073.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.2-servicing.22606.8 to 7.0.3-servicing.23072.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.3-servicing.23061.11 to 7.0.3-servicing.23073.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230123.13 - **Date Produced**: January 23, 2023 11:21:51 PM UTC - **Commit**: 0498415bdd41d96152e70726f407c39c02feb825 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.200 to 7.0.200][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.200-rtm.23073.5 to 7.0.200-rtm.23073.13][1] - **Microsoft.NET.Sdk**: [from 7.0.200-rtm.23073.5 to 7.0.200-rtm.23073.13][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.200-rtm.23073.5 to 7.0.200-rtm.23073.13][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.3 to 7.0.3][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23072.2 to 7.0.3-servicing.23073.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.3-servicing.23072.2 to 7.0.3-servicing.23073.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.2-servicing.22606.8 to 7.0.3-servicing.23072.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.3-servicing.23061.11 to 7.0.3-servicing.23073.1][4] [1]: https://dev.azur... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0148533a5..b8bee2aa4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,10 +16,10 @@ - + - + @@ -46,10 +46,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bbe10d4e..92bb4e403 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 + 0e6192540357f08063fb1127f1a791fb6a3e194c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 + 0e6192540357f08063fb1127f1a791fb6a3e194c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91d3f08648bb0b76b5354ff737e1a3ade221cb4a + 0498415bdd41d96152e70726f407c39c02feb825 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91d3f08648bb0b76b5354ff737e1a3ade221cb4a + 0498415bdd41d96152e70726f407c39c02feb825 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91d3f08648bb0b76b5354ff737e1a3ade221cb4a + 0498415bdd41d96152e70726f407c39c02feb825 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91d3f08648bb0b76b5354ff737e1a3ade221cb4a + 0498415bdd41d96152e70726f407c39c02feb825 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b06c27c9b81f33e69f8d5155fe69693f661fa3d + cce692f665cbefe335ed33369897cea328d5fbcf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 69a9b7a08dabcaa9ca39eb2ce4c6051d729ce899 + 0a09c7d17212981cb4fd5907fa6a6214966a366d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 543ff5ef3..678c23c11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.2-servicing.22606.8 + 7.0.3-servicing.23072.1 - 7.0.3-servicing.23061.11 + 7.0.3-servicing.23073.1 @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-rtm.23073.5 - 7.0.200-rtm.23073.5 + 7.0.200-rtm.23073.13 + 7.0.200-rtm.23073.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.3-servicing.23072.2 - 7.0.3-servicing.23072.2 + 7.0.3-servicing.23073.3 + 7.0.3-servicing.23073.3 7.0.3 7.0.3 From d827aeafc601d808c8943029e292efd8f0622ed5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 18:24:47 +0000 Subject: [PATCH 278/654] Merged PR 29137: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230124.10 - **Date Produced**: January 24, 2023 4:07:45 PM UTC - **Commit**: 80d46a254ef8523b54e2ed6d18a912744b11165d - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.200 to 7.0.200][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.200-rtm.23073.13 to 7.0.200-rtm.23074.10][1] - **Microsoft.NET.Sdk**: [from 7.0.200-rtm.23073.13 to 7.0.200-rtm.23074.10][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.200-rtm.23073.13 to 7.0.200-rtm.23074.10][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.3 to 7.0.3][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] - **dotnet-dev-certs**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] - **dotnet-user-jwts**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] - **dotnet-user-secrets**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0498415&targetVersion=GC80d46a2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspn... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index b8bee2aa4..2df832ae4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -41,12 +41,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92bb4e403..38342a5a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0498415bdd41d96152e70726f407c39c02feb825 + 80d46a254ef8523b54e2ed6d18a912744b11165d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0498415bdd41d96152e70726f407c39c02feb825 + 80d46a254ef8523b54e2ed6d18a912744b11165d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0498415bdd41d96152e70726f407c39c02feb825 + 80d46a254ef8523b54e2ed6d18a912744b11165d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0498415bdd41d96152e70726f407c39c02feb825 + 80d46a254ef8523b54e2ed6d18a912744b11165d diff --git a/eng/Versions.props b/eng/Versions.props index 678c23c11..cbc725fd5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.3 7.0.3 - 7.0.3-servicing.23062.18 - 7.0.3-servicing.23062.18 - 7.0.3-servicing.23062.18 - 7.0.3-servicing.23062.18 - 7.0.3-servicing.23062.18 + 7.0.3-servicing.23073.14 + 7.0.3-servicing.23073.14 + 7.0.3-servicing.23073.14 + 7.0.3-servicing.23073.14 + 7.0.3-servicing.23073.14 0.2.0 @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-rtm.23073.13 - 7.0.200-rtm.23073.13 + 7.0.200-rtm.23074.10 + 7.0.200-rtm.23074.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 901526848f8702d4234831ab84597a3c7d604e82 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 21:03:29 +0000 Subject: [PATCH 279/654] Merged PR 29187: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230124.33 - **Date Produced**: January 24, 2023 8:21:47 PM UTC - **Commit**: 24e4ce5d4b73b0959fca44a22e725efb91c407e1 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.200 to 7.0.200][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.200-rtm.23074.10 to 7.0.200-rtm.23074.33][1] - **Microsoft.NET.Sdk**: [from 7.0.200-rtm.23074.10 to 7.0.200-rtm.23074.33][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.200-rtm.23074.10 to 7.0.200-rtm.23074.33][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.3 to 7.0.3][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] - **dotnet-dev-certs**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] - **dotnet-user-jwts**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] - **dotnet-user-secrets**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC80d46a2&targetVersion=GC24e4ce5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/bra... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2df832ae4..3be001b79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -41,12 +41,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38342a5a4..52276ae81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80d46a254ef8523b54e2ed6d18a912744b11165d + 24e4ce5d4b73b0959fca44a22e725efb91c407e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80d46a254ef8523b54e2ed6d18a912744b11165d + 24e4ce5d4b73b0959fca44a22e725efb91c407e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80d46a254ef8523b54e2ed6d18a912744b11165d + 24e4ce5d4b73b0959fca44a22e725efb91c407e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80d46a254ef8523b54e2ed6d18a912744b11165d + 24e4ce5d4b73b0959fca44a22e725efb91c407e1 diff --git a/eng/Versions.props b/eng/Versions.props index cbc725fd5..1cee2d328 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.3 7.0.3 - 7.0.3-servicing.23073.14 - 7.0.3-servicing.23073.14 - 7.0.3-servicing.23073.14 - 7.0.3-servicing.23073.14 - 7.0.3-servicing.23073.14 + 7.0.3-servicing.23074.4 + 7.0.3-servicing.23074.4 + 7.0.3-servicing.23074.4 + 7.0.3-servicing.23074.4 + 7.0.3-servicing.23074.4 0.2.0 @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-rtm.23074.10 - 7.0.200-rtm.23074.10 + 7.0.200-rtm.23074.33 + 7.0.200-rtm.23074.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e57516fdfa3e8fb11749d192ca013b99043c8059 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 25 Jan 2023 19:45:27 +0000 Subject: [PATCH 280/654] Merged PR 29213: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230125.12 - **Date Produced**: January 25, 2023 7:14:47 PM UTC - **Commit**: b06e943b6b17783dd21fe81cb2f914a7120f5349 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.200 to 7.0.200][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.200-rtm.23074.33 to 7.0.200-rtm.23075.12][1] - **Microsoft.NET.Sdk**: [from 7.0.200-rtm.23074.33 to 7.0.200-rtm.23075.12][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.200-rtm.23074.33 to 7.0.200-rtm.23075.12][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC24e4ce5&targetVersion=GCb06e943&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91) --- NuGet.config | 9 +++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3be001b79..b6c0c5cd1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,18 +8,21 @@ + + - + + @@ -41,14 +44,16 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0c756b63..22bc43324 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24e4ce5d4b73b0959fca44a22e725efb91c407e1 + b06e943b6b17783dd21fe81cb2f914a7120f5349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24e4ce5d4b73b0959fca44a22e725efb91c407e1 + b06e943b6b17783dd21fe81cb2f914a7120f5349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24e4ce5d4b73b0959fca44a22e725efb91c407e1 + b06e943b6b17783dd21fe81cb2f914a7120f5349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24e4ce5d4b73b0959fca44a22e725efb91c407e1 + b06e943b6b17783dd21fe81cb2f914a7120f5349 diff --git a/eng/Versions.props b/eng/Versions.props index 33b4166e9..8edaa4367 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-rtm.23074.33 - 7.0.200-rtm.23074.33 + 7.0.200-rtm.23075.12 + 7.0.200-rtm.23075.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 534117727ba029772571b09ac6012956e605949b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 30 Jan 2023 21:51:09 +0000 Subject: [PATCH 281/654] Merged PR 29269: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230130.7 - **Date Produced**: January 30, 2023 9:04:37 PM UTC - **Commit**: fc6a47e3e33b91bd2690161465db7a6c4149d480 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.200 to 7.0.200][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.200-rtm.23075.12 to 7.0.200-rtm.23080.7][1] - **Microsoft.NET.Sdk**: [from 7.0.200-rtm.23075.12 to 7.0.200-rtm.23080.7][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.200-rtm.23075.12 to 7.0.200-rtm.23080.7][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.3 to 7.0.3][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] - **dotnet-dev-certs**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] - **dotnet-user-jwts**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] - **dotnet-user-secrets**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb06e943&targetVersion=GCfc6a47e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVers... --- NuGet.config | 13 +++++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index b6c0c5cd1..115e019e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,22 @@ - - + + - + + @@ -44,16 +45,16 @@ - - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22bc43324..2f02139c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b06e943b6b17783dd21fe81cb2f914a7120f5349 + fc6a47e3e33b91bd2690161465db7a6c4149d480 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b06e943b6b17783dd21fe81cb2f914a7120f5349 + fc6a47e3e33b91bd2690161465db7a6c4149d480 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b06e943b6b17783dd21fe81cb2f914a7120f5349 + fc6a47e3e33b91bd2690161465db7a6c4149d480 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b06e943b6b17783dd21fe81cb2f914a7120f5349 + fc6a47e3e33b91bd2690161465db7a6c4149d480 diff --git a/eng/Versions.props b/eng/Versions.props index 8edaa4367..a4a3322b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.3 7.0.3 - 7.0.3-servicing.23074.4 - 7.0.3-servicing.23074.4 - 7.0.3-servicing.23074.4 - 7.0.3-servicing.23074.4 - 7.0.3-servicing.23074.4 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 0.2.0 @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-rtm.23075.12 - 7.0.200-rtm.23075.12 + 7.0.200-rtm.23080.7 + 7.0.200-rtm.23080.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fd189af197de5b9d3811a5beb8cddabea66b8ffc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 14:22:53 -0800 Subject: [PATCH 282/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15304) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 8 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2d2b72a7..49dd18bf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - b3d3ae6773f6015c1b0713de52bb66d2152c3da9 + b14a7932d39d902facc5e7894cc08719cf96b5f4 - + https://github.com/dotnet/sdk - b3d3ae6773f6015c1b0713de52bb66d2152c3da9 + b14a7932d39d902facc5e7894cc08719cf96b5f4 - + https://github.com/dotnet/sdk - b3d3ae6773f6015c1b0713de52bb66d2152c3da9 + b14a7932d39d902facc5e7894cc08719cf96b5f4 - + https://github.com/dotnet/sdk - b3d3ae6773f6015c1b0713de52bb66d2152c3da9 + b14a7932d39d902facc5e7894cc08719cf96b5f4 @@ -124,34 +124,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 6ebe669cd147075a2e66699cf4e1b1a338f89fe5 + 710fe514a6944d2cfc385ec7ab4f43c6a1a74496 - + https://github.com/dotnet/fsharp - 6ebe669cd147075a2e66699cf4e1b1a338f89fe5 + 710fe514a6944d2cfc385ec7ab4f43c6a1a74496 - + https://github.com/microsoft/vstest - 5e9c3debd9d0007c53e7510ac030ea5e8fc483f4 + e4dc6da9be102b98cce874bccdd3641e1d0e558d - + https://github.com/dotnet/linker - 19fa656d35252ccf926e6a6d783b16a2f094aaef + de8bf14fcdfb55f2bae3db8cfc310ddd8ee921e6 linker - + https://github.com/dotnet/roslyn - 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 + f5987d2c4a3cc6d524e63fc851641545ad05af37 - + https://github.com/dotnet/msbuild - 98924b86bbc19aff3360f9cc3a2922df6a5c5d6a + 7bf511372af6bc80510e1ee6711661c2e0683fe0 diff --git a/eng/Versions.props b/eng/Versions.props index 47414d52b..b88f96c41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23068.2 - 7.0.300-preview.23068.2 - 7.0.300-preview.23068.2 + 7.0.300-preview.23101.7 + 7.0.300-preview.23101.7 + 7.0.300-preview.23101.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230117-02 + 17.6.0-preview-20230131-02 From 053418daf6d6d4a6613ff450bf9a6f9ea0ce281f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 16:39:41 -0800 Subject: [PATCH 283/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15396) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49dd18bf6..038a28308 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - b14a7932d39d902facc5e7894cc08719cf96b5f4 + 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f - + https://github.com/dotnet/sdk - b14a7932d39d902facc5e7894cc08719cf96b5f4 + 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f - + https://github.com/dotnet/sdk - b14a7932d39d902facc5e7894cc08719cf96b5f4 + 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f - + https://github.com/dotnet/sdk - b14a7932d39d902facc5e7894cc08719cf96b5f4 + 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 710fe514a6944d2cfc385ec7ab4f43c6a1a74496 + b4317096ea3aacdb48505744c9e371d5310464c2 - + https://github.com/dotnet/fsharp - 710fe514a6944d2cfc385ec7ab4f43c6a1a74496 + b4317096ea3aacdb48505744c9e371d5310464c2 @@ -149,9 +149,9 @@ f5987d2c4a3cc6d524e63fc851641545ad05af37 - + https://github.com/dotnet/msbuild - 7bf511372af6bc80510e1ee6711661c2e0683fe0 + 7cfb36cb90d1c9cc34bc4e0910d0c9ef42ee47b6 diff --git a/eng/Versions.props b/eng/Versions.props index b88f96c41..bfc8e4e2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23101.7 - 7.0.300-preview.23101.7 - 7.0.300-preview.23101.7 + 7.0.300-preview.23101.10 + 7.0.300-preview.23101.10 + 7.0.300-preview.23101.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8f3b1270b3c951beb723c7bc622e3f86ea775378 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Feb 2023 04:27:26 +0000 Subject: [PATCH 284/654] Update dependencies from https://github.com/dotnet/sdk build 20230201.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23101.10 -> To Version 7.0.300-preview.23101.17 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230131-02 -> To Version 17.6.0-preview-20230201-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 038a28308..fafb2bd78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f + e8d113abe7e4553e3960c3727d80b1df80225374 - + https://github.com/dotnet/sdk - 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f + e8d113abe7e4553e3960c3727d80b1df80225374 - + https://github.com/dotnet/sdk - 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f + e8d113abe7e4553e3960c3727d80b1df80225374 - + https://github.com/dotnet/sdk - 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f + e8d113abe7e4553e3960c3727d80b1df80225374 @@ -133,9 +133,9 @@ b4317096ea3aacdb48505744c9e371d5310464c2 - + https://github.com/microsoft/vstest - e4dc6da9be102b98cce874bccdd3641e1d0e558d + d978833419256dccf0167561dabf2fca4e837c16 diff --git a/eng/Versions.props b/eng/Versions.props index bfc8e4e2b..de8766a30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23101.10 - 7.0.300-preview.23101.10 - 7.0.300-preview.23101.10 + 7.0.300-preview.23101.17 + 7.0.300-preview.23101.17 + 7.0.300-preview.23101.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230131-02 + 17.6.0-preview-20230201-01 From 6390db54bd4abc46ada6b651d2dda0949db0009b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 Feb 2023 20:52:48 +0000 Subject: [PATCH 285/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15402) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230201-01 to 17.6.0-preview-20230202-01 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.6.0-1.23081.20 to 4.6.0-1.23101.17 (parent: Microsoft.NET.Sdk) - Remove backported source-build razor patch --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 8 +++---- ...-Exclude-Analyzers-from-source-build.patch | 23 ------------------ 3 files changed, 16 insertions(+), 39 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf836f9a2..97e1050a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e8d113abe7e4553e3960c3727d80b1df80225374 + 6af89373709c6763fed1870546876cbedecaaf6f - + https://github.com/dotnet/sdk - e8d113abe7e4553e3960c3727d80b1df80225374 + 6af89373709c6763fed1870546876cbedecaaf6f - + https://github.com/dotnet/sdk - e8d113abe7e4553e3960c3727d80b1df80225374 + 6af89373709c6763fed1870546876cbedecaaf6f - + https://github.com/dotnet/sdk - e8d113abe7e4553e3960c3727d80b1df80225374 + 6af89373709c6763fed1870546876cbedecaaf6f @@ -133,9 +133,9 @@ b4317096ea3aacdb48505744c9e371d5310464c2 - + https://github.com/microsoft/vstest - d978833419256dccf0167561dabf2fca4e837c16 + 7bfe4aaae404d53868bb2bdba1082b8a683aba01 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - f5987d2c4a3cc6d524e63fc851641545ad05af37 + 8da03f9cd0471db81cea9a5d7f7f92d3a746c6de diff --git a/eng/Versions.props b/eng/Versions.props index 68e4cf731..f1baa29d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23101.17 - 7.0.300-preview.23101.17 - 7.0.300-preview.23101.17 + 7.0.300-preview.23103.3 + 7.0.300-preview.23103.3 + 7.0.300-preview.23103.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230201-01 + 17.6.0-preview-20230202-01 diff --git a/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch b/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch deleted file mode 100644 index 071ca05da..000000000 --- a/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 16 Dec 2022 03:31:02 +0000 -Subject: [PATCH] Exclude Analyzers from source-build - -Backport: https://github.com/dotnet/razor/issues/8035 ---- - src/Compiler/Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Compiler/Directory.Build.props b/src/Compiler/Directory.Build.props -index e69a99bf3..f70902a08 100644 ---- a/src/Compiler/Directory.Build.props -+++ b/src/Compiler/Directory.Build.props -@@ -37,7 +37,7 @@ - $(WarningsNotAsErrors);xUnit1004 - - -- -+ - - - From 7347226d8065002ca9255d897f5f8ca460aea0cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 4 Feb 2023 00:32:29 +0000 Subject: [PATCH 286/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15424) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.5.0-beta.23101.1 to 12.5.0-beta.23103.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23101.1 to 7.0.300-beta.23103.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230202-01 to 17.6.0-preview-20230202-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97e1050a1..4c401821b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 6af89373709c6763fed1870546876cbedecaaf6f + 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe - + https://github.com/dotnet/sdk - 6af89373709c6763fed1870546876cbedecaaf6f + 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe - + https://github.com/dotnet/sdk - 6af89373709c6763fed1870546876cbedecaaf6f + 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe - + https://github.com/dotnet/sdk - 6af89373709c6763fed1870546876cbedecaaf6f + 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - b4317096ea3aacdb48505744c9e371d5310464c2 + 9c1fe2945415867ffb3f46e95bc42e26cb19ad03 - + https://github.com/dotnet/fsharp - b4317096ea3aacdb48505744c9e371d5310464c2 + 9c1fe2945415867ffb3f46e95bc42e26cb19ad03 - + https://github.com/microsoft/vstest - 7bfe4aaae404d53868bb2bdba1082b8a683aba01 + ef449ea49d874b6415c0244d775f5e3a2f4e941f diff --git a/eng/Versions.props b/eng/Versions.props index f1baa29d1..14f4ae2b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23103.3 - 7.0.300-preview.23103.3 - 7.0.300-preview.23103.3 + 7.0.300-preview.23103.9 + 7.0.300-preview.23103.9 + 7.0.300-preview.23103.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230202-01 + 17.6.0-preview-20230202-02 From b95f3d5a4c79bb7b86d490617d5bf83e5d3d6417 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Feb 2023 00:46:42 +0000 Subject: [PATCH 287/654] Update dependencies from https://github.com/dotnet/sdk build 20230203.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23103.9 -> To Version 7.0.300-preview.23103.12 --- 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 4c401821b..594b49b6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe + 734a7183e243edcf541868dff92114fce56626cf - + https://github.com/dotnet/sdk - 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe + 734a7183e243edcf541868dff92114fce56626cf - + https://github.com/dotnet/sdk - 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe + 734a7183e243edcf541868dff92114fce56626cf - + https://github.com/dotnet/sdk - 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe + 734a7183e243edcf541868dff92114fce56626cf diff --git a/eng/Versions.props b/eng/Versions.props index 14f4ae2b3..583ab58b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23103.9 - 7.0.300-preview.23103.9 - 7.0.300-preview.23103.9 + 7.0.300-preview.23103.12 + 7.0.300-preview.23103.12 + 7.0.300-preview.23103.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26228c01f3dace6db008cf5625a8a0640d059411 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Feb 2023 02:02:40 +0000 Subject: [PATCH 288/654] Update dependencies from https://github.com/dotnet/sdk build 20230203.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23103.9 -> To Version 7.0.300-preview.23103.15 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23103.1 -> To Version 12.5.0-beta.23103.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 594b49b6e..c882a116b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 734a7183e243edcf541868dff92114fce56626cf + 23cb0983a8605b03c3ce8fd9a5121bd9391340cf - + https://github.com/dotnet/sdk - 734a7183e243edcf541868dff92114fce56626cf + 23cb0983a8605b03c3ce8fd9a5121bd9391340cf - + https://github.com/dotnet/sdk - 734a7183e243edcf541868dff92114fce56626cf + 23cb0983a8605b03c3ce8fd9a5121bd9391340cf - + https://github.com/dotnet/sdk - 734a7183e243edcf541868dff92114fce56626cf + 23cb0983a8605b03c3ce8fd9a5121bd9391340cf @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 9c1fe2945415867ffb3f46e95bc42e26cb19ad03 + e2af231f075c132622780054de5ce204389683bf - + https://github.com/dotnet/fsharp - 9c1fe2945415867ffb3f46e95bc42e26cb19ad03 + e2af231f075c132622780054de5ce204389683bf diff --git a/eng/Versions.props b/eng/Versions.props index 583ab58b4..8c3d3b009 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23103.12 - 7.0.300-preview.23103.12 - 7.0.300-preview.23103.12 + 7.0.300-preview.23103.15 + 7.0.300-preview.23103.15 + 7.0.300-preview.23103.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a59bd1152439130e31a82d641bad68e853b03d78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Feb 2023 07:05:45 +0000 Subject: [PATCH 289/654] Update dependencies from https://github.com/dotnet/sdk build 20230205.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23103.15 -> To Version 7.0.300-preview.23105.8 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23101-01 -> To Version 17.6.0-preview-23106-07 (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 c882a116b..1e40be1d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 23cb0983a8605b03c3ce8fd9a5121bd9391340cf + 65bc72a3420b9e72f8555dc7ecdba874671e9718 - + https://github.com/dotnet/sdk - 23cb0983a8605b03c3ce8fd9a5121bd9391340cf + 65bc72a3420b9e72f8555dc7ecdba874671e9718 - + https://github.com/dotnet/sdk - 23cb0983a8605b03c3ce8fd9a5121bd9391340cf + 65bc72a3420b9e72f8555dc7ecdba874671e9718 - + https://github.com/dotnet/sdk - 23cb0983a8605b03c3ce8fd9a5121bd9391340cf + 65bc72a3420b9e72f8555dc7ecdba874671e9718 @@ -149,9 +149,9 @@ 8da03f9cd0471db81cea9a5d7f7f92d3a746c6de - + https://github.com/dotnet/msbuild - 7cfb36cb90d1c9cc34bc4e0910d0c9ef42ee47b6 + fc3ab4c5e2a486abb8fc66aede7ec8e3eb91fe08 diff --git a/eng/Versions.props b/eng/Versions.props index 8c3d3b009..a512716ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23103.15 - 7.0.300-preview.23103.15 - 7.0.300-preview.23103.15 + 7.0.300-preview.23105.8 + 7.0.300-preview.23105.8 + 7.0.300-preview.23105.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3872153fa4c777aee93feb76ce6f332fd27fcdf8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Feb 2023 07:00:39 +0000 Subject: [PATCH 290/654] Update dependencies from https://github.com/dotnet/sdk build 20230206.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23105.8 -> To Version 7.0.300-preview.23106.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.23103.4 -> To Version 12.5.0-beta.23106.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e40be1d4..71cf64cde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 65bc72a3420b9e72f8555dc7ecdba874671e9718 + 117ad74602515b7dd022baf75482ef7988533a92 - + https://github.com/dotnet/sdk - 65bc72a3420b9e72f8555dc7ecdba874671e9718 + 117ad74602515b7dd022baf75482ef7988533a92 - + https://github.com/dotnet/sdk - 65bc72a3420b9e72f8555dc7ecdba874671e9718 + 117ad74602515b7dd022baf75482ef7988533a92 - + https://github.com/dotnet/sdk - 65bc72a3420b9e72f8555dc7ecdba874671e9718 + 117ad74602515b7dd022baf75482ef7988533a92 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - e2af231f075c132622780054de5ce204389683bf + 6e280448367a288c6d28d9c0a446302c4fb90e3f - + https://github.com/dotnet/fsharp - e2af231f075c132622780054de5ce204389683bf + 6e280448367a288c6d28d9c0a446302c4fb90e3f @@ -149,9 +149,9 @@ 8da03f9cd0471db81cea9a5d7f7f92d3a746c6de - + https://github.com/dotnet/msbuild - fc3ab4c5e2a486abb8fc66aede7ec8e3eb91fe08 + 76215a05cd2f3853ceb59e7de473fa85c088abe0 diff --git a/eng/Versions.props b/eng/Versions.props index a512716ee..58373d554 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23105.8 - 7.0.300-preview.23105.8 - 7.0.300-preview.23105.8 + 7.0.300-preview.23106.10 + 7.0.300-preview.23106.10 + 7.0.300-preview.23106.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 33ef3b27ee7a70e3ca8b0dbf63111ad6c2d36793 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 7 Feb 2023 15:01:58 -0800 Subject: [PATCH 291/654] Update branding to 7.0.201 (#15465) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4b1d59f38..6ffd9de52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 2 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm From 816bb6d5222c51356edd1b3fac356e718b3b048f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 23:02:32 +0000 Subject: [PATCH 292/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15466) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230202-02 to 17.6.0-preview-20230206-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71cf64cde..be71cf123 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 117ad74602515b7dd022baf75482ef7988533a92 + a2d2cc3d585211cfaf1b0b7cfd675ca22765615b - + https://github.com/dotnet/sdk - 117ad74602515b7dd022baf75482ef7988533a92 + a2d2cc3d585211cfaf1b0b7cfd675ca22765615b - + https://github.com/dotnet/sdk - 117ad74602515b7dd022baf75482ef7988533a92 + a2d2cc3d585211cfaf1b0b7cfd675ca22765615b - + https://github.com/dotnet/sdk - 117ad74602515b7dd022baf75482ef7988533a92 + a2d2cc3d585211cfaf1b0b7cfd675ca22765615b @@ -133,9 +133,9 @@ 6e280448367a288c6d28d9c0a446302c4fb90e3f - + https://github.com/microsoft/vstest - ef449ea49d874b6415c0244d775f5e3a2f4e941f + 85d67695a7a01397501216d54eec979d7d296bdb diff --git a/eng/Versions.props b/eng/Versions.props index 58373d554..01aa61a23 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23106.10 - 7.0.300-preview.23106.10 - 7.0.300-preview.23106.10 + 7.0.300-preview.23107.7 + 7.0.300-preview.23107.7 + 7.0.300-preview.23107.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230202-02 + 17.6.0-preview-20230206-01 From f1da1277032f4d5321087a1dc7e357d6ae22b35d Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 8 Feb 2023 00:16:13 +0100 Subject: [PATCH 293/654] [automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15322) Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Jason Zhai --- eng/Versions.props | 1 + .../job/source-build-build-tarball.yml | 29 +++++++++++++++++++ .../job/source-build-run-tarball-build.yml | 14 +++++++++ .../pipelines/security-partners-dotnet.yml | 1 + .../source-build-reference-packages.proj | 2 -- 5 files changed, 45 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6ffd9de52..2e5be79b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,6 +193,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> + 7.0.102 7.0.102-4 diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 9ae170d1c..9e67adb4d 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -101,6 +101,35 @@ jobs: Contents: '*.tar.gz' TargetFolder: $(tarballDir)/packages/archive/ + - script: | + set -euo pipefail + + sourceBuiltSDKUrl="https://dotnetcli.azureedge.net/source-built-artifacts/sdks/" + packageVersionsPath="$(Build.SourcesDirectory)/eng/Versions.props" + notFoundMessage="No source-built SDK found to download..." + + echo "Looking for source-built SDK to download..." + archiveVersionLine=`grep -m 1 "" "$packageVersionsPath" || :` + versionPattern="(.*)" + + if [[ $archiveVersionLine =~ $versionPattern ]]; then + filename="dotnet-sdk-${BASH_REMATCH[1]}-centos.8-x64.tar.gz" + archiveUrl="${sourceBuiltSDKUrl}${filename}" + downloadDir=$(mktemp -d) + (cd $downloadDir && curl --retry 5 -O $archiveUrl) + + mkdir $(tarballDir)/.dotnet + tar -xzf $downloadDir/$filename -C $(tarballDir)/.dotnet + rm -rf $downloadDir + else + echo "$notFoundMessage" + exit 1 + fi + + echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /tarball/.dotnet" + displayName: Setup Previously Source-Built SDK + condition: eq(variables._WithPreviousSDK, 'true') + - script: | set -x 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 5459e8415..efa1ff1af 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 @@ -41,31 +41,43 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: true + _WithPreviousSDK: false CentOSStream8-Offline: _BootstrapPrep: true _Container: ${{ parameters.centOSStream8Container }} _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: false + _WithPreviousSDK: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + CentOSStream8-WithPreviousSDK: + _BootstrapPrep: false + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: true CentOSStream9-Offline: _BootstrapPrep: true _Container: ${{ parameters.centOSStream9Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false Fedora36-Offline: _BootstrapPrep: true _Container: ${{ parameters.fedora36Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false Ubuntu2004-Offline: _BootstrapPrep: true _Container: ${{ parameters.ubuntu2004Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false name: Build_Tarball_x64 pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: @@ -89,6 +101,7 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false name: Build_Tarball_arm64 pool: ${{ parameters.poolInternalArm64 }} @@ -109,6 +122,7 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false name: Build_Tarball_x64_Using_Previous pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 69bef21e9..6200e7fc0 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -12,6 +12,7 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false name: Build_Tarball_x64 pool: name: NetCore1ESPool-Svc-Internal diff --git a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj index 9f7c3853c..c1321e716 100644 --- a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj +++ b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj @@ -16,8 +16,6 @@ true - - NU1504 From dd369ac6b6e107a85d554f97fa593461426b647e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 00:28:31 +0000 Subject: [PATCH 294/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15471) [release/7.0.3xx] Update dependencies from dotnet/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 be71cf123..498291bb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - a2d2cc3d585211cfaf1b0b7cfd675ca22765615b + 9b4e136ddc4b14e7bd577c8bd7ab086ec1927102 - + https://github.com/dotnet/sdk - a2d2cc3d585211cfaf1b0b7cfd675ca22765615b + 9b4e136ddc4b14e7bd577c8bd7ab086ec1927102 - + https://github.com/dotnet/sdk - a2d2cc3d585211cfaf1b0b7cfd675ca22765615b + 9b4e136ddc4b14e7bd577c8bd7ab086ec1927102 - + https://github.com/dotnet/sdk - a2d2cc3d585211cfaf1b0b7cfd675ca22765615b + 9b4e136ddc4b14e7bd577c8bd7ab086ec1927102 diff --git a/eng/Versions.props b/eng/Versions.props index 01aa61a23..ac89944d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23107.7 - 7.0.300-preview.23107.7 - 7.0.300-preview.23107.7 + 7.0.300-preview.23107.13 + 7.0.300-preview.23107.13 + 7.0.300-preview.23107.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 260025f7e0943c4eaa16117af2d1afc7823cc772 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Feb 2023 00:35:11 +0000 Subject: [PATCH 295/654] Update dependencies from https://github.com/dotnet/sdk build 20230207.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23107.13 -> To Version 7.0.300-preview.23107.21 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23107-01 -> To Version 17.6.0-preview-23107-03 (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 498291bb7..75ad95997 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 9b4e136ddc4b14e7bd577c8bd7ab086ec1927102 + 13c5e1052eb7c9a8cd073a28a6bfd53c80fbf03d - + https://github.com/dotnet/sdk - 9b4e136ddc4b14e7bd577c8bd7ab086ec1927102 + 13c5e1052eb7c9a8cd073a28a6bfd53c80fbf03d - + https://github.com/dotnet/sdk - 9b4e136ddc4b14e7bd577c8bd7ab086ec1927102 + 13c5e1052eb7c9a8cd073a28a6bfd53c80fbf03d - + https://github.com/dotnet/sdk - 9b4e136ddc4b14e7bd577c8bd7ab086ec1927102 + 13c5e1052eb7c9a8cd073a28a6bfd53c80fbf03d @@ -149,9 +149,9 @@ 8da03f9cd0471db81cea9a5d7f7f92d3a746c6de - + https://github.com/dotnet/msbuild - 76215a05cd2f3853ceb59e7de473fa85c088abe0 + 446f42e6d1478acb44faec787f90f57f38c08b73 diff --git a/eng/Versions.props b/eng/Versions.props index ac89944d5..f4fae20ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23107.13 - 7.0.300-preview.23107.13 - 7.0.300-preview.23107.13 + 7.0.300-preview.23107.21 + 7.0.300-preview.23107.21 + 7.0.300-preview.23107.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4cddd8d072dd77b0206fe53c4ba58a46877b7bc8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Feb 2023 02:56:26 +0000 Subject: [PATCH 296/654] Update dependencies from https://github.com/dotnet/sdk build 20230207.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23107.13 -> To Version 7.0.300-preview.23107.31 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23107-01 -> To Version 17.6.0-preview-23107-03 (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 75ad95997..f9d984655 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 13c5e1052eb7c9a8cd073a28a6bfd53c80fbf03d + 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 - + https://github.com/dotnet/sdk - 13c5e1052eb7c9a8cd073a28a6bfd53c80fbf03d + 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 - + https://github.com/dotnet/sdk - 13c5e1052eb7c9a8cd073a28a6bfd53c80fbf03d + 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 - + https://github.com/dotnet/sdk - 13c5e1052eb7c9a8cd073a28a6bfd53c80fbf03d + 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 diff --git a/eng/Versions.props b/eng/Versions.props index f4fae20ba..1c824753c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23107.21 - 7.0.300-preview.23107.21 - 7.0.300-preview.23107.21 + 7.0.300-preview.23107.31 + 7.0.300-preview.23107.31 + 7.0.300-preview.23107.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a50f7c19b3add0d0474774654604cae8ba609bdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Feb 2023 07:08:12 +0000 Subject: [PATCH 297/654] Update dependencies from https://github.com/dotnet/sdk build 20230207.47 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23107.31 -> To Version 7.0.300-preview.23107.47 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23107-03 -> To Version 17.6.0-preview-23108-01 (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 f9d984655..beeca8362 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 + ad096f173ce6922b9217bb277e74a36a4d3730be - + https://github.com/dotnet/sdk - 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 + ad096f173ce6922b9217bb277e74a36a4d3730be - + https://github.com/dotnet/sdk - 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 + ad096f173ce6922b9217bb277e74a36a4d3730be - + https://github.com/dotnet/sdk - 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 + ad096f173ce6922b9217bb277e74a36a4d3730be @@ -149,9 +149,9 @@ 8da03f9cd0471db81cea9a5d7f7f92d3a746c6de - + https://github.com/dotnet/msbuild - 446f42e6d1478acb44faec787f90f57f38c08b73 + c3541c6a284e10eacd615e2f9568c9f484a0b417 diff --git a/eng/Versions.props b/eng/Versions.props index 1c824753c..e88bf449f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23107.31 - 7.0.300-preview.23107.31 - 7.0.300-preview.23107.31 + 7.0.300-preview.23107.47 + 7.0.300-preview.23107.47 + 7.0.300-preview.23107.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b26aedc19d5c3f002c16ce0e875124b5b782e8bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Feb 2023 00:19:49 +0000 Subject: [PATCH 298/654] Update dependencies from https://github.com/dotnet/sdk build 20230208.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23107.47 -> To Version 7.0.300-preview.23108.34 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23106.7 -> To Version 12.5.0-beta.23108.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 8 ++++---- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index beeca8362..0165258b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ad096f173ce6922b9217bb277e74a36a4d3730be + 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 - + https://github.com/dotnet/sdk - ad096f173ce6922b9217bb277e74a36a4d3730be + 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 - + https://github.com/dotnet/sdk - ad096f173ce6922b9217bb277e74a36a4d3730be + 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 - + https://github.com/dotnet/sdk - ad096f173ce6922b9217bb277e74a36a4d3730be + 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 6e280448367a288c6d28d9c0a446302c4fb90e3f + 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa - + https://github.com/dotnet/fsharp - 6e280448367a288c6d28d9c0a446302c4fb90e3f + 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa - + https://github.com/microsoft/vstest - 85d67695a7a01397501216d54eec979d7d296bdb + f119868280da3cea22db8e6f85d24252f605db4c @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 8da03f9cd0471db81cea9a5d7f7f92d3a746c6de + 50bd09a9eefdf9bc3653dbf6d9624b31a023c7c0 - + https://github.com/dotnet/msbuild - c3541c6a284e10eacd615e2f9568c9f484a0b417 + 51df47643a8ee2715ac67fab8d652b25be070cd2 diff --git a/eng/Versions.props b/eng/Versions.props index e88bf449f..27dbee468 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23107.47 - 7.0.300-preview.23107.47 - 7.0.300-preview.23107.47 + 7.0.300-preview.23108.34 + 7.0.300-preview.23108.34 + 7.0.300-preview.23108.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230206-01 + 17.6.0-preview-20230208-02 From 0d4b7ea4959f2392c3c014da135456bd693b818c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 02:13:09 +0000 Subject: [PATCH 299/654] [release/7.0.3xx] Update dependencies from dotnet/arcade (#15486) [release/7.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++-- eng/Versions.props | 2 +- eng/common/generate-locproject.ps1 | 48 ++++++++++++++- eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 0 -> 3810 bytes eng/common/templates/job/execute-sdl.yml | 3 +- eng/common/templates/job/onelocbuild.yml | 43 +++++++------ .../templates/job/publish-build-assets.yml | 14 ++++- eng/common/templates/job/source-build.yml | 7 ++- .../templates/job/source-index-stage1.yml | 5 +- eng/common/templates/jobs/jobs.yml | 9 --- .../templates/post-build/post-build.yml | 12 ++-- .../templates/variables/pool-providers.yml | 57 ++++++++++++++++++ global.json | 4 +- 13 files changed, 163 insertions(+), 53 deletions(-) create mode 100644 eng/common/loc/P22DotNetHtmlLocalization.lss create mode 100644 eng/common/templates/variables/pool-providers.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0165258b0..10217eb14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 5f8519337c864af63b8692754ca0fa971bfc55d4 + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 - + https://github.com/dotnet/arcade - 5f8519337c864af63b8692754ca0fa971bfc55d4 + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 - + https://github.com/dotnet/arcade - 5f8519337c864af63b8692754ca0fa971bfc55d4 + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 27dbee468..5464d7f6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23073.6 + 7.0.0-beta.23108.1 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index bab18543d..bcb579e37 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object { $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern $wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them +if (-not $wxlFiles) { + $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files + if ($wxlEnFiles) { + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } + } +} + +$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files +$macosHtmlFiles = @() +if ($macosHtmlEnFiles) { + $macosHtmlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } +} $xlfFiles = @() @@ -91,6 +110,7 @@ $locJson = @{ ) }, @{ + LanguageSet = $LanguageSet CloneLanguageSet = "WiX_CloneLanguages" LssFiles = @( "wxl_loc.lss" ) LocItems = @( @@ -98,8 +118,7 @@ $locJson = @{ $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) - { + if ($_.FullName.Contains($exclusion)) { $continue = $false } } @@ -110,7 +129,30 @@ $locJson = @{ SourceFile = $sourceFile CopyOption = "LangIDOnPath" OutputPath = $outputPath - Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW" + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "VS_macOS_CloneLanguages" + LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" ) + LocItems = @( + $macosHtmlFiles | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath } } } diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss new file mode 100644 index 0000000000000000000000000000000000000000..6661fed566e49b0c206665bc21f135e06c9b89c4 GIT binary patch literal 3810 zcmd^CT~8BH5S?ce|HG9Bo&v?0;P_m6l= znU-wb=}VLT7UH{>{5H;0M4iLmRE8QeBRr|>&k=uV*L;heKY+dq>B$0^=0I}|x`)s{ zht4t9zaiEh5Fe>E-;zVT;c4G?v;9N0G=rWwo~*(Cs`OS6ZL`HL;vsL0J@I%$+0YvE zx{9ukK|FtFx1PlPD5M;6ZM>f;1BhCf?`8y6QH*?RT9T>XwF z#~m_N+i^UKE^j{e;KdNW`kH9Rbj{G8tDY}mafCgG+m3H`I@_PhrDmcIzxD&IX@s083kV|lLUE^0(h6wWRPN0QN1n^PU5eX8r6OZ*s^g)tt77#SZCB}znxye#U$Dtinr6lnVu z!LzA{A}0~no7p$thFGJAnI}oSW||9H=Bz}I7kD#2MLg7WfrlE5o9sQjePc>qmv+6iQCmdp(y}(Vr literal 0 HcmV?d00001 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index aaeb83b4d..7c164ac02 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -46,6 +46,7 @@ jobs: - template: /eng/common/templates/variables/sdl-variables.yml - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + - template: /eng/common/templates/variables/pool-providers.yml pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: @@ -53,7 +54,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 6b8fc9970..60ab00c4d 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -14,6 +14,7 @@ parameters: ReusePr: true UseLfLineEndings: true UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false LanguageSet: VS_Main_Languages LclSource: lclFilesInRepo LclPackageId: '' @@ -22,13 +23,25 @@ parameters: MirrorRepo: '' MirrorBranch: main condition: '' + JobNameSuffix: '' jobs: -- job: OneLocBuild +- job: OneLocBuild${{ parameters.JobNameSuffix }} dependsOn: ${{ parameters.dependsOn }} - displayName: OneLocBuild + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} @@ -40,27 +53,17 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 - variables: - - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat - - name: _GenerateLocProjectArguments - value: -SourcesDirectory ${{ parameters.SourcesDirectory }} - -LanguageSet "${{ parameters.LanguageSet }}" - -CreateNeutralXlfs - - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: - - name: _GenerateLocProjectArguments - value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson - - steps: - - task: Powershell@2 - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 - arguments: $(_GenerateLocProjectArguments) - displayName: Generate LocProject.json - condition: ${{ parameters.condition }} + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} - task: OneLocBuild@2 displayName: OneLocBuild diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 1cbb6a0c5..c5fedd7f7 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -34,15 +34,15 @@ jobs: - job: Asset_Registry_Publish dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: displayName: Publish Assets ${{ else }}: displayName: Publish to Build Asset Registry - pool: ${{ parameters.pool }} - variables: + - template: /eng/common/templates/variables/pool-providers.yml - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats @@ -51,6 +51,16 @@ jobs: - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - template: /eng/common/templates/post-build/common-variables.yml + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64 + steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: DownloadBuildArtifacts@0 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index b6137f44a..8a3deef2b 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -44,13 +44,16 @@ jobs: ${{ if eq(parameters.platform.pool, '') }}: # The default VM host AzDO pool. This should be capable of running Docker containers: almost all # source-build builds run in Docker, including the default managed platform. + # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 59a42c338..09c506d11 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -22,16 +22,17 @@ jobs: value: ${{ parameters.binlogPath }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: source-dot-net stage1 variables + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} ${{ if eq(parameters.pool, '') }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 297e7946b..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -88,15 +88,6 @@ jobs: - ${{ job.job }} - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 957375c1c..c051f1b65 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -95,6 +95,7 @@ stages: displayName: Validate Build Assets variables: - template: common-variables.yml + - template: /eng/common/templates/variables/pool-providers.yml jobs: - job: displayName: NuGet Validation @@ -106,7 +107,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -143,7 +144,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -203,7 +204,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -251,6 +252,7 @@ stages: displayName: Publish using Darc variables: - template: common-variables.yml + - template: /eng/common/templates/variables/pool-providers.yml jobs: - job: displayName: Publish Using Darc @@ -262,7 +264,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -282,4 +284,4 @@ stages: -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml new file mode 100644 index 000000000..99c80212b --- /dev/null +++ b/eng/common/templates/variables/pool-providers.yml @@ -0,0 +1,57 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS) +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage these can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) and $ (DncEngPublicBuildPool), e.g.: +# +# pool: +# name: $(DncEngInternalBuildPool) +# demands: ImageOverride -equals windows.vs2019.amd64 + +variables: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + - name: DncEngPublicBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore-Svc-Public' + ), + False, + 'NetCore-Public' + ) + ] + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/global.json b/global.json index 0d15a2c1f..40e2f263c 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.23073.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23073.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23108.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23108.1" } } From cec8d235e1de0a050a59e291c35f785121e82b00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Feb 2023 04:30:26 +0000 Subject: [PATCH 300/654] Update dependencies from https://github.com/dotnet/sdk build 20230208.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23108.34 -> To Version 7.0.300-preview.23108.40 --- 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 10217eb14..c20033102 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 + 31945c5e5c1e85e289efd3d222fd9f76b42a3293 - + https://github.com/dotnet/sdk - 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 + 31945c5e5c1e85e289efd3d222fd9f76b42a3293 - + https://github.com/dotnet/sdk - 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 + 31945c5e5c1e85e289efd3d222fd9f76b42a3293 - + https://github.com/dotnet/sdk - 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 + 31945c5e5c1e85e289efd3d222fd9f76b42a3293 diff --git a/eng/Versions.props b/eng/Versions.props index 5464d7f6a..398caf899 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23108.34 - 7.0.300-preview.23108.34 - 7.0.300-preview.23108.34 + 7.0.300-preview.23108.40 + 7.0.300-preview.23108.40 + 7.0.300-preview.23108.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 83d785ccfb755e51b3dfb9b388ea46dc47020a12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 13:35:31 -0800 Subject: [PATCH 301/654] [release/7.0.2xx] Update dependencies from dotnet/arcade (#15332) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- eng/Version.Details.xml | 96 +++++++++--------- eng/Versions.props | 44 ++++---- eng/common/generate-locproject.ps1 | 48 ++++++++- eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 0 -> 3810 bytes eng/common/templates/job/execute-sdl.yml | 3 +- eng/common/templates/job/onelocbuild.yml | 43 ++++---- .../templates/job/publish-build-assets.yml | 14 ++- eng/common/templates/job/source-build.yml | 7 +- .../templates/job/source-index-stage1.yml | 5 +- eng/common/templates/jobs/jobs.yml | 9 -- .../templates/post-build/post-build.yml | 12 ++- .../templates/variables/pool-providers.yml | 57 +++++++++++ global.json | 4 +- 13 files changed, 226 insertions(+), 116 deletions(-) create mode 100644 eng/common/loc/P22DotNetHtmlLocalization.lss create mode 100644 eng/common/templates/variables/pool-providers.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4901444ee..9d76a5c04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 https://github.com/dotnet/test-templates @@ -116,13 +116,13 @@ 9acbc4db3fa18e9839189580622be7258f81c9d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b06c27c9b81f33e69f8d5155fe69693f661fa3d + e83409daa530605da4eb5f847c6740a520325d25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - df04c57b2e2bb986f0afc2384cbebb3c950447b5 + 636e2b7a00a434a354a126f510a56e16ce3c6bbc https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - d71ea7cbed84152a921c7b7b4b4439c306bf9130 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 - + https://github.com/dotnet/emsdk - d71ea7cbed84152a921c7b7b4b4439c306bf9130 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 https://github.com/dotnet/deployment-tools @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2e5be79b4..a1d3aaff8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,15 +27,15 @@ - 7.0.0-beta.23060.4 + 7.0.0-beta.23108.1 - 7.0.2-servicing.22606.8 + 7.0.0-rtm.22518.7 - 7.0.2-servicing.22606.2 + 7.0.0-rtm.22518.2 @@ -50,13 +50,13 @@ - 7.0.2 - 7.0.2 - 7.0.2-servicing.22606.6 - 7.0.2-servicing.22606.6 - 7.0.2-servicing.22606.6 - 7.0.2-servicing.22606.6 - 7.0.2-servicing.22606.6 + 7.0.0 + 7.0.0 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 0.2.0 @@ -76,20 +76,20 @@ - 7.0.2-servicing.22606.5 - 7.0.2-servicing.22606.5 - 7.0.2 - 7.0.2 - 7.0.2 - 7.0.2 + 7.0.0-rtm.22518.5 + 7.0.0-rtm.22518.5 + 7.0.0 + 7.0.0 + 7.0.0 + 7.0.0 2.1.0 - 7.0.2-servicing.22607.1 - 7.0.2-servicing.22607.1 - 7.0.2 - 7.0.2 + 7.0.0-rtm.22519.1 + 7.0.0-rtm.22519.1 + 7.0.0 + 7.0.0 @@ -206,8 +206,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.2 - 7.0.2 + 7.0.0 + 7.0.0 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index bab18543d..bcb579e37 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object { $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern $wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them +if (-not $wxlFiles) { + $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files + if ($wxlEnFiles) { + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } + } +} + +$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files +$macosHtmlFiles = @() +if ($macosHtmlEnFiles) { + $macosHtmlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } +} $xlfFiles = @() @@ -91,6 +110,7 @@ $locJson = @{ ) }, @{ + LanguageSet = $LanguageSet CloneLanguageSet = "WiX_CloneLanguages" LssFiles = @( "wxl_loc.lss" ) LocItems = @( @@ -98,8 +118,7 @@ $locJson = @{ $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) - { + if ($_.FullName.Contains($exclusion)) { $continue = $false } } @@ -110,7 +129,30 @@ $locJson = @{ SourceFile = $sourceFile CopyOption = "LangIDOnPath" OutputPath = $outputPath - Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW" + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "VS_macOS_CloneLanguages" + LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" ) + LocItems = @( + $macosHtmlFiles | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath } } } diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss new file mode 100644 index 0000000000000000000000000000000000000000..6661fed566e49b0c206665bc21f135e06c9b89c4 GIT binary patch literal 3810 zcmd^CT~8BH5S?ce|HG9Bo&v?0;P_m6l= znU-wb=}VLT7UH{>{5H;0M4iLmRE8QeBRr|>&k=uV*L;heKY+dq>B$0^=0I}|x`)s{ zht4t9zaiEh5Fe>E-;zVT;c4G?v;9N0G=rWwo~*(Cs`OS6ZL`HL;vsL0J@I%$+0YvE zx{9ukK|FtFx1PlPD5M;6ZM>f;1BhCf?`8y6QH*?RT9T>XwF z#~m_N+i^UKE^j{e;KdNW`kH9Rbj{G8tDY}mafCgG+m3H`I@_PhrDmcIzxD&IX@s083kV|lLUE^0(h6wWRPN0QN1n^PU5eX8r6OZ*s^g)tt77#SZCB}znxye#U$Dtinr6lnVu z!LzA{A}0~no7p$thFGJAnI}oSW||9H=Bz}I7kD#2MLg7WfrlE5o9sQjePc>qmv+6iQCmdp(y}(Vr literal 0 HcmV?d00001 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index aaeb83b4d..7c164ac02 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -46,6 +46,7 @@ jobs: - template: /eng/common/templates/variables/sdl-variables.yml - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + - template: /eng/common/templates/variables/pool-providers.yml pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: @@ -53,7 +54,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 6b8fc9970..60ab00c4d 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -14,6 +14,7 @@ parameters: ReusePr: true UseLfLineEndings: true UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false LanguageSet: VS_Main_Languages LclSource: lclFilesInRepo LclPackageId: '' @@ -22,13 +23,25 @@ parameters: MirrorRepo: '' MirrorBranch: main condition: '' + JobNameSuffix: '' jobs: -- job: OneLocBuild +- job: OneLocBuild${{ parameters.JobNameSuffix }} dependsOn: ${{ parameters.dependsOn }} - displayName: OneLocBuild + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} @@ -40,27 +53,17 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 - variables: - - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat - - name: _GenerateLocProjectArguments - value: -SourcesDirectory ${{ parameters.SourcesDirectory }} - -LanguageSet "${{ parameters.LanguageSet }}" - -CreateNeutralXlfs - - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: - - name: _GenerateLocProjectArguments - value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson - - steps: - - task: Powershell@2 - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 - arguments: $(_GenerateLocProjectArguments) - displayName: Generate LocProject.json - condition: ${{ parameters.condition }} + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} - task: OneLocBuild@2 displayName: OneLocBuild diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 1cbb6a0c5..c5fedd7f7 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -34,15 +34,15 @@ jobs: - job: Asset_Registry_Publish dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: displayName: Publish Assets ${{ else }}: displayName: Publish to Build Asset Registry - pool: ${{ parameters.pool }} - variables: + - template: /eng/common/templates/variables/pool-providers.yml - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats @@ -51,6 +51,16 @@ jobs: - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - template: /eng/common/templates/post-build/common-variables.yml + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64 + steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: DownloadBuildArtifacts@0 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index b6137f44a..8a3deef2b 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -44,13 +44,16 @@ jobs: ${{ if eq(parameters.platform.pool, '') }}: # The default VM host AzDO pool. This should be capable of running Docker containers: almost all # source-build builds run in Docker, including the default managed platform. + # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 59a42c338..09c506d11 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -22,16 +22,17 @@ jobs: value: ${{ parameters.binlogPath }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: source-dot-net stage1 variables + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} ${{ if eq(parameters.pool, '') }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 297e7946b..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -88,15 +88,6 @@ jobs: - ${{ job.job }} - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 957375c1c..c051f1b65 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -95,6 +95,7 @@ stages: displayName: Validate Build Assets variables: - template: common-variables.yml + - template: /eng/common/templates/variables/pool-providers.yml jobs: - job: displayName: NuGet Validation @@ -106,7 +107,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -143,7 +144,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -203,7 +204,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -251,6 +252,7 @@ stages: displayName: Publish using Darc variables: - template: common-variables.yml + - template: /eng/common/templates/variables/pool-providers.yml jobs: - job: displayName: Publish Using Darc @@ -262,7 +264,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -282,4 +284,4 @@ stages: -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml new file mode 100644 index 000000000..99c80212b --- /dev/null +++ b/eng/common/templates/variables/pool-providers.yml @@ -0,0 +1,57 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS) +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage these can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) and $ (DncEngPublicBuildPool), e.g.: +# +# pool: +# name: $(DncEngInternalBuildPool) +# demands: ImageOverride -equals windows.vs2019.amd64 + +variables: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + - name: DncEngPublicBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore-Svc-Public' + ), + False, + 'NetCore-Public' + ) + ] + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/global.json b/global.json index c4142c606..40e2f263c 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.23060.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23060.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23108.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23108.1" } } From 2b9f6c2591531d9ea4771a5f3795660d48e18ae2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 14:14:25 -0800 Subject: [PATCH 302/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15502) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c20033102..a127c62c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 31945c5e5c1e85e289efd3d222fd9f76b42a3293 + f42306939dc8f93312e5d9ab8718d64d0536e6a7 - + https://github.com/dotnet/sdk - 31945c5e5c1e85e289efd3d222fd9f76b42a3293 + f42306939dc8f93312e5d9ab8718d64d0536e6a7 - + https://github.com/dotnet/sdk - 31945c5e5c1e85e289efd3d222fd9f76b42a3293 + f42306939dc8f93312e5d9ab8718d64d0536e6a7 - + https://github.com/dotnet/sdk - 31945c5e5c1e85e289efd3d222fd9f76b42a3293 + f42306939dc8f93312e5d9ab8718d64d0536e6a7 @@ -133,9 +133,9 @@ 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa - + https://github.com/microsoft/vstest - f119868280da3cea22db8e6f85d24252f605db4c + d104dca228e7e71ec5bf4119b8ef0ed3e8ebb3e8 diff --git a/eng/Versions.props b/eng/Versions.props index 454395ce3..dc445dccc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23108.40 - 7.0.300-preview.23108.40 - 7.0.300-preview.23108.40 + 7.0.300-preview.23109.8 + 7.0.300-preview.23109.8 + 7.0.300-preview.23109.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230208-02 + 17.6.0-preview-20230209-01 From e2c796b8c1c07902c474daf30964ba360dcb705d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 9 Feb 2023 16:08:19 -0800 Subject: [PATCH 303/654] [release/7.0.2xx] Update checksum generation order (#15397) (#15482) Co-authored-by: Michael Simons --- eng/AfterSigning.targets | 24 ++++++++++++++++++++++++ src/redist/redist.csproj | 1 - 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 eng/AfterSigning.targets diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets new file mode 100644 index 000000000..b8a08378a --- /dev/null +++ b/eng/AfterSigning.targets @@ -0,0 +1,24 @@ + + + <_SuppressSdkImports>false + + + + + + + + + + + + + %(FullPath).sha512 + + + + + + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index d9b868ecc..554b1b1ee 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -47,5 +47,4 @@ - From b3789cb0af2035280ee9f1272bb6069fd388f16f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Feb 2023 04:02:48 +0000 Subject: [PATCH 304/654] Update dependencies from https://github.com/dotnet/sdk build 20230209.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23109.8 -> To Version 7.0.300-preview.23109.17 Dependency coherency updates NuGet.Build.Tasks From Version 6.5.0-preview.3.136 -> To Version 6.6.0-preview.2.19 (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 a127c62c6..35faafb66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - f42306939dc8f93312e5d9ab8718d64d0536e6a7 + 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 - + https://github.com/dotnet/sdk - f42306939dc8f93312e5d9ab8718d64d0536e6a7 + 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 - + https://github.com/dotnet/sdk - f42306939dc8f93312e5d9ab8718d64d0536e6a7 + 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 - + https://github.com/dotnet/sdk - f42306939dc8f93312e5d9ab8718d64d0536e6a7 + 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 @@ -154,9 +154,9 @@ 51df47643a8ee2715ac67fab8d652b25be070cd2 - + https://github.com/nuget/nuget.client - 743503cb3c7e9ced2602ee2e29c38d63cc339451 + 8dec976a1ae4f80c82b3007cd8a5c80bdc8f3b22 diff --git a/eng/Versions.props b/eng/Versions.props index dc445dccc..6ee820262 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23109.8 - 7.0.300-preview.23109.8 - 7.0.300-preview.23109.8 + 7.0.300-preview.23109.17 + 7.0.300-preview.23109.17 + 7.0.300-preview.23109.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 942fb3b51e3c92ee10a3279e12514c9e30eda25a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Feb 2023 09:07:52 +0000 Subject: [PATCH 305/654] Update dependencies from https://github.com/dotnet/sdk build 20230209.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23109.17 -> To Version 7.0.300-preview.23109.26 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-1.23107.10 -> To Version 4.6.0-1.23109.10 (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 35faafb66..6cce43f33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 + 10095975bc381f67b4321c275d057d401f11d2dd - + https://github.com/dotnet/sdk - 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 + 10095975bc381f67b4321c275d057d401f11d2dd - + https://github.com/dotnet/sdk - 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 + 10095975bc381f67b4321c275d057d401f11d2dd - + https://github.com/dotnet/sdk - 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 + 10095975bc381f67b4321c275d057d401f11d2dd @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 50bd09a9eefdf9bc3653dbf6d9624b31a023c7c0 + 73338d92270b9f26982eca2e8872037a0214b912 diff --git a/eng/Versions.props b/eng/Versions.props index 6ee820262..f4ecd0fe6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23109.17 - 7.0.300-preview.23109.17 - 7.0.300-preview.23109.17 + 7.0.300-preview.23109.26 + 7.0.300-preview.23109.26 + 7.0.300-preview.23109.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 702bf607ccbb1a5a860bbbedc06a31bbd393e8da Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Sat, 11 Feb 2023 00:49:21 +0100 Subject: [PATCH 306/654] [automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15506) Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai Co-authored-by: Matt Mitchell Co-authored-by: Michael Simons --- eng/AfterSigning.targets | 24 ++++++++++++++++++++++++ src/redist/redist.csproj | 1 - 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 eng/AfterSigning.targets diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets new file mode 100644 index 000000000..b8a08378a --- /dev/null +++ b/eng/AfterSigning.targets @@ -0,0 +1,24 @@ + + + <_SuppressSdkImports>false + + + + + + + + + + + + + %(FullPath).sha512 + + + + + + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index d9b868ecc..554b1b1ee 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -47,5 +47,4 @@ - From 11315562cf13f1cf19837e61cd5da050cb0c2b6a Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Sat, 11 Feb 2023 00:57:40 +0100 Subject: [PATCH 307/654] [automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15472) Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Chris Rummel Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: dotnet-bot Co-authored-by: Matt Mitchell Co-authored-by: DotNet-Bot Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: William Godbe Co-authored-by: Jason Zhai Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: Matt Thalman Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Daniel Plaisted --- .../src/Tarball_WriteSourceRepoProperties.cs | 1 - .../tarball/content/Directory.Build.props | 14 +++++------ .../pipelines/security-partners-dotnet.yml | 15 +++++++++++- .../content/repos/Directory.Build.props | 4 +++- .../tarball/content/repos/fsharp.proj | 1 - .../tarball/content/repos/xliff-tasks.proj | 2 -- test/SdkTests/SdkTests.csproj | 5 ++++ test/SdkTests/TestsToSkipOSX.xml | 23 +++++++++++++++++++ 8 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 test/SdkTests/TestsToSkipOSX.xml diff --git a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs index b177b6f01..0dc26774e 100644 --- a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs +++ b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs @@ -71,7 +71,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks ["OfficialBuildId"] = derivedVersion.OfficialBuildId, ["OutputPackageVersion"] = dependency.Version, ["PreReleaseVersionLabel"] = derivedVersion.PreReleaseVersionLabel, - ["IsStable"] = string.IsNullOrWhiteSpace(derivedVersion.PreReleaseVersionLabel) ? "true" : "false", }; if (!string.IsNullOrEmpty(dependency.GitCommitCount)) { diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 6ca72bb7a..2f4a8ee71 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -216,13 +216,13 @@ - + - + - - - + + + @@ -238,8 +238,8 @@ - - + + diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 6200e7fc0..02641873b 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -1,5 +1,18 @@ trigger: none +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + jobs: - template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: @@ -7,7 +20,7 @@ jobs: excludeSdkContentTests: true matrix: Ubuntu2004-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd _EnablePoison: false _ExcludeOmniSharpTests: false diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 04ab89d11..625d3fb5b 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -15,7 +15,6 @@ true $(LoggingDir)$(RepositoryName).log >> $(RepoConsoleLogFile) 2>&1 - true $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/ @@ -99,6 +98,9 @@ + + + diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index 3ffd14406..bc9a10be7 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -27,7 +27,6 @@ - $(StandardSourceBuildArgs) - - $(BuildCommandArgs) /p:CheckEolTargetFramework=false $(StandardSourceBuildCommand) $(BuildCommandArgs) false diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index b99346824..9fb5965a4 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -225,6 +225,11 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml" + + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipOSX.xml" + + diff --git a/test/SdkTests/TestsToSkipOSX.xml b/test/SdkTests/TestsToSkipOSX.xml new file mode 100644 index 000000000..09330bb1f --- /dev/null +++ b/test/SdkTests/TestsToSkipOSX.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + From 691ac162a03a5fc9b5b580010bbc5ae3609bc20c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 23:58:39 +0000 Subject: [PATCH 308/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15510) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230209-01 to 17.6.0-preview-20230210-01 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0-preview-23108-10 to 17.6.0-preview-23110-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cce43f33..d2fa98b93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 10095975bc381f67b4321c275d057d401f11d2dd + 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 - + https://github.com/dotnet/sdk - 10095975bc381f67b4321c275d057d401f11d2dd + 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 - + https://github.com/dotnet/sdk - 10095975bc381f67b4321c275d057d401f11d2dd + 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 - + https://github.com/dotnet/sdk - 10095975bc381f67b4321c275d057d401f11d2dd + 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 @@ -133,9 +133,9 @@ 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa - + https://github.com/microsoft/vstest - d104dca228e7e71ec5bf4119b8ef0ed3e8ebb3e8 + 2066cbb384f6d0fa6fd36963b1db78f86f598800 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - 51df47643a8ee2715ac67fab8d652b25be070cd2 + 81877bd58d0f1efa2ce2d194ebaf545a84f74aba diff --git a/eng/Versions.props b/eng/Versions.props index f4ecd0fe6..99646269c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23109.26 - 7.0.300-preview.23109.26 - 7.0.300-preview.23109.26 + 7.0.300-preview.23110.8 + 7.0.300-preview.23110.8 + 7.0.300-preview.23110.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230209-01 + 17.6.0-preview-20230210-01 From e610a0a26a4bbd59d014a59c5d4b9a29bdfb49f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Feb 2023 01:24:10 +0000 Subject: [PATCH 309/654] Update dependencies from https://github.com/dotnet/sdk build 20230210.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23110.8 -> To Version 7.0.300-preview.23110.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks From Version 12.5.0-beta.23108.3 -> To Version 12.5.0-beta.23110.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2fa98b93..c9f658c82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 + f6cd3735f6aa9d0c555e7fd0271692472ef63197 - + https://github.com/dotnet/sdk - 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 + f6cd3735f6aa9d0c555e7fd0271692472ef63197 - + https://github.com/dotnet/sdk - 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 + f6cd3735f6aa9d0c555e7fd0271692472ef63197 - + https://github.com/dotnet/sdk - 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 + f6cd3735f6aa9d0c555e7fd0271692472ef63197 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa + 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 - + https://github.com/dotnet/fsharp - 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa + 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 @@ -138,9 +138,9 @@ 2066cbb384f6d0fa6fd36963b1db78f86f598800 - + https://github.com/dotnet/linker - de8bf14fcdfb55f2bae3db8cfc310ddd8ee921e6 + 19b53fbd053afc02fc20456d07d83fb8a94649c8 linker diff --git a/eng/Versions.props b/eng/Versions.props index 99646269c..d56cba3b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23110.8 - 7.0.300-preview.23110.8 - 7.0.300-preview.23110.8 + 7.0.300-preview.23110.18 + 7.0.300-preview.23110.18 + 7.0.300-preview.23110.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 245921006df478431f33fac85042d05c35833160 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Feb 2023 02:30:51 +0000 Subject: [PATCH 310/654] Update dependencies from https://github.com/dotnet/sdk build 20230212.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23110.18 -> To Version 7.0.300-preview.23112.4 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.6.0-preview-20230210-01 -> To Version 17.6.0-preview-20230210-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9f658c82..69ca43b54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - f6cd3735f6aa9d0c555e7fd0271692472ef63197 + 01a16c392cf012af247f499d8f0de4734c107031 - + https://github.com/dotnet/sdk - f6cd3735f6aa9d0c555e7fd0271692472ef63197 + 01a16c392cf012af247f499d8f0de4734c107031 - + https://github.com/dotnet/sdk - f6cd3735f6aa9d0c555e7fd0271692472ef63197 + 01a16c392cf012af247f499d8f0de4734c107031 - + https://github.com/dotnet/sdk - f6cd3735f6aa9d0c555e7fd0271692472ef63197 + 01a16c392cf012af247f499d8f0de4734c107031 @@ -133,9 +133,9 @@ 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 - + https://github.com/microsoft/vstest - 2066cbb384f6d0fa6fd36963b1db78f86f598800 + e545c34442e27a97197d574bc00fcd0fc2eece39 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - 81877bd58d0f1efa2ce2d194ebaf545a84f74aba + dba9b2343547c39971c92627476a926bf6f730bd diff --git a/eng/Versions.props b/eng/Versions.props index d56cba3b5..69af11272 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23110.18 - 7.0.300-preview.23110.18 - 7.0.300-preview.23110.18 + 7.0.300-preview.23112.4 + 7.0.300-preview.23112.4 + 7.0.300-preview.23112.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230210-01 + 17.6.0-preview-20230210-02 From 91caa7d21ca963502f8e624603c749d4bd129598 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 13 Feb 2023 22:50:32 +0100 Subject: [PATCH 311/654] [automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15514) Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai Co-authored-by: Matt Mitchell Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Chris Rummel Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: dotnet-bot Co-authored-by: DotNet-Bot Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: William Godbe Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: Matt Thalman Co-authored-by: Daniel Plaisted --- .../src/Tarball_WriteSourceRepoProperties.cs | 1 - .../tarball/content/Directory.Build.props | 14 +++++------ .../pipelines/security-partners-dotnet.yml | 15 +++++++++++- .../content/repos/Directory.Build.props | 4 +++- .../tarball/content/repos/fsharp.proj | 1 - .../tarball/content/repos/xliff-tasks.proj | 2 -- test/SdkTests/SdkTests.csproj | 5 ++++ test/SdkTests/TestsToSkipOSX.xml | 23 +++++++++++++++++++ 8 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 test/SdkTests/TestsToSkipOSX.xml diff --git a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs index b177b6f01..0dc26774e 100644 --- a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs +++ b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs @@ -71,7 +71,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks ["OfficialBuildId"] = derivedVersion.OfficialBuildId, ["OutputPackageVersion"] = dependency.Version, ["PreReleaseVersionLabel"] = derivedVersion.PreReleaseVersionLabel, - ["IsStable"] = string.IsNullOrWhiteSpace(derivedVersion.PreReleaseVersionLabel) ? "true" : "false", }; if (!string.IsNullOrEmpty(dependency.GitCommitCount)) { diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 6ca72bb7a..2f4a8ee71 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -216,13 +216,13 @@ - + - + - - - + + + @@ -238,8 +238,8 @@ - - + + diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 6200e7fc0..02641873b 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -1,5 +1,18 @@ trigger: none +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + jobs: - template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: @@ -7,7 +20,7 @@ jobs: excludeSdkContentTests: true matrix: Ubuntu2004-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd _EnablePoison: false _ExcludeOmniSharpTests: false diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 04ab89d11..625d3fb5b 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -15,7 +15,6 @@ true $(LoggingDir)$(RepositoryName).log >> $(RepoConsoleLogFile) 2>&1 - true $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/ @@ -99,6 +98,9 @@ + + + diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index 3ffd14406..bc9a10be7 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -27,7 +27,6 @@ - $(StandardSourceBuildArgs) - - $(BuildCommandArgs) /p:CheckEolTargetFramework=false $(StandardSourceBuildCommand) $(BuildCommandArgs) false diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index b99346824..9fb5965a4 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -225,6 +225,11 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml" + + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipOSX.xml" + + diff --git a/test/SdkTests/TestsToSkipOSX.xml b/test/SdkTests/TestsToSkipOSX.xml new file mode 100644 index 000000000..09330bb1f --- /dev/null +++ b/test/SdkTests/TestsToSkipOSX.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + From f6cac26eee3d578abf69ce659f1441e48ddd5109 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 15:51:59 -0800 Subject: [PATCH 312/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15525) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69ca43b54..7337c48b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 01a16c392cf012af247f499d8f0de4734c107031 + 0633039bb303781170ce9ac2e57565b1f4d121e5 - + https://github.com/dotnet/sdk - 01a16c392cf012af247f499d8f0de4734c107031 + 0633039bb303781170ce9ac2e57565b1f4d121e5 - + https://github.com/dotnet/sdk - 01a16c392cf012af247f499d8f0de4734c107031 + 0633039bb303781170ce9ac2e57565b1f4d121e5 - + https://github.com/dotnet/sdk - 01a16c392cf012af247f499d8f0de4734c107031 + 0633039bb303781170ce9ac2e57565b1f4d121e5 @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 + 3263ac15552940d944b4bff27547022ade3da16a - + https://github.com/dotnet/fsharp - 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 + 3263ac15552940d944b4bff27547022ade3da16a - + https://github.com/microsoft/vstest - e545c34442e27a97197d574bc00fcd0fc2eece39 + b6a8c3b174380a5d57059428d8d3840915325373 @@ -154,9 +154,9 @@ dba9b2343547c39971c92627476a926bf6f730bd - + https://github.com/nuget/nuget.client - 8dec976a1ae4f80c82b3007cd8a5c80bdc8f3b22 + b84ca7373557c5725836697f81786ed22e20ead5 diff --git a/eng/Versions.props b/eng/Versions.props index 69af11272..106b9f3ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23112.4 - 7.0.300-preview.23112.4 - 7.0.300-preview.23112.4 + 7.0.300-preview.23113.14 + 7.0.300-preview.23113.14 + 7.0.300-preview.23113.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230210-02 + 17.6.0-preview-20230213-02 From 51603b07e3db9aa4221960c9fe540a05d5c5ac87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Feb 2023 00:17:18 +0000 Subject: [PATCH 313/654] Update dependencies from https://github.com/dotnet/sdk build 20230213.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23113.14 -> To Version 7.0.300-preview.23113.21 --- 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 7337c48b4..2d523d445 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0633039bb303781170ce9ac2e57565b1f4d121e5 + 6d253cefc0cd96e51b5185cf65be05867311da54 - + https://github.com/dotnet/sdk - 0633039bb303781170ce9ac2e57565b1f4d121e5 + 6d253cefc0cd96e51b5185cf65be05867311da54 - + https://github.com/dotnet/sdk - 0633039bb303781170ce9ac2e57565b1f4d121e5 + 6d253cefc0cd96e51b5185cf65be05867311da54 - + https://github.com/dotnet/sdk - 0633039bb303781170ce9ac2e57565b1f4d121e5 + 6d253cefc0cd96e51b5185cf65be05867311da54 diff --git a/eng/Versions.props b/eng/Versions.props index 106b9f3ef..f4a965777 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23113.14 - 7.0.300-preview.23113.14 - 7.0.300-preview.23113.14 + 7.0.300-preview.23113.21 + 7.0.300-preview.23113.21 + 7.0.300-preview.23113.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7da88e07cc45e5da7e7ba71cf707ad9942ee7efb Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Tue, 14 Feb 2023 14:06:02 +0100 Subject: [PATCH 314/654] add tests for covering adding item templates (C# and VB) (#15343) --- test/EndToEnd/ProjectBuildTests.cs | 85 ++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 16 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index ec6684750..a19309b52 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; @@ -115,7 +116,7 @@ namespace EndToEnd.Tests .Execute(newArgs) .Should().Pass(); - string publishArgs="-r win-arm64"; + string publishArgs = "-r win-arm64"; new PublishCommand() .WithWorkingDirectory(projectDirectory) .Execute(publishArgs) @@ -149,7 +150,7 @@ namespace EndToEnd.Tests .Execute(newArgs) .Should().Pass(); - string publishArgs="-r win-arm64"; + string publishArgs = "-r win-arm64"; new PublishCommand() .WithWorkingDirectory(projectDirectory) .Execute(publishArgs) @@ -248,6 +249,47 @@ namespace EndToEnd.Tests Assert.True(directory.EnumerateFileSystemInfos().Any()); } + [Theory] + // microsoft.dotnet.common.itemtemplates templates + [InlineData("class")] + [InlineData("struct")] + [InlineData("enum")] + [InlineData("record")] + [InlineData("interface")] + [InlineData("class", "C#")] + [InlineData("class", "VB")] + [InlineData("struct", "VB")] + [InlineData("enum", "VB")] + [InlineData("interface", "VB")] + public void ItCanCreateItemTemplateWithProjectRestriction(string templateName, string language = "") + { + var languageExtensionMap = new Dictionary() + { + { "", ".cs" }, + { "C#", ".cs" }, + { "VB", ".vb" } + }; + + DirectoryInfo directory = InstantiateProjectTemplate("classlib", language, withNoRestore: false); + string projectDirectory = directory.FullName; + string expectedItemName = $"TestItem_{templateName}"; + string newArgs = $"{templateName} --name {expectedItemName} --debug:ephemeral-hive"; + if (!string.IsNullOrWhiteSpace(language)) + { + newArgs += $" --language {language}"; + } + + new NewCommandShim() + .WithWorkingDirectory(projectDirectory) + .Execute(newArgs) + .Should().Pass(); + + //check if the template created files + Assert.True(directory.Exists); + Assert.True(directory.EnumerateFileSystemInfos().Any()); + Assert.True(directory.GetFile($"{expectedItemName}.{languageExtensionMap[language]}") != null); + } + [WindowsOnlyTheory] [InlineData("wpf", Skip = "https://github.com/dotnet/wpf/issues/2363")] [InlineData("winforms", Skip = "https://github.com/dotnet/wpf/issues/2363")] @@ -402,20 +444,9 @@ namespace EndToEnd.Tests private static void TestTemplateCreateAndBuild(string templateName, bool build = true, bool selfContained = false, string language = "", string framework = "") { - DirectoryInfo directory = TestAssets.CreateTestDirectory(identifier: string.IsNullOrWhiteSpace(language) ? templateName : $"{templateName}[{language}]"); + DirectoryInfo directory = InstantiateProjectTemplate(templateName, language); string projectDirectory = directory.FullName; - string newArgs = $"{templateName} --debug:ephemeral-hive --no-restore"; - if (!string.IsNullOrWhiteSpace(language)) - { - newArgs += $" --language {language}"; - } - - new NewCommandShim() - .WithWorkingDirectory(projectDirectory) - .Execute(newArgs) - .Should().Pass(); - if (!string.IsNullOrWhiteSpace(framework)) { //check if MSBuild TargetFramework property for *proj is set to expected framework @@ -439,13 +470,13 @@ namespace EndToEnd.Tests { buildArgs += $" --framework {framework}"; } - + // Remove this (or formalize it) after https://github.com/dotnet/installer/issues/12479 is resolved. if (language == "F#") { buildArgs += $" /p:_NETCoreSdkIsPreview=true"; } - + string dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); new BuildCommand() .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet @@ -454,5 +485,27 @@ namespace EndToEnd.Tests .Should().Pass(); } } + + private static DirectoryInfo InstantiateProjectTemplate(string templateName, string language = "", bool withNoRestore = true) + { + DirectoryInfo directory = TestAssets.CreateTestDirectory( + identifier: string.IsNullOrWhiteSpace(language) + ? templateName + : $"{templateName}[{language}]"); + string projectDirectory = directory.FullName; + + string newArgs = $"{templateName} --debug:ephemeral-hive {(withNoRestore ? "--no-restore" : "")}"; + if (!string.IsNullOrWhiteSpace(language)) + { + newArgs += $" --language {language}"; + } + + new NewCommandShim() + .WithWorkingDirectory(projectDirectory) + .Execute(newArgs) + .Should().Pass(); + + return directory; + } } } From 975f12e9e8f5906daebadc89f762cbc915b08f24 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 09:53:16 -0800 Subject: [PATCH 315/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15531) Co-authored-by: dotnet-maestro[bot] --- 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 2d523d445..92e76677c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 6d253cefc0cd96e51b5185cf65be05867311da54 + 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 - + https://github.com/dotnet/sdk - 6d253cefc0cd96e51b5185cf65be05867311da54 + 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 - + https://github.com/dotnet/sdk - 6d253cefc0cd96e51b5185cf65be05867311da54 + 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 - + https://github.com/dotnet/sdk - 6d253cefc0cd96e51b5185cf65be05867311da54 + 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - dba9b2343547c39971c92627476a926bf6f730bd + 03de075bf00cadc8cf6e884f1719ea1d2da5b30e diff --git a/eng/Versions.props b/eng/Versions.props index f4a965777..f811a41e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23113.21 - 7.0.300-preview.23113.21 - 7.0.300-preview.23113.21 + 7.0.300-preview.23114.3 + 7.0.300-preview.23114.3 + 7.0.300-preview.23114.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6059f9bcac5e1408e4c587e5cfede40938432e97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Feb 2023 19:17:16 +0000 Subject: [PATCH 316/654] Update dependencies from https://github.com/dotnet/sdk build 20230214.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23114.3 -> To Version 7.0.300-preview.23114.6 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230213-02 -> To Version 17.6.0-preview-20230213-04 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92e76677c..43a9007a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 + 8e4346a910549b1221c24bec7bc2fdff17367293 - + https://github.com/dotnet/sdk - 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 + 8e4346a910549b1221c24bec7bc2fdff17367293 - + https://github.com/dotnet/sdk - 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 + 8e4346a910549b1221c24bec7bc2fdff17367293 - + https://github.com/dotnet/sdk - 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 + 8e4346a910549b1221c24bec7bc2fdff17367293 @@ -133,9 +133,9 @@ 3263ac15552940d944b4bff27547022ade3da16a - + https://github.com/microsoft/vstest - b6a8c3b174380a5d57059428d8d3840915325373 + 4bb2af558ce5bea6b8822135fa88fa6ae035b408 diff --git a/eng/Versions.props b/eng/Versions.props index f811a41e0..f2e3e9542 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23114.3 - 7.0.300-preview.23114.3 - 7.0.300-preview.23114.3 + 7.0.300-preview.23114.6 + 7.0.300-preview.23114.6 + 7.0.300-preview.23114.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230213-02 + 17.6.0-preview-20230213-04 From 3cc0821abb05a202fe6d59ec9aba5ab9e1d43be9 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:55:20 -0800 Subject: [PATCH 317/654] Merging internal commits for release/7.0.2xx (#15537) Co-authored-by: DotNet Bot Co-authored-by: Matt Mitchell --- NuGet.config | 15 +++ eng/Version.Details.xml | 120 +++++++++--------- eng/Versions.props | 48 +++---- ...solvePackageFileConflicts-workaround.patch | 23 ---- 4 files changed, 99 insertions(+), 107 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch diff --git a/NuGet.config b/NuGet.config index 3d6b197f7..115e019e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,23 @@ + + + + + + + + + @@ -36,11 +45,17 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d76a5c04..f142d42a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://github.com/dotnet/test-templates @@ -98,39 +98,39 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - - https://github.com/dotnet/sdk - 9acbc4db3fa18e9839189580622be7258f81c9d5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + fc6a47e3e33b91bd2690161465db7a6c4149d480 - - https://github.com/dotnet/sdk - 9acbc4db3fa18e9839189580622be7258f81c9d5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + fc6a47e3e33b91bd2690161465db7a6c4149d480 - - https://github.com/dotnet/sdk - 9acbc4db3fa18e9839189580622be7258f81c9d5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + fc6a47e3e33b91bd2690161465db7a6c4149d480 - - https://github.com/dotnet/sdk - 9acbc4db3fa18e9839189580622be7258f81c9d5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + fc6a47e3e33b91bd2690161465db7a6c4149d480 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e83409daa530605da4eb5f847c6740a520325d25 + cce692f665cbefe335ed33369897cea328d5fbcf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 636e2b7a00a434a354a126f510a56e16ce3c6bbc + 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 9abb456f29f254da028126cb09ad10751a01eebf + e391694876e891d2cdc4089e62fe7b1138d8294e - + https://github.com/dotnet/fsharp - 9abb456f29f254da028126cb09ad10751a01eebf + e391694876e891d2cdc4089e62fe7b1138d8294e @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 8ad2e6240cb7426d83f1b45241f8f33bddf3d474 + 5964d1a8e82d7a6e27b3b31bc1d6e44d0a2127b4 @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index a1d3aaff8..e602baaa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22518.7 + 7.0.3-servicing.23072.1 - 7.0.0-rtm.22518.2 + 7.0.3-servicing.23073.1 @@ -50,22 +50,22 @@ - 7.0.0 - 7.0.0 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 + 7.0.3 + 7.0.3 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 0.2.0 - 7.0.200-preview.23063.9 - 7.0.200-preview.23063.9 - 7.0.200-preview.23063.9 + 7.0.200 + 7.0.200-rtm.23080.7 + 7.0.200-rtm.23080.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,20 +76,20 @@ - 7.0.0-rtm.22518.5 - 7.0.0-rtm.22518.5 - 7.0.0 - 7.0.0 - 7.0.0 - 7.0.0 + 7.0.3-servicing.23069.10 + 7.0.3-servicing.23069.10 + 7.0.3 + 7.0.3 + 7.0.3 + 7.0.3 2.1.0 - 7.0.0-rtm.22519.1 - 7.0.0-rtm.22519.1 - 7.0.0 - 7.0.0 + 7.0.3-servicing.23073.3 + 7.0.3-servicing.23073.3 + 7.0.3 + 7.0.3 @@ -206,8 +206,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0 - 7.0.0 + 7.0.3 + 7.0.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch deleted file mode 100644 index ab355630e..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 11 Nov 2022 21:10:54 +0000 -Subject: [PATCH] ResolvePackageFileConflicts workaround - ---- - .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -index 3b5d2ae950..f92fb421fe 100644 ---- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - -+ -+ -+ - - - From db2e7bac4f6fc44212bc792714974209d28db39f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 14 Feb 2023 16:35:54 -0800 Subject: [PATCH 318/654] Change how VS setup authoring is configured. --- src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs index 03e407b2e..7ce25b785 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -53,7 +53,7 @@ namespace Microsoft.DotNet.Cli.Build foreach (var file in files) { - sb.Append(@" file source=""!(bindpath.sources)\Redist\Common\NetCoreSDK\MSBuildExtensions\"); + sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\"); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); sb.AppendLine("\""); } From 920b57b9202706724e42891af8c4773eae9298f0 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:51:47 -0800 Subject: [PATCH 319/654] [release/7.0.3xx] Bump ASP.NET template versions (#15546) - regular 6.0.x update - noticed we serviced the 3.0.x template but didn't reflect that here --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f2e3e9542..f28f3a89d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.13 + 6.0.14 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -159,7 +159,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) $(MicrosoftDotNetTestProjectTemplates30PackageVersion) - 3.0.1 + 3.0.3 1.5.3 1.0.2-beta3 From 2b6a12615fd9bfbf38fc2023442203e33abd0de2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:59:10 -0800 Subject: [PATCH 320/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15545) Co-authored-by: dotnet-maestro[bot] --- 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 43a9007a0..facb64304 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 8e4346a910549b1221c24bec7bc2fdff17367293 + 758db962ccbfa4526798159135034b30209dc454 - + https://github.com/dotnet/sdk - 8e4346a910549b1221c24bec7bc2fdff17367293 + 758db962ccbfa4526798159135034b30209dc454 - + https://github.com/dotnet/sdk - 8e4346a910549b1221c24bec7bc2fdff17367293 + 758db962ccbfa4526798159135034b30209dc454 - + https://github.com/dotnet/sdk - 8e4346a910549b1221c24bec7bc2fdff17367293 + 758db962ccbfa4526798159135034b30209dc454 diff --git a/eng/Versions.props b/eng/Versions.props index f28f3a89d..03c93d912 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23114.6 - 7.0.300-preview.23114.6 - 7.0.300-preview.23114.6 + 7.0.300-preview.23114.15 + 7.0.300-preview.23114.15 + 7.0.300-preview.23114.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bbcbae4320bf7379fd70d6709dd5c1b88dbf860f Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 14 Feb 2023 17:36:39 -0800 Subject: [PATCH 321/654] [release/7.0.2xx] Bump ASP.NET template versions (#15547) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e602baaa4..c7cab947c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.13 + 6.0.14 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -159,7 +159,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) $(MicrosoftDotNetTestProjectTemplates30PackageVersion) - 3.0.1 + 3.0.3 1.5.3 1.0.2-beta3 From ab3f98be97814cd294cfc161840d5838d8dd4e66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Feb 2023 04:59:40 +0000 Subject: [PATCH 322/654] Update dependencies from https://github.com/dotnet/arcade build 20230214.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23108.1 -> To Version 7.0.0-beta.23114.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index facb64304..9bc540e9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 - + https://github.com/dotnet/arcade - 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 - + https://github.com/dotnet/arcade - 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 03c93d912..ea898f695 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23108.1 + 7.0.0-beta.23114.3 diff --git a/global.json b/global.json index 40e2f263c..5039463a8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.102", + "dotnet": "7.0.103", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23108.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23108.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3" } } From 7baf416472183c2281c3f56f863d9312ad8dfe8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 11:06:49 -0800 Subject: [PATCH 323/654] [release/7.0.2xx] Update dependencies from dotnet/arcade (#15557) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 17 ++++++++++++++--- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 115e019e1..daf27e784 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,24 @@ + + - - - + + + + + @@ -45,16 +49,23 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f142d42a3..a8df6366f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 - + https://github.com/dotnet/arcade - 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 - + https://github.com/dotnet/arcade - 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c7cab947c..3fd223333 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23108.1 + 7.0.0-beta.23114.3 diff --git a/global.json b/global.json index 40e2f263c..5039463a8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.102", + "dotnet": "7.0.103", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23108.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23108.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3" } } From e52c7c37de9399d9f6333e4be08671ac11981f53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 02:46:31 +0000 Subject: [PATCH 324/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15555) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rtm.22519.1 to 7.0.3-servicing.23073.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rtm.22519.1 to 7.0.3-servicing.23073.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rtm.22518.5 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-rtm.22518.7 to 7.0.3-servicing.23072.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-rtm.22518.2 to 7.0.3-servicing.23073.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.5.0-beta.23113.3 to 12.5.0-beta.23114.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23113.3 to 7.0.300-beta.23114.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230213-04 to 17.6.0-preview-20230214-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.23110.2 to 7.0.100-1.23115.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0-preview-23114-04 to 17.6.0-preview-23115-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.6.0-preview.2.21 to 6.6.0-preview.2.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22518.5 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100: from 7.0.0 to 7.0.3 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22518.5 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100: from 7.0.0 to 7.0.3 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - Merge branch 'release/7.0.3xx' of https://github.com/dotnet/installer into darc-release/7.0.3xx-f01d7d5b-1d0f-4013-a849-a2d0a661b15b --- NuGet.config | 20 +++++++ eng/Version.Details.xml | 124 ++++++++++++++++++++-------------------- eng/Versions.props | 50 ++++++++-------- 3 files changed, 107 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d6b197f7..0f14f7ff0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,24 @@ + + + + + + + + + + @@ -36,11 +46,21 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bc540e9b..e5ad729f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://github.com/dotnet/test-templates @@ -98,49 +98,49 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 758db962ccbfa4526798159135034b30209dc454 + 20f38277e93844dd7cbbb4dcc6121050f2557712 - + https://github.com/dotnet/sdk - 758db962ccbfa4526798159135034b30209dc454 + 20f38277e93844dd7cbbb4dcc6121050f2557712 - + https://github.com/dotnet/sdk - 758db962ccbfa4526798159135034b30209dc454 + 20f38277e93844dd7cbbb4dcc6121050f2557712 - + https://github.com/dotnet/sdk - 758db962ccbfa4526798159135034b30209dc454 + 20f38277e93844dd7cbbb4dcc6121050f2557712 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e83409daa530605da4eb5f847c6740a520325d25 + cce692f665cbefe335ed33369897cea328d5fbcf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 636e2b7a00a434a354a126f510a56e16ce3c6bbc + 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 3263ac15552940d944b4bff27547022ade3da16a + 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/dotnet/fsharp - 3263ac15552940d944b4bff27547022ade3da16a + 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 4bb2af558ce5bea6b8822135fa88fa6ae035b408 + 4cf1986ee6f2c7ec42efdbbda84d16a0435f741b - + https://github.com/dotnet/linker - 19b53fbd053afc02fc20456d07d83fb8a94649c8 + 757da5c5adf9a6a9732285ccace1abf136be1370 linker @@ -149,27 +149,27 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - 03de075bf00cadc8cf6e884f1719ea1d2da5b30e + dfd8f413a80cd0865f968b2c0ad9b09c0df8c430 - + https://github.com/nuget/nuget.client - b84ca7373557c5725836697f81786ed22e20ead5 + 55728432057dc57733661fe01e9c8493ab5034f2 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index ea898f695..943874c00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22518.7 + 7.0.3-servicing.23072.1 - 7.0.0-rtm.22518.2 + 7.0.3-servicing.23073.1 @@ -50,22 +50,22 @@ - 7.0.0 - 7.0.0 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 + 7.0.3 + 7.0.3 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 0.2.0 - 7.0.300-preview.23114.15 - 7.0.300-preview.23114.15 - 7.0.300-preview.23114.15 + 7.0.300-preview.23115.25 + 7.0.300-preview.23115.25 + 7.0.300-preview.23115.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,20 +76,20 @@ - 7.0.0-rtm.22518.5 - 7.0.0-rtm.22518.5 - 7.0.0 - 7.0.0 - 7.0.0 - 7.0.0 + 7.0.3-servicing.23069.10 + 7.0.3-servicing.23069.10 + 7.0.3 + 7.0.3 + 7.0.3 + 7.0.3 2.1.0 - 7.0.0-rtm.22519.1 - 7.0.0-rtm.22519.1 - 7.0.0 - 7.0.0 + 7.0.3-servicing.23073.3 + 7.0.3-servicing.23073.3 + 7.0.3 + 7.0.3 @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230213-04 + 17.6.0-preview-20230214-01 @@ -205,8 +205,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0 - 7.0.0 + 7.0.3 + 7.0.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 492415028e8d9079f5509ad7d07a9d8ba7b30ca1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 18:34:16 +0000 Subject: [PATCH 325/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15568) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230214-01 to 17.6.0-preview-20230215-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5ad729f7..348a0300f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 20f38277e93844dd7cbbb4dcc6121050f2557712 + 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee - + https://github.com/dotnet/sdk - 20f38277e93844dd7cbbb4dcc6121050f2557712 + 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee - + https://github.com/dotnet/sdk - 20f38277e93844dd7cbbb4dcc6121050f2557712 + 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee - + https://github.com/dotnet/sdk - 20f38277e93844dd7cbbb4dcc6121050f2557712 + 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 4cf1986ee6f2c7ec42efdbbda84d16a0435f741b + 9da4e7f7505af42b34e1a2d7ba6857f98782025f diff --git a/eng/Versions.props b/eng/Versions.props index 943874c00..a53949324 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23115.25 - 7.0.300-preview.23115.25 - 7.0.300-preview.23115.25 + 7.0.300-preview.23116.3 + 7.0.300-preview.23116.3 + 7.0.300-preview.23116.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230214-01 + 17.6.0-preview-20230215-02 From aca89f19d00c2c27da1e1bb887a133ac602486ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 10:34:28 -0800 Subject: [PATCH 326/654] [release/7.0.2xx] Update dependencies from dotnet/test-templates (#15567) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8df6366f..6711e9149 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - bb3695688177f5f80eeb3c0498168612e31549d5 + 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/test-templates - bb3695688177f5f80eeb3c0498168612e31549d5 + 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/test-templates - bb3695688177f5f80eeb3c0498168612e31549d5 + 94c498e399eb1cbb7290ed1e42564589a259312a diff --git a/eng/Versions.props b/eng/Versions.props index 3fd223333..5ecffc42b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22558.1 - 1.1.0-rc.22558.1 - 1.1.0-rc.22558.1 + 1.1.0-rc.23115.1 + 1.1.0-rc.23115.1 + 1.1.0-rc.23115.1 From c37b41100483f1e5cd219fc29ad730fe970e108d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 18:37:22 +0000 Subject: [PATCH 327/654] [release/7.0.3xx] Update dependencies from dotnet/test-templates (#15566) [release/7.0.3xx] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 348a0300f..0c1b665f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - bb3695688177f5f80eeb3c0498168612e31549d5 + 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/test-templates - bb3695688177f5f80eeb3c0498168612e31549d5 + 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/test-templates - bb3695688177f5f80eeb3c0498168612e31549d5 + 94c498e399eb1cbb7290ed1e42564589a259312a diff --git a/eng/Versions.props b/eng/Versions.props index a53949324..eac08ee40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22558.1 - 1.1.0-rc.22558.1 - 1.1.0-rc.22558.1 + 1.1.0-rc.23115.1 + 1.1.0-rc.23115.1 + 1.1.0-rc.23115.1 From 6bd39417c02dd4cfa3b12e2d92c20be32f7c9faa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Feb 2023 23:45:26 +0000 Subject: [PATCH 328/654] Update dependencies from https://github.com/dotnet/sdk build 20230216.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23116.3 -> To Version 7.0.300-preview.23116.20 --- NuGet.config | 6 ------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0f14f7ff0..cca4643c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -46,9 +43,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c1b665f4..98cda2204 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee + 3e548f194d9ce13407da2b76a919d8342bd844a6 - + https://github.com/dotnet/sdk - 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee + 3e548f194d9ce13407da2b76a919d8342bd844a6 - + https://github.com/dotnet/sdk - 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee + 3e548f194d9ce13407da2b76a919d8342bd844a6 - + https://github.com/dotnet/sdk - 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee + 3e548f194d9ce13407da2b76a919d8342bd844a6 diff --git a/eng/Versions.props b/eng/Versions.props index eac08ee40..886e7eff5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23116.3 - 7.0.300-preview.23116.3 - 7.0.300-preview.23116.3 + 7.0.300-preview.23116.20 + 7.0.300-preview.23116.20 + 7.0.300-preview.23116.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2bbeab10e482b7c30979c9dcbefd73f65c07aeae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Feb 2023 20:29:29 +0000 Subject: [PATCH 329/654] Update dependencies from https://github.com/dotnet/sdk build 20230217.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23116.20 -> To Version 7.0.300-preview.23117.12 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.6.0-preview-20230215-02 -> To Version 17.6.0-preview-20230216-01 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ---- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index cca4643c7..60f566b46 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,8 +11,6 @@ - - @@ -45,8 +43,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98cda2204..f9d0dc7b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 3e548f194d9ce13407da2b76a919d8342bd844a6 + a39a29e6c79966e684f548d040c23b3fad42b3f7 - + https://github.com/dotnet/sdk - 3e548f194d9ce13407da2b76a919d8342bd844a6 + a39a29e6c79966e684f548d040c23b3fad42b3f7 - + https://github.com/dotnet/sdk - 3e548f194d9ce13407da2b76a919d8342bd844a6 + a39a29e6c79966e684f548d040c23b3fad42b3f7 - + https://github.com/dotnet/sdk - 3e548f194d9ce13407da2b76a919d8342bd844a6 + a39a29e6c79966e684f548d040c23b3fad42b3f7 @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 9da4e7f7505af42b34e1a2d7ba6857f98782025f + ffe76699011531871532725b317bfcac1d45ef5f @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - dfd8f413a80cd0865f968b2c0ad9b09c0df8c430 + c5cceaabe1b83f8aaea2f29792157b6307b29686 diff --git a/eng/Versions.props b/eng/Versions.props index 886e7eff5..f2e8d3ce3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23116.20 - 7.0.300-preview.23116.20 - 7.0.300-preview.23116.20 + 7.0.300-preview.23117.12 + 7.0.300-preview.23117.12 + 7.0.300-preview.23117.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230215-02 + 17.6.0-preview-20230216-01 From 72e301ec9952acd14e048b75b7d4b0e4c78c4c42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Feb 2023 00:45:16 +0000 Subject: [PATCH 330/654] Update dependencies from https://github.com/dotnet/sdk build 20230217.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23117.12 -> To Version 7.0.300-preview.23117.32 --- 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 f9d0dc7b2..79757fa14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - a39a29e6c79966e684f548d040c23b3fad42b3f7 + 8a9199debb102c782d14e04afe10ede56f158c35 - + https://github.com/dotnet/sdk - a39a29e6c79966e684f548d040c23b3fad42b3f7 + 8a9199debb102c782d14e04afe10ede56f158c35 - + https://github.com/dotnet/sdk - a39a29e6c79966e684f548d040c23b3fad42b3f7 + 8a9199debb102c782d14e04afe10ede56f158c35 - + https://github.com/dotnet/sdk - a39a29e6c79966e684f548d040c23b3fad42b3f7 + 8a9199debb102c782d14e04afe10ede56f158c35 diff --git a/eng/Versions.props b/eng/Versions.props index f2e8d3ce3..a60850d22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23117.12 - 7.0.300-preview.23117.12 - 7.0.300-preview.23117.12 + 7.0.300-preview.23117.32 + 7.0.300-preview.23117.32 + 7.0.300-preview.23117.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 83bd64eaad2cfb4066103d471e9aa55647112390 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 07:33:24 +0000 Subject: [PATCH 331/654] Update dependencies from https://github.com/dotnet/sdk build 20230219.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23117.12 -> To Version 7.0.300-preview.23119.5 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230216-01 -> To Version 17.6.0-preview-20230217-01 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ---------- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 60f566b46..3d6b197f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,11 +15,6 @@ - - - - - @@ -46,11 +41,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79757fa14..0871bf28a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 8a9199debb102c782d14e04afe10ede56f158c35 + c7add0029f4ce60808753b9c0c053a92165b19f1 - + https://github.com/dotnet/sdk - 8a9199debb102c782d14e04afe10ede56f158c35 + c7add0029f4ce60808753b9c0c053a92165b19f1 - + https://github.com/dotnet/sdk - 8a9199debb102c782d14e04afe10ede56f158c35 + c7add0029f4ce60808753b9c0c053a92165b19f1 - + https://github.com/dotnet/sdk - 8a9199debb102c782d14e04afe10ede56f158c35 + c7add0029f4ce60808753b9c0c053a92165b19f1 @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - ffe76699011531871532725b317bfcac1d45ef5f + 27964da9af0a67fd25bb75488a6582eecbf8fe03 diff --git a/eng/Versions.props b/eng/Versions.props index a60850d22..d9f11e43b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23117.32 - 7.0.300-preview.23117.32 - 7.0.300-preview.23117.32 + 7.0.300-preview.23119.5 + 7.0.300-preview.23119.5 + 7.0.300-preview.23119.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230216-01 + 17.6.0-preview-20230217-01 From 8a7ef9f5d4995d275ce9123931f9697dcaaeeb4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 11:23:57 +0000 Subject: [PATCH 332/654] Update dependencies from https://github.com/dotnet/sdk build 20230220.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23119.5 -> To Version 7.0.300-preview.23120.4 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23117-04 -> To Version 17.6.0-preview-23120-01 (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 0871bf28a..9663cae81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - c7add0029f4ce60808753b9c0c053a92165b19f1 + ae1dd97107fef7d4b5a78e7df96e954b397d4950 - + https://github.com/dotnet/sdk - c7add0029f4ce60808753b9c0c053a92165b19f1 + ae1dd97107fef7d4b5a78e7df96e954b397d4950 - + https://github.com/dotnet/sdk - c7add0029f4ce60808753b9c0c053a92165b19f1 + ae1dd97107fef7d4b5a78e7df96e954b397d4950 - + https://github.com/dotnet/sdk - c7add0029f4ce60808753b9c0c053a92165b19f1 + ae1dd97107fef7d4b5a78e7df96e954b397d4950 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - c5cceaabe1b83f8aaea2f29792157b6307b29686 + bd756efe2f9ddec21afb01807a450a0a83cfd985 diff --git a/eng/Versions.props b/eng/Versions.props index d9f11e43b..12efb93f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23119.5 - 7.0.300-preview.23119.5 - 7.0.300-preview.23119.5 + 7.0.300-preview.23120.4 + 7.0.300-preview.23120.4 + 7.0.300-preview.23120.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bee3089f2ab1d306bd96defb3ac97651c7b44a7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 03:56:32 +0000 Subject: [PATCH 333/654] Update dependencies from https://github.com/dotnet/sdk build 20230220.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23119.5 -> To Version 7.0.300-preview.23120.13 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.6.0-preview-20230217-01 -> To Version 17.6.0-preview-20230220-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9663cae81..e353d637c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - ae1dd97107fef7d4b5a78e7df96e954b397d4950 + 4e0f5acf23d044d7f66f98bcc24312f818c96f5d - + https://github.com/dotnet/sdk - ae1dd97107fef7d4b5a78e7df96e954b397d4950 + 4e0f5acf23d044d7f66f98bcc24312f818c96f5d - + https://github.com/dotnet/sdk - ae1dd97107fef7d4b5a78e7df96e954b397d4950 + 4e0f5acf23d044d7f66f98bcc24312f818c96f5d - + https://github.com/dotnet/sdk - ae1dd97107fef7d4b5a78e7df96e954b397d4950 + 4e0f5acf23d044d7f66f98bcc24312f818c96f5d @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 27964da9af0a67fd25bb75488a6582eecbf8fe03 + 537a174d393a0c8770aa472d5eb8a3c45271ce1b diff --git a/eng/Versions.props b/eng/Versions.props index 12efb93f2..40d3a82eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23120.4 - 7.0.300-preview.23120.4 - 7.0.300-preview.23120.4 + 7.0.300-preview.23120.13 + 7.0.300-preview.23120.13 + 7.0.300-preview.23120.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230217-01 + 17.6.0-preview-20230220-01 From cebe98b5b60dec4ab85134514404e900ecbf6dcd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 07:47:09 +0000 Subject: [PATCH 334/654] Update dependencies from https://github.com/dotnet/sdk build 20230220.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23120.13 -> To Version 7.0.300-preview.23120.16 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23120-01 -> To Version 17.6.0-preview-23121-03 (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 e353d637c..a3c493549 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 4e0f5acf23d044d7f66f98bcc24312f818c96f5d + f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 - + https://github.com/dotnet/sdk - 4e0f5acf23d044d7f66f98bcc24312f818c96f5d + f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 - + https://github.com/dotnet/sdk - 4e0f5acf23d044d7f66f98bcc24312f818c96f5d + f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 - + https://github.com/dotnet/sdk - 4e0f5acf23d044d7f66f98bcc24312f818c96f5d + f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - bd756efe2f9ddec21afb01807a450a0a83cfd985 + 02c4162874fb061081978f49295c3c3cee25978a diff --git a/eng/Versions.props b/eng/Versions.props index 40d3a82eb..2f9d73bc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23120.13 - 7.0.300-preview.23120.13 - 7.0.300-preview.23120.13 + 7.0.300-preview.23120.16 + 7.0.300-preview.23120.16 + 7.0.300-preview.23120.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5d9462454d200e2b71b0813b9036c0a2ac0fab68 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 21 Feb 2023 00:37:18 -0800 Subject: [PATCH 335/654] Update implicit version for March release --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 5ecb3a19f..3bdff216f 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -63,7 +63,7 @@ 30 32 17 - 13 + 14 From c884d8c54ea1b6d025b5919871c5c524468aece0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 17:00:45 +0000 Subject: [PATCH 336/654] Update dependencies from https://github.com/dotnet/sdk build 20230221.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23120.16 -> To Version 7.0.300-preview.23121.4 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230220-01 -> To Version 17.6.0-preview-20230221-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3c493549..1c471c337 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 + 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb - + https://github.com/dotnet/sdk - f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 + 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb - + https://github.com/dotnet/sdk - f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 + 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb - + https://github.com/dotnet/sdk - f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 + 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 537a174d393a0c8770aa472d5eb8a3c45271ce1b + 3990c633bcf933291f40d44c0b7586c3a6e89d55 diff --git a/eng/Versions.props b/eng/Versions.props index 2f9d73bc6..d94d82c30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23120.16 - 7.0.300-preview.23120.16 - 7.0.300-preview.23120.16 + 7.0.300-preview.23121.4 + 7.0.300-preview.23121.4 + 7.0.300-preview.23121.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230220-01 + 17.6.0-preview-20230221-02 From 59eed2b64e59b5064e08dc15cd80b9c551fca499 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 19:27:41 +0000 Subject: [PATCH 337/654] Update dependencies from https://github.com/dotnet/sdk build 20230221.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23120.16 -> To Version 7.0.300-preview.23121.7 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230220-01 -> To Version 17.6.0-preview-20230221-02 (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 1c471c337..ed6ae0fc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb + 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 - + https://github.com/dotnet/sdk - 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb + 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 - + https://github.com/dotnet/sdk - 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb + 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 - + https://github.com/dotnet/sdk - 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb + 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 diff --git a/eng/Versions.props b/eng/Versions.props index d94d82c30..25e36ad7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23121.4 - 7.0.300-preview.23121.4 - 7.0.300-preview.23121.4 + 7.0.300-preview.23121.7 + 7.0.300-preview.23121.7 + 7.0.300-preview.23121.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4946228186ef5cdcdd58cb5ecd5c168f6ede0bd4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Feb 2023 20:55:43 +0000 Subject: [PATCH 338/654] Merged PR 29723: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.3-servicing.23073.3 to 7.0.4-servicing.23118.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.3-servicing.23073.3 to 7.0.4-servicing.23118.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.3-servicing.23069.10 to 7.0.4-servicing.23115.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23117.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.3-servicing.23073.1 to 7.0.4-servicing.23117.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.Net.Compilers.Toolset**: from 4.5.0-3.23070.7 to 4.5.0-6.23109.5 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.5.0-preview-23061-01 to 17.5.0 (par... --- NuGet.config | 38 ++---- eng/Version.Details.xml | 116 +++++++++--------- eng/Versions.props | 50 ++++---- ...-Exclude-Analyzers-from-source-build.patch | 23 ---- 4 files changed, 97 insertions(+), 130 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch diff --git a/NuGet.config b/NuGet.config index daf27e784..19bd67321 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,22 @@ - - - + + + + + - - + - - - + - - - - - + @@ -49,24 +44,15 @@ - - - + - - + - - - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6711e9149..2adc73944 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6a47e3e33b91bd2690161465db7a6c4149d480 + 1ce1f1ed71df8601a096b8a856840d22fb318bc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6a47e3e33b91bd2690161465db7a6c4149d480 + 1ce1f1ed71df8601a096b8a856840d22fb318bc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6a47e3e33b91bd2690161465db7a6c4149d480 + 1ce1f1ed71df8601a096b8a856840d22fb318bc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6a47e3e33b91bd2690161465db7a6c4149d480 + 1ce1f1ed71df8601a096b8a856840d22fb318bc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cce692f665cbefe335ed33369897cea328d5fbcf + 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a09c7d17212981cb4fd5907fa6a6214966a366d + 0315841ebb89a21c717002224ad9d39f3c21320a https://github.com/dotnet/fsharp @@ -144,14 +144,18 @@ linker - + https://github.com/dotnet/roslyn - 5964d1a8e82d7a6e27b3b31bc1d6e44d0a2127b4 + 6a5a63bbc9f4449d9bd1e95a8f9624939c3ccdc3 - + https://github.com/dotnet/msbuild - 040e2a90ee794997fc9716487280a54b0ad8fe2a + 81ac93548ee1044f03d0ac363712bb778920ef8c + + + https://github.com/dotnet/msbuild + 81ac93548ee1044f03d0ac363712bb778920ef8c @@ -163,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb + ba16583f6b055e5a0623d817a48f1f2f15629e6b - + https://github.com/dotnet/emsdk - 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb + ba16583f6b055e5a0623d817a48f1f2f15629e6b https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 5ecffc42b..106a8ef85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.3-servicing.23072.1 + 7.0.4-servicing.23117.7 - 7.0.3-servicing.23073.1 + 7.0.4-servicing.23117.7 @@ -50,46 +50,46 @@ - 7.0.3 - 7.0.3 - 7.0.3-servicing.23080.9 - 7.0.3-servicing.23080.9 - 7.0.3-servicing.23080.9 - 7.0.3-servicing.23080.9 - 7.0.3-servicing.23080.9 + 7.0.4 + 7.0.4 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 0.2.0 - 7.0.200 - 7.0.200-rtm.23080.7 - 7.0.200-rtm.23080.7 + 7.0.201 + 7.0.201-rtm.23120.7 + 7.0.201-rtm.23120.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0 + 7.0.1 - 7.0.3-servicing.23069.10 - 7.0.3-servicing.23069.10 - 7.0.3 - 7.0.3 - 7.0.3 - 7.0.3 + 7.0.4-servicing.23115.8 + 7.0.4-servicing.23115.8 + 7.0.4 + 7.0.4 + 7.0.4 + 7.0.4 2.1.0 - 7.0.3-servicing.23073.3 - 7.0.3-servicing.23073.3 - 7.0.3 - 7.0.3 + 7.0.4-servicing.23118.3 + 7.0.4-servicing.23118.3 + 7.0.4 + 7.0.4 @@ -206,8 +206,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.3 - 7.0.3 + 7.0.4 + 7.0.4 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch b/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch deleted file mode 100644 index 071ca05da..000000000 --- a/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 16 Dec 2022 03:31:02 +0000 -Subject: [PATCH] Exclude Analyzers from source-build - -Backport: https://github.com/dotnet/razor/issues/8035 ---- - src/Compiler/Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Compiler/Directory.Build.props b/src/Compiler/Directory.Build.props -index e69a99bf3..f70902a08 100644 ---- a/src/Compiler/Directory.Build.props -+++ b/src/Compiler/Directory.Build.props -@@ -37,7 +37,7 @@ - $(WarningsNotAsErrors);xUnit1004 - - -- -+ - - - From 41c01dc860b00c4f4e3ac96ded63e95263c71abe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 03:28:00 +0000 Subject: [PATCH 339/654] Update dependencies from https://github.com/dotnet/sdk build 20230221.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23121.7 -> To Version 7.0.300-preview.23121.10 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset From Version 7.0.100-1.23115.1 -> To Version 7.0.100-1.23121.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed6ae0fc5..f419e88d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 + 1e267a014a1b18c6273a86c68299b425cf47596b - + https://github.com/dotnet/sdk - 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 + 1e267a014a1b18c6273a86c68299b425cf47596b - + https://github.com/dotnet/sdk - 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 + 1e267a014a1b18c6273a86c68299b425cf47596b - + https://github.com/dotnet/sdk - 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 + 1e267a014a1b18c6273a86c68299b425cf47596b @@ -138,15 +138,15 @@ 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/linker - 757da5c5adf9a6a9732285ccace1abf136be1370 + b516999ab57ce68da016b68cc2a09e2c15208e68 linker - + https://github.com/dotnet/roslyn - 73338d92270b9f26982eca2e8872037a0214b912 + e728efff2fe94c2614dd53ae4bd428cb4187753e diff --git a/eng/Versions.props b/eng/Versions.props index 25e36ad7c..54f6dc00f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23121.7 - 7.0.300-preview.23121.7 - 7.0.300-preview.23121.7 + 7.0.300-preview.23121.10 + 7.0.300-preview.23121.10 + 7.0.300-preview.23121.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d56895f92fb4c63b2371ad75180faf4c717e1c07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 07:09:36 +0000 Subject: [PATCH 340/654] Update dependencies from https://github.com/dotnet/sdk build 20230221.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23121.10 -> To Version 7.0.300-preview.23121.14 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23121-03 -> To Version 17.6.0-preview-23122-01 (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 f419e88d4..143aad28f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 1e267a014a1b18c6273a86c68299b425cf47596b + 106807e7fe11f4f7f5fee31bc3fe0218248d16ba - + https://github.com/dotnet/sdk - 1e267a014a1b18c6273a86c68299b425cf47596b + 106807e7fe11f4f7f5fee31bc3fe0218248d16ba - + https://github.com/dotnet/sdk - 1e267a014a1b18c6273a86c68299b425cf47596b + 106807e7fe11f4f7f5fee31bc3fe0218248d16ba - + https://github.com/dotnet/sdk - 1e267a014a1b18c6273a86c68299b425cf47596b + 106807e7fe11f4f7f5fee31bc3fe0218248d16ba @@ -149,9 +149,9 @@ e728efff2fe94c2614dd53ae4bd428cb4187753e - + https://github.com/dotnet/msbuild - 02c4162874fb061081978f49295c3c3cee25978a + 4b5e303b3646131dfbaf425c21021f5233cece8e diff --git a/eng/Versions.props b/eng/Versions.props index 54f6dc00f..ce2acadc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23121.10 - 7.0.300-preview.23121.10 - 7.0.300-preview.23121.10 + 7.0.300-preview.23121.14 + 7.0.300-preview.23121.14 + 7.0.300-preview.23121.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3d7a3d235319665fef45fa177fb358b24c88e187 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 17:11:32 +0000 Subject: [PATCH 341/654] Update dependencies from https://github.com/dotnet/arcade build 20230217.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23114.3 -> To Version 7.0.0-beta.23117.3 --- 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 143aad28f..9ae23bc6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ce2acadc3..e8d2af96e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23114.3 + 7.0.0-beta.23117.3 diff --git a/global.json b/global.json index 5039463a8..dfd6be6d5 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.23114.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23117.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23117.3" } } From f868f35234f6a0d9b1a3676897890ab6c118fede Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 17:11:35 +0000 Subject: [PATCH 342/654] Update dependencies from https://github.com/dotnet/arcade build 20230217.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23114.3 -> To Version 7.0.0-beta.23117.3 --- NuGet.config | 26 -------------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index daf27e784..3d6b197f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,14 @@ - - - - - - - - - - - - - @@ -49,24 +36,11 @@ - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6711e9149..2e8a65610 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 5ecffc42b..537c5a15b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23114.3 + 7.0.0-beta.23117.3 diff --git a/global.json b/global.json index 5039463a8..dfd6be6d5 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.23114.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23117.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23117.3" } } From 9fe0829624d9b22b69f7373a9b50611c9eeedf3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 04:56:38 +0000 Subject: [PATCH 343/654] Update dependencies from https://github.com/dotnet/sdk build 20230222.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23121.14 -> To Version 7.0.300-preview.23122.5 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.6.0-2.23121.6 -> To Version 4.6.0-2.23122.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ae23bc6c..38043c9c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 106807e7fe11f4f7f5fee31bc3fe0218248d16ba + ff59f5dc32c377243e40620a7a3091f9270a15ae - + https://github.com/dotnet/sdk - 106807e7fe11f4f7f5fee31bc3fe0218248d16ba + ff59f5dc32c377243e40620a7a3091f9270a15ae - + https://github.com/dotnet/sdk - 106807e7fe11f4f7f5fee31bc3fe0218248d16ba + ff59f5dc32c377243e40620a7a3091f9270a15ae - + https://github.com/dotnet/sdk - 106807e7fe11f4f7f5fee31bc3fe0218248d16ba + ff59f5dc32c377243e40620a7a3091f9270a15ae @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - e728efff2fe94c2614dd53ae4bd428cb4187753e + 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/msbuild - 4b5e303b3646131dfbaf425c21021f5233cece8e + f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 diff --git a/eng/Versions.props b/eng/Versions.props index e8d2af96e..e5bfe99c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23121.14 - 7.0.300-preview.23121.14 - 7.0.300-preview.23121.14 + 7.0.300-preview.23122.5 + 7.0.300-preview.23122.5 + 7.0.300-preview.23122.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 24930165c292fa4a5d499d811e015ee2af6a53a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 06:14:28 +0000 Subject: [PATCH 344/654] Update dependencies from https://github.com/dotnet/sdk build 20230222.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23121.14 -> To Version 7.0.300-preview.23122.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23114.3 -> To Version 12.5.0-beta.23122.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38043c9c2..be87684dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - ff59f5dc32c377243e40620a7a3091f9270a15ae + 1cdb9e6024885766c67b3513db7f9ccd54bb378b - + https://github.com/dotnet/sdk - ff59f5dc32c377243e40620a7a3091f9270a15ae + 1cdb9e6024885766c67b3513db7f9ccd54bb378b - + https://github.com/dotnet/sdk - ff59f5dc32c377243e40620a7a3091f9270a15ae + 1cdb9e6024885766c67b3513db7f9ccd54bb378b - + https://github.com/dotnet/sdk - ff59f5dc32c377243e40620a7a3091f9270a15ae + 1cdb9e6024885766c67b3513db7f9ccd54bb378b @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 75647e8f098a1a2b50d4d755394598ae6f38b164 + 0b0c07d12f64502d28312d679a966b3f2285244e - + https://github.com/dotnet/fsharp - 75647e8f098a1a2b50d4d755394598ae6f38b164 + 0b0c07d12f64502d28312d679a966b3f2285244e diff --git a/eng/Versions.props b/eng/Versions.props index e5bfe99c4..b742fb533 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23122.5 - 7.0.300-preview.23122.5 - 7.0.300-preview.23122.5 + 7.0.300-preview.23122.7 + 7.0.300-preview.23122.7 + 7.0.300-preview.23122.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c2e4bd96b0fad0a1fca5b4a90c4a492cb1bc08aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 07:28:18 +0000 Subject: [PATCH 345/654] Update dependencies from https://github.com/dotnet/sdk build 20230222.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23122.7 -> To Version 7.0.300-preview.23122.9 --- 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 be87684dc..9538c1e7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 1cdb9e6024885766c67b3513db7f9ccd54bb378b + b99d91865c9af282470a55ff4ba938ffe2a8caa1 - + https://github.com/dotnet/sdk - 1cdb9e6024885766c67b3513db7f9ccd54bb378b + b99d91865c9af282470a55ff4ba938ffe2a8caa1 - + https://github.com/dotnet/sdk - 1cdb9e6024885766c67b3513db7f9ccd54bb378b + b99d91865c9af282470a55ff4ba938ffe2a8caa1 - + https://github.com/dotnet/sdk - 1cdb9e6024885766c67b3513db7f9ccd54bb378b + b99d91865c9af282470a55ff4ba938ffe2a8caa1 diff --git a/eng/Versions.props b/eng/Versions.props index b742fb533..8b0b6c0b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23122.7 - 7.0.300-preview.23122.7 - 7.0.300-preview.23122.7 + 7.0.300-preview.23122.9 + 7.0.300-preview.23122.9 + 7.0.300-preview.23122.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e2d2e795a4f39632e8bcec0955338bab7f0ab2e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 09:21:41 +0000 Subject: [PATCH 346/654] Update dependencies from https://github.com/dotnet/sdk build 20230223.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23122.9 -> To Version 7.0.300-preview.23123.1 --- 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 9538c1e7f..92935a8de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - b99d91865c9af282470a55ff4ba938ffe2a8caa1 + 854826d569ad743a0d55fde44a7d642e5d646745 - + https://github.com/dotnet/sdk - b99d91865c9af282470a55ff4ba938ffe2a8caa1 + 854826d569ad743a0d55fde44a7d642e5d646745 - + https://github.com/dotnet/sdk - b99d91865c9af282470a55ff4ba938ffe2a8caa1 + 854826d569ad743a0d55fde44a7d642e5d646745 - + https://github.com/dotnet/sdk - b99d91865c9af282470a55ff4ba938ffe2a8caa1 + 854826d569ad743a0d55fde44a7d642e5d646745 diff --git a/eng/Versions.props b/eng/Versions.props index 8b0b6c0b7..2b20c7459 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23122.9 - 7.0.300-preview.23122.9 - 7.0.300-preview.23122.9 + 7.0.300-preview.23123.1 + 7.0.300-preview.23123.1 + 7.0.300-preview.23123.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 89e9bcfd7fcde2a9e4f4ebca574fb31a28fab366 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 18:27:03 +0000 Subject: [PATCH 347/654] Update dependencies from https://github.com/dotnet/sdk build 20230223.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.1 -> To Version 7.0.300-preview.23123.7 --- 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 92935a8de..b5127b1f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 854826d569ad743a0d55fde44a7d642e5d646745 + 904d0d9c253889457ab70cbb335a49cc01a9f901 - + https://github.com/dotnet/sdk - 854826d569ad743a0d55fde44a7d642e5d646745 + 904d0d9c253889457ab70cbb335a49cc01a9f901 - + https://github.com/dotnet/sdk - 854826d569ad743a0d55fde44a7d642e5d646745 + 904d0d9c253889457ab70cbb335a49cc01a9f901 - + https://github.com/dotnet/sdk - 854826d569ad743a0d55fde44a7d642e5d646745 + 904d0d9c253889457ab70cbb335a49cc01a9f901 diff --git a/eng/Versions.props b/eng/Versions.props index 2b20c7459..f34ec3b3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23123.1 - 7.0.300-preview.23123.1 - 7.0.300-preview.23123.1 + 7.0.300-preview.23123.7 + 7.0.300-preview.23123.7 + 7.0.300-preview.23123.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 20311135cc9b4ff16f63319a8d784026ecb15256 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 22:26:51 +0000 Subject: [PATCH 348/654] Update dependencies from https://github.com/dotnet/arcade build 20230222.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23117.3 -> To Version 7.0.0-beta.23122.4 --- 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 92935a8de..b176f1dab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2b20c7459..b866f166d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23117.3 + 7.0.0-beta.23122.4 diff --git a/global.json b/global.json index dfd6be6d5..9890ccd94 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.23117.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23117.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23122.4" } } From 63512f7023ba2338c3050cb3d06dbf72286b2429 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 22:26:55 +0000 Subject: [PATCH 349/654] Update dependencies from https://github.com/dotnet/arcade build 20230222.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23114.3 -> To Version 7.0.0-beta.23122.4 --- 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 2e8a65610..dff3649ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 537c5a15b..717c9ea98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23117.3 + 7.0.0-beta.23122.4 diff --git a/global.json b/global.json index dfd6be6d5..9890ccd94 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.23117.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23117.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23122.4" } } From 7717d4e146e093781e33245b2d0ec2a3b750fe03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 03:38:46 +0000 Subject: [PATCH 350/654] Update dependencies from https://github.com/dotnet/sdk build 20230223.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.7 -> To Version 7.0.300-preview.23123.10 --- 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 d7b5451b7..c0193d67f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 904d0d9c253889457ab70cbb335a49cc01a9f901 + 308e7840125579279180a45461c113966f39cb7b - + https://github.com/dotnet/sdk - 904d0d9c253889457ab70cbb335a49cc01a9f901 + 308e7840125579279180a45461c113966f39cb7b - + https://github.com/dotnet/sdk - 904d0d9c253889457ab70cbb335a49cc01a9f901 + 308e7840125579279180a45461c113966f39cb7b - + https://github.com/dotnet/sdk - 904d0d9c253889457ab70cbb335a49cc01a9f901 + 308e7840125579279180a45461c113966f39cb7b diff --git a/eng/Versions.props b/eng/Versions.props index c3d9206e2..470782284 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23123.7 - 7.0.300-preview.23123.7 - 7.0.300-preview.23123.7 + 7.0.300-preview.23123.10 + 7.0.300-preview.23123.10 + 7.0.300-preview.23123.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From af8c1fc956e873e14ea6ba9ebe65db8a430d6534 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 04:48:53 +0000 Subject: [PATCH 351/654] Update dependencies from https://github.com/dotnet/sdk build 20230223.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.7 -> To Version 7.0.300-preview.23123.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23122.4 -> To Version 12.5.0-beta.23123.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0193d67f..73ea85d35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 308e7840125579279180a45461c113966f39cb7b + 55a430259c58334f7fd6d573b5d70d9d1ef0a11e - + https://github.com/dotnet/sdk - 308e7840125579279180a45461c113966f39cb7b + 55a430259c58334f7fd6d573b5d70d9d1ef0a11e - + https://github.com/dotnet/sdk - 308e7840125579279180a45461c113966f39cb7b + 55a430259c58334f7fd6d573b5d70d9d1ef0a11e - + https://github.com/dotnet/sdk - 308e7840125579279180a45461c113966f39cb7b + 55a430259c58334f7fd6d573b5d70d9d1ef0a11e @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 0b0c07d12f64502d28312d679a966b3f2285244e + 77528ef88dcffb9a089bea428bc95037a089a206 - + https://github.com/dotnet/fsharp - 0b0c07d12f64502d28312d679a966b3f2285244e + 77528ef88dcffb9a089bea428bc95037a089a206 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + 104f0dcd74804aaf0b02df745910e9ab3973d758 diff --git a/eng/Versions.props b/eng/Versions.props index 470782284..6f72b256f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23123.10 - 7.0.300-preview.23123.10 - 7.0.300-preview.23123.10 + 7.0.300-preview.23123.13 + 7.0.300-preview.23123.13 + 7.0.300-preview.23123.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 895cd71b001887f8e2cb5900c3f8353419ad4a41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 06:55:19 +0000 Subject: [PATCH 352/654] Update dependencies from https://github.com/dotnet/sdk build 20230223.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.13 -> To Version 7.0.300-preview.23123.14 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.6.0-2.23123.5 -> To Version 4.6.0-2.23123.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73ea85d35..d80743eb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 55a430259c58334f7fd6d573b5d70d9d1ef0a11e + 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f - + https://github.com/dotnet/sdk - 55a430259c58334f7fd6d573b5d70d9d1ef0a11e + 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f - + https://github.com/dotnet/sdk - 55a430259c58334f7fd6d573b5d70d9d1ef0a11e + 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f - + https://github.com/dotnet/sdk - 55a430259c58334f7fd6d573b5d70d9d1ef0a11e + 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 104f0dcd74804aaf0b02df745910e9ab3973d758 + 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 - + https://github.com/dotnet/msbuild - f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 + 3a7bdada94286f0715dca3a2298a74c450a90a48 diff --git a/eng/Versions.props b/eng/Versions.props index 6f72b256f..ddcb32309 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23123.13 - 7.0.300-preview.23123.13 - 7.0.300-preview.23123.13 + 7.0.300-preview.23123.14 + 7.0.300-preview.23123.14 + 7.0.300-preview.23123.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5a65e387fa11d5184769a51465dd454b3cf66646 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 08:07:23 +0000 Subject: [PATCH 353/654] Update dependencies from https://github.com/dotnet/sdk build 20230223.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.13 -> To Version 7.0.300-preview.23123.17 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 4.6.0-2.23123.5 -> To Version 4.6.0-2.23123.8 (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 d80743eb9..57b1d54f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f + 26d4e2192c99c84285828118182800bb85f66101 - + https://github.com/dotnet/sdk - 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f + 26d4e2192c99c84285828118182800bb85f66101 - + https://github.com/dotnet/sdk - 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f + 26d4e2192c99c84285828118182800bb85f66101 - + https://github.com/dotnet/sdk - 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f + 26d4e2192c99c84285828118182800bb85f66101 @@ -154,9 +154,9 @@ 3a7bdada94286f0715dca3a2298a74c450a90a48 - + https://github.com/nuget/nuget.client - 55728432057dc57733661fe01e9c8493ab5034f2 + 32dfd20a77f37a75fd2e7d3f785a0abb1eb5f3e3 diff --git a/eng/Versions.props b/eng/Versions.props index ddcb32309..d5bfedaeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23123.14 - 7.0.300-preview.23123.14 - 7.0.300-preview.23123.14 + 7.0.300-preview.23123.17 + 7.0.300-preview.23123.17 + 7.0.300-preview.23123.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1fdf8fcc2db28420fc09241348c58df463a844dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 09:27:54 +0000 Subject: [PATCH 354/654] Update dependencies from https://github.com/dotnet/sdk build 20230224.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.13 -> To Version 7.0.300-preview.23124.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23123.2 -> To Version 12.5.0-beta.23123.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57b1d54f5..66d7be599 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 26d4e2192c99c84285828118182800bb85f66101 + 650dc2d9a0ad6105087530882930029396b0f907 - + https://github.com/dotnet/sdk - 26d4e2192c99c84285828118182800bb85f66101 + 650dc2d9a0ad6105087530882930029396b0f907 - + https://github.com/dotnet/sdk - 26d4e2192c99c84285828118182800bb85f66101 + 650dc2d9a0ad6105087530882930029396b0f907 - + https://github.com/dotnet/sdk - 26d4e2192c99c84285828118182800bb85f66101 + 650dc2d9a0ad6105087530882930029396b0f907 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 77528ef88dcffb9a089bea428bc95037a089a206 + 6fb3ae3c29411266f6ccc938ec922a49b61a319c - + https://github.com/dotnet/fsharp - 77528ef88dcffb9a089bea428bc95037a089a206 + 6fb3ae3c29411266f6ccc938ec922a49b61a319c diff --git a/eng/Versions.props b/eng/Versions.props index d5bfedaeb..57ae59eb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23123.17 - 7.0.300-preview.23123.17 - 7.0.300-preview.23123.17 + 7.0.300-preview.23124.1 + 7.0.300-preview.23124.1 + 7.0.300-preview.23124.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0c1642eb4b7c6ccdcf7918826ca2e51484ae2fca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 10:43:45 +0000 Subject: [PATCH 355/654] Update dependencies from https://github.com/dotnet/sdk build 20230224.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.13 -> To Version 7.0.300-preview.23124.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23123.2 -> To Version 12.5.0-beta.23123.3 (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 66d7be599..0282bdfea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 650dc2d9a0ad6105087530882930029396b0f907 + 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe - + https://github.com/dotnet/sdk - 650dc2d9a0ad6105087530882930029396b0f907 + 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe - + https://github.com/dotnet/sdk - 650dc2d9a0ad6105087530882930029396b0f907 + 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe - + https://github.com/dotnet/sdk - 650dc2d9a0ad6105087530882930029396b0f907 + 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a diff --git a/eng/Versions.props b/eng/Versions.props index 57ae59eb4..2b950c456 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.1 - 7.0.300-preview.23124.1 - 7.0.300-preview.23124.1 + 7.0.300-preview.23124.2 + 7.0.300-preview.23124.2 + 7.0.300-preview.23124.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e7f2ee11cc808bed6ea7278ee83a6126012fc4fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 18:48:26 +0000 Subject: [PATCH 356/654] Update dependencies from https://github.com/dotnet/sdk build 20230224.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.2 -> To Version 7.0.300-preview.23124.6 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 17.6.0-preview-20230221-02 -> To Version 17.6.0-preview-20230223-05 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0282bdfea..ee56035c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe + 6406aec83e9784635cabe9d5b313bb7789112c28 - + https://github.com/dotnet/sdk - 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe + 6406aec83e9784635cabe9d5b313bb7789112c28 - + https://github.com/dotnet/sdk - 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe + 6406aec83e9784635cabe9d5b313bb7789112c28 - + https://github.com/dotnet/sdk - 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe + 6406aec83e9784635cabe9d5b313bb7789112c28 @@ -133,9 +133,9 @@ 6fb3ae3c29411266f6ccc938ec922a49b61a319c - + https://github.com/microsoft/vstest - 3990c633bcf933291f40d44c0b7586c3a6e89d55 + 05c0c4c4f084782533443dfeae0f6627018c5b6a @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + b80df1b027ab46d65c6986c33840721ff71ba0c0 diff --git a/eng/Versions.props b/eng/Versions.props index 2b950c456..764bd2d39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.2 - 7.0.300-preview.23124.2 - 7.0.300-preview.23124.2 + 7.0.300-preview.23124.6 + 7.0.300-preview.23124.6 + 7.0.300-preview.23124.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230221-02 + 17.6.0-preview-20230223-05 From 0c0194383a6e51bacc226856761d0a4e99bd51a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 20:03:41 +0000 Subject: [PATCH 357/654] Update dependencies from https://github.com/dotnet/sdk build 20230224.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.2 -> To Version 7.0.300-preview.23124.8 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.6.0-preview-20230221-02 -> To Version 17.6.0-preview-20230223-05 (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 ee56035c7..b17d39ce0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 6406aec83e9784635cabe9d5b313bb7789112c28 + 459ad47e717d72d6f9d1314c50fbeb0e26c24007 - + https://github.com/dotnet/sdk - 6406aec83e9784635cabe9d5b313bb7789112c28 + 459ad47e717d72d6f9d1314c50fbeb0e26c24007 - + https://github.com/dotnet/sdk - 6406aec83e9784635cabe9d5b313bb7789112c28 + 459ad47e717d72d6f9d1314c50fbeb0e26c24007 - + https://github.com/dotnet/sdk - 6406aec83e9784635cabe9d5b313bb7789112c28 + 459ad47e717d72d6f9d1314c50fbeb0e26c24007 @@ -149,9 +149,9 @@ b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/msbuild - 3a7bdada94286f0715dca3a2298a74c450a90a48 + d434c0e464ee0c119bdd5ee87b448e16fe0786be diff --git a/eng/Versions.props b/eng/Versions.props index 764bd2d39..5e4cc9a6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.6 - 7.0.300-preview.23124.6 - 7.0.300-preview.23124.6 + 7.0.300-preview.23124.8 + 7.0.300-preview.23124.8 + 7.0.300-preview.23124.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 502cbe0e3aa2c1c75470737260f215d67ddb232f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 21:35:31 +0000 Subject: [PATCH 358/654] Update dependencies from https://github.com/dotnet/sdk build 20230224.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.2 -> To Version 7.0.300-preview.23124.13 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.6.0-preview-20230221-02 -> To Version 17.6.0-preview-20230223-05 (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 b17d39ce0..9dd5bae5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 459ad47e717d72d6f9d1314c50fbeb0e26c24007 + 71f20e519f052f85443e1a0f36f70b1dc6ffb67a - + https://github.com/dotnet/sdk - 459ad47e717d72d6f9d1314c50fbeb0e26c24007 + 71f20e519f052f85443e1a0f36f70b1dc6ffb67a - + https://github.com/dotnet/sdk - 459ad47e717d72d6f9d1314c50fbeb0e26c24007 + 71f20e519f052f85443e1a0f36f70b1dc6ffb67a - + https://github.com/dotnet/sdk - 459ad47e717d72d6f9d1314c50fbeb0e26c24007 + 71f20e519f052f85443e1a0f36f70b1dc6ffb67a @@ -154,9 +154,9 @@ d434c0e464ee0c119bdd5ee87b448e16fe0786be - + https://github.com/nuget/nuget.client - 32dfd20a77f37a75fd2e7d3f785a0abb1eb5f3e3 + 4d5af8a3492c8d9d0c99c3cdf3cce12129c8e743 diff --git a/eng/Versions.props b/eng/Versions.props index 5e4cc9a6e..b7f899038 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.8 - 7.0.300-preview.23124.8 - 7.0.300-preview.23124.8 + 7.0.300-preview.23124.13 + 7.0.300-preview.23124.13 + 7.0.300-preview.23124.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e9aced5597f765a663ef37eecf32a805229b6853 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 23:50:25 +0000 Subject: [PATCH 359/654] Update dependencies from https://github.com/dotnet/sdk build 20230224.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.13 -> To Version 7.0.300-preview.23124.16 --- 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 9dd5bae5a..9b30e1379 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 71f20e519f052f85443e1a0f36f70b1dc6ffb67a + 5872c043f6e6cd114fd9fa0d4ba729200962df5b - + https://github.com/dotnet/sdk - 71f20e519f052f85443e1a0f36f70b1dc6ffb67a + 5872c043f6e6cd114fd9fa0d4ba729200962df5b - + https://github.com/dotnet/sdk - 71f20e519f052f85443e1a0f36f70b1dc6ffb67a + 5872c043f6e6cd114fd9fa0d4ba729200962df5b - + https://github.com/dotnet/sdk - 71f20e519f052f85443e1a0f36f70b1dc6ffb67a + 5872c043f6e6cd114fd9fa0d4ba729200962df5b diff --git a/eng/Versions.props b/eng/Versions.props index b7f899038..e6d9384fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.13 - 7.0.300-preview.23124.13 - 7.0.300-preview.23124.13 + 7.0.300-preview.23124.16 + 7.0.300-preview.23124.16 + 7.0.300-preview.23124.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a1fdb50445056b3ec4e1847c7de2d9c298a2e4be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 01:06:25 +0000 Subject: [PATCH 360/654] Update dependencies from https://github.com/dotnet/sdk build 20230224.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.13 -> To Version 7.0.300-preview.23124.19 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23124.1 -> To Version 4.6.0-2.23124.4 (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 9b30e1379..d8c015e26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 5872c043f6e6cd114fd9fa0d4ba729200962df5b + d1bcc35bacc316c0d397b4d26c9134d406940b6d - + https://github.com/dotnet/sdk - 5872c043f6e6cd114fd9fa0d4ba729200962df5b + d1bcc35bacc316c0d397b4d26c9134d406940b6d - + https://github.com/dotnet/sdk - 5872c043f6e6cd114fd9fa0d4ba729200962df5b + d1bcc35bacc316c0d397b4d26c9134d406940b6d - + https://github.com/dotnet/sdk - 5872c043f6e6cd114fd9fa0d4ba729200962df5b + d1bcc35bacc316c0d397b4d26c9134d406940b6d @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c diff --git a/eng/Versions.props b/eng/Versions.props index e6d9384fc..e54544b94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.16 - 7.0.300-preview.23124.16 - 7.0.300-preview.23124.16 + 7.0.300-preview.23124.19 + 7.0.300-preview.23124.19 + 7.0.300-preview.23124.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8514f0cffde6a52f05b881ac7dd7aa2d83301c92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 03:36:04 +0000 Subject: [PATCH 361/654] Update dependencies from https://github.com/dotnet/sdk build 20230226.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.19 -> To Version 7.0.300-preview.23126.5 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23124.4 -> To Version 4.6.0-2.23126.2 (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 d8c015e26..088247cb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - d1bcc35bacc316c0d397b4d26c9134d406940b6d + beb0421e5c0f0b9db7274bf679ad5b21a51c145b - + https://github.com/dotnet/sdk - d1bcc35bacc316c0d397b4d26c9134d406940b6d + beb0421e5c0f0b9db7274bf679ad5b21a51c145b - + https://github.com/dotnet/sdk - d1bcc35bacc316c0d397b4d26c9134d406940b6d + beb0421e5c0f0b9db7274bf679ad5b21a51c145b - + https://github.com/dotnet/sdk - d1bcc35bacc316c0d397b4d26c9134d406940b6d + beb0421e5c0f0b9db7274bf679ad5b21a51c145b @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 diff --git a/eng/Versions.props b/eng/Versions.props index e54544b94..9614e0ed1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.19 - 7.0.300-preview.23124.19 - 7.0.300-preview.23124.19 + 7.0.300-preview.23126.5 + 7.0.300-preview.23126.5 + 7.0.300-preview.23126.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d6838673af5f90aa939158e4baf5bc05241f1dba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 04:53:28 +0000 Subject: [PATCH 362/654] Update dependencies from https://github.com/dotnet/sdk build 20230226.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.19 -> To Version 7.0.300-preview.23126.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23123.3 -> To Version 12.5.0-beta.23124.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 088247cb6..101d9b948 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - beb0421e5c0f0b9db7274bf679ad5b21a51c145b + 131f6c4dac6b60526a84183056e5f38f71f0b72c - + https://github.com/dotnet/sdk - beb0421e5c0f0b9db7274bf679ad5b21a51c145b + 131f6c4dac6b60526a84183056e5f38f71f0b72c - + https://github.com/dotnet/sdk - beb0421e5c0f0b9db7274bf679ad5b21a51c145b + 131f6c4dac6b60526a84183056e5f38f71f0b72c - + https://github.com/dotnet/sdk - beb0421e5c0f0b9db7274bf679ad5b21a51c145b + 131f6c4dac6b60526a84183056e5f38f71f0b72c @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 6fb3ae3c29411266f6ccc938ec922a49b61a319c + 69e9a985b80c41e7d9d589e58b75a004831c07bc - + https://github.com/dotnet/fsharp - 6fb3ae3c29411266f6ccc938ec922a49b61a319c + 69e9a985b80c41e7d9d589e58b75a004831c07bc diff --git a/eng/Versions.props b/eng/Versions.props index 9614e0ed1..ee8755145 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23126.5 - 7.0.300-preview.23126.5 - 7.0.300-preview.23126.5 + 7.0.300-preview.23126.6 + 7.0.300-preview.23126.6 + 7.0.300-preview.23126.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 676d174833089a7ee232d0535c968ec7e90bce42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 06:54:11 +0000 Subject: [PATCH 363/654] Update dependencies from https://github.com/dotnet/sdk build 20230226.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23126.6 -> To Version 7.0.300-preview.23126.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.23124.3 -> To Version 12.5.0-beta.23126.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 101d9b948..c6cde5faf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 131f6c4dac6b60526a84183056e5f38f71f0b72c + 3c28e76fd7d1463c7eeede4becafe7f6487b64aa - + https://github.com/dotnet/sdk - 131f6c4dac6b60526a84183056e5f38f71f0b72c + 3c28e76fd7d1463c7eeede4becafe7f6487b64aa - + https://github.com/dotnet/sdk - 131f6c4dac6b60526a84183056e5f38f71f0b72c + 3c28e76fd7d1463c7eeede4becafe7f6487b64aa - + https://github.com/dotnet/sdk - 131f6c4dac6b60526a84183056e5f38f71f0b72c + 3c28e76fd7d1463c7eeede4becafe7f6487b64aa @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 69e9a985b80c41e7d9d589e58b75a004831c07bc + 4de2393866be1be6fa35af544c6f25a10af5ab3d - + https://github.com/dotnet/fsharp - 69e9a985b80c41e7d9d589e58b75a004831c07bc + 4de2393866be1be6fa35af544c6f25a10af5ab3d @@ -149,9 +149,9 @@ 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/msbuild - d434c0e464ee0c119bdd5ee87b448e16fe0786be + 49c7a8cf6dc7425ae3205cbb4e5babe15b72c005 diff --git a/eng/Versions.props b/eng/Versions.props index ee8755145..f1c223e1b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23126.6 - 7.0.300-preview.23126.6 - 7.0.300-preview.23126.6 + 7.0.300-preview.23126.8 + 7.0.300-preview.23126.8 + 7.0.300-preview.23126.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7d72c5a676b8fb4e1d03585bfec8a039c0693c74 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 27 Feb 2023 09:13:26 -0800 Subject: [PATCH 364/654] Increase branding version and downgrade implicit version to enable hotfix release (#15587) --- eng/Versions.props | 4 ++-- src/redist/targets/GenerateBundledVersions.targets | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5ecffc42b..466f3d5da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,9 +8,9 @@ 7 0 2 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 391078d3c..fc64d3a14 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -63,7 +63,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 14)) + $([MSBuild]::Add($(VersionFeature), 13)) From b86f2ee7f78c62de308ad64d63bfec3ce0512ff5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 19:33:47 +0000 Subject: [PATCH 365/654] Update dependencies from https://github.com/dotnet/sdk build 20230227.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23126.8 -> To Version 7.0.300-preview.23127.9 --- 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 c6cde5faf..ad434a543 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 3c28e76fd7d1463c7eeede4becafe7f6487b64aa + e349939f4a764d117269cba0f4205b0079403e61 - + https://github.com/dotnet/sdk - 3c28e76fd7d1463c7eeede4becafe7f6487b64aa + e349939f4a764d117269cba0f4205b0079403e61 - + https://github.com/dotnet/sdk - 3c28e76fd7d1463c7eeede4becafe7f6487b64aa + e349939f4a764d117269cba0f4205b0079403e61 - + https://github.com/dotnet/sdk - 3c28e76fd7d1463c7eeede4becafe7f6487b64aa + e349939f4a764d117269cba0f4205b0079403e61 diff --git a/eng/Versions.props b/eng/Versions.props index f1c223e1b..6b4a703e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23126.8 - 7.0.300-preview.23126.8 - 7.0.300-preview.23126.8 + 7.0.300-preview.23127.9 + 7.0.300-preview.23127.9 + 7.0.300-preview.23127.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8a516d2a80c9505e758c77481b83f8ca29e09717 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Feb 2023 22:25:05 +0000 Subject: [PATCH 366/654] Merged PR 29817: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Net.Compilers.Toolset**: from 4.5.0-6.23109.5 to 4.5.0-6.23123.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.5.0 to 17.5.0 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230227.10 - **Date Produced**: February 27, 2023 7:35:58 PM UTC - **Commit**: 19d897be95902ca23a704f58d2fa7adf5b13106c - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.201 to 7.0.202][3] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3] - **Microsoft.NET.Sdk**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3] - **Microsoft.TemplateEngine.Cli**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3] - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23109.5 to 4.5.0-6.23123.11][4] - **Microsoft.Build**: [from 17.5.0 to 17.5.0][5] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1ce1f1e&targetVersion=GC19d897b&_a=files [4]: https://github.com/dotnet/roslyn/compare/6a5a63b...271ccd7 [5]: https://github.com/dotnet/msbuild/compare/81ac935...8ce3029 [DependencyUpdate]: <> (End) [marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91) --- NuGet.config | 11 ++++++++--- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 6 +++--- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 19bd67321..e1a92ae53 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,24 @@ + + - + - + + @@ -44,14 +47,16 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2adc73944..9f53963bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ce1f1ed71df8601a096b8a856840d22fb318bc7 + 19d897be95902ca23a704f58d2fa7adf5b13106c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ce1f1ed71df8601a096b8a856840d22fb318bc7 + 19d897be95902ca23a704f58d2fa7adf5b13106c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ce1f1ed71df8601a096b8a856840d22fb318bc7 + 19d897be95902ca23a704f58d2fa7adf5b13106c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ce1f1ed71df8601a096b8a856840d22fb318bc7 + 19d897be95902ca23a704f58d2fa7adf5b13106c @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 6a5a63bbc9f4449d9bd1e95a8f9624939c3ccdc3 + 271ccd71554f7d28d2f90551aafd0bdeb5d327aa https://github.com/dotnet/msbuild - 81ac93548ee1044f03d0ac363712bb778920ef8c + 8ce3029f48a4169237024a8f0bb4b07727a151a7 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 975e77088..cce7a122a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.201 - 7.0.201-rtm.23120.7 - 7.0.201-rtm.23120.7 + 7.0.202 + 7.0.202-servicing.23127.10 + 7.0.202-servicing.23127.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 474c3e274874fb7686ef470ecfd1214df1c2d721 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Feb 2023 03:22:46 +0000 Subject: [PATCH 367/654] Update dependencies from https://github.com/dotnet/sdk build 20230227.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23126.8 -> To Version 7.0.300-preview.23127.14 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23126.1 -> To Version 12.5.0-beta.23127.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad434a543..bc3fd235b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - e349939f4a764d117269cba0f4205b0079403e61 + bb91913be6e9b077dbaba0fee491071540df7f20 - + https://github.com/dotnet/sdk - e349939f4a764d117269cba0f4205b0079403e61 + bb91913be6e9b077dbaba0fee491071540df7f20 - + https://github.com/dotnet/sdk - e349939f4a764d117269cba0f4205b0079403e61 + bb91913be6e9b077dbaba0fee491071540df7f20 - + https://github.com/dotnet/sdk - e349939f4a764d117269cba0f4205b0079403e61 + bb91913be6e9b077dbaba0fee491071540df7f20 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 4de2393866be1be6fa35af544c6f25a10af5ab3d + 2f802c77efc09c63d3e36f50ca4380cbe5b4a5ce - + https://github.com/dotnet/fsharp - 4de2393866be1be6fa35af544c6f25a10af5ab3d + 2f802c77efc09c63d3e36f50ca4380cbe5b4a5ce diff --git a/eng/Versions.props b/eng/Versions.props index 6b4a703e7..8e41cb3cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23127.9 - 7.0.300-preview.23127.9 - 7.0.300-preview.23127.9 + 7.0.300-preview.23127.14 + 7.0.300-preview.23127.14 + 7.0.300-preview.23127.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 30795b7041a987cbe0380813316cdbae0b2bb82e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Feb 2023 09:05:36 +0000 Subject: [PATCH 368/654] Update dependencies from https://github.com/dotnet/sdk build 20230227.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23127.14 -> To Version 7.0.300-preview.23127.19 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23126.2 -> To Version 4.6.0-2.23127.9 (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 bc3fd235b..00d896e3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - bb91913be6e9b077dbaba0fee491071540df7f20 + 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 - + https://github.com/dotnet/sdk - bb91913be6e9b077dbaba0fee491071540df7f20 + 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 - + https://github.com/dotnet/sdk - bb91913be6e9b077dbaba0fee491071540df7f20 + 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 - + https://github.com/dotnet/sdk - bb91913be6e9b077dbaba0fee491071540df7f20 + 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 4641f2bff815fb7743be8aa2bdafe82b74a1f756 + 22bdff50d72eec9120bb1b68ce49668fda91d0a2 diff --git a/eng/Versions.props b/eng/Versions.props index 8e41cb3cb..4d1b0b0de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23127.14 - 7.0.300-preview.23127.14 - 7.0.300-preview.23127.14 + 7.0.300-preview.23127.19 + 7.0.300-preview.23127.19 + 7.0.300-preview.23127.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6c74320bc3ea80d03493a069e4c424b19a5a1983 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 28 Feb 2023 15:54:28 +0000 Subject: [PATCH 369/654] Merged PR 29823: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Net.Compilers.Toolset**: from 4.5.0-6.23123.11 to 4.5.0-6.23127.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.5.0 to 17.5.0 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230228.1 - **Date Produced**: February 28, 2023 10:36:52 AM UTC - **Commit**: 288f1065b0d882689bdbee4a91ceb34617fc9f96 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.202 to 7.0.202][6] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6] - **Microsoft.NET.Sdk**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6] - **Microsoft.TemplateEngine.Cli**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6] - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23123.11 to 4.5.0-6.23127.3][7] - **Microsoft.Build**: [from 17.5.0 to 17.5.0][8] [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC19d897b&targetVersion=GC288f106&_a=files [7]: https://github.com/dotnet/roslyn/compare/271ccd7...e2bc27d [8]: https://github.com/dotnet/msbuild/compare/8ce3029...6f08c67 [DependencyUpdate]: <> (End) [marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91) --- NuGet.config | 6 +++--- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index e1a92ae53..7723bf088 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,13 +15,13 @@ - + - + @@ -53,7 +53,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f53963bf..0c5879ac0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19d897be95902ca23a704f58d2fa7adf5b13106c + 288f1065b0d882689bdbee4a91ceb34617fc9f96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19d897be95902ca23a704f58d2fa7adf5b13106c + 288f1065b0d882689bdbee4a91ceb34617fc9f96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19d897be95902ca23a704f58d2fa7adf5b13106c + 288f1065b0d882689bdbee4a91ceb34617fc9f96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19d897be95902ca23a704f58d2fa7adf5b13106c + 288f1065b0d882689bdbee4a91ceb34617fc9f96 @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 271ccd71554f7d28d2f90551aafd0bdeb5d327aa + e2bc27d266040403e0c6de24f29a6bdce5cc7231 https://github.com/dotnet/msbuild - 8ce3029f48a4169237024a8f0bb4b07727a151a7 + 6f08c67f3ed838dccfbcdab91e6bebc54a26fd94 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index cce7a122a..3219402b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.202 - 7.0.202-servicing.23127.10 - 7.0.202-servicing.23127.10 + 7.0.202-servicing.23128.1 + 7.0.202-servicing.23128.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4e371c9cdac7bd4b4c3956fbd9b749c68bf36a2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Feb 2023 19:42:55 +0000 Subject: [PATCH 370/654] Update dependencies from https://github.com/dotnet/sdk build 20230228.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23127.19 -> To Version 7.0.300-preview.23128.3 --- 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 00d896e3a..dc67ac878 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 + 17b64056af48795c5dac99216ae2910456b6224e - + https://github.com/dotnet/sdk - 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 + 17b64056af48795c5dac99216ae2910456b6224e - + https://github.com/dotnet/sdk - 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 + 17b64056af48795c5dac99216ae2910456b6224e - + https://github.com/dotnet/sdk - 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 + 17b64056af48795c5dac99216ae2910456b6224e diff --git a/eng/Versions.props b/eng/Versions.props index 4d1b0b0de..ddf9ef39f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23127.19 - 7.0.300-preview.23127.19 - 7.0.300-preview.23127.19 + 7.0.300-preview.23128.3 + 7.0.300-preview.23128.3 + 7.0.300-preview.23128.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 58ec7a99fa2df6c3345552ffdaf75fd7a1ab0711 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Mar 2023 16:21:54 +0000 Subject: [PATCH 371/654] Update dependencies from https://github.com/dotnet/sdk build 20230301.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23128.3 -> To Version 7.0.300-preview.23151.1 --- 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 dc67ac878..fdab276cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 17b64056af48795c5dac99216ae2910456b6224e + ef17fef515b44b0dbfe4078a66625381ff798154 - + https://github.com/dotnet/sdk - 17b64056af48795c5dac99216ae2910456b6224e + ef17fef515b44b0dbfe4078a66625381ff798154 - + https://github.com/dotnet/sdk - 17b64056af48795c5dac99216ae2910456b6224e + ef17fef515b44b0dbfe4078a66625381ff798154 - + https://github.com/dotnet/sdk - 17b64056af48795c5dac99216ae2910456b6224e + ef17fef515b44b0dbfe4078a66625381ff798154 diff --git a/eng/Versions.props b/eng/Versions.props index ddf9ef39f..f0988e009 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23128.3 - 7.0.300-preview.23128.3 - 7.0.300-preview.23128.3 + 7.0.300-preview.23151.1 + 7.0.300-preview.23151.1 + 7.0.300-preview.23151.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e2d3ef563940cb342b19694076e60738b358d59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Mar 2023 03:13:12 +0000 Subject: [PATCH 372/654] Update dependencies from https://github.com/dotnet/sdk build 20230301.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23151.1 -> To Version 7.0.300-preview.23151.8 --- 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 fdab276cb..d3276208d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - ef17fef515b44b0dbfe4078a66625381ff798154 + 861c2bccdb6015176f8a59c8b9d586030b2035f9 - + https://github.com/dotnet/sdk - ef17fef515b44b0dbfe4078a66625381ff798154 + 861c2bccdb6015176f8a59c8b9d586030b2035f9 - + https://github.com/dotnet/sdk - ef17fef515b44b0dbfe4078a66625381ff798154 + 861c2bccdb6015176f8a59c8b9d586030b2035f9 - + https://github.com/dotnet/sdk - ef17fef515b44b0dbfe4078a66625381ff798154 + 861c2bccdb6015176f8a59c8b9d586030b2035f9 diff --git a/eng/Versions.props b/eng/Versions.props index f0988e009..a23118cf4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23151.1 - 7.0.300-preview.23151.1 - 7.0.300-preview.23151.1 + 7.0.300-preview.23151.8 + 7.0.300-preview.23151.8 + 7.0.300-preview.23151.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7476c7f5427b97aefabe3d7c573496215f4074d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 03:00:48 +0000 Subject: [PATCH 373/654] Update dependencies from https://github.com/dotnet/sdk build 20230302.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23151.8 -> To Version 7.0.300-preview.23152.2 --- 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 d3276208d..941d845f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 861c2bccdb6015176f8a59c8b9d586030b2035f9 + 740ae87c81b8aed3da0821611186cb94b29a8f74 - + https://github.com/dotnet/sdk - 861c2bccdb6015176f8a59c8b9d586030b2035f9 + 740ae87c81b8aed3da0821611186cb94b29a8f74 - + https://github.com/dotnet/sdk - 861c2bccdb6015176f8a59c8b9d586030b2035f9 + 740ae87c81b8aed3da0821611186cb94b29a8f74 - + https://github.com/dotnet/sdk - 861c2bccdb6015176f8a59c8b9d586030b2035f9 + 740ae87c81b8aed3da0821611186cb94b29a8f74 diff --git a/eng/Versions.props b/eng/Versions.props index a23118cf4..25b671627 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23151.8 - 7.0.300-preview.23151.8 - 7.0.300-preview.23151.8 + 7.0.300-preview.23152.2 + 7.0.300-preview.23152.2 + 7.0.300-preview.23152.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From adb2ac6f52a7cc5efe31d05588d9eac9d0f75bf9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 04:57:58 +0000 Subject: [PATCH 374/654] Update dependencies from https://github.com/dotnet/sdk build 20230302.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23151.8 -> To Version 7.0.300-preview.23152.5 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.6.0-2.23127.9 -> To Version 4.6.0-3.23152.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 941d845f8..9f9d5e0ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 740ae87c81b8aed3da0821611186cb94b29a8f74 + a97e6a95d9707bfdc600d95a046f03e369c172a2 - + https://github.com/dotnet/sdk - 740ae87c81b8aed3da0821611186cb94b29a8f74 + a97e6a95d9707bfdc600d95a046f03e369c172a2 - + https://github.com/dotnet/sdk - 740ae87c81b8aed3da0821611186cb94b29a8f74 + a97e6a95d9707bfdc600d95a046f03e369c172a2 - + https://github.com/dotnet/sdk - 740ae87c81b8aed3da0821611186cb94b29a8f74 + a97e6a95d9707bfdc600d95a046f03e369c172a2 @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 22bdff50d72eec9120bb1b68ce49668fda91d0a2 + 81404ba772fe054b1ccd1b4cc67a59d44967c926 - + https://github.com/dotnet/msbuild - 49c7a8cf6dc7425ae3205cbb4e5babe15b72c005 + 47a712160eb420136ec983be5e0f412dc1c25b55 diff --git a/eng/Versions.props b/eng/Versions.props index 25b671627..8af130605 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23152.2 - 7.0.300-preview.23152.2 - 7.0.300-preview.23152.2 + 7.0.300-preview.23152.5 + 7.0.300-preview.23152.5 + 7.0.300-preview.23152.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 32284ea4fb55eeee8cf402582a069b736e13c58f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 20:40:39 +0000 Subject: [PATCH 375/654] Update dependencies from https://github.com/dotnet/sdk build 20230303.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23152.5 -> To Version 7.0.300-preview.23153.4 --- 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 9f9d5e0ce..58ac14583 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - a97e6a95d9707bfdc600d95a046f03e369c172a2 + 4840cf0aef98894a07844b704240ab6185d25415 - + https://github.com/dotnet/sdk - a97e6a95d9707bfdc600d95a046f03e369c172a2 + 4840cf0aef98894a07844b704240ab6185d25415 - + https://github.com/dotnet/sdk - a97e6a95d9707bfdc600d95a046f03e369c172a2 + 4840cf0aef98894a07844b704240ab6185d25415 - + https://github.com/dotnet/sdk - a97e6a95d9707bfdc600d95a046f03e369c172a2 + 4840cf0aef98894a07844b704240ab6185d25415 diff --git a/eng/Versions.props b/eng/Versions.props index 8af130605..0c463cbc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23152.5 - 7.0.300-preview.23152.5 - 7.0.300-preview.23152.5 + 7.0.300-preview.23153.4 + 7.0.300-preview.23153.4 + 7.0.300-preview.23153.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b050f611f9e516b62e9e9974f5c89613150b5eb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Mar 2023 03:27:38 +0000 Subject: [PATCH 376/654] Update dependencies from https://github.com/dotnet/sdk build 20230305.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23153.4 -> To Version 7.0.300-preview.23155.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23127.2 -> To Version 12.5.0-beta.23153.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58ac14583..ffc64083e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 4840cf0aef98894a07844b704240ab6185d25415 + 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd - + https://github.com/dotnet/sdk - 4840cf0aef98894a07844b704240ab6185d25415 + 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd - + https://github.com/dotnet/sdk - 4840cf0aef98894a07844b704240ab6185d25415 + 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd - + https://github.com/dotnet/sdk - 4840cf0aef98894a07844b704240ab6185d25415 + 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 2f802c77efc09c63d3e36f50ca4380cbe5b4a5ce + ab771de3c23cebcf699e1753500a8649eb4b6272 - + https://github.com/dotnet/fsharp - 2f802c77efc09c63d3e36f50ca4380cbe5b4a5ce + ab771de3c23cebcf699e1753500a8649eb4b6272 diff --git a/eng/Versions.props b/eng/Versions.props index 0c463cbc3..d0d130275 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23153.4 - 7.0.300-preview.23153.4 - 7.0.300-preview.23153.4 + 7.0.300-preview.23155.1 + 7.0.300-preview.23155.1 + 7.0.300-preview.23155.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bb6c9105d91834d83f4dc90e8d131489f459fc4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 17:32:49 +0000 Subject: [PATCH 377/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15708) [release/7.0.3xx] Update dependencies from dotnet/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 ffc64083e..436c806b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd + 201db70f2b8213018f0e01d3f40e2e30c880a1ec - + https://github.com/dotnet/sdk - 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd + 201db70f2b8213018f0e01d3f40e2e30c880a1ec - + https://github.com/dotnet/sdk - 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd + 201db70f2b8213018f0e01d3f40e2e30c880a1ec - + https://github.com/dotnet/sdk - 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd + 201db70f2b8213018f0e01d3f40e2e30c880a1ec diff --git a/eng/Versions.props b/eng/Versions.props index d0d130275..6a1eb4f55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23155.1 - 7.0.300-preview.23155.1 - 7.0.300-preview.23155.1 + 7.0.300-preview.23156.2 + 7.0.300-preview.23156.2 + 7.0.300-preview.23156.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f70d7defe75eec331087cfcce6130ec99d8b449a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 11:02:20 -0800 Subject: [PATCH 378/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15709) Co-authored-by: dotnet-maestro[bot] --- 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 436c806b6..ed66b0a3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 201db70f2b8213018f0e01d3f40e2e30c880a1ec + 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 - + https://github.com/dotnet/sdk - 201db70f2b8213018f0e01d3f40e2e30c880a1ec + 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 - + https://github.com/dotnet/sdk - 201db70f2b8213018f0e01d3f40e2e30c880a1ec + 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 - + https://github.com/dotnet/sdk - 201db70f2b8213018f0e01d3f40e2e30c880a1ec + 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 81404ba772fe054b1ccd1b4cc67a59d44967c926 + 1314d090671dc1a1500c5303c4b5ae9150f40d98 diff --git a/eng/Versions.props b/eng/Versions.props index 6a1eb4f55..cb2b7a7d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23156.2 - 7.0.300-preview.23156.2 - 7.0.300-preview.23156.2 + 7.0.300-preview.23156.7 + 7.0.300-preview.23156.7 + 7.0.300-preview.23156.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1a18e43729d72e502cfbc1ed2d5ab1c8102885f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 15:04:00 -0800 Subject: [PATCH 379/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15710) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed66b0a3c..a4256ed6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 + e719ec15410358ebc222bb015b1ec714a2e76563 - + https://github.com/dotnet/sdk - 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 + e719ec15410358ebc222bb015b1ec714a2e76563 - + https://github.com/dotnet/sdk - 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 + e719ec15410358ebc222bb015b1ec714a2e76563 - + https://github.com/dotnet/sdk - 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 + e719ec15410358ebc222bb015b1ec714a2e76563 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - ab771de3c23cebcf699e1753500a8649eb4b6272 + 4fe02408af45297c07da59626108a73edbb8ad32 - + https://github.com/dotnet/fsharp - ab771de3c23cebcf699e1753500a8649eb4b6272 + 4fe02408af45297c07da59626108a73edbb8ad32 diff --git a/eng/Versions.props b/eng/Versions.props index cb2b7a7d9..8f830e94e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23156.7 - 7.0.300-preview.23156.7 - 7.0.300-preview.23156.7 + 7.0.300-preview.23156.11 + 7.0.300-preview.23156.11 + 7.0.300-preview.23156.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 97c30ca066e6f1ce95bf70af32ff0b3fd7251e82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Mar 2023 06:44:09 +0000 Subject: [PATCH 380/654] Update dependencies from https://github.com/dotnet/sdk build 20230306.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23156.11 -> To Version 7.0.300-preview.23156.16 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23152-03 -> To Version 17.6.0-preview-23157-01 (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 a4256ed6f..ffbda0716 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - e719ec15410358ebc222bb015b1ec714a2e76563 + ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 - + https://github.com/dotnet/sdk - e719ec15410358ebc222bb015b1ec714a2e76563 + ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 - + https://github.com/dotnet/sdk - e719ec15410358ebc222bb015b1ec714a2e76563 + ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 - + https://github.com/dotnet/sdk - e719ec15410358ebc222bb015b1ec714a2e76563 + ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 47a712160eb420136ec983be5e0f412dc1c25b55 + 747ecc3420e49f2fd43c0bfaaf0e873575bae586 diff --git a/eng/Versions.props b/eng/Versions.props index 8f830e94e..0afc8d458 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23156.11 - 7.0.300-preview.23156.11 - 7.0.300-preview.23156.11 + 7.0.300-preview.23156.16 + 7.0.300-preview.23156.16 + 7.0.300-preview.23156.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bb91038a827521fd26f499e4b71e3ef1b4fd855f Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 7 Mar 2023 10:22:58 -0800 Subject: [PATCH 381/654] Update branding to 7.0.203 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 466f3d5da..3bdbf0733 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 2 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 1347445515f7123eb3e2e4503caf421d1dcced08 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 19:50:31 +0000 Subject: [PATCH 382/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15723) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.5.0-beta.23156.2 to 12.5.0-beta.23157.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23156.2 to 7.0.300-beta.23157.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffbda0716..f99793d89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 + 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd - + https://github.com/dotnet/sdk - ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 + 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd - + https://github.com/dotnet/sdk - ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 + 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd - + https://github.com/dotnet/sdk - ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 + 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 4fe02408af45297c07da59626108a73edbb8ad32 + d8b592e358fb86e3b34b166bf6fff2d52c6c6446 - + https://github.com/dotnet/fsharp - 4fe02408af45297c07da59626108a73edbb8ad32 + d8b592e358fb86e3b34b166bf6fff2d52c6c6446 diff --git a/eng/Versions.props b/eng/Versions.props index 0afc8d458..21299c5da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23156.16 - 7.0.300-preview.23156.16 - 7.0.300-preview.23156.16 + 7.0.300-preview.23157.7 + 7.0.300-preview.23157.7 + 7.0.300-preview.23157.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d0378c917907d50ca392f893c374e419b5ca19ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Mar 2023 02:11:55 +0000 Subject: [PATCH 383/654] Update dependencies from https://github.com/dotnet/sdk build 20230307.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23157.7 -> To Version 7.0.300-preview.23157.24 --- 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 f99793d89..97ea77a4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd + 558a8884369adc0ec846b2d3256b949e26fc2efd - + https://github.com/dotnet/sdk - 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd + 558a8884369adc0ec846b2d3256b949e26fc2efd - + https://github.com/dotnet/sdk - 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd + 558a8884369adc0ec846b2d3256b949e26fc2efd - + https://github.com/dotnet/sdk - 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd + 558a8884369adc0ec846b2d3256b949e26fc2efd diff --git a/eng/Versions.props b/eng/Versions.props index 21299c5da..af62c311f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23157.7 - 7.0.300-preview.23157.7 - 7.0.300-preview.23157.7 + 7.0.300-preview.23157.24 + 7.0.300-preview.23157.24 + 7.0.300-preview.23157.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c3fd1936b515705344c6a92066de304d89956058 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Mar 2023 02:14:40 +0000 Subject: [PATCH 384/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.202 -> To Version 7.0.203 --- NuGet.config | 19 ++++++++++++++++--- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7723bf088..7256e3c4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,23 +8,30 @@ + + + + - + + - + + + @@ -48,15 +55,21 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c5879ac0..3d8a952e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 288f1065b0d882689bdbee4a91ceb34617fc9f96 + 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 288f1065b0d882689bdbee4a91ceb34617fc9f96 + 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 288f1065b0d882689bdbee4a91ceb34617fc9f96 + 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 288f1065b0d882689bdbee4a91ceb34617fc9f96 + 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 diff --git a/eng/Versions.props b/eng/Versions.props index fa5b979e3..72b2ee835 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.202 - 7.0.202-servicing.23128.1 - 7.0.202-servicing.23128.1 + 7.0.203 + 7.0.203-servicing.23157.25 + 7.0.203-servicing.23157.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2a60f19fddfdecada8cb0e4127ee72e6e4dc30b5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Mar 2023 03:55:30 +0000 Subject: [PATCH 385/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.202 -> To Version 7.0.203 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.5.0-6.23127.3 -> To Version 4.5.2-3.23152.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7256e3c4a..260e18713 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d8a952e9..465b75ea5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 + 3760d8678b4a386b91b4018163f9e3e9e522f325 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 + 3760d8678b4a386b91b4018163f9e3e9e522f325 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 + 3760d8678b4a386b91b4018163f9e3e9e522f325 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 + 3760d8678b4a386b91b4018163f9e3e9e522f325 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - e2bc27d266040403e0c6de24f29a6bdce5cc7231 + 019bee653d1f2c0d7500be262536e505f67117cf diff --git a/eng/Versions.props b/eng/Versions.props index 72b2ee835..4121e0e36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.203 - 7.0.203-servicing.23157.25 - 7.0.203-servicing.23157.25 + 7.0.203-servicing.23157.34 + 7.0.203-servicing.23157.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f968ecb731dedfbbaf455fd4b136d7d6edb80663 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Mar 2023 03:58:51 +0000 Subject: [PATCH 386/654] Update dependencies from https://github.com/dotnet/sdk build 20230307.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23157.24 -> To Version 7.0.300-preview.23157.35 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23157-01 -> To Version 17.6.0-preview-23157-03 (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 97ea77a4f..29188174b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 558a8884369adc0ec846b2d3256b949e26fc2efd + c7aa39967e179e23ef54c1068d9a067f2bebf738 - + https://github.com/dotnet/sdk - 558a8884369adc0ec846b2d3256b949e26fc2efd + c7aa39967e179e23ef54c1068d9a067f2bebf738 - + https://github.com/dotnet/sdk - 558a8884369adc0ec846b2d3256b949e26fc2efd + c7aa39967e179e23ef54c1068d9a067f2bebf738 - + https://github.com/dotnet/sdk - 558a8884369adc0ec846b2d3256b949e26fc2efd + c7aa39967e179e23ef54c1068d9a067f2bebf738 @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 747ecc3420e49f2fd43c0bfaaf0e873575bae586 + 1a6d753a7648baf0cc991af0c0d254a41d36eba6 diff --git a/eng/Versions.props b/eng/Versions.props index af62c311f..5bc081b85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23157.24 - 7.0.300-preview.23157.24 - 7.0.300-preview.23157.24 + 7.0.300-preview.23157.35 + 7.0.300-preview.23157.35 + 7.0.300-preview.23157.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3c0f81bb30cb7a5dda134b3c5877d6a22c85ad71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 13:11:20 -0800 Subject: [PATCH 387/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15738) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29188174b..16c54158e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - c7aa39967e179e23ef54c1068d9a067f2bebf738 + c94357641a738ee5bb6a65b9e0f79b30b26ccb7d - + https://github.com/dotnet/sdk - c7aa39967e179e23ef54c1068d9a067f2bebf738 + c94357641a738ee5bb6a65b9e0f79b30b26ccb7d - + https://github.com/dotnet/sdk - c7aa39967e179e23ef54c1068d9a067f2bebf738 + c94357641a738ee5bb6a65b9e0f79b30b26ccb7d - + https://github.com/dotnet/sdk - c7aa39967e179e23ef54c1068d9a067f2bebf738 + c94357641a738ee5bb6a65b9e0f79b30b26ccb7d @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - d8b592e358fb86e3b34b166bf6fff2d52c6c6446 + edebe8edefbfa795ba776deb9470b2a80a2bfdc4 - + https://github.com/dotnet/fsharp - d8b592e358fb86e3b34b166bf6fff2d52c6c6446 + edebe8edefbfa795ba776deb9470b2a80a2bfdc4 diff --git a/eng/Versions.props b/eng/Versions.props index 5bc081b85..8b849c8d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23157.35 - 7.0.300-preview.23157.35 - 7.0.300-preview.23157.35 + 7.0.300-preview.23158.14 + 7.0.300-preview.23158.14 + 7.0.300-preview.23158.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ede3cbf328ef0081b7586874f8b9f5de5f7e7b9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 23:26:40 +0000 Subject: [PATCH 388/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15744) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.5.0-beta.23158.4 to 12.5.0-beta.23158.5 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23158.4 to 7.0.300-beta.23158.5 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.6.0-preview.2.29 to 6.6.0-preview.3.42 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16c54158e..e01374a73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - c94357641a738ee5bb6a65b9e0f79b30b26ccb7d + 701383aea38328e5e4a947d201bb0b5f8eeea582 - + https://github.com/dotnet/sdk - c94357641a738ee5bb6a65b9e0f79b30b26ccb7d + 701383aea38328e5e4a947d201bb0b5f8eeea582 - + https://github.com/dotnet/sdk - c94357641a738ee5bb6a65b9e0f79b30b26ccb7d + 701383aea38328e5e4a947d201bb0b5f8eeea582 - + https://github.com/dotnet/sdk - c94357641a738ee5bb6a65b9e0f79b30b26ccb7d + 701383aea38328e5e4a947d201bb0b5f8eeea582 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - edebe8edefbfa795ba776deb9470b2a80a2bfdc4 + 225eaa6ddb994e7c74c7eac1e301f688366f1b78 - + https://github.com/dotnet/fsharp - edebe8edefbfa795ba776deb9470b2a80a2bfdc4 + 225eaa6ddb994e7c74c7eac1e301f688366f1b78 @@ -154,9 +154,9 @@ 1a6d753a7648baf0cc991af0c0d254a41d36eba6 - + https://github.com/nuget/nuget.client - 4d5af8a3492c8d9d0c99c3cdf3cce12129c8e743 + 9ebbe50f56c5e508f631946f1424fe93934b329c diff --git a/eng/Versions.props b/eng/Versions.props index 8b849c8d3..692641741 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23158.14 - 7.0.300-preview.23158.14 - 7.0.300-preview.23158.14 + 7.0.300-preview.23158.27 + 7.0.300-preview.23158.27 + 7.0.300-preview.23158.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15f10dbff379a85f4bd8e649242cff382fdaf627 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Mar 2023 07:43:50 +0000 Subject: [PATCH 389/654] Update dependencies from https://github.com/dotnet/sdk build 20230308.52 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23158.27 -> To Version 7.0.300-preview.23158.52 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23157-03 -> To Version 17.6.0-preview-23159-01 (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 e01374a73..52f99ca71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 701383aea38328e5e4a947d201bb0b5f8eeea582 + 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c - + https://github.com/dotnet/sdk - 701383aea38328e5e4a947d201bb0b5f8eeea582 + 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c - + https://github.com/dotnet/sdk - 701383aea38328e5e4a947d201bb0b5f8eeea582 + 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c - + https://github.com/dotnet/sdk - 701383aea38328e5e4a947d201bb0b5f8eeea582 + 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 1a6d753a7648baf0cc991af0c0d254a41d36eba6 + 0fb1955ea9708d3b8f817dfa193af0edf5dd3991 diff --git a/eng/Versions.props b/eng/Versions.props index 692641741..d4a0c06fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23158.27 - 7.0.300-preview.23158.27 - 7.0.300-preview.23158.27 + 7.0.300-preview.23158.52 + 7.0.300-preview.23158.52 + 7.0.300-preview.23158.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 93a37b271934a37c4c7eab50a917b7214975d3e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 21:20:52 +0000 Subject: [PATCH 390/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15754) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.5.0-beta.23158.5 to 12.5.0-beta.23159.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23158.5 to 7.0.300-beta.23159.2 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0-preview-23159-01 to 17.6.0-preview-23159-04 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52f99ca71..3e74d5737 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c + d056bba338c787ebc9145f8f95e838b799a8b0fa - + https://github.com/dotnet/sdk - 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c + d056bba338c787ebc9145f8f95e838b799a8b0fa - + https://github.com/dotnet/sdk - 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c + d056bba338c787ebc9145f8f95e838b799a8b0fa - + https://github.com/dotnet/sdk - 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c + d056bba338c787ebc9145f8f95e838b799a8b0fa @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 225eaa6ddb994e7c74c7eac1e301f688366f1b78 + 99ecffb8525b48caf64ac3108680b7b251fb4e89 - + https://github.com/dotnet/fsharp - 225eaa6ddb994e7c74c7eac1e301f688366f1b78 + 99ecffb8525b48caf64ac3108680b7b251fb4e89 @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 0fb1955ea9708d3b8f817dfa193af0edf5dd3991 + a0c282787d59ca9a449ded85175f39030e5077b8 diff --git a/eng/Versions.props b/eng/Versions.props index c4532e380..2bb7fd6eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23158.52 - 7.0.300-preview.23158.52 - 7.0.300-preview.23158.52 + 7.0.300-preview.23159.11 + 7.0.300-preview.23159.11 + 7.0.300-preview.23159.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e059a7607c0ed1125749561b5464009e3a3f166f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 9 Mar 2023 22:21:56 +0000 Subject: [PATCH 391/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230309.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.203 -> To Version 7.0.203 --- NuGet.config | 11 +++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 260e18713..e60ae552a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,12 +8,14 @@ + + @@ -22,14 +24,16 @@ + - + + @@ -57,19 +61,22 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 465b75ea5..fae543cd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3760d8678b4a386b91b4018163f9e3e9e522f325 + 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3760d8678b4a386b91b4018163f9e3e9e522f325 + 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3760d8678b4a386b91b4018163f9e3e9e522f325 + 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3760d8678b4a386b91b4018163f9e3e9e522f325 + 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 diff --git a/eng/Versions.props b/eng/Versions.props index 4121e0e36..021c2270a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.203 - 7.0.203-servicing.23157.34 - 7.0.203-servicing.23157.34 + 7.0.203-servicing.23159.19 + 7.0.203-servicing.23159.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 43a4d99ea1c03d700f03eb1b9a7a7364c6b4ef19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 15:34:43 -0800 Subject: [PATCH 392/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15760) Co-authored-by: dotnet-maestro[bot] --- 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 3e74d5737..2dd93364b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - d056bba338c787ebc9145f8f95e838b799a8b0fa + 450e0f6167fccd851825e46d397fd8a39108de7f - + https://github.com/dotnet/sdk - d056bba338c787ebc9145f8f95e838b799a8b0fa + 450e0f6167fccd851825e46d397fd8a39108de7f - + https://github.com/dotnet/sdk - d056bba338c787ebc9145f8f95e838b799a8b0fa + 450e0f6167fccd851825e46d397fd8a39108de7f - + https://github.com/dotnet/sdk - d056bba338c787ebc9145f8f95e838b799a8b0fa + 450e0f6167fccd851825e46d397fd8a39108de7f @@ -154,9 +154,9 @@ a0c282787d59ca9a449ded85175f39030e5077b8 - + https://github.com/nuget/nuget.client - 9ebbe50f56c5e508f631946f1424fe93934b329c + f49ca00e27297fe7b4b82a2557d5b0caad907a06 diff --git a/eng/Versions.props b/eng/Versions.props index 2bb7fd6eb..3fd1f976e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23159.11 - 7.0.300-preview.23159.11 - 7.0.300-preview.23159.11 + 7.0.300-preview.23159.17 + 7.0.300-preview.23159.17 + 7.0.300-preview.23159.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a4d57dc25c710df7e5d8629955a944e164ca69a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Mar 2023 06:44:19 +0000 Subject: [PATCH 393/654] Update dependencies from https://github.com/dotnet/sdk build 20230309.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23159.17 -> To Version 7.0.300-preview.23159.32 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23159-04 -> To Version 17.6.0-preview-23160-01 (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 2dd93364b..17dbc774b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 450e0f6167fccd851825e46d397fd8a39108de7f + 3281b6cbf4e63264ccc24716d0cb1053164af8a1 - + https://github.com/dotnet/sdk - 450e0f6167fccd851825e46d397fd8a39108de7f + 3281b6cbf4e63264ccc24716d0cb1053164af8a1 - + https://github.com/dotnet/sdk - 450e0f6167fccd851825e46d397fd8a39108de7f + 3281b6cbf4e63264ccc24716d0cb1053164af8a1 - + https://github.com/dotnet/sdk - 450e0f6167fccd851825e46d397fd8a39108de7f + 3281b6cbf4e63264ccc24716d0cb1053164af8a1 @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - a0c282787d59ca9a449ded85175f39030e5077b8 + 15dea1b35cc21461d56f3fefcc332664da5840f7 diff --git a/eng/Versions.props b/eng/Versions.props index 3fd1f976e..d437daaff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23159.17 - 7.0.300-preview.23159.17 - 7.0.300-preview.23159.17 + 7.0.300-preview.23159.32 + 7.0.300-preview.23159.32 + 7.0.300-preview.23159.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 200e8137b71521a0ac606a497656fd3c29ecc84a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Mar 2023 09:54:56 +0000 Subject: [PATCH 394/654] Update dependencies from https://github.com/dotnet/sdk build 20230310.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23159.32 -> To Version 7.0.300-preview.23160.2 --- 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 17dbc774b..69eab1bf5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 3281b6cbf4e63264ccc24716d0cb1053164af8a1 + b61c39085096854daeb0851edfeb9d147431ccee - + https://github.com/dotnet/sdk - 3281b6cbf4e63264ccc24716d0cb1053164af8a1 + b61c39085096854daeb0851edfeb9d147431ccee - + https://github.com/dotnet/sdk - 3281b6cbf4e63264ccc24716d0cb1053164af8a1 + b61c39085096854daeb0851edfeb9d147431ccee - + https://github.com/dotnet/sdk - 3281b6cbf4e63264ccc24716d0cb1053164af8a1 + b61c39085096854daeb0851edfeb9d147431ccee diff --git a/eng/Versions.props b/eng/Versions.props index d437daaff..322d5954c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23159.32 - 7.0.300-preview.23159.32 - 7.0.300-preview.23159.32 + 7.0.300-preview.23160.2 + 7.0.300-preview.23160.2 + 7.0.300-preview.23160.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f31f7b69ca9d2321147376027cffb851ba10082e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Mar 2023 23:07:24 +0000 Subject: [PATCH 395/654] Update dependencies from https://github.com/dotnet/sdk build 20230310.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23159.32 -> To Version 7.0.300-preview.23160.18 Dependency coherency updates NuGet.Build.Tasks From Version 6.6.0-preview.3.43 -> To Version 6.6.0-preview.3.44 (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 69eab1bf5..4fb4d52b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - b61c39085096854daeb0851edfeb9d147431ccee + f91626fc4bb3a996340b66a9adc6edf0a764e144 - + https://github.com/dotnet/sdk - b61c39085096854daeb0851edfeb9d147431ccee + f91626fc4bb3a996340b66a9adc6edf0a764e144 - + https://github.com/dotnet/sdk - b61c39085096854daeb0851edfeb9d147431ccee + f91626fc4bb3a996340b66a9adc6edf0a764e144 - + https://github.com/dotnet/sdk - b61c39085096854daeb0851edfeb9d147431ccee + f91626fc4bb3a996340b66a9adc6edf0a764e144 @@ -154,9 +154,9 @@ 15dea1b35cc21461d56f3fefcc332664da5840f7 - + https://github.com/nuget/nuget.client - f49ca00e27297fe7b4b82a2557d5b0caad907a06 + 3ab7d1462029e0b211a88040c952c9b8a679708d diff --git a/eng/Versions.props b/eng/Versions.props index 322d5954c..d0b552c96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23160.2 - 7.0.300-preview.23160.2 - 7.0.300-preview.23160.2 + 7.0.300-preview.23160.18 + 7.0.300-preview.23160.18 + 7.0.300-preview.23160.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bc88fae6a5fe58a20eff5490cc5043dfbc93051e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Mar 2023 00:07:59 +0000 Subject: [PATCH 396/654] Update dependencies from https://github.com/dotnet/sdk build 20230310.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23159.32 -> To Version 7.0.300-preview.23160.25 Dependency coherency updates NuGet.Build.Tasks From Version 6.6.0-preview.3.43 -> To Version 6.6.0-preview.3.44 (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 4fb4d52b1..b1ec674fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - f91626fc4bb3a996340b66a9adc6edf0a764e144 + 9cec2011b88f97b414d271f35882d555143d4ada - + https://github.com/dotnet/sdk - f91626fc4bb3a996340b66a9adc6edf0a764e144 + 9cec2011b88f97b414d271f35882d555143d4ada - + https://github.com/dotnet/sdk - f91626fc4bb3a996340b66a9adc6edf0a764e144 + 9cec2011b88f97b414d271f35882d555143d4ada - + https://github.com/dotnet/sdk - f91626fc4bb3a996340b66a9adc6edf0a764e144 + 9cec2011b88f97b414d271f35882d555143d4ada diff --git a/eng/Versions.props b/eng/Versions.props index d0b552c96..8c7c94c55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23160.18 - 7.0.300-preview.23160.18 - 7.0.300-preview.23160.18 + 7.0.300-preview.23160.25 + 7.0.300-preview.23160.25 + 7.0.300-preview.23160.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9794e7097d8044bd1737bd8ff326618ce95563fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Mar 2023 01:06:19 +0000 Subject: [PATCH 397/654] Update dependencies from https://github.com/dotnet/sdk build 20230310.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23159.32 -> To Version 7.0.300-preview.23160.27 Dependency coherency updates Microsoft.Build,NuGet.Build.Tasks From Version 17.6.0-preview-23160-01 -> To Version 17.6.0-preview-23160-02 (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 b1ec674fc..db0ede573 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 9cec2011b88f97b414d271f35882d555143d4ada + 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 - + https://github.com/dotnet/sdk - 9cec2011b88f97b414d271f35882d555143d4ada + 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 - + https://github.com/dotnet/sdk - 9cec2011b88f97b414d271f35882d555143d4ada + 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 - + https://github.com/dotnet/sdk - 9cec2011b88f97b414d271f35882d555143d4ada + 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 15dea1b35cc21461d56f3fefcc332664da5840f7 + 20614d22a579d73f632d5d4c7449f1ff93a2ad81 diff --git a/eng/Versions.props b/eng/Versions.props index 8c7c94c55..711fa1510 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23160.25 - 7.0.300-preview.23160.25 - 7.0.300-preview.23160.25 + 7.0.300-preview.23160.27 + 7.0.300-preview.23160.27 + 7.0.300-preview.23160.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 636052dd0ce77163aec3ecf681b880aa51d5319b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Mar 2023 03:06:49 +0000 Subject: [PATCH 398/654] Update dependencies from https://github.com/dotnet/sdk build 20230312.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23160.27 -> To Version 7.0.300-preview.23162.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23159.2 -> To Version 12.5.0-beta.23161.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db0ede573..9538dda25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 + 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 - + https://github.com/dotnet/sdk - 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 + 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 - + https://github.com/dotnet/sdk - 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 + 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 - + https://github.com/dotnet/sdk - 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 + 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 99ecffb8525b48caf64ac3108680b7b251fb4e89 + 50ede7324c833488ee6769b18662d0e7be31c862 - + https://github.com/dotnet/fsharp - 99ecffb8525b48caf64ac3108680b7b251fb4e89 + 50ede7324c833488ee6769b18662d0e7be31c862 diff --git a/eng/Versions.props b/eng/Versions.props index 711fa1510..c19930873 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23160.27 - 7.0.300-preview.23160.27 - 7.0.300-preview.23160.27 + 7.0.300-preview.23162.2 + 7.0.300-preview.23162.2 + 7.0.300-preview.23162.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3b1da70249c9145dfb068774a1d56efeace0c9b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Mar 2023 06:37:22 +0000 Subject: [PATCH 399/654] Update dependencies from https://github.com/dotnet/sdk build 20230312.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23162.2 -> To Version 7.0.300-preview.23162.5 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23160-02 -> To Version 17.6.0-preview-23163-03 (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 9538dda25..346e5019e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 + 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 - + https://github.com/dotnet/sdk - 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 + 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 - + https://github.com/dotnet/sdk - 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 + 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 - + https://github.com/dotnet/sdk - 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 + 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 20614d22a579d73f632d5d4c7449f1ff93a2ad81 + f776814442dc189b442ba87e3bdf1656c45dce81 diff --git a/eng/Versions.props b/eng/Versions.props index c19930873..75f54c574 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23162.2 - 7.0.300-preview.23162.2 - 7.0.300-preview.23162.2 + 7.0.300-preview.23162.5 + 7.0.300-preview.23162.5 + 7.0.300-preview.23162.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 54578ddfd8ec47554db77642f2cbe55723f5c96f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Mar 2023 10:55:43 +0000 Subject: [PATCH 400/654] Update dependencies from https://github.com/dotnet/sdk build 20230313.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23162.5 -> To Version 7.0.300-preview.23163.1 --- 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 346e5019e..3a64b902f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 + 584ea86b6a3318a428910d308a2b02971972a74e - + https://github.com/dotnet/sdk - 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 + 584ea86b6a3318a428910d308a2b02971972a74e - + https://github.com/dotnet/sdk - 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 + 584ea86b6a3318a428910d308a2b02971972a74e - + https://github.com/dotnet/sdk - 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 + 584ea86b6a3318a428910d308a2b02971972a74e diff --git a/eng/Versions.props b/eng/Versions.props index 75f54c574..bb978ad5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23162.5 - 7.0.300-preview.23162.5 - 7.0.300-preview.23162.5 + 7.0.300-preview.23163.1 + 7.0.300-preview.23163.1 + 7.0.300-preview.23163.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0618b2c20d311cb615f5a4b2857dd15376ba09d4 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 13 Mar 2023 14:02:57 -0700 Subject: [PATCH 401/654] Automate asp.net template updates into dotnet/installer --- eng/Versions.props | 28 +++++++++++++++++-- .../targets/GenerateBundledVersions.targets | 7 ----- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 45673d3d7..fed6eec12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,6 +19,12 @@ true release + + 30 + 32 + 17 + $([MSBuild]::Add($(VersionFeature), 13)) + @@ -103,12 +109,28 @@ 5.8.0 + + + + $(MicrosoftNETSdkPackageVersion.Split('.')[2]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Split('-')[0]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Substring(1)) + + true + true + $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) + 5.0.403 6.0.302 - 5.0.13 - 6.0.1 5.0.17-servicing.22215.4 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 @@ -135,7 +157,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.14 + 6.0.$(AspNetCoreTemplateFeature60) $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index fc64d3a14..60d7ecde1 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -59,13 +59,6 @@ - - 30 - 32 - 17 - $([MSBuild]::Add($(VersionFeature), 13)) - - Microsoft.NETCoreSdk.BundledVersions.props From 67e4bf2cf09f349693e606fcc1293bdbfde576f3 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 13 Mar 2023 14:07:05 -0700 Subject: [PATCH 402/654] Automate asp.net template updates into dotnet/installer --- eng/Versions.props | 28 +++++++++++++++++-- .../targets/GenerateBundledVersions.targets | 7 ----- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 75f54c574..3f7f42255 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,6 +19,12 @@ false release + + 30 + 32 + 17 + 14 + @@ -103,12 +109,28 @@ 5.8.0 + + + + $(MicrosoftNETSdkPackageVersion.Split('.')[2]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Split('-')[0]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Substring(1)) + + true + true + $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) + 5.0.403 6.0.302 - 5.0.13 - 6.0.1 5.0.17-servicing.22215.4 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 @@ -135,7 +157,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.14 + 6.0.$(AspNetCoreTemplateFeature60) $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 3bdff216f..60d7ecde1 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -59,13 +59,6 @@ - - 30 - 32 - 17 - 14 - - Microsoft.NETCoreSdk.BundledVersions.props From c98763de28aa805cec65af49f38c1309bc85b539 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 00:45:13 +0000 Subject: [PATCH 403/654] Update dependencies from https://github.com/dotnet/sdk build 20230313.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23162.5 -> To Version 7.0.300-preview.23163.6 --- 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 3a64b902f..82903eb38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 584ea86b6a3318a428910d308a2b02971972a74e + 6544593237fcc6c4f0ebb88121d2d7c6d631679a - + https://github.com/dotnet/sdk - 584ea86b6a3318a428910d308a2b02971972a74e + 6544593237fcc6c4f0ebb88121d2d7c6d631679a - + https://github.com/dotnet/sdk - 584ea86b6a3318a428910d308a2b02971972a74e + 6544593237fcc6c4f0ebb88121d2d7c6d631679a - + https://github.com/dotnet/sdk - 584ea86b6a3318a428910d308a2b02971972a74e + 6544593237fcc6c4f0ebb88121d2d7c6d631679a diff --git a/eng/Versions.props b/eng/Versions.props index bb978ad5f..3e181bc58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23163.1 - 7.0.300-preview.23163.1 - 7.0.300-preview.23163.1 + 7.0.300-preview.23163.6 + 7.0.300-preview.23163.6 + 7.0.300-preview.23163.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4c7fe015de014d9f43a4b9164bd57f2a6ac8f78a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 03:07:21 +0000 Subject: [PATCH 404/654] Update dependencies from https://github.com/dotnet/sdk build 20230313.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23163.6 -> To Version 7.0.300-preview.23163.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23161.1 -> To Version 12.5.0-beta.23163.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 6 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82903eb38..5b32f57fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 6544593237fcc6c4f0ebb88121d2d7c6d631679a + 2e8a920151b67aa331be0ea0bebb87068be750d4 - + https://github.com/dotnet/sdk - 6544593237fcc6c4f0ebb88121d2d7c6d631679a + 2e8a920151b67aa331be0ea0bebb87068be750d4 - + https://github.com/dotnet/sdk - 6544593237fcc6c4f0ebb88121d2d7c6d631679a + 2e8a920151b67aa331be0ea0bebb87068be750d4 - + https://github.com/dotnet/sdk - 6544593237fcc6c4f0ebb88121d2d7c6d631679a + 2e8a920151b67aa331be0ea0bebb87068be750d4 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 50ede7324c833488ee6769b18662d0e7be31c862 + c941623cc85b3598448e80b31a0a01241848610f - + https://github.com/dotnet/fsharp - 50ede7324c833488ee6769b18662d0e7be31c862 + c941623cc85b3598448e80b31a0a01241848610f @@ -149,14 +149,14 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - f776814442dc189b442ba87e3bdf1656c45dce81 + 7dc4565a1bb9667fab53d82c8fbb53e832f3f009 - + https://github.com/nuget/nuget.client - 3ab7d1462029e0b211a88040c952c9b8a679708d + fdc39cc7f7541056c638ea982dc179f554849b7d diff --git a/eng/Versions.props b/eng/Versions.props index 3e181bc58..069ca6b5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23163.6 - 7.0.300-preview.23163.6 - 7.0.300-preview.23163.6 + 7.0.300-preview.23163.9 + 7.0.300-preview.23163.9 + 7.0.300-preview.23163.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0c2053ec5ed8eb6491d6cab1c601ef834a212941 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 06:35:08 +0000 Subject: [PATCH 405/654] Update dependencies from https://github.com/dotnet/sdk build 20230313.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23163.9 -> To Version 7.0.300-preview.23163.13 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23163-06 -> To Version 17.6.0-preview-23164-01 (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 5b32f57fa..1a8c28f92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 2e8a920151b67aa331be0ea0bebb87068be750d4 + 042cb86c525c673e69564d2067e6a71816eb4cdb - + https://github.com/dotnet/sdk - 2e8a920151b67aa331be0ea0bebb87068be750d4 + 042cb86c525c673e69564d2067e6a71816eb4cdb - + https://github.com/dotnet/sdk - 2e8a920151b67aa331be0ea0bebb87068be750d4 + 042cb86c525c673e69564d2067e6a71816eb4cdb - + https://github.com/dotnet/sdk - 2e8a920151b67aa331be0ea0bebb87068be750d4 + 042cb86c525c673e69564d2067e6a71816eb4cdb @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 7dc4565a1bb9667fab53d82c8fbb53e832f3f009 + 18fe510422c6cf65533add0c82b9d4d190e5df28 diff --git a/eng/Versions.props b/eng/Versions.props index 069ca6b5d..44a7548fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23163.9 - 7.0.300-preview.23163.9 - 7.0.300-preview.23163.9 + 7.0.300-preview.23163.13 + 7.0.300-preview.23163.13 + 7.0.300-preview.23163.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bb2f4dc0df549cda1b90a915e44098b7b8403ead Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 08:28:02 +0000 Subject: [PATCH 406/654] Update dependencies from https://github.com/dotnet/sdk build 20230314.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23163.13 -> To Version 7.0.300-preview.23164.2 --- 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 1a8c28f92..4e823806a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 042cb86c525c673e69564d2067e6a71816eb4cdb + 081249fc2d499c2d3acd105d2d79696db742024a - + https://github.com/dotnet/sdk - 042cb86c525c673e69564d2067e6a71816eb4cdb + 081249fc2d499c2d3acd105d2d79696db742024a - + https://github.com/dotnet/sdk - 042cb86c525c673e69564d2067e6a71816eb4cdb + 081249fc2d499c2d3acd105d2d79696db742024a - + https://github.com/dotnet/sdk - 042cb86c525c673e69564d2067e6a71816eb4cdb + 081249fc2d499c2d3acd105d2d79696db742024a diff --git a/eng/Versions.props b/eng/Versions.props index 44a7548fa..a6d042519 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23163.13 - 7.0.300-preview.23163.13 - 7.0.300-preview.23163.13 + 7.0.300-preview.23164.2 + 7.0.300-preview.23164.2 + 7.0.300-preview.23164.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d453fa00438d0e0fc241f70adeccf60fe6252ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 17:50:54 +0000 Subject: [PATCH 407/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15786) [release/7.0.3xx] Update dependencies from dotnet/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 4e823806a..16093b1d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 081249fc2d499c2d3acd105d2d79696db742024a + 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e - + https://github.com/dotnet/sdk - 081249fc2d499c2d3acd105d2d79696db742024a + 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e - + https://github.com/dotnet/sdk - 081249fc2d499c2d3acd105d2d79696db742024a + 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e - + https://github.com/dotnet/sdk - 081249fc2d499c2d3acd105d2d79696db742024a + 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e diff --git a/eng/Versions.props b/eng/Versions.props index a6d042519..9bf3f89ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23164.2 - 7.0.300-preview.23164.2 - 7.0.300-preview.23164.2 + 7.0.300-preview.23164.4 + 7.0.300-preview.23164.4 + 7.0.300-preview.23164.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From be832a92bbfead1f28fe37ef30d3d5b45972d0a1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 14 Mar 2023 13:40:06 -0700 Subject: [PATCH 408/654] 6.0.15 just released to updating the version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6209eb4c5..9a6f19663 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 30 32 17 - 14 + 15 From b0f9f6f3c7bd5b8d1e078526b64de12b411132b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 22:40:21 +0000 Subject: [PATCH 409/654] Update dependencies from https://github.com/dotnet/arcade build 20230314.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23122.4 -> To Version 7.0.0-beta.23164.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- global.json | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16093b1d2..044e8923c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 6209eb4c5..895f275b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23122.4 + 7.0.0-beta.23164.3 @@ -122,8 +122,8 @@ We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case. Instead the indicator is that the incoming SDK version is not RTM or greater yet. --> - true - true + true + true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) diff --git a/global.json b/global.json index 9890ccd94..da60f35de 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.103", + "dotnet": "7.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23122.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" } } From f1d6cda9f086e5742c16de00c2ecaa981b0f31a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 22:40:22 +0000 Subject: [PATCH 410/654] Update dependencies from https://github.com/dotnet/arcade build 20230314.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23122.4 -> To Version 7.0.0-beta.23164.3 --- NuGet.config | 26 +++++++++++++++++++++----- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- global.json | 6 +++--- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7723bf088..e0e0db215 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,33 @@ - - + + + - + + + + + + + + + @@ -47,16 +56,23 @@ - - + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04a71d8ff..f8cab39ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,18 +198,18 @@ - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 28736b4b4..cb68e967c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23122.4 + 7.0.0-beta.23164.3 @@ -122,8 +122,8 @@ We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case. Instead the indicator is that the incoming SDK version is not RTM or greater yet. --> - true - true + true + true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) diff --git a/global.json b/global.json index 9890ccd94..da60f35de 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.103", + "dotnet": "7.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23122.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" } } From c43b7f00f50a475d4371f3bf03c8ba018247fc82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 22:51:03 +0000 Subject: [PATCH 411/654] Update dependencies from https://github.com/dotnet/sdk build 20230314.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23164.4 -> To Version 7.0.300-preview.23164.22 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16093b1d2..75c8c7f23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e + 278bb569e3618a41a1d2ed6a4c336e55783ad4cc - + https://github.com/dotnet/sdk - 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e + 278bb569e3618a41a1d2ed6a4c336e55783ad4cc - + https://github.com/dotnet/sdk - 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e + 278bb569e3618a41a1d2ed6a4c336e55783ad4cc - + https://github.com/dotnet/sdk - 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e + 278bb569e3618a41a1d2ed6a4c336e55783ad4cc diff --git a/eng/Versions.props b/eng/Versions.props index 6209eb4c5..22ec40b90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23164.4 - 7.0.300-preview.23164.4 - 7.0.300-preview.23164.4 + 7.0.300-preview.23164.22 + 7.0.300-preview.23164.22 + 7.0.300-preview.23164.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -122,8 +122,8 @@ We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case. Instead the indicator is that the incoming SDK version is not RTM or greater yet. --> - true - true + true + true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From 52aeec5f31b06dbef91bdf8639f74c5b4c4f985f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 03:04:47 +0000 Subject: [PATCH 412/654] Update dependencies from https://github.com/dotnet/sdk build 20230314.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23164.22 -> To Version 7.0.300-preview.23164.30 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23152.6 -> To Version 4.6.0-2.23164.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 d47ab3714..7953d5765 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 278bb569e3618a41a1d2ed6a4c336e55783ad4cc + b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 - + https://github.com/dotnet/sdk - 278bb569e3618a41a1d2ed6a4c336e55783ad4cc + b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 - + https://github.com/dotnet/sdk - 278bb569e3618a41a1d2ed6a4c336e55783ad4cc + b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 - + https://github.com/dotnet/sdk - 278bb569e3618a41a1d2ed6a4c336e55783ad4cc + b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 1314d090671dc1a1500c5303c4b5ae9150f40d98 + 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 diff --git a/eng/Versions.props b/eng/Versions.props index 7cfa25d08..8c8cd1d06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23164.22 - 7.0.300-preview.23164.22 - 7.0.300-preview.23164.22 + 7.0.300-preview.23164.30 + 7.0.300-preview.23164.30 + 7.0.300-preview.23164.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7a32cfc478c64ccd1beb551d018603cdf1e8954a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 07:21:12 +0000 Subject: [PATCH 413/654] Update dependencies from https://github.com/dotnet/sdk build 20230314.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23164.30 -> To Version 7.0.300-preview.23164.37 Dependency coherency updates NuGet.Build.Tasks From Version 6.6.0-preview.3.45 -> To Version 6.6.0-preview.3.46 (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 7953d5765..d3376c0b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 + 1e443ce28676af05870aecfdb9e7f487b772b4b5 - + https://github.com/dotnet/sdk - b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 + 1e443ce28676af05870aecfdb9e7f487b772b4b5 - + https://github.com/dotnet/sdk - b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 + 1e443ce28676af05870aecfdb9e7f487b772b4b5 - + https://github.com/dotnet/sdk - b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 + 1e443ce28676af05870aecfdb9e7f487b772b4b5 @@ -154,9 +154,9 @@ 18fe510422c6cf65533add0c82b9d4d190e5df28 - + https://github.com/nuget/nuget.client - fdc39cc7f7541056c638ea982dc179f554849b7d + ac7977c16f6d4c7d48ad3c624b6d5caa46c4447f diff --git a/eng/Versions.props b/eng/Versions.props index 8c8cd1d06..275d54584 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23164.30 - 7.0.300-preview.23164.30 - 7.0.300-preview.23164.30 + 7.0.300-preview.23164.37 + 7.0.300-preview.23164.37 + 7.0.300-preview.23164.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eaebe23ea2a4f1ca6d1922a5db1458cd2ad4668c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 09:44:37 -0700 Subject: [PATCH 414/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15814) Co-authored-by: dotnet-maestro[bot] --- 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 d3376c0b9..17b9b958a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 1e443ce28676af05870aecfdb9e7f487b772b4b5 + 8e9ee2651dc301bb2ad800f9dcc83a514923d19d - + https://github.com/dotnet/sdk - 1e443ce28676af05870aecfdb9e7f487b772b4b5 + 8e9ee2651dc301bb2ad800f9dcc83a514923d19d - + https://github.com/dotnet/sdk - 1e443ce28676af05870aecfdb9e7f487b772b4b5 + 8e9ee2651dc301bb2ad800f9dcc83a514923d19d - + https://github.com/dotnet/sdk - 1e443ce28676af05870aecfdb9e7f487b772b4b5 + 8e9ee2651dc301bb2ad800f9dcc83a514923d19d @@ -149,9 +149,9 @@ 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 - + https://github.com/dotnet/msbuild - 18fe510422c6cf65533add0c82b9d4d190e5df28 + 60ea2f733cfcc78da965ab43cf040fe5c58800fb diff --git a/eng/Versions.props b/eng/Versions.props index 275d54584..7e218b178 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23164.37 - 7.0.300-preview.23164.37 - 7.0.300-preview.23164.37 + 7.0.300-preview.23165.11 + 7.0.300-preview.23165.11 + 7.0.300-preview.23165.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5f1eea877266e5c849a34cb2c368c625f76abdc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 22:01:25 +0000 Subject: [PATCH 415/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15825) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.23121.1 to 7.0.100-1.23165.1 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.6.0-preview.3.46 to 6.6.0-preview.3.48 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17b9b958a..9fb5cb23e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 8e9ee2651dc301bb2ad800f9dcc83a514923d19d + 574630cfaf547ff17817e39954c9f122a0625ff9 - + https://github.com/dotnet/sdk - 8e9ee2651dc301bb2ad800f9dcc83a514923d19d + 574630cfaf547ff17817e39954c9f122a0625ff9 - + https://github.com/dotnet/sdk - 8e9ee2651dc301bb2ad800f9dcc83a514923d19d + 574630cfaf547ff17817e39954c9f122a0625ff9 - + https://github.com/dotnet/sdk - 8e9ee2651dc301bb2ad800f9dcc83a514923d19d + 574630cfaf547ff17817e39954c9f122a0625ff9 @@ -138,9 +138,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/linker - b516999ab57ce68da016b68cc2a09e2c15208e68 + d3fc41eadc9ff73ae8e20eb6f874cf5321714c0b linker @@ -154,9 +154,9 @@ 60ea2f733cfcc78da965ab43cf040fe5c58800fb - + https://github.com/nuget/nuget.client - ac7977c16f6d4c7d48ad3c624b6d5caa46c4447f + ddffda6517a01d88d6eeaef24dfc0c490c7f62a0 diff --git a/eng/Versions.props b/eng/Versions.props index cc6d465f8..7f34ca54a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23165.11 - 7.0.300-preview.23165.11 - 7.0.300-preview.23165.11 + 7.0.300-preview.23165.15 + 7.0.300-preview.23165.15 + 7.0.300-preview.23165.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3ca17395996106f6b211fce4edb00f6ef9805c9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 23:03:55 +0000 Subject: [PATCH 416/654] Update dependencies from https://github.com/dotnet/sdk build 20230315.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23165.15 -> To Version 7.0.300-preview.23165.21 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23163.3 -> To Version 12.5.0-beta.23165.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fb5cb23e..2d65b3961 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 574630cfaf547ff17817e39954c9f122a0625ff9 + 56262afc3d3db7a9cef92e23d3508e2fcaeb808f - + https://github.com/dotnet/sdk - 574630cfaf547ff17817e39954c9f122a0625ff9 + 56262afc3d3db7a9cef92e23d3508e2fcaeb808f - + https://github.com/dotnet/sdk - 574630cfaf547ff17817e39954c9f122a0625ff9 + 56262afc3d3db7a9cef92e23d3508e2fcaeb808f - + https://github.com/dotnet/sdk - 574630cfaf547ff17817e39954c9f122a0625ff9 + 56262afc3d3db7a9cef92e23d3508e2fcaeb808f @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - c941623cc85b3598448e80b31a0a01241848610f + f252dc2cecdb4ff4ff679a7abbdb3d79dc5d6aae - + https://github.com/dotnet/fsharp - c941623cc85b3598448e80b31a0a01241848610f + f252dc2cecdb4ff4ff679a7abbdb3d79dc5d6aae diff --git a/eng/Versions.props b/eng/Versions.props index 7f34ca54a..f4c37bae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23165.15 - 7.0.300-preview.23165.15 - 7.0.300-preview.23165.15 + 7.0.300-preview.23165.21 + 7.0.300-preview.23165.21 + 7.0.300-preview.23165.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11fc1e8580db23f75796defe955131af03de82b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Mar 2023 04:18:10 +0000 Subject: [PATCH 417/654] Update dependencies from https://github.com/dotnet/sdk build 20230315.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23165.21 -> To Version 7.0.300-preview.23165.28 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23165.4 -> To Version 12.5.0-beta.23165.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d65b3961..881f00ba9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 56262afc3d3db7a9cef92e23d3508e2fcaeb808f + 892e807345094d04f4662e888a7c1d856acee519 - + https://github.com/dotnet/sdk - 56262afc3d3db7a9cef92e23d3508e2fcaeb808f + 892e807345094d04f4662e888a7c1d856acee519 - + https://github.com/dotnet/sdk - 56262afc3d3db7a9cef92e23d3508e2fcaeb808f + 892e807345094d04f4662e888a7c1d856acee519 - + https://github.com/dotnet/sdk - 56262afc3d3db7a9cef92e23d3508e2fcaeb808f + 892e807345094d04f4662e888a7c1d856acee519 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - f252dc2cecdb4ff4ff679a7abbdb3d79dc5d6aae + 2a827fdff7e07ec013c299ac6c9e7dabea87d554 - + https://github.com/dotnet/fsharp - f252dc2cecdb4ff4ff679a7abbdb3d79dc5d6aae + 2a827fdff7e07ec013c299ac6c9e7dabea87d554 diff --git a/eng/Versions.props b/eng/Versions.props index f4c37bae8..8cc876bf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23165.21 - 7.0.300-preview.23165.21 - 7.0.300-preview.23165.21 + 7.0.300-preview.23165.28 + 7.0.300-preview.23165.28 + 7.0.300-preview.23165.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4efc8275102e1d4c6836b105ea13c5ebaac1c596 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 09:11:45 -0700 Subject: [PATCH 418/654] [release/7.0.2xx] Update dependencies from dotnet/test-templates (#15834) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 26 -------------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0e0db215..3038e77bd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,23 +18,10 @@ - - - - - - - - - - - - - @@ -58,22 +45,9 @@ - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8cab39ca..64bd34ec5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 diff --git a/eng/Versions.props b/eng/Versions.props index cb68e967c..855f52d0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23115.1 - 1.1.0-rc.23115.1 - 1.1.0-rc.23115.1 + 1.1.0-rc.23166.1 + 1.1.0-rc.23166.1 + 1.1.0-rc.23166.1 From 283378d69393e4e8b73e415171677a14d3aa21b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 09:13:06 -0700 Subject: [PATCH 419/654] [release/7.0.3xx] Update dependencies from dotnet/test-templates (#15835) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 881f00ba9..fcb79a3ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 diff --git a/eng/Versions.props b/eng/Versions.props index 8cc876bf7..2565cc366 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23115.1 - 1.1.0-rc.23115.1 - 1.1.0-rc.23115.1 + 1.1.0-rc.23166.1 + 1.1.0-rc.23166.1 + 1.1.0-rc.23166.1 From c18627f4afd7b54722c0eb108b5b1ee08c27b74e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 20:12:37 +0000 Subject: [PATCH 420/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15839) [release/7.0.3xx] Update dependencies from dotnet/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 fcb79a3ce..4f34c38ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 892e807345094d04f4662e888a7c1d856acee519 + 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 - + https://github.com/dotnet/sdk - 892e807345094d04f4662e888a7c1d856acee519 + 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 - + https://github.com/dotnet/sdk - 892e807345094d04f4662e888a7c1d856acee519 + 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 - + https://github.com/dotnet/sdk - 892e807345094d04f4662e888a7c1d856acee519 + 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 diff --git a/eng/Versions.props b/eng/Versions.props index 2565cc366..9008894dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23165.28 - 7.0.300-preview.23165.28 - 7.0.300-preview.23165.28 + 7.0.300-preview.23166.4 + 7.0.300-preview.23166.4 + 7.0.300-preview.23166.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0683f0cdea2d63d9b61b62ac7d2fd2aab501928f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Mar 2023 21:14:10 +0000 Subject: [PATCH 421/654] Update dependencies from https://github.com/dotnet/sdk build 20230316.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23166.4 -> To Version 7.0.300-preview.23166.14 Dependency coherency updates NuGet.Build.Tasks From Version 6.6.0-preview.3.48 -> To Version 6.6.0-preview.3.50 (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 4f34c38ac..10ee330d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 + a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 - + https://github.com/dotnet/sdk - 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 + a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 - + https://github.com/dotnet/sdk - 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 + a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 - + https://github.com/dotnet/sdk - 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 + a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 @@ -154,9 +154,9 @@ 60ea2f733cfcc78da965ab43cf040fe5c58800fb - + https://github.com/nuget/nuget.client - ddffda6517a01d88d6eeaef24dfc0c490c7f62a0 + b9b418e95ed428961af59f3ee5883f37cf4b0004 diff --git a/eng/Versions.props b/eng/Versions.props index 9008894dc..a1e5f6c5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23166.4 - 7.0.300-preview.23166.4 - 7.0.300-preview.23166.4 + 7.0.300-preview.23166.14 + 7.0.300-preview.23166.14 + 7.0.300-preview.23166.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c028d681add95784160e4a44ac7a05a0af2c1e89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 03:11:40 +0000 Subject: [PATCH 422/654] Update dependencies from https://github.com/dotnet/sdk build 20230316.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23166.14 -> To Version 7.0.300-preview.23166.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23165.8 -> To Version 12.5.0-beta.23166.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10ee330d0..caca19631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 + ba515ce838a5a35f7c845aa9db39fdecaffc9a79 - + https://github.com/dotnet/sdk - a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 + ba515ce838a5a35f7c845aa9db39fdecaffc9a79 - + https://github.com/dotnet/sdk - a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 + ba515ce838a5a35f7c845aa9db39fdecaffc9a79 - + https://github.com/dotnet/sdk - a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 + ba515ce838a5a35f7c845aa9db39fdecaffc9a79 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 2a827fdff7e07ec013c299ac6c9e7dabea87d554 + bf1480450655ba8da5a3721c9aa783488f519a8d - + https://github.com/dotnet/fsharp - 2a827fdff7e07ec013c299ac6c9e7dabea87d554 + bf1480450655ba8da5a3721c9aa783488f519a8d diff --git a/eng/Versions.props b/eng/Versions.props index a1e5f6c5c..9df167fc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23166.14 - 7.0.300-preview.23166.14 - 7.0.300-preview.23166.14 + 7.0.300-preview.23166.18 + 7.0.300-preview.23166.18 + 7.0.300-preview.23166.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4b9c79a6a1641af84aa7e1e7fed7ce63d77a9128 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 04:18:06 +0000 Subject: [PATCH 423/654] Update dependencies from https://github.com/dotnet/sdk build 20230316.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23166.14 -> To Version 7.0.300-preview.23166.20 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23165.8 -> To Version 12.5.0-beta.23166.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index caca19631..9ec20b790 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - ba515ce838a5a35f7c845aa9db39fdecaffc9a79 + a746e615dba27e2a81e697d1d6eb2937695bb727 - + https://github.com/dotnet/sdk - ba515ce838a5a35f7c845aa9db39fdecaffc9a79 + a746e615dba27e2a81e697d1d6eb2937695bb727 - + https://github.com/dotnet/sdk - ba515ce838a5a35f7c845aa9db39fdecaffc9a79 + a746e615dba27e2a81e697d1d6eb2937695bb727 - + https://github.com/dotnet/sdk - ba515ce838a5a35f7c845aa9db39fdecaffc9a79 + a746e615dba27e2a81e697d1d6eb2937695bb727 @@ -144,7 +144,7 @@ linker - + https://github.com/dotnet/roslyn 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 diff --git a/eng/Versions.props b/eng/Versions.props index 9df167fc3..954114f0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23166.18 - 7.0.300-preview.23166.18 - 7.0.300-preview.23166.18 + 7.0.300-preview.23166.20 + 7.0.300-preview.23166.20 + 7.0.300-preview.23166.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4a0cd984cae0387bd678007f7a975aae77034b50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 21:18:07 +0000 Subject: [PATCH 424/654] Update dependencies from https://github.com/dotnet/sdk build 20230317.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23166.20 -> To Version 7.0.300-preview.23167.13 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.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.3 -> To Version 7.0.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 50 +++++++++---------- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ec20b790..9b0bea276 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - a746e615dba27e2a81e697d1d6eb2937695bb727 + 8ed29bc36092166f479646aa4ad6f01352866ddb - + https://github.com/dotnet/sdk - a746e615dba27e2a81e697d1d6eb2937695bb727 + 8ed29bc36092166f479646aa4ad6f01352866ddb - + https://github.com/dotnet/sdk - a746e615dba27e2a81e697d1d6eb2937695bb727 + 8ed29bc36092166f479646aa4ad6f01352866ddb - + https://github.com/dotnet/sdk - a746e615dba27e2a81e697d1d6eb2937695bb727 + 8ed29bc36092166f479646aa4ad6f01352866ddb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cce692f665cbefe335ed33369897cea328d5fbcf + 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a09c7d17212981cb4fd5907fa6a6214966a366d + 0315841ebb89a21c717002224ad9d39f3c21320a https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb + ba16583f6b055e5a0623d817a48f1f2f15629e6b - + https://github.com/dotnet/emsdk - 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb + ba16583f6b055e5a0623d817a48f1f2f15629e6b https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index eceb7a185..517b302bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.3-servicing.23072.1 + 7.0.4-servicing.23117.7 - 7.0.3-servicing.23073.1 + 7.0.4-servicing.23117.7 @@ -56,46 +56,46 @@ - 7.0.3 - 7.0.3 - 7.0.3-servicing.23080.9 - 7.0.3-servicing.23080.9 - 7.0.3-servicing.23080.9 - 7.0.3-servicing.23080.9 - 7.0.3-servicing.23080.9 + 7.0.4 + 7.0.4 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 0.2.0 - 7.0.300-preview.23166.20 - 7.0.300-preview.23166.20 - 7.0.300-preview.23166.20 + 7.0.300-preview.23167.13 + 7.0.300-preview.23167.13 + 7.0.300-preview.23167.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0 + 7.0.1 - 7.0.3-servicing.23069.10 - 7.0.3-servicing.23069.10 - 7.0.3 - 7.0.3 - 7.0.3 - 7.0.3 + 7.0.4-servicing.23115.8 + 7.0.4-servicing.23115.8 + 7.0.4 + 7.0.4 + 7.0.4 + 7.0.4 2.1.0 - 7.0.3-servicing.23073.3 - 7.0.3-servicing.23073.3 - 7.0.3 - 7.0.3 + 7.0.4-servicing.23118.3 + 7.0.4-servicing.23118.3 + 7.0.4 + 7.0.4 @@ -227,8 +227,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.3 - 7.0.3 + 7.0.4 + 7.0.4 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From f77df9880b3720b2b2352fe02c5f4c77c19f1805 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 22:46:56 +0000 Subject: [PATCH 425/654] Update dependencies from https://github.com/dotnet/sdk build 20230317.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23166.20 -> To Version 7.0.300-preview.23167.15 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.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,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.3 -> To Version 7.0.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b0bea276..b39b714d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 8ed29bc36092166f479646aa4ad6f01352866ddb + b846680f22bcc552e84507e11d8e1ebe7bfbe62a - + https://github.com/dotnet/sdk - 8ed29bc36092166f479646aa4ad6f01352866ddb + b846680f22bcc552e84507e11d8e1ebe7bfbe62a - + https://github.com/dotnet/sdk - 8ed29bc36092166f479646aa4ad6f01352866ddb + b846680f22bcc552e84507e11d8e1ebe7bfbe62a - + https://github.com/dotnet/sdk - 8ed29bc36092166f479646aa4ad6f01352866ddb + b846680f22bcc552e84507e11d8e1ebe7bfbe62a @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - bf1480450655ba8da5a3721c9aa783488f519a8d + b84ecd1811491b6df2689eb3543c1411a898b9cd - + https://github.com/dotnet/fsharp - bf1480450655ba8da5a3721c9aa783488f519a8d + b84ecd1811491b6df2689eb3543c1411a898b9cd diff --git a/eng/Versions.props b/eng/Versions.props index 517b302bd..a530936ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23167.13 - 7.0.300-preview.23167.13 - 7.0.300-preview.23167.13 + 7.0.300-preview.23167.15 + 7.0.300-preview.23167.15 + 7.0.300-preview.23167.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 381f5826754b8ae357dfe10ca5f88f70b3cbf7bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Mar 2023 06:42:15 +0000 Subject: [PATCH 426/654] Update dependencies from https://github.com/dotnet/sdk build 20230319.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23167.15 -> To Version 7.0.300-preview.23169.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23167.3 -> To Version 12.5.0-beta.23167.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b39b714d1..2b934533d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - b846680f22bcc552e84507e11d8e1ebe7bfbe62a + bc621fa963db1d094ddd298054d96cd8466343fa - + https://github.com/dotnet/sdk - b846680f22bcc552e84507e11d8e1ebe7bfbe62a + bc621fa963db1d094ddd298054d96cd8466343fa - + https://github.com/dotnet/sdk - b846680f22bcc552e84507e11d8e1ebe7bfbe62a + bc621fa963db1d094ddd298054d96cd8466343fa - + https://github.com/dotnet/sdk - b846680f22bcc552e84507e11d8e1ebe7bfbe62a + bc621fa963db1d094ddd298054d96cd8466343fa @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - b84ecd1811491b6df2689eb3543c1411a898b9cd + 1075dfd55cba81b4da9bf61aa58650ffe9eb8592 - + https://github.com/dotnet/fsharp - b84ecd1811491b6df2689eb3543c1411a898b9cd + 1075dfd55cba81b4da9bf61aa58650ffe9eb8592 diff --git a/eng/Versions.props b/eng/Versions.props index a530936ca..924cac14d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23167.15 - 7.0.300-preview.23167.15 - 7.0.300-preview.23167.15 + 7.0.300-preview.23169.3 + 7.0.300-preview.23169.3 + 7.0.300-preview.23169.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 85ee83b70de7c92fe6bd4422fdc66b8b4b283227 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Mar 2023 22:38:13 +0000 Subject: [PATCH 427/654] Update dependencies from https://github.com/dotnet/sdk build 20230320.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23169.3 -> To Version 7.0.300-preview.23170.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23167.4 -> To Version 12.5.0-beta.23170.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b934533d..891420c16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - bc621fa963db1d094ddd298054d96cd8466343fa + 0dae489f4561317ea850978ecac7baa68f23f8ec - + https://github.com/dotnet/sdk - bc621fa963db1d094ddd298054d96cd8466343fa + 0dae489f4561317ea850978ecac7baa68f23f8ec - + https://github.com/dotnet/sdk - bc621fa963db1d094ddd298054d96cd8466343fa + 0dae489f4561317ea850978ecac7baa68f23f8ec - + https://github.com/dotnet/sdk - bc621fa963db1d094ddd298054d96cd8466343fa + 0dae489f4561317ea850978ecac7baa68f23f8ec @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 1075dfd55cba81b4da9bf61aa58650ffe9eb8592 + 4adb17929e35014c5b9d51301c7406fc816bc4b0 - + https://github.com/dotnet/fsharp - 1075dfd55cba81b4da9bf61aa58650ffe9eb8592 + 4adb17929e35014c5b9d51301c7406fc816bc4b0 diff --git a/eng/Versions.props b/eng/Versions.props index 924cac14d..ac9f8a85e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23169.3 - 7.0.300-preview.23169.3 - 7.0.300-preview.23169.3 + 7.0.300-preview.23170.10 + 7.0.300-preview.23170.10 + 7.0.300-preview.23170.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 90016bf21e4a59095db09925246add76dae74f02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Mar 2023 03:11:00 +0000 Subject: [PATCH 428/654] Update dependencies from https://github.com/dotnet/sdk build 20230320.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23170.10 -> To Version 7.0.300-preview.23170.22 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23170.6 -> To Version 12.5.0-beta.23170.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 891420c16..5b51c3ced 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 0dae489f4561317ea850978ecac7baa68f23f8ec + aa2ce88d65096be2da4970e013139f4f7362090a - + https://github.com/dotnet/sdk - 0dae489f4561317ea850978ecac7baa68f23f8ec + aa2ce88d65096be2da4970e013139f4f7362090a - + https://github.com/dotnet/sdk - 0dae489f4561317ea850978ecac7baa68f23f8ec + aa2ce88d65096be2da4970e013139f4f7362090a - + https://github.com/dotnet/sdk - 0dae489f4561317ea850978ecac7baa68f23f8ec + aa2ce88d65096be2da4970e013139f4f7362090a @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 4adb17929e35014c5b9d51301c7406fc816bc4b0 + 29cdad34b502e2720399765b63700954cc8a70cc - + https://github.com/dotnet/fsharp - 4adb17929e35014c5b9d51301c7406fc816bc4b0 + 29cdad34b502e2720399765b63700954cc8a70cc diff --git a/eng/Versions.props b/eng/Versions.props index ac9f8a85e..1e62cecfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23170.10 - 7.0.300-preview.23170.10 - 7.0.300-preview.23170.10 + 7.0.300-preview.23170.22 + 7.0.300-preview.23170.22 + 7.0.300-preview.23170.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 00358e483af5bd809669b48eaabd26a415955c59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Mar 2023 04:15:34 +0000 Subject: [PATCH 429/654] Update dependencies from https://github.com/dotnet/sdk build 20230320.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23170.10 -> To Version 7.0.300-preview.23170.25 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks From Version 12.5.0-beta.23170.6 -> To Version 12.5.0-beta.23170.8 (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 5b51c3ced..d1e8e84f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - aa2ce88d65096be2da4970e013139f4f7362090a + cfa60f9af1208d86a2581ff487966e1bf216b101 - + https://github.com/dotnet/sdk - aa2ce88d65096be2da4970e013139f4f7362090a + cfa60f9af1208d86a2581ff487966e1bf216b101 - + https://github.com/dotnet/sdk - aa2ce88d65096be2da4970e013139f4f7362090a + cfa60f9af1208d86a2581ff487966e1bf216b101 - + https://github.com/dotnet/sdk - aa2ce88d65096be2da4970e013139f4f7362090a + cfa60f9af1208d86a2581ff487966e1bf216b101 @@ -154,9 +154,9 @@ 60ea2f733cfcc78da965ab43cf040fe5c58800fb - + https://github.com/nuget/nuget.client - b9b418e95ed428961af59f3ee5883f37cf4b0004 + c835f7f2050bc8d7166ca5b2a6e750d434ba002a diff --git a/eng/Versions.props b/eng/Versions.props index 1e62cecfb..3b37ccaa3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23170.22 - 7.0.300-preview.23170.22 - 7.0.300-preview.23170.22 + 7.0.300-preview.23170.25 + 7.0.300-preview.23170.25 + 7.0.300-preview.23170.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fba50935e902c7ee52ef115c356334218164be8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Mar 2023 08:21:43 +0000 Subject: [PATCH 430/654] Update dependencies from https://github.com/dotnet/sdk build 20230321.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23170.25 -> To Version 7.0.300-preview.23171.2 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23165-02 -> To Version 17.6.0-preview-23171-02 (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 d1e8e84f8..659b7992b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - cfa60f9af1208d86a2581ff487966e1bf216b101 + 45406907645903f94d26e7abe814ec9393cf9014 - + https://github.com/dotnet/sdk - cfa60f9af1208d86a2581ff487966e1bf216b101 + 45406907645903f94d26e7abe814ec9393cf9014 - + https://github.com/dotnet/sdk - cfa60f9af1208d86a2581ff487966e1bf216b101 + 45406907645903f94d26e7abe814ec9393cf9014 - + https://github.com/dotnet/sdk - cfa60f9af1208d86a2581ff487966e1bf216b101 + 45406907645903f94d26e7abe814ec9393cf9014 @@ -149,9 +149,9 @@ 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 - + https://github.com/dotnet/msbuild - 60ea2f733cfcc78da965ab43cf040fe5c58800fb + b84faa7d0dfb42daedca5c244f73f0b07e1135d7 diff --git a/eng/Versions.props b/eng/Versions.props index 3b37ccaa3..1c04b8f63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23170.25 - 7.0.300-preview.23170.25 - 7.0.300-preview.23170.25 + 7.0.300-preview.23171.2 + 7.0.300-preview.23171.2 + 7.0.300-preview.23171.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0450da1eae463601e2f0917e45ac758338693ad7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 20:51:43 +0000 Subject: [PATCH 431/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15893) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 6.6.0-preview.3.54 to 6.6.0-preview.3.55 (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 659b7992b..59a1276a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 45406907645903f94d26e7abe814ec9393cf9014 + 390530ff3c6e034b43d22ef37126a900102e8c38 - + https://github.com/dotnet/sdk - 45406907645903f94d26e7abe814ec9393cf9014 + 390530ff3c6e034b43d22ef37126a900102e8c38 - + https://github.com/dotnet/sdk - 45406907645903f94d26e7abe814ec9393cf9014 + 390530ff3c6e034b43d22ef37126a900102e8c38 - + https://github.com/dotnet/sdk - 45406907645903f94d26e7abe814ec9393cf9014 + 390530ff3c6e034b43d22ef37126a900102e8c38 @@ -154,9 +154,9 @@ b84faa7d0dfb42daedca5c244f73f0b07e1135d7 - + https://github.com/nuget/nuget.client - c835f7f2050bc8d7166ca5b2a6e750d434ba002a + fc41cff354547a3c7f84d88d10d4e0bdf79d9c4b diff --git a/eng/Versions.props b/eng/Versions.props index 1c04b8f63..2a6801399 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23171.2 - 7.0.300-preview.23171.2 - 7.0.300-preview.23171.2 + 7.0.300-preview.23171.16 + 7.0.300-preview.23171.16 + 7.0.300-preview.23171.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2fd81d2ad030f2413260ed3c180b061e63216a41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Mar 2023 23:12:53 +0000 Subject: [PATCH 432/654] Update dependencies from https://github.com/dotnet/sdk build 20230321.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23171.16 -> To Version 7.0.300-preview.23171.26 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23170.8 -> To Version 12.5.0-beta.23171.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59a1276a8..68d8ac251 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 390530ff3c6e034b43d22ef37126a900102e8c38 + 04ede91859fd1606070d590f5440404e236dcc27 - + https://github.com/dotnet/sdk - 390530ff3c6e034b43d22ef37126a900102e8c38 + 04ede91859fd1606070d590f5440404e236dcc27 - + https://github.com/dotnet/sdk - 390530ff3c6e034b43d22ef37126a900102e8c38 + 04ede91859fd1606070d590f5440404e236dcc27 - + https://github.com/dotnet/sdk - 390530ff3c6e034b43d22ef37126a900102e8c38 + 04ede91859fd1606070d590f5440404e236dcc27 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 29cdad34b502e2720399765b63700954cc8a70cc + 759352037893d79516181a8a3f996a6207e384e8 - + https://github.com/dotnet/fsharp - 29cdad34b502e2720399765b63700954cc8a70cc + 759352037893d79516181a8a3f996a6207e384e8 @@ -144,7 +144,7 @@ linker - + https://github.com/dotnet/roslyn 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 diff --git a/eng/Versions.props b/eng/Versions.props index 2a6801399..f901e56f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23171.16 - 7.0.300-preview.23171.16 - 7.0.300-preview.23171.16 + 7.0.300-preview.23171.26 + 7.0.300-preview.23171.26 + 7.0.300-preview.23171.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 74d1b866777a78b7e4089ee438ae7686fa9112c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Mar 2023 01:48:46 +0000 Subject: [PATCH 433/654] Update dependencies from https://github.com/dotnet/sdk build 20230321.36 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23171.16 -> To Version 7.0.300-preview.23171.36 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23170.8 -> To Version 12.5.0-beta.23171.4 (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 68d8ac251..2278a7b8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 04ede91859fd1606070d590f5440404e236dcc27 + 4b2a65ab5790ee906fed3391e68db916c297f77c - + https://github.com/dotnet/sdk - 04ede91859fd1606070d590f5440404e236dcc27 + 4b2a65ab5790ee906fed3391e68db916c297f77c - + https://github.com/dotnet/sdk - 04ede91859fd1606070d590f5440404e236dcc27 + 4b2a65ab5790ee906fed3391e68db916c297f77c - + https://github.com/dotnet/sdk - 04ede91859fd1606070d590f5440404e236dcc27 + 4b2a65ab5790ee906fed3391e68db916c297f77c diff --git a/eng/Versions.props b/eng/Versions.props index f901e56f5..db070e642 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23171.26 - 7.0.300-preview.23171.26 - 7.0.300-preview.23171.26 + 7.0.300-preview.23171.36 + 7.0.300-preview.23171.36 + 7.0.300-preview.23171.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8de14ffe549c2d733f4ed492cc5686190ea14ee6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Mar 2023 08:35:31 +0000 Subject: [PATCH 434/654] Update dependencies from https://github.com/dotnet/sdk build 20230322.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23171.36 -> To Version 7.0.300-preview.23172.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23171.4 -> To Version 12.5.0-beta.23171.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2278a7b8a..8fc949c06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 4b2a65ab5790ee906fed3391e68db916c297f77c + 5648fadae1f07a92ee738a307f835f6f5c1da086 - + https://github.com/dotnet/sdk - 4b2a65ab5790ee906fed3391e68db916c297f77c + 5648fadae1f07a92ee738a307f835f6f5c1da086 - + https://github.com/dotnet/sdk - 4b2a65ab5790ee906fed3391e68db916c297f77c + 5648fadae1f07a92ee738a307f835f6f5c1da086 - + https://github.com/dotnet/sdk - 4b2a65ab5790ee906fed3391e68db916c297f77c + 5648fadae1f07a92ee738a307f835f6f5c1da086 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 759352037893d79516181a8a3f996a6207e384e8 + fa42aff3113ee163cde64511ee8d0128cf9ea3aa - + https://github.com/dotnet/fsharp - 759352037893d79516181a8a3f996a6207e384e8 + fa42aff3113ee163cde64511ee8d0128cf9ea3aa diff --git a/eng/Versions.props b/eng/Versions.props index db070e642..6eda8b859 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23171.36 - 7.0.300-preview.23171.36 - 7.0.300-preview.23171.36 + 7.0.300-preview.23172.1 + 7.0.300-preview.23172.1 + 7.0.300-preview.23172.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5c770989d7616fb76d85799e76652ba2b6648e90 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 16:09:35 +0000 Subject: [PATCH 435/654] Merged PR 29969: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.4-servicing.23115.8 to 7.0.5-servicing.23163.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.1 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.5.2-3.23152.4 to 4.5.2-3.23171.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.5.0 to 17.5.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23115.8 to 7.0.5-servicing.23163.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.4 to 7.0.4 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23115.8 to 7.0.5-servicing.23163.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: from 7.0.4 to 7.0.4 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230311.3 - **Date Produced**: March 12, 2023 ... --- NuGet.config | 42 ++++----------------- eng/Version.Details.xml | 82 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- 3 files changed, 64 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index e60ae552a..980e9235a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,36 +7,20 @@ - - - - - + - - - - - + - - - - + - + - - - - - @@ -58,26 +42,14 @@ - - - - - + - - - - + - + - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5e03ad65..c9c95a0f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 + eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 + eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 + eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 + eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 019bee653d1f2c0d7500be262536e505f67117cf + d17f741546fad2786cbd6394d08619544e53a36d - + https://github.com/dotnet/msbuild - 6f08c67f3ed838dccfbcdab91e6bebc54a26fd94 + f6fdcf537aded4f49ebedfcb800e2a3c1483fddc https://github.com/dotnet/msbuild @@ -169,11 +169,11 @@ https://github.com/dotnet/emsdk - ba16583f6b055e5a0623d817a48f1f2f15629e6b + 3d7178d836ea32bb7bb51d8d1c714d52fe641ffa https://github.com/dotnet/emsdk - ba16583f6b055e5a0623d817a48f1f2f15629e6b + 3d7178d836ea32bb7bb51d8d1c714d52fe641ffa https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 3b940a31d..7274649ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,13 +56,13 @@ - 7.0.4 - 7.0.4 - 7.0.4-servicing.23119.3 - 7.0.4-servicing.23119.3 - 7.0.4-servicing.23119.3 - 7.0.4-servicing.23119.3 - 7.0.4-servicing.23119.3 + 7.0.5 + 7.0.5 + 7.0.5-servicing.23166.6 + 7.0.5-servicing.23166.6 + 7.0.5-servicing.23166.6 + 7.0.5-servicing.23166.6 + 7.0.5-servicing.23166.6 0.2.0 @@ -70,24 +70,24 @@ 7.0.203 - 7.0.203-servicing.23159.19 - 7.0.203-servicing.23159.19 + 7.0.203-servicing.23171.27 + 7.0.203-servicing.23171.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.1 + 7.0.2 - 7.0.4-servicing.23115.8 - 7.0.4-servicing.23115.8 - 7.0.4 - 7.0.4 - 7.0.4 - 7.0.4 + 7.0.5-servicing.23163.9 + 7.0.5-servicing.23163.9 + 7.0.5 + 7.0.5 + 7.0.5 + 7.0.5 2.1.0 From 3d94398f1b762660c46c6f15839d1ca94119d022 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 23:37:10 +0000 Subject: [PATCH 436/654] Merged PR 30177: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23118.3 to 7.0.4-servicing.23172.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23118.3 to 7.0.4-servicing.23172.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.5-servicing.23163.9 to 7.0.5-servicing.23171.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.4-servicing.23117.7 to 7.0.5-servicing.23172.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.4-servicing.23117.7 to 7.0.5-servicing.23172.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23163.9 to 7.0.5-servicing.23171.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscr... --- NuGet.config | 14 ++++---- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 61 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 980e9235a..79f48e78c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,12 +15,13 @@ - + - + + @@ -42,14 +43,15 @@ - + - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9c95a0f1..5bb0ace90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 @@ -50,36 +50,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 + fbc1f3cbf77cbec89545242fc1561884491d95ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 + fbc1f3cbf77cbec89545242fc1561884491d95ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 + fbc1f3cbf77cbec89545242fc1561884491d95ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 + fbc1f3cbf77cbec89545242fc1561884491d95ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b + 83187e9a232f5f54e4783a693ead665d4aa6caa6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0315841ebb89a21c717002224ad9d39f3c21320a + b529424dd2a05711abf1f8a18215a5a9b8f79861 https://github.com/dotnet/fsharp @@ -169,11 +169,11 @@ https://github.com/dotnet/emsdk - 3d7178d836ea32bb7bb51d8d1c714d52fe641ffa + 2a1a284cb9e62959ed261bba6cfc678612fc4559 https://github.com/dotnet/emsdk - 3d7178d836ea32bb7bb51d8d1c714d52fe641ffa + 2a1a284cb9e62959ed261bba6cfc678612fc4559 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 7274649ef..c9ee49f03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.4-servicing.23117.7 + 7.0.5-servicing.23172.5 - 7.0.4-servicing.23117.7 + 7.0.5-servicing.23172.5 @@ -58,11 +58,11 @@ 7.0.5 7.0.5 - 7.0.5-servicing.23166.6 - 7.0.5-servicing.23166.6 - 7.0.5-servicing.23166.6 - 7.0.5-servicing.23166.6 - 7.0.5-servicing.23166.6 + 7.0.5-servicing.23171.9 + 7.0.5-servicing.23171.9 + 7.0.5-servicing.23171.9 + 7.0.5-servicing.23171.9 + 7.0.5-servicing.23171.9 0.2.0 @@ -70,8 +70,8 @@ 7.0.203 - 7.0.203-servicing.23171.27 - 7.0.203-servicing.23171.27 + 7.0.203-servicing.23172.24 + 7.0.203-servicing.23172.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,8 +82,8 @@ - 7.0.5-servicing.23163.9 - 7.0.5-servicing.23163.9 + 7.0.5-servicing.23171.12 + 7.0.5-servicing.23171.12 7.0.5 7.0.5 7.0.5 @@ -92,8 +92,8 @@ - 7.0.4-servicing.23118.3 - 7.0.4-servicing.23118.3 + 7.0.4-servicing.23172.8 + 7.0.4-servicing.23172.8 7.0.4 7.0.4 From d27e2635a55c633ee799820e216698ac7774a807 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 02:35:12 +0000 Subject: [PATCH 437/654] Update dependencies from https://github.com/dotnet/sdk build 20230322.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23172.1 -> To Version 7.0.300-preview.23172.26 --- 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 8fc949c06..7578b3c30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 5648fadae1f07a92ee738a307f835f6f5c1da086 + 2b629746dd86d27d6ab50b2c212fc8273b83f148 - + https://github.com/dotnet/sdk - 5648fadae1f07a92ee738a307f835f6f5c1da086 + 2b629746dd86d27d6ab50b2c212fc8273b83f148 - + https://github.com/dotnet/sdk - 5648fadae1f07a92ee738a307f835f6f5c1da086 + 2b629746dd86d27d6ab50b2c212fc8273b83f148 - + https://github.com/dotnet/sdk - 5648fadae1f07a92ee738a307f835f6f5c1da086 + 2b629746dd86d27d6ab50b2c212fc8273b83f148 diff --git a/eng/Versions.props b/eng/Versions.props index 6eda8b859..402ff73a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23172.1 - 7.0.300-preview.23172.1 - 7.0.300-preview.23172.1 + 7.0.300-preview.23172.26 + 7.0.300-preview.23172.26 + 7.0.300-preview.23172.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ecdd4ad2af4e2e243e2d9b723beda81fb1c9f04a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 03:36:49 +0000 Subject: [PATCH 438/654] Update dependencies from https://github.com/dotnet/sdk build 20230322.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23172.1 -> To Version 7.0.300-preview.23172.29 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23171.5 -> To Version 12.5.0-beta.23172.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7578b3c30..7ffab3b3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 2b629746dd86d27d6ab50b2c212fc8273b83f148 + 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 - + https://github.com/dotnet/sdk - 2b629746dd86d27d6ab50b2c212fc8273b83f148 + 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 - + https://github.com/dotnet/sdk - 2b629746dd86d27d6ab50b2c212fc8273b83f148 + 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 - + https://github.com/dotnet/sdk - 2b629746dd86d27d6ab50b2c212fc8273b83f148 + 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - fa42aff3113ee163cde64511ee8d0128cf9ea3aa + 54773808aed924ea6ba071b1a0dd1db8da3007cc - + https://github.com/dotnet/fsharp - fa42aff3113ee163cde64511ee8d0128cf9ea3aa + 54773808aed924ea6ba071b1a0dd1db8da3007cc diff --git a/eng/Versions.props b/eng/Versions.props index 402ff73a9..0ff80698f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23172.26 - 7.0.300-preview.23172.26 - 7.0.300-preview.23172.26 + 7.0.300-preview.23172.29 + 7.0.300-preview.23172.29 + 7.0.300-preview.23172.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2ebb651b9d4ed4177c1dec26b1add4071e7d48e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 04:53:49 +0000 Subject: [PATCH 439/654] Update dependencies from https://github.com/dotnet/sdk build 20230322.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23172.1 -> To Version 7.0.300-preview.23172.30 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks From Version 12.5.0-beta.23171.5 -> To Version 12.5.0-beta.23172.6 (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 7ffab3b3c..16bafdbb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 + 68079cdee72cd5cce3928c26b5fd47616ed7338b - + https://github.com/dotnet/sdk - 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 + 68079cdee72cd5cce3928c26b5fd47616ed7338b - + https://github.com/dotnet/sdk - 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 + 68079cdee72cd5cce3928c26b5fd47616ed7338b - + https://github.com/dotnet/sdk - 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 + 68079cdee72cd5cce3928c26b5fd47616ed7338b @@ -154,9 +154,9 @@ b84faa7d0dfb42daedca5c244f73f0b07e1135d7 - + https://github.com/nuget/nuget.client - fc41cff354547a3c7f84d88d10d4e0bdf79d9c4b + f99e9b890eb66a8b4876aa6f93852717683e1fe4 diff --git a/eng/Versions.props b/eng/Versions.props index 0ff80698f..5c4c77322 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23172.29 - 7.0.300-preview.23172.29 - 7.0.300-preview.23172.29 + 7.0.300-preview.23172.30 + 7.0.300-preview.23172.30 + 7.0.300-preview.23172.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 139d0c4ec8e9d0392187542d282ebb849c20ec22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 00:21:25 +0000 Subject: [PATCH 440/654] Update dependencies from https://github.com/dotnet/sdk build 20230323.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23172.30 -> To Version 7.0.300-preview.23173.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks From Version 12.5.0-beta.23172.6 -> To Version 12.5.0-beta.23173.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16bafdbb9..213eb3756 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 68079cdee72cd5cce3928c26b5fd47616ed7338b + 0d2fd6e451b0f15da8a0fd1975799d441140ec8e - + https://github.com/dotnet/sdk - 68079cdee72cd5cce3928c26b5fd47616ed7338b + 0d2fd6e451b0f15da8a0fd1975799d441140ec8e - + https://github.com/dotnet/sdk - 68079cdee72cd5cce3928c26b5fd47616ed7338b + 0d2fd6e451b0f15da8a0fd1975799d441140ec8e - + https://github.com/dotnet/sdk - 68079cdee72cd5cce3928c26b5fd47616ed7338b + 0d2fd6e451b0f15da8a0fd1975799d441140ec8e @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 54773808aed924ea6ba071b1a0dd1db8da3007cc + cd43c1e8cf0a8e1fe7cf16dc405361de699f3833 - + https://github.com/dotnet/fsharp - 54773808aed924ea6ba071b1a0dd1db8da3007cc + cd43c1e8cf0a8e1fe7cf16dc405361de699f3833 @@ -154,9 +154,9 @@ b84faa7d0dfb42daedca5c244f73f0b07e1135d7 - + https://github.com/nuget/nuget.client - f99e9b890eb66a8b4876aa6f93852717683e1fe4 + 80c3c74ca5c6d67912a19833e8cc2b10f875dc95 diff --git a/eng/Versions.props b/eng/Versions.props index 5c4c77322..5c5ce83e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23172.30 - 7.0.300-preview.23172.30 - 7.0.300-preview.23172.30 + 7.0.300-preview.23173.13 + 7.0.300-preview.23173.13 + 7.0.300-preview.23173.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ac018da533a09635c21677655caa2b76d1b53eca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 09:14:23 +0000 Subject: [PATCH 441/654] Update dependencies from https://github.com/dotnet/sdk build 20230324.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23173.13 -> To Version 7.0.300-preview.23174.1 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23171-02 -> To Version 17.6.0-preview-23174-01 (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 213eb3756..d9058943c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 0d2fd6e451b0f15da8a0fd1975799d441140ec8e + a21e9c821c4d4dcb2edd190560ac355fe0041c0f - + https://github.com/dotnet/sdk - 0d2fd6e451b0f15da8a0fd1975799d441140ec8e + a21e9c821c4d4dcb2edd190560ac355fe0041c0f - + https://github.com/dotnet/sdk - 0d2fd6e451b0f15da8a0fd1975799d441140ec8e + a21e9c821c4d4dcb2edd190560ac355fe0041c0f - + https://github.com/dotnet/sdk - 0d2fd6e451b0f15da8a0fd1975799d441140ec8e + a21e9c821c4d4dcb2edd190560ac355fe0041c0f @@ -149,9 +149,9 @@ 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 - + https://github.com/dotnet/msbuild - b84faa7d0dfb42daedca5c244f73f0b07e1135d7 + e7de1330724224a542668e1ef82c997613c7080c diff --git a/eng/Versions.props b/eng/Versions.props index 5c5ce83e1..c9d8b4d3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23173.13 - 7.0.300-preview.23173.13 - 7.0.300-preview.23173.13 + 7.0.300-preview.23174.1 + 7.0.300-preview.23174.1 + 7.0.300-preview.23174.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5ad5a6f3a353ec4fd29cb386b61f3008308dc197 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 16:06:16 +0000 Subject: [PATCH 442/654] Update dependencies from https://github.com/dotnet/sdk build 20230324.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23174.1 -> To Version 7.0.300-preview.23174.3 --- 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 d9058943c..f972cd71b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - a21e9c821c4d4dcb2edd190560ac355fe0041c0f + eabf9d4edeb9f6faac2478dd02759629e3f8fa16 - + https://github.com/dotnet/sdk - a21e9c821c4d4dcb2edd190560ac355fe0041c0f + eabf9d4edeb9f6faac2478dd02759629e3f8fa16 - + https://github.com/dotnet/sdk - a21e9c821c4d4dcb2edd190560ac355fe0041c0f + eabf9d4edeb9f6faac2478dd02759629e3f8fa16 - + https://github.com/dotnet/sdk - a21e9c821c4d4dcb2edd190560ac355fe0041c0f + eabf9d4edeb9f6faac2478dd02759629e3f8fa16 diff --git a/eng/Versions.props b/eng/Versions.props index c9d8b4d3d..14b5a798c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23174.1 - 7.0.300-preview.23174.1 - 7.0.300-preview.23174.1 + 7.0.300-preview.23174.3 + 7.0.300-preview.23174.3 + 7.0.300-preview.23174.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 606f8a8f51d554c06bf58b9cd8a5adcad94afa31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 18:04:42 +0000 Subject: [PATCH 443/654] Update dependencies from https://github.com/dotnet/test-templates build 20230324.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23174.1 --- NuGet.config | 5 ----- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3038e77bd..770df6dcb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,11 +9,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64bd34ec5..3f19cb1f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada diff --git a/eng/Versions.props b/eng/Versions.props index 355237ca9..14686b8c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 From c7422ccf5b0031d817aa62e2230395589add8609 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 18:04:43 +0000 Subject: [PATCH 444/654] Update dependencies from https://github.com/dotnet/test-templates build 20230324.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23174.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9058943c..9f88925d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada diff --git a/eng/Versions.props b/eng/Versions.props index c9d8b4d3d..f89b98753 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 From 416edaf1c2f8884224ccd1cf4d7d434159bb025e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 21:37:33 +0000 Subject: [PATCH 445/654] Update dependencies from https://github.com/dotnet/sdk build 20230324.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23174.1 -> To Version 7.0.300-preview.23174.14 --- 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 f972cd71b..0c6b6e0bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - eabf9d4edeb9f6faac2478dd02759629e3f8fa16 + 5d56cadbae6defb597362134e3a7af212b518a2b - + https://github.com/dotnet/sdk - eabf9d4edeb9f6faac2478dd02759629e3f8fa16 + 5d56cadbae6defb597362134e3a7af212b518a2b - + https://github.com/dotnet/sdk - eabf9d4edeb9f6faac2478dd02759629e3f8fa16 + 5d56cadbae6defb597362134e3a7af212b518a2b - + https://github.com/dotnet/sdk - eabf9d4edeb9f6faac2478dd02759629e3f8fa16 + 5d56cadbae6defb597362134e3a7af212b518a2b diff --git a/eng/Versions.props b/eng/Versions.props index 14b5a798c..56cbf8053 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23174.3 - 7.0.300-preview.23174.3 - 7.0.300-preview.23174.3 + 7.0.300-preview.23174.14 + 7.0.300-preview.23174.14 + 7.0.300-preview.23174.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b7761933be784e341415166e8868cab91c5a9706 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 23:32:19 +0000 Subject: [PATCH 446/654] Update dependencies from https://github.com/dotnet/sdk build 20230324.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23174.1 -> To Version 7.0.300-preview.23174.22 --- 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 0c6b6e0bd..37e7a0ff7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 5d56cadbae6defb597362134e3a7af212b518a2b + c73800a06184e993e8194be83e227439f9094214 - + https://github.com/dotnet/sdk - 5d56cadbae6defb597362134e3a7af212b518a2b + c73800a06184e993e8194be83e227439f9094214 - + https://github.com/dotnet/sdk - 5d56cadbae6defb597362134e3a7af212b518a2b + c73800a06184e993e8194be83e227439f9094214 - + https://github.com/dotnet/sdk - 5d56cadbae6defb597362134e3a7af212b518a2b + c73800a06184e993e8194be83e227439f9094214 diff --git a/eng/Versions.props b/eng/Versions.props index 56cbf8053..10dfcc1ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23174.14 - 7.0.300-preview.23174.14 - 7.0.300-preview.23174.14 + 7.0.300-preview.23174.22 + 7.0.300-preview.23174.22 + 7.0.300-preview.23174.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f06de864644c7359fac2cbbd7bc6048bd493cccd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 19:21:03 +0000 Subject: [PATCH 447/654] Merged PR 30247: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.5-servicing.23171.12 to 7.0.5-servicing.23174.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23171.12 to 7.0.5-servicing.23174.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.4 to 7.0.5 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23171.12 to 7.0.5-servicing.23174.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: from 7.0.4 to 7.0.5 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230325.5 - **Date Produced**: March 25, 2023 4:49:25 PM UTC - **Commit**: ff216197144f80f4ac2449945f0b22a8a06c32ce - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.... --- NuGet.config | 15 +++++----- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 3 files changed, 50 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index 79f48e78c..83fd2e15f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,21 @@ - + + - + - + - @@ -43,15 +43,14 @@ - + - + - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bb0ace90..5c553b3e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 @@ -50,36 +50,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fbc1f3cbf77cbec89545242fc1561884491d95ae + ff216197144f80f4ac2449945f0b22a8a06c32ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fbc1f3cbf77cbec89545242fc1561884491d95ae + ff216197144f80f4ac2449945f0b22a8a06c32ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fbc1f3cbf77cbec89545242fc1561884491d95ae + ff216197144f80f4ac2449945f0b22a8a06c32ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fbc1f3cbf77cbec89545242fc1561884491d95ae + ff216197144f80f4ac2449945f0b22a8a06c32ce @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2a1a284cb9e62959ed261bba6cfc678612fc4559 + 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d - + https://github.com/dotnet/emsdk - 2a1a284cb9e62959ed261bba6cfc678612fc4559 + 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index c9ee49f03..b785b5641 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.5 7.0.5 - 7.0.5-servicing.23171.9 - 7.0.5-servicing.23171.9 - 7.0.5-servicing.23171.9 - 7.0.5-servicing.23171.9 - 7.0.5-servicing.23171.9 + 7.0.5-servicing.23174.10 + 7.0.5-servicing.23174.10 + 7.0.5-servicing.23174.10 + 7.0.5-servicing.23174.10 + 7.0.5-servicing.23174.10 0.2.0 @@ -70,8 +70,8 @@ 7.0.203 - 7.0.203-servicing.23172.24 - 7.0.203-servicing.23172.24 + 7.0.203-servicing.23175.5 + 7.0.203-servicing.23175.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,8 +82,8 @@ - 7.0.5-servicing.23171.12 - 7.0.5-servicing.23171.12 + 7.0.5-servicing.23174.5 + 7.0.5-servicing.23174.5 7.0.5 7.0.5 7.0.5 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.4 - 7.0.4 + 7.0.5 + 7.0.5 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From a17b97bf80b3e150dd697a85975da41a0937af54 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 26 Mar 2023 21:46:14 +0000 Subject: [PATCH 448/654] Merged PR 30263: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23172.8 to 7.0.4-servicing.23176.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23172.8 to 7.0.4-servicing.23176.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.5-servicing.23172.5 to 7.0.5-servicing.23175.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.5-servicing.23172.5 to 7.0.5-servicing.23176.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230326.4 - **Date Produced**: March 26, 2023 8:03:27 PM UTC - **Commit**: 6791a59d6bb0085576413fde227dcb163572b762 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.203 to 7.0.203][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.203-servicing.23175.5 to 7.0.203-servicing.23176.4][1] - **Microsoft.NET.Sdk**: [from 7.0.203-servicing.23175.5 to 7.0.203-servicing.23176.4][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.203-servicing.23175.5 to 7.0.203-servicing.23176.4][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.4 to 7.0.4][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23172.8 to 7.0.4-servicing.23176.2][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.4-servicing.23172.8 to 7.0.4-servicing.23176.2][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.5-servicing.23172.5 to 7.0.5-servicing.23175.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.5-servicing.23172.5 to 7.0.5-servicing.23176.1][... --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 83fd2e15f..3f69cec3d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,9 +19,10 @@ - + + @@ -48,9 +49,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c553b3e2..c69325488 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d + 21bafd49406659961eaf4853853d1b4a4e669654 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d + 21bafd49406659961eaf4853853d1b4a4e669654 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d + 21bafd49406659961eaf4853853d1b4a4e669654 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d + 21bafd49406659961eaf4853853d1b4a4e669654 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ff216197144f80f4ac2449945f0b22a8a06c32ce + 6791a59d6bb0085576413fde227dcb163572b762 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ff216197144f80f4ac2449945f0b22a8a06c32ce + 6791a59d6bb0085576413fde227dcb163572b762 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ff216197144f80f4ac2449945f0b22a8a06c32ce + 6791a59d6bb0085576413fde227dcb163572b762 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ff216197144f80f4ac2449945f0b22a8a06c32ce + 6791a59d6bb0085576413fde227dcb163572b762 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 83187e9a232f5f54e4783a693ead665d4aa6caa6 + f75d9496cbb2fe61cfdb1299520c5c34a062a898 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b529424dd2a05711abf1f8a18215a5a9b8f79861 + 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b785b5641..e67fa0aa1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.5-servicing.23172.5 + 7.0.5-servicing.23175.1 - 7.0.5-servicing.23172.5 + 7.0.5-servicing.23176.1 @@ -70,8 +70,8 @@ 7.0.203 - 7.0.203-servicing.23175.5 - 7.0.203-servicing.23175.5 + 7.0.203-servicing.23176.4 + 7.0.203-servicing.23176.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.4-servicing.23172.8 - 7.0.4-servicing.23172.8 + 7.0.4-servicing.23176.2 + 7.0.4-servicing.23176.2 7.0.4 7.0.4 From 4b3902d23bfbee42af83ed23d46871d847f65546 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Mar 2023 06:43:54 +0000 Subject: [PATCH 449/654] Update dependencies from https://github.com/dotnet/sdk build 20230326.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23174.22 -> To Version 7.0.300-preview.23176.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23173.4 -> To Version 12.5.0-beta.23176.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed0dab1a1..7de42121f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - c73800a06184e993e8194be83e227439f9094214 + 1bddf64d4d41da91ee011becd0574801a5b4c487 - + https://github.com/dotnet/sdk - c73800a06184e993e8194be83e227439f9094214 + 1bddf64d4d41da91ee011becd0574801a5b4c487 - + https://github.com/dotnet/sdk - c73800a06184e993e8194be83e227439f9094214 + 1bddf64d4d41da91ee011becd0574801a5b4c487 - + https://github.com/dotnet/sdk - c73800a06184e993e8194be83e227439f9094214 + 1bddf64d4d41da91ee011becd0574801a5b4c487 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - cd43c1e8cf0a8e1fe7cf16dc405361de699f3833 + 93562c0c97dda1fb131e8eaf73e35487a6998ee5 - + https://github.com/dotnet/fsharp - cd43c1e8cf0a8e1fe7cf16dc405361de699f3833 + 93562c0c97dda1fb131e8eaf73e35487a6998ee5 diff --git a/eng/Versions.props b/eng/Versions.props index 86e19930b..dce9a4f7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23174.22 - 7.0.300-preview.23174.22 - 7.0.300-preview.23174.22 + 7.0.300-preview.23176.6 + 7.0.300-preview.23176.6 + 7.0.300-preview.23176.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a79315109c88cb264197d1c9f5d2d8127fa6ab75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Mar 2023 10:30:33 +0000 Subject: [PATCH 450/654] Update dependencies from https://github.com/dotnet/sdk build 20230327.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23176.6 -> To Version 7.0.300-preview.23177.3 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230223-05 -> To Version 17.6.0-release-20230324-04 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7de42121f..972fe0888 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 1bddf64d4d41da91ee011becd0574801a5b4c487 + bf00d9be88196ce70e2a863559c41f414406702c - + https://github.com/dotnet/sdk - 1bddf64d4d41da91ee011becd0574801a5b4c487 + bf00d9be88196ce70e2a863559c41f414406702c - + https://github.com/dotnet/sdk - 1bddf64d4d41da91ee011becd0574801a5b4c487 + bf00d9be88196ce70e2a863559c41f414406702c - + https://github.com/dotnet/sdk - 1bddf64d4d41da91ee011becd0574801a5b4c487 + bf00d9be88196ce70e2a863559c41f414406702c @@ -133,9 +133,9 @@ 93562c0c97dda1fb131e8eaf73e35487a6998ee5 - + https://github.com/microsoft/vstest - 05c0c4c4f084782533443dfeae0f6627018c5b6a + 5bef4cdc79ad79f5627c028b6cf06a4197aa9c54 diff --git a/eng/Versions.props b/eng/Versions.props index dce9a4f7e..eddee8a51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23176.6 - 7.0.300-preview.23176.6 - 7.0.300-preview.23176.6 + 7.0.300-preview.23177.3 + 7.0.300-preview.23177.3 + 7.0.300-preview.23177.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -193,7 +193,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230223-05 + 17.6.0-release-20230324-04 From 5b005c19f54dd103ae2cd4d9be6acbea187c5bcd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 28 Mar 2023 00:00:31 +0000 Subject: [PATCH 451/654] Merged PR 30280: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230327.18 - **Date Produced**: March 27, 2023 9:16:58 PM UTC - **Commit**: e8a9e334c151df38ce00d696d54f52d4f0c65989 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.203 to 7.0.203][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.203-servicing.23176.4 to 7.0.203-servicing.23177.18][1] - **Microsoft.NET.Sdk**: [from 7.0.203-servicing.23176.4 to 7.0.203-servicing.23177.18][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.203-servicing.23176.4 to 7.0.203-servicing.23177.18][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.4 to 7.0.5][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.5][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6791a59d6b&targetVersion=GCe8a9e334c1&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC21bafd4940&targetVersion=GC265ddce1c1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91) --- NuGet.config | 14 ++++++++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3f69cec3d..a8b2060e2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,13 @@ - + + + - + + @@ -49,10 +52,13 @@ - + + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c69325488..86b5fad8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 21bafd49406659961eaf4853853d1b4a4e669654 + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 21bafd49406659961eaf4853853d1b4a4e669654 + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 21bafd49406659961eaf4853853d1b4a4e669654 + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 21bafd49406659961eaf4853853d1b4a4e669654 + 265ddce1c1939672e1223e750544bb0443a8f74b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6791a59d6bb0085576413fde227dcb163572b762 + e8a9e334c151df38ce00d696d54f52d4f0c65989 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6791a59d6bb0085576413fde227dcb163572b762 + e8a9e334c151df38ce00d696d54f52d4f0c65989 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6791a59d6bb0085576413fde227dcb163572b762 + e8a9e334c151df38ce00d696d54f52d4f0c65989 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6791a59d6bb0085576413fde227dcb163572b762 + e8a9e334c151df38ce00d696d54f52d4f0c65989 diff --git a/eng/Versions.props b/eng/Versions.props index e67fa0aa1..48376ba44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.203 - 7.0.203-servicing.23176.4 - 7.0.203-servicing.23176.4 + 7.0.203-servicing.23177.18 + 7.0.203-servicing.23177.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,10 +92,10 @@ - 7.0.4-servicing.23176.2 - 7.0.4-servicing.23176.2 - 7.0.4 - 7.0.4 + 7.0.5-servicing.23177.5 + 7.0.5-servicing.23177.5 + 7.0.5 + 7.0.5 From 2276d99d03551f3baf61fcefbf9fecfc3eb11091 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Mar 2023 03:17:57 +0000 Subject: [PATCH 452/654] Update dependencies from https://github.com/dotnet/sdk build 20230327.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23177.3 -> To Version 7.0.300-preview.23177.21 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23171.5 -> To Version 4.6.0-2.23177.5 (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 972fe0888..d1cd7556e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - bf00d9be88196ce70e2a863559c41f414406702c + 4970adfe3e684d9099e7e9b8128d2a1c29d951df - + https://github.com/dotnet/sdk - bf00d9be88196ce70e2a863559c41f414406702c + 4970adfe3e684d9099e7e9b8128d2a1c29d951df - + https://github.com/dotnet/sdk - bf00d9be88196ce70e2a863559c41f414406702c + 4970adfe3e684d9099e7e9b8128d2a1c29d951df - + https://github.com/dotnet/sdk - bf00d9be88196ce70e2a863559c41f414406702c + 4970adfe3e684d9099e7e9b8128d2a1c29d951df @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 + 736845e610cbabd7a61b3777dadd899f677c70fd diff --git a/eng/Versions.props b/eng/Versions.props index eddee8a51..59c545992 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23177.3 - 7.0.300-preview.23177.3 - 7.0.300-preview.23177.3 + 7.0.300-preview.23177.21 + 7.0.300-preview.23177.21 + 7.0.300-preview.23177.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b4c83306cc7a97f73f293f6e06a6115cae5e6896 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Mar 2023 07:43:38 +0000 Subject: [PATCH 453/654] Update dependencies from https://github.com/dotnet/sdk build 20230327.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23177.21 -> To Version 7.0.300-preview.23177.23 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23177.5 -> To Version 4.6.0-2.23177.13 (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 d1cd7556e..77836fd17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 4970adfe3e684d9099e7e9b8128d2a1c29d951df + e42c93d8c5d8a7e762d26a9238f14c9764026c55 - + https://github.com/dotnet/sdk - 4970adfe3e684d9099e7e9b8128d2a1c29d951df + e42c93d8c5d8a7e762d26a9238f14c9764026c55 - + https://github.com/dotnet/sdk - 4970adfe3e684d9099e7e9b8128d2a1c29d951df + e42c93d8c5d8a7e762d26a9238f14c9764026c55 - + https://github.com/dotnet/sdk - 4970adfe3e684d9099e7e9b8128d2a1c29d951df + e42c93d8c5d8a7e762d26a9238f14c9764026c55 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 736845e610cbabd7a61b3777dadd899f677c70fd + 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 diff --git a/eng/Versions.props b/eng/Versions.props index 59c545992..32e2145c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23177.21 - 7.0.300-preview.23177.21 - 7.0.300-preview.23177.21 + 7.0.300-preview.23177.23 + 7.0.300-preview.23177.23 + 7.0.300-preview.23177.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 497110be53dd8590216a6da23393726e617fa2be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Mar 2023 18:49:30 +0000 Subject: [PATCH 454/654] Update dependencies from https://github.com/dotnet/sdk build 20230328.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23177.23 -> To Version 7.0.300-preview.23178.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23176.1 -> To Version 12.5.0-beta.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77836fd17..9821835b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - e42c93d8c5d8a7e762d26a9238f14c9764026c55 + 17dce84d331424e7632e9c33c76b1391ebbd627e - + https://github.com/dotnet/sdk - e42c93d8c5d8a7e762d26a9238f14c9764026c55 + 17dce84d331424e7632e9c33c76b1391ebbd627e - + https://github.com/dotnet/sdk - e42c93d8c5d8a7e762d26a9238f14c9764026c55 + 17dce84d331424e7632e9c33c76b1391ebbd627e - + https://github.com/dotnet/sdk - e42c93d8c5d8a7e762d26a9238f14c9764026c55 + 17dce84d331424e7632e9c33c76b1391ebbd627e @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 93562c0c97dda1fb131e8eaf73e35487a6998ee5 + 58b9455165940e09bd473ea6a352904da9537629 - + https://github.com/dotnet/fsharp - 93562c0c97dda1fb131e8eaf73e35487a6998ee5 + 58b9455165940e09bd473ea6a352904da9537629 diff --git a/eng/Versions.props b/eng/Versions.props index 32e2145c3..a4a3bc0e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23177.23 - 7.0.300-preview.23177.23 - 7.0.300-preview.23177.23 + 7.0.300-preview.23178.5 + 7.0.300-preview.23178.5 + 7.0.300-preview.23178.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9911fe76b58cdce37ef5dbda5916d5612e780a27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 03:20:13 +0000 Subject: [PATCH 455/654] Update dependencies from https://github.com/dotnet/sdk build 20230328.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23177.23 -> To Version 7.0.300-preview.23178.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.23176.1 -> To Version 12.5.0-beta.23178.3 (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 9821835b1..3d4c86eeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 17dce84d331424e7632e9c33c76b1391ebbd627e + 121cf0170743b38a1d8a5e81906badd9afa7cd67 - + https://github.com/dotnet/sdk - 17dce84d331424e7632e9c33c76b1391ebbd627e + 121cf0170743b38a1d8a5e81906badd9afa7cd67 - + https://github.com/dotnet/sdk - 17dce84d331424e7632e9c33c76b1391ebbd627e + 121cf0170743b38a1d8a5e81906badd9afa7cd67 - + https://github.com/dotnet/sdk - 17dce84d331424e7632e9c33c76b1391ebbd627e + 121cf0170743b38a1d8a5e81906badd9afa7cd67 @@ -149,9 +149,9 @@ 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 - + https://github.com/dotnet/msbuild - e7de1330724224a542668e1ef82c997613c7080c + ea90db2e418d5d4f9a8da1c6f46ae9a9a30971bd diff --git a/eng/Versions.props b/eng/Versions.props index a4a3bc0e2..37f9ed1a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23178.5 - 7.0.300-preview.23178.5 - 7.0.300-preview.23178.5 + 7.0.300-preview.23178.10 + 7.0.300-preview.23178.10 + 7.0.300-preview.23178.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 12cd341876b818526287c295e9387b5f483bc6a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 04:23:29 +0000 Subject: [PATCH 456/654] Update dependencies from https://github.com/dotnet/sdk build 20230328.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23177.23 -> To Version 7.0.300-preview.23178.12 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23176.1 -> To Version 12.5.0-beta.23178.3 (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 3d4c86eeb..59c0a4d12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 121cf0170743b38a1d8a5e81906badd9afa7cd67 + 5c188f1ed0aebaa7cd076776d702c26f67d47a78 - + https://github.com/dotnet/sdk - 121cf0170743b38a1d8a5e81906badd9afa7cd67 + 5c188f1ed0aebaa7cd076776d702c26f67d47a78 - + https://github.com/dotnet/sdk - 121cf0170743b38a1d8a5e81906badd9afa7cd67 + 5c188f1ed0aebaa7cd076776d702c26f67d47a78 - + https://github.com/dotnet/sdk - 121cf0170743b38a1d8a5e81906badd9afa7cd67 + 5c188f1ed0aebaa7cd076776d702c26f67d47a78 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 + cab05f9378364ce35d9c0fc32e11518090f29caa diff --git a/eng/Versions.props b/eng/Versions.props index 37f9ed1a4..0c5965273 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23178.10 - 7.0.300-preview.23178.10 - 7.0.300-preview.23178.10 + 7.0.300-preview.23178.12 + 7.0.300-preview.23178.12 + 7.0.300-preview.23178.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 62f31ab487eecb6ed3920329cc946ae58fb5f079 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 10:54:55 +0000 Subject: [PATCH 457/654] Update dependencies from https://github.com/dotnet/sdk build 20230329.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23178.12 -> To Version 7.0.300-preview.23179.3 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23178-11 -> To Version 17.6.0-preview-23179-01 (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 59c0a4d12..088dc3590 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 5c188f1ed0aebaa7cd076776d702c26f67d47a78 + 855dd0acbe5dd31481b7afc9508f97571706302f - + https://github.com/dotnet/sdk - 5c188f1ed0aebaa7cd076776d702c26f67d47a78 + 855dd0acbe5dd31481b7afc9508f97571706302f - + https://github.com/dotnet/sdk - 5c188f1ed0aebaa7cd076776d702c26f67d47a78 + 855dd0acbe5dd31481b7afc9508f97571706302f - + https://github.com/dotnet/sdk - 5c188f1ed0aebaa7cd076776d702c26f67d47a78 + 855dd0acbe5dd31481b7afc9508f97571706302f @@ -149,9 +149,9 @@ cab05f9378364ce35d9c0fc32e11518090f29caa - + https://github.com/dotnet/msbuild - ea90db2e418d5d4f9a8da1c6f46ae9a9a30971bd + dd5d9f746fe3ec521ed44c6f2b852740d25f51be diff --git a/eng/Versions.props b/eng/Versions.props index 0c5965273..93b90f0dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23178.12 - 7.0.300-preview.23178.12 - 7.0.300-preview.23178.12 + 7.0.300-preview.23179.3 + 7.0.300-preview.23179.3 + 7.0.300-preview.23179.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0339a58a230d3361bced2044c87419dac7161372 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 18:40:03 +0000 Subject: [PATCH 458/654] Update dependencies from https://github.com/dotnet/sdk build 20230329.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.3 -> To Version 7.0.300-preview.23179.6 Dependency coherency updates NuGet.Build.Tasks From Version 6.6.0-preview.3.57 -> To Version 6.6.0-preview.3.58 (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 088dc3590..a62a97ecc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 855dd0acbe5dd31481b7afc9508f97571706302f + 1e18cce585f796a9dc3a7852885f09f16a736969 - + https://github.com/dotnet/sdk - 855dd0acbe5dd31481b7afc9508f97571706302f + 1e18cce585f796a9dc3a7852885f09f16a736969 - + https://github.com/dotnet/sdk - 855dd0acbe5dd31481b7afc9508f97571706302f + 1e18cce585f796a9dc3a7852885f09f16a736969 - + https://github.com/dotnet/sdk - 855dd0acbe5dd31481b7afc9508f97571706302f + 1e18cce585f796a9dc3a7852885f09f16a736969 @@ -154,9 +154,9 @@ dd5d9f746fe3ec521ed44c6f2b852740d25f51be - + https://github.com/nuget/nuget.client - 80c3c74ca5c6d67912a19833e8cc2b10f875dc95 + 545330e99bc4a1c4e1ee3ee1e3d664419cec8efe diff --git a/eng/Versions.props b/eng/Versions.props index 93b90f0dd..930f83be2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.3 - 7.0.300-preview.23179.3 - 7.0.300-preview.23179.3 + 7.0.300-preview.23179.6 + 7.0.300-preview.23179.6 + 7.0.300-preview.23179.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 27bcdb7964267203c0502c43559f7e57985041f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 19:49:47 +0000 Subject: [PATCH 459/654] Update dependencies from https://github.com/dotnet/sdk build 20230329.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.3 -> To Version 7.0.300-preview.23179.7 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.6.0-2.23178.8 -> To Version 4.6.0-3.23178.21 (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 a62a97ecc..f87c5462a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 1e18cce585f796a9dc3a7852885f09f16a736969 + 59ac74b5b3858e8675b2b0b05aa4321715657e9d - + https://github.com/dotnet/sdk - 1e18cce585f796a9dc3a7852885f09f16a736969 + 59ac74b5b3858e8675b2b0b05aa4321715657e9d - + https://github.com/dotnet/sdk - 1e18cce585f796a9dc3a7852885f09f16a736969 + 59ac74b5b3858e8675b2b0b05aa4321715657e9d - + https://github.com/dotnet/sdk - 1e18cce585f796a9dc3a7852885f09f16a736969 + 59ac74b5b3858e8675b2b0b05aa4321715657e9d @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - cab05f9378364ce35d9c0fc32e11518090f29caa + 1861e34dc30c2d6e1e668c5b3e3a7bf345158fbb diff --git a/eng/Versions.props b/eng/Versions.props index 930f83be2..249788740 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.6 - 7.0.300-preview.23179.6 - 7.0.300-preview.23179.6 + 7.0.300-preview.23179.7 + 7.0.300-preview.23179.7 + 7.0.300-preview.23179.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 145f04e872f439bb7ad42912380db7d015a3d9de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 20:58:49 +0000 Subject: [PATCH 460/654] Update dependencies from https://github.com/dotnet/sdk build 20230329.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.3 -> To Version 7.0.300-preview.23179.9 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.6.0-2.23178.8 -> To Version 4.6.0-3.23178.21 (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 f87c5462a..1a4443982 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 59ac74b5b3858e8675b2b0b05aa4321715657e9d + 83ab231d9865b0002711a523c28fe22c917cda0c - + https://github.com/dotnet/sdk - 59ac74b5b3858e8675b2b0b05aa4321715657e9d + 83ab231d9865b0002711a523c28fe22c917cda0c - + https://github.com/dotnet/sdk - 59ac74b5b3858e8675b2b0b05aa4321715657e9d + 83ab231d9865b0002711a523c28fe22c917cda0c - + https://github.com/dotnet/sdk - 59ac74b5b3858e8675b2b0b05aa4321715657e9d + 83ab231d9865b0002711a523c28fe22c917cda0c diff --git a/eng/Versions.props b/eng/Versions.props index 249788740..f6fde53f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.7 - 7.0.300-preview.23179.7 - 7.0.300-preview.23179.7 + 7.0.300-preview.23179.9 + 7.0.300-preview.23179.9 + 7.0.300-preview.23179.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b85c53f7d0e148a8536462f1b814d378fad62f67 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 22:06:07 +0000 Subject: [PATCH 461/654] Update dependencies from https://github.com/dotnet/sdk build 20230329.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.3 -> To Version 7.0.300-preview.23179.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.6.0-2.23178.8 -> To Version 4.6.0-3.23178.21 (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 1a4443982..ea63b950a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 83ab231d9865b0002711a523c28fe22c917cda0c + 994ce60024d32f51e5872afceadcfce425208977 - + https://github.com/dotnet/sdk - 83ab231d9865b0002711a523c28fe22c917cda0c + 994ce60024d32f51e5872afceadcfce425208977 - + https://github.com/dotnet/sdk - 83ab231d9865b0002711a523c28fe22c917cda0c + 994ce60024d32f51e5872afceadcfce425208977 - + https://github.com/dotnet/sdk - 83ab231d9865b0002711a523c28fe22c917cda0c + 994ce60024d32f51e5872afceadcfce425208977 diff --git a/eng/Versions.props b/eng/Versions.props index f6fde53f5..a052a0d99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.9 - 7.0.300-preview.23179.9 - 7.0.300-preview.23179.9 + 7.0.300-preview.23179.11 + 7.0.300-preview.23179.11 + 7.0.300-preview.23179.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bdcab863f8267473db47d3c7acf8d2039154a3f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 03:12:40 +0000 Subject: [PATCH 462/654] Update dependencies from https://github.com/dotnet/sdk build 20230329.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.11 -> To Version 7.0.300-preview.23179.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23178.3 -> To Version 12.5.0-beta.23179.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea63b950a..00b2d957b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 994ce60024d32f51e5872afceadcfce425208977 + 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 - + https://github.com/dotnet/sdk - 994ce60024d32f51e5872afceadcfce425208977 + 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 - + https://github.com/dotnet/sdk - 994ce60024d32f51e5872afceadcfce425208977 + 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 - + https://github.com/dotnet/sdk - 994ce60024d32f51e5872afceadcfce425208977 + 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 58b9455165940e09bd473ea6a352904da9537629 + 97b1ee7f9de85aa66cb9883febbfffb6ca282ce9 - + https://github.com/dotnet/fsharp - 58b9455165940e09bd473ea6a352904da9537629 + 97b1ee7f9de85aa66cb9883febbfffb6ca282ce9 diff --git a/eng/Versions.props b/eng/Versions.props index a052a0d99..94a0b6f9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.11 - 7.0.300-preview.23179.11 - 7.0.300-preview.23179.11 + 7.0.300-preview.23179.13 + 7.0.300-preview.23179.13 + 7.0.300-preview.23179.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b3a7afcb82915139ec8b237d656133c8027e51a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 07:42:52 +0000 Subject: [PATCH 463/654] Update dependencies from https://github.com/dotnet/sdk build 20230329.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.13 -> To Version 7.0.300-preview.23179.16 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23179.5 -> To Version 12.5.0-beta.23179.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00b2d957b..cccdfbb76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 + 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 - + https://github.com/dotnet/sdk - 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 + 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 - + https://github.com/dotnet/sdk - 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 + 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 - + https://github.com/dotnet/sdk - 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 + 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 97b1ee7f9de85aa66cb9883febbfffb6ca282ce9 + 7681004e60fa33211ed2690d38796788ce4a2df8 - + https://github.com/dotnet/fsharp - 97b1ee7f9de85aa66cb9883febbfffb6ca282ce9 + 7681004e60fa33211ed2690d38796788ce4a2df8 diff --git a/eng/Versions.props b/eng/Versions.props index 94a0b6f9c..4a2e62a14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.13 - 7.0.300-preview.23179.13 - 7.0.300-preview.23179.13 + 7.0.300-preview.23179.16 + 7.0.300-preview.23179.16 + 7.0.300-preview.23179.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7c24071b75057c1324a31cb7560036f8ab300aba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 10:24:56 +0000 Subject: [PATCH 464/654] Update dependencies from https://github.com/dotnet/sdk build 20230330.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23180.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-3.23178.21 -> To Version 4.6.0-3.23179.15 (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 cccdfbb76..78590d54d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 + 4188210079afb65359890efd06aa1123f249d7b6 - + https://github.com/dotnet/sdk - 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 + 4188210079afb65359890efd06aa1123f249d7b6 - + https://github.com/dotnet/sdk - 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 + 4188210079afb65359890efd06aa1123f249d7b6 - + https://github.com/dotnet/sdk - 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 + 4188210079afb65359890efd06aa1123f249d7b6 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 1861e34dc30c2d6e1e668c5b3e3a7bf345158fbb + daad346cf905e453a7bb5561dbeb0b1be24a09ca diff --git a/eng/Versions.props b/eng/Versions.props index 4a2e62a14..4b419dd9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.16 - 7.0.300-preview.23179.16 - 7.0.300-preview.23179.16 + 7.0.300-preview.23180.1 + 7.0.300-preview.23180.1 + 7.0.300-preview.23180.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a6c6f161441232c79c58895320c2d6b7fc4e00d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 18:54:51 +0000 Subject: [PATCH 465/654] Update dependencies from https://github.com/dotnet/sdk build 20230330.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23180.3 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.6.0-3.23178.21 -> To Version 4.6.0-3.23179.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 3 +++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d6b197f7..62cb9d6ad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78590d54d..efa731d06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 4188210079afb65359890efd06aa1123f249d7b6 + b3f862a37780a0882407788c809b87114cb23b95 - + https://github.com/dotnet/sdk - 4188210079afb65359890efd06aa1123f249d7b6 + b3f862a37780a0882407788c809b87114cb23b95 - + https://github.com/dotnet/sdk - 4188210079afb65359890efd06aa1123f249d7b6 + b3f862a37780a0882407788c809b87114cb23b95 - + https://github.com/dotnet/sdk - 4188210079afb65359890efd06aa1123f249d7b6 + b3f862a37780a0882407788c809b87114cb23b95 @@ -149,9 +149,9 @@ daad346cf905e453a7bb5561dbeb0b1be24a09ca - + https://github.com/dotnet/msbuild - dd5d9f746fe3ec521ed44c6f2b852740d25f51be + 61dd6568446aff7602d37e6a15595371fa057012 diff --git a/eng/Versions.props b/eng/Versions.props index 4b419dd9e..6f777006c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23180.1 - 7.0.300-preview.23180.1 - 7.0.300-preview.23180.1 + 7.0.300-preview.23180.3 + 7.0.300-preview.23180.3 + 7.0.300-preview.23180.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15ebd54c3466ea3e6232472a3d1930ebe336510d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 03:13:50 +0000 Subject: [PATCH 466/654] Update dependencies from https://github.com/dotnet/sdk build 20230330.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23180.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.6.0-3.23178.21 -> To Version 4.6.0-3.23180.6 (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 efa731d06..3c8014f47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - b3f862a37780a0882407788c809b87114cb23b95 + d8a227f2d10e0f471fb777338334ce1e68ebc515 - + https://github.com/dotnet/sdk - b3f862a37780a0882407788c809b87114cb23b95 + d8a227f2d10e0f471fb777338334ce1e68ebc515 - + https://github.com/dotnet/sdk - b3f862a37780a0882407788c809b87114cb23b95 + d8a227f2d10e0f471fb777338334ce1e68ebc515 - + https://github.com/dotnet/sdk - b3f862a37780a0882407788c809b87114cb23b95 + d8a227f2d10e0f471fb777338334ce1e68ebc515 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - daad346cf905e453a7bb5561dbeb0b1be24a09ca + 99e956e42697a6dd886d1e12478ea2b27cceacfa diff --git a/eng/Versions.props b/eng/Versions.props index 6f777006c..a4ef7c925 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23180.3 - 7.0.300-preview.23180.3 - 7.0.300-preview.23180.3 + 7.0.300-preview.23180.8 + 7.0.300-preview.23180.8 + 7.0.300-preview.23180.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7828afa1fb337646531229c2be2875f2fe44d5da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 04:17:33 +0000 Subject: [PATCH 467/654] Update dependencies from https://github.com/dotnet/sdk build 20230330.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23180.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23179.6 -> To Version 12.5.0-beta.23180.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c8014f47..7314ffd31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - d8a227f2d10e0f471fb777338334ce1e68ebc515 + 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a - + https://github.com/dotnet/sdk - d8a227f2d10e0f471fb777338334ce1e68ebc515 + 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a - + https://github.com/dotnet/sdk - d8a227f2d10e0f471fb777338334ce1e68ebc515 + 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a - + https://github.com/dotnet/sdk - d8a227f2d10e0f471fb777338334ce1e68ebc515 + 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 7681004e60fa33211ed2690d38796788ce4a2df8 + 15e94b3cb730ed90d454141e0d4c10a28d9efe1d - + https://github.com/dotnet/fsharp - 7681004e60fa33211ed2690d38796788ce4a2df8 + 15e94b3cb730ed90d454141e0d4c10a28d9efe1d diff --git a/eng/Versions.props b/eng/Versions.props index a4ef7c925..3d5375e4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23180.8 - 7.0.300-preview.23180.8 - 7.0.300-preview.23180.8 + 7.0.300-preview.23180.10 + 7.0.300-preview.23180.10 + 7.0.300-preview.23180.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 860b98a189c58d45dac3b71b7f57932f60a24289 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 09:29:06 +0000 Subject: [PATCH 468/654] Update dependencies from https://github.com/dotnet/sdk build 20230331.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23181.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23179.6 -> To Version 12.5.0-beta.23180.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 7314ffd31..881c9ec7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a + 714e05196d7d9d4eb80c01179ea2a67e93149283 - + https://github.com/dotnet/sdk - 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a + 714e05196d7d9d4eb80c01179ea2a67e93149283 - + https://github.com/dotnet/sdk - 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a + 714e05196d7d9d4eb80c01179ea2a67e93149283 - + https://github.com/dotnet/sdk - 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a + 714e05196d7d9d4eb80c01179ea2a67e93149283 @@ -154,9 +154,9 @@ 61dd6568446aff7602d37e6a15595371fa057012 - + https://github.com/nuget/nuget.client - 545330e99bc4a1c4e1ee3ee1e3d664419cec8efe + 0fa557836fa35aee7d60776ef0c88176dbcd22ac diff --git a/eng/Versions.props b/eng/Versions.props index 3d5375e4c..4f7f6487a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23180.10 - 7.0.300-preview.23180.10 - 7.0.300-preview.23180.10 + 7.0.300-preview.23181.1 + 7.0.300-preview.23181.1 + 7.0.300-preview.23181.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1960b608ee8f400432a52a062ba1e695247df156 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 11:00:09 +0000 Subject: [PATCH 469/654] Update dependencies from https://github.com/dotnet/sdk build 20230331.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23181.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23179.6 -> To Version 12.5.0-beta.23180.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 881c9ec7e..df816c265 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 714e05196d7d9d4eb80c01179ea2a67e93149283 + 6952b7a478462c898db283979964d21bb3607566 - + https://github.com/dotnet/sdk - 714e05196d7d9d4eb80c01179ea2a67e93149283 + 6952b7a478462c898db283979964d21bb3607566 - + https://github.com/dotnet/sdk - 714e05196d7d9d4eb80c01179ea2a67e93149283 + 6952b7a478462c898db283979964d21bb3607566 - + https://github.com/dotnet/sdk - 714e05196d7d9d4eb80c01179ea2a67e93149283 + 6952b7a478462c898db283979964d21bb3607566 diff --git a/eng/Versions.props b/eng/Versions.props index 4f7f6487a..8128e226b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23181.1 - 7.0.300-preview.23181.1 - 7.0.300-preview.23181.1 + 7.0.300-preview.23181.4 + 7.0.300-preview.23181.4 + 7.0.300-preview.23181.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2ff31e8228f397111a3a5fc2538817fa4827c3a5 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 31 Mar 2023 16:14:39 +0000 Subject: [PATCH 470/654] Fix source-build issue related to stable versioning --- eng/Version.Details.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df816c265..594ca2a79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,6 +152,10 @@ https://github.com/dotnet/msbuild 61dd6568446aff7602d37e6a15595371fa057012 + + + https://github.com/dotnet/msbuild + 61dd6568446aff7602d37e6a15595371fa057012 From ce55da54c1143231b7776970e0364fa64789cf99 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 18:00:57 +0000 Subject: [PATCH 471/654] Update dependencies from https://github.com/dotnet/test-templates build 20230331.2 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23181.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f19cb1f8..bbf895c1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 diff --git a/eng/Versions.props b/eng/Versions.props index 14686b8c7..2dfd5bc0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 + 1.1.0-rc.23181.2 + 1.1.0-rc.23181.2 + 1.1.0-rc.23181.2 From 57733356964e5dc69700514f0bc322e81771b7fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 18:54:43 +0000 Subject: [PATCH 472/654] Update dependencies from https://github.com/dotnet/test-templates build 20230331.3 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23181.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbf895c1a..754445cd7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/test-templates - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/test-templates - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 diff --git a/eng/Versions.props b/eng/Versions.props index 2dfd5bc0c..62c48b38f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23181.2 - 1.1.0-rc.23181.2 - 1.1.0-rc.23181.2 + 1.1.0-rc.23181.3 + 1.1.0-rc.23181.3 + 1.1.0-rc.23181.3 From 7260cf93e62f5aa6e3a52f69537a1290246ed260 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Apr 2023 16:06:10 +0000 Subject: [PATCH 473/654] Update dependencies from https://github.com/dotnet/sdk build 20230403.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23181.4 -> To Version 7.0.300-preview.23203.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23180.1 -> To Version 12.5.0-beta.23201.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 594ca2a79..ab3b0f1a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 6952b7a478462c898db283979964d21bb3607566 + fcf5a8c6527ecf533225d36f38630eca63511bd1 - + https://github.com/dotnet/sdk - 6952b7a478462c898db283979964d21bb3607566 + fcf5a8c6527ecf533225d36f38630eca63511bd1 - + https://github.com/dotnet/sdk - 6952b7a478462c898db283979964d21bb3607566 + fcf5a8c6527ecf533225d36f38630eca63511bd1 - + https://github.com/dotnet/sdk - 6952b7a478462c898db283979964d21bb3607566 + fcf5a8c6527ecf533225d36f38630eca63511bd1 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 15e94b3cb730ed90d454141e0d4c10a28d9efe1d + 576a650f5edc52f2ff294ea68a11e64fe8075e21 - + https://github.com/dotnet/fsharp - 15e94b3cb730ed90d454141e0d4c10a28d9efe1d + 576a650f5edc52f2ff294ea68a11e64fe8075e21 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 99e956e42697a6dd886d1e12478ea2b27cceacfa + 78abd4a4a0e5f9fcf55c6ee920d6265f74ff5b5a diff --git a/eng/Versions.props b/eng/Versions.props index 8128e226b..4dcb718bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23181.4 - 7.0.300-preview.23181.4 - 7.0.300-preview.23181.4 + 7.0.300-preview.23203.1 + 7.0.300-preview.23203.1 + 7.0.300-preview.23203.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6fc960bb45c940116833317f425b3ae9e4cd3596 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Apr 2023 21:48:10 +0000 Subject: [PATCH 474/654] Update dependencies from https://github.com/dotnet/sdk build 20230403.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23203.1 -> To Version 7.0.300-preview.23203.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23201.1 -> To Version 12.5.0-beta.23203.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab3b0f1a4..686c5a3dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - fcf5a8c6527ecf533225d36f38630eca63511bd1 + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 - + https://github.com/dotnet/sdk - fcf5a8c6527ecf533225d36f38630eca63511bd1 + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 - + https://github.com/dotnet/sdk - fcf5a8c6527ecf533225d36f38630eca63511bd1 + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 - + https://github.com/dotnet/sdk - fcf5a8c6527ecf533225d36f38630eca63511bd1 + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 576a650f5edc52f2ff294ea68a11e64fe8075e21 + 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/dotnet/fsharp - 576a650f5edc52f2ff294ea68a11e64fe8075e21 + 5b37dd5fea143baefbef2bd83836188af0815a30 diff --git a/eng/Versions.props b/eng/Versions.props index 4dcb718bc..de1a0e16c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23203.1 - 7.0.300-preview.23203.1 - 7.0.300-preview.23203.1 + 7.0.300-preview.23203.7 + 7.0.300-preview.23203.7 + 7.0.300-preview.23203.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 138c3bbdf4c91b75a57e623bdeba4df7782bc435 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Apr 2023 10:33:55 -0700 Subject: [PATCH 475/654] Update branding to 7.0.204 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 355237ca9..0361d3816 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 2 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 157f63c3242703cec4e7de0810d97248e36de129 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Apr 2023 19:00:51 +0000 Subject: [PATCH 476/654] Update dependencies from https://github.com/dotnet/test-templates build 20230404.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23204.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 754445cd7..12d976155 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 diff --git a/eng/Versions.props b/eng/Versions.props index 62c48b38f..f872b0e4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23181.3 - 1.1.0-rc.23181.3 - 1.1.0-rc.23181.3 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 From 6a58883a80c05bbbc343fb648983988530b70ec8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 20:11:55 +0000 Subject: [PATCH 477/654] [release/7.0.3xx] Update dependencies from dotnet/test-templates (#15985) [release/7.0.3xx] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 686c5a3dc..b2a4a7132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 diff --git a/eng/Versions.props b/eng/Versions.props index de1a0e16c..93f323b4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 From aff54705ad0bf45bee1c3f02340b222907e7ecac Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 4 Apr 2023 15:52:32 -0700 Subject: [PATCH 478/654] Stabilize branding and implicit version --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 93f323b4c..697fcafda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,20 +10,20 @@ 3 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release 30 32 17 - 15 + $([MSBuild]::Add($(VersionFeature), 17)) From b3367914b9605208b6f663e4d41c2cf89e8e5279 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 20:28:49 +0000 Subject: [PATCH 479/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15992) [release/7.0.3xx] Update dependencies from dotnet/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 b2a4a7132..768037280 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + f926985763ae5c226cf59cd0cac8a09f38ce300d - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + f926985763ae5c226cf59cd0cac8a09f38ce300d - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + f926985763ae5c226cf59cd0cac8a09f38ce300d - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + f926985763ae5c226cf59cd0cac8a09f38ce300d diff --git a/eng/Versions.props b/eng/Versions.props index 93f323b4c..15f39434d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23203.7 - 7.0.300-preview.23203.7 - 7.0.300-preview.23203.7 + 7.0.300-preview.23204.25 + 7.0.300-preview.23204.25 + 7.0.300-preview.23204.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5cac85d60dda1711866787642c8b9027e8625f79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 10:26:38 +0000 Subject: [PATCH 480/654] Update dependencies from https://github.com/dotnet/sdk build 20230407.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23204.25 -> To Version 7.0.300-preview.23207.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-3.23181.8 -> To Version 4.6.0-3.23206.9 (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 768037280..b97db0a6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + a4890ef1558b80487deb5534bc811e45c05ecaff - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + a4890ef1558b80487deb5534bc811e45c05ecaff - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + a4890ef1558b80487deb5534bc811e45c05ecaff - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + a4890ef1558b80487deb5534bc811e45c05ecaff @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 78abd4a4a0e5f9fcf55c6ee920d6265f74ff5b5a + 6bd2384c7889b7a141ba0c7a23aebc5b44f1f237 diff --git a/eng/Versions.props b/eng/Versions.props index 15f39434d..95c1aa2c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23204.25 - 7.0.300-preview.23204.25 - 7.0.300-preview.23204.25 + 7.0.300-preview.23207.1 + 7.0.300-preview.23207.1 + 7.0.300-preview.23207.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 14ca231477d9421b8a7036d7a276be7944e2cf4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 19:14:34 +0000 Subject: [PATCH 481/654] Update dependencies from https://github.com/dotnet/sdk build 20230407.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23207.1 -> To Version 7.0.300-preview.23207.5 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.23165.1 -> To Version 7.0.100-1.23207.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 b97db0a6e..71389c073 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - a4890ef1558b80487deb5534bc811e45c05ecaff + c1593c8729e8c0abfcf5b4fae0b6248dba81a063 - + https://github.com/dotnet/sdk - a4890ef1558b80487deb5534bc811e45c05ecaff + c1593c8729e8c0abfcf5b4fae0b6248dba81a063 - + https://github.com/dotnet/sdk - a4890ef1558b80487deb5534bc811e45c05ecaff + c1593c8729e8c0abfcf5b4fae0b6248dba81a063 - + https://github.com/dotnet/sdk - a4890ef1558b80487deb5534bc811e45c05ecaff + c1593c8729e8c0abfcf5b4fae0b6248dba81a063 @@ -138,9 +138,9 @@ 5bef4cdc79ad79f5627c028b6cf06a4197aa9c54 - + https://github.com/dotnet/linker - d3fc41eadc9ff73ae8e20eb6f874cf5321714c0b + 08a09f27f664fb84368aa4b9eb862b13bf808579 linker diff --git a/eng/Versions.props b/eng/Versions.props index 95c1aa2c5..586cd92d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23207.1 - 7.0.300-preview.23207.1 - 7.0.300-preview.23207.1 + 7.0.300-preview.23207.5 + 7.0.300-preview.23207.5 + 7.0.300-preview.23207.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f990fab11a533c38fc6cefa6b282d7d101e7b94c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 09:17:12 -0700 Subject: [PATCH 482/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#16034) Co-authored-by: dotnet-maestro[bot] --- 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 71389c073..a94168ac1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - c1593c8729e8c0abfcf5b4fae0b6248dba81a063 + 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 - + https://github.com/dotnet/sdk - c1593c8729e8c0abfcf5b4fae0b6248dba81a063 + 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 - + https://github.com/dotnet/sdk - c1593c8729e8c0abfcf5b4fae0b6248dba81a063 + 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 - + https://github.com/dotnet/sdk - c1593c8729e8c0abfcf5b4fae0b6248dba81a063 + 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 6bd2384c7889b7a141ba0c7a23aebc5b44f1f237 + a10bbf218cbd333e13a5387661c73f9b4077bd48 diff --git a/eng/Versions.props b/eng/Versions.props index 586cd92d5..557faec50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23207.5 - 7.0.300-preview.23207.5 - 7.0.300-preview.23207.5 + 7.0.300-preview.23211.4 + 7.0.300-preview.23211.4 + 7.0.300-preview.23211.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6312afa324cce02a532b81f218ede4acc4d7417d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:21:43 -0700 Subject: [PATCH 483/654] [release/7.0.3xx] Update dependencies from dotnet/sdk (#16042) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a94168ac1..81ae6103f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 + 5752fcec04293de0c14fa875cd6e87876dbef4f7 - + https://github.com/dotnet/sdk - 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 + 5752fcec04293de0c14fa875cd6e87876dbef4f7 - + https://github.com/dotnet/sdk - 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 + 5752fcec04293de0c14fa875cd6e87876dbef4f7 - + https://github.com/dotnet/sdk - 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 + 5752fcec04293de0c14fa875cd6e87876dbef4f7 @@ -133,9 +133,9 @@ 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/microsoft/vstest - 5bef4cdc79ad79f5627c028b6cf06a4197aa9c54 + 7933ee32f416745e48ff33cb6a3e82fd1ca38b87 diff --git a/eng/Versions.props b/eng/Versions.props index 557faec50..2168799f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23211.4 - 7.0.300-preview.23211.4 - 7.0.300-preview.23211.4 + 7.0.300-preview.23211.7 + 7.0.300-preview.23211.7 + 7.0.300-preview.23211.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -193,7 +193,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-release-20230324-04 + 17.6.0-release-20230405-08 From 2914abcb7d52663df373d635836b746de0648838 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 19:54:08 +0000 Subject: [PATCH 484/654] [release/7.0.2xx] Update dependencies from dotnet/arcade (#16050) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 284c51a49..67caa736d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,18 +198,18 @@ - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2477cd3e2..6c068dce8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23164.3 + 7.0.0-beta.23211.2 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 41a26d802..f13b74080 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index da60f35de..550a365a9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.104", + "dotnet": "7.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2" } } From 756d7336a066c610bc6e3f4bd9c379f2d2b398d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 19:55:24 +0000 Subject: [PATCH 485/654] [release/7.0.3xx] Update dependencies from dotnet/arcade (#16051) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81ae6103f..8c7052794 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2168799f7..451b61c67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23164.3 + 7.0.0-beta.23211.2 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 41a26d802..f13b74080 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index da60f35de..550a365a9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.104", + "dotnet": "7.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2" } } From 3e56e863592067dac854c98ee718934fd34d2598 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Apr 2023 08:29:37 +0000 Subject: [PATCH 486/654] Update dependencies from https://github.com/dotnet/test-templates build 20230413.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23204.1 -> To Version 1.1.0-rc.23213.1 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index a8b2060e2..9f41cb141 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,31 @@ - + + + + + + + + @@ -47,17 +54,22 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67caa736d..f1069a15c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 diff --git a/eng/Versions.props b/eng/Versions.props index 465aebd23..26345d72e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23204.1 - 1.1.0-rc.23204.1 - 1.1.0-rc.23204.1 + 1.1.0-rc.23213.1 + 1.1.0-rc.23213.1 + 1.1.0-rc.23213.1 From 2c6d66877c56908882eb52d5e2125b13929a0187 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 14 Apr 2023 09:58:36 -0500 Subject: [PATCH 487/654] Disable source-build tarball official builds in unsupported branches (#16107) --- eng/source-build-tarball-build-official.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 5d396baab..aa1de43eb 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -11,10 +11,12 @@ resources: - release/* - internal/release/* exclude: - - release/6.0.3xx - - internal/release/6.0.3xx - - release/6.0.4xx - - internal/release/6.0.4xx + - release/7.0.2xx + - internal/release/7.0.2xx + - release/7.0.3xx + - internal/release/7.0.3xx + - release/7.0.4xx + - internal/release/7.0.4xx stages: - build From 83a520aa45ee075d8beb286726a89adaa4fe5740 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 14 Apr 2023 15:49:40 +0000 Subject: [PATCH 488/654] Merged PR 30595: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.5-servicing.23177.5 to 7.0.6-servicing.23213.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.5-servicing.23177.5 to 7.0.6-servicing.23213.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.5-servicing.23174.5 to 7.0.6-servicing.23212.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.5-servicing.23175.1 to 7.0.6-servicing.23204.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.5-servicing.23176.1 to 7.0.6-servicing.23213.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 7.0.100-1.23207.1 to 7.0.100-1.23211.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.6.0-3.23210.15 to 4.6.0-3.23212.2 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.6... --- NuGet.config | 28 ++++----- eng/Version.Details.xml | 130 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++-------- 3 files changed, 103 insertions(+), 103 deletions(-) diff --git a/NuGet.config b/NuGet.config index 515768919..fbe9a1756 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,25 @@ - + - + - + + + + - - - + - - + @@ -47,18 +47,18 @@ - + + + + - - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ad77b80d..6fb12ce2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 265ddce1c1939672e1223e750544bb0443a8f74b + 36584a5b81a6527a1298a092117bce4a0bb237b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 265ddce1c1939672e1223e750544bb0443a8f74b + 36584a5b81a6527a1298a092117bce4a0bb237b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 265ddce1c1939672e1223e750544bb0443a8f74b + 36584a5b81a6527a1298a092117bce4a0bb237b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 265ddce1c1939672e1223e750544bb0443a8f74b + 36584a5b81a6527a1298a092117bce4a0bb237b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - - https://github.com/dotnet/sdk - 5752fcec04293de0c14fa875cd6e87876dbef4f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 - - https://github.com/dotnet/sdk - 5752fcec04293de0c14fa875cd6e87876dbef4f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 - - https://github.com/dotnet/sdk - 5752fcec04293de0c14fa875cd6e87876dbef4f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 - - https://github.com/dotnet/sdk - 5752fcec04293de0c14fa875cd6e87876dbef4f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f75d9496cbb2fe61cfdb1299520c5c34a062a898 + a7742f16a6b2750e39825e301560a6abbb44b6f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 + 153de16d5ed088a1c3ef9ba007a871d0995ef612 https://github.com/dotnet/fsharp @@ -138,42 +138,42 @@ 7933ee32f416745e48ff33cb6a3e82fd1ca38b87 - + https://github.com/dotnet/linker - 08a09f27f664fb84368aa4b9eb862b13bf808579 + 9d4b3f3e0c100fe5ac4dc7f40d14d792178dbd0c linker - + https://github.com/dotnet/roslyn - a10bbf218cbd333e13a5387661c73f9b4077bd48 + d78a163b525fd73efb768f4f0095590f9ade3469 - + https://github.com/dotnet/msbuild - 61dd6568446aff7602d37e6a15595371fa057012 + 8ffc3fe3dc15b17ecf39a289deb5cd7fb65993a0 - + https://github.com/dotnet/msbuild - 61dd6568446aff7602d37e6a15595371fa057012 + 8ffc3fe3dc15b17ecf39a289deb5cd7fb65993a0 - - https://github.com/nuget/nuget.client - 0fa557836fa35aee7d60776ef0c88176dbcd22ac + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d + b0eec69ee7bdab81823db7d6482cb6cff9f07e48 - + https://github.com/dotnet/emsdk - 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d + b0eec69ee7bdab81823db7d6482cb6cff9f07e48 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 52e9d94c9..59df32196 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.5-servicing.23175.1 + 7.0.6-servicing.23204.3 - 7.0.5-servicing.23176.1 + 7.0.6-servicing.23213.3 @@ -56,22 +56,22 @@ - 7.0.5 - 7.0.5 - 7.0.5-servicing.23174.10 - 7.0.5-servicing.23174.10 - 7.0.5-servicing.23174.10 - 7.0.5-servicing.23174.10 - 7.0.5-servicing.23174.10 + 7.0.6 + 7.0.6 + 7.0.6-servicing.23212.15 + 7.0.6-servicing.23212.15 + 7.0.6-servicing.23212.15 + 7.0.6-servicing.23212.15 + 7.0.6-servicing.23212.15 0.2.0 - 7.0.300-preview.23211.7 - 7.0.300-preview.23211.7 - 7.0.300-preview.23211.7 + 7.0.300 + 7.0.300-rtm.23213.60 + 7.0.300-rtm.23213.60 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.5-servicing.23174.5 - 7.0.5-servicing.23174.5 - 7.0.5 - 7.0.5 - 7.0.5 - 7.0.5 + 7.0.6-servicing.23212.12 + 7.0.6-servicing.23212.12 + 7.0.6 + 7.0.6 + 7.0.6 + 7.0.6 2.1.0 - 7.0.5-servicing.23177.5 - 7.0.5-servicing.23177.5 - 7.0.5 - 7.0.5 + 7.0.6-servicing.23213.6 + 7.0.6-servicing.23213.6 + 7.0.6 + 7.0.6 @@ -227,8 +227,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.5 - 7.0.5 + 7.0.6 + 7.0.6 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From a3ba726ea101b30463694a5611e7f54468de1dfd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 15 Apr 2023 20:18:31 +0000 Subject: [PATCH 489/654] Merged PR 30679: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.6-servicing.23213.6 to 7.0.6-servicing.23213.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.6-servicing.23213.6 to 7.0.6-servicing.23213.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.6-servicing.23204.3 to 7.0.6-servicing.23213.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.6-servicing.23213.3 to 7.0.6-servicing.23213.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230415.6 - **Date Produced**: April 15, 2023 5:38:19 PM UTC - **Commit**: 3f765dd3a04a69dc988088394b19f20e8d9ae4ce - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.300 to 7.0.300][5] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.300-rtm.23213.60 to 7.0.300-rtm.23215.6][5] - **Microsoft.NET.Sdk**: [from 7.0.300-rtm.23213.60 to 7.0.300-rtm.23215.6][5] - **Micr... --- NuGet.config | 18 +++++-------- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index fbe9a1756..04bc9078a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,22 +10,19 @@ - + - - - - + - + @@ -47,18 +44,15 @@ - + - - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6fb12ce2b..5bd5993ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 36584a5b81a6527a1298a092117bce4a0bb237b8 + 0af2ffd343917ef04085946fb40e75474b391ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 36584a5b81a6527a1298a092117bce4a0bb237b8 + 0af2ffd343917ef04085946fb40e75474b391ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 36584a5b81a6527a1298a092117bce4a0bb237b8 + 0af2ffd343917ef04085946fb40e75474b391ccf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 36584a5b81a6527a1298a092117bce4a0bb237b8 + 0af2ffd343917ef04085946fb40e75474b391ccf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 + 3f765dd3a04a69dc988088394b19f20e8d9ae4ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 + 3f765dd3a04a69dc988088394b19f20e8d9ae4ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 + 3f765dd3a04a69dc988088394b19f20e8d9ae4ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 + 3f765dd3a04a69dc988088394b19f20e8d9ae4ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a7742f16a6b2750e39825e301560a6abbb44b6f7 + b3dce1f781e8f035f43da3d5eb11d4916d1be36f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 153de16d5ed088a1c3ef9ba007a871d0995ef612 + 2c5505b6cdfe7e0be6283d8b2f9968139cc54087 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 59df32196..8c98694af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.6-servicing.23204.3 + 7.0.6-servicing.23213.5 - 7.0.6-servicing.23213.3 + 7.0.6-servicing.23213.10 @@ -58,11 +58,11 @@ 7.0.6 7.0.6 - 7.0.6-servicing.23212.15 - 7.0.6-servicing.23212.15 - 7.0.6-servicing.23212.15 - 7.0.6-servicing.23212.15 - 7.0.6-servicing.23212.15 + 7.0.6-servicing.23214.13 + 7.0.6-servicing.23214.13 + 7.0.6-servicing.23214.13 + 7.0.6-servicing.23214.13 + 7.0.6-servicing.23214.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.300 - 7.0.300-rtm.23213.60 - 7.0.300-rtm.23213.60 + 7.0.300-rtm.23215.6 + 7.0.300-rtm.23215.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.6-servicing.23213.6 - 7.0.6-servicing.23213.6 + 7.0.6-servicing.23213.14 + 7.0.6-servicing.23213.14 7.0.6 7.0.6 From 32ee2f1487175ec352b6be6c082143a5170495bc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Apr 2023 17:22:31 +0000 Subject: [PATCH 490/654] Merged PR 30762: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230418.9 - **Date Produced**: April 18, 2023 3:38:34 PM UTC - **Commit**: fb94b17af2dd037d0b2e4d551efde34812083ba5 - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.300 to 7.0.300][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.300-rtm.23215.6 to 7.0.300-rtm.23218.9][1] - **Microsoft.NET.Sdk**: [from 7.0.300-rtm.23215.6 to 7.0.300-rtm.23218.9][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.300-rtm.23215.6 to 7.0.300-rtm.23218.9][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.6 to 7.0.6][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.6][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] - **dotnet-dev-certs**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] - **dotnet-user-jwts**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] - **dotnet-user-secrets**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC3f765dd3a0&targetVersion=GCfb94b17af2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branch... --- NuGet.config | 13 +++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 04bc9078a..768f2c308 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,22 @@ - + + + - + + @@ -44,14 +47,16 @@ - + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bd5993ae..4641873ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f765dd3a04a69dc988088394b19f20e8d9ae4ce + fb94b17af2dd037d0b2e4d551efde34812083ba5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f765dd3a04a69dc988088394b19f20e8d9ae4ce + fb94b17af2dd037d0b2e4d551efde34812083ba5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f765dd3a04a69dc988088394b19f20e8d9ae4ce + fb94b17af2dd037d0b2e4d551efde34812083ba5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f765dd3a04a69dc988088394b19f20e8d9ae4ce + fb94b17af2dd037d0b2e4d551efde34812083ba5 diff --git a/eng/Versions.props b/eng/Versions.props index 8c98694af..e0f5b2162 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.6 7.0.6 - 7.0.6-servicing.23214.13 - 7.0.6-servicing.23214.13 - 7.0.6-servicing.23214.13 - 7.0.6-servicing.23214.13 - 7.0.6-servicing.23214.13 + 7.0.6-servicing.23217.6 + 7.0.6-servicing.23217.6 + 7.0.6-servicing.23217.6 + 7.0.6-servicing.23217.6 + 7.0.6-servicing.23217.6 0.2.0 @@ -70,8 +70,8 @@ 7.0.300 - 7.0.300-rtm.23215.6 - 7.0.300-rtm.23215.6 + 7.0.300-rtm.23218.9 + 7.0.300-rtm.23218.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f277f1473fb2a42a9df116585542bda2da883374 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 20 Mar 2023 14:07:20 -0700 Subject: [PATCH 491/654] Publish checksums (#15803) --- eng/Publishing.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 3d0751dd8..f564a94e3 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -78,12 +78,12 @@ - - - - - - + + + + + + Date: Tue, 2 May 2023 11:00:06 -0700 Subject: [PATCH 492/654] Update branding to 7.0.205 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 26345d72e..99787c728 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 2 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From a828d6f1a8417b5f88d8d9920302169d53fea25c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 May 2023 11:00:10 -0700 Subject: [PATCH 493/654] Update branding to 7.0.301 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c3f147800..eb52c0fe4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm From c661d5dae1946c7b62ea75f12162c05cc4844cbb Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 2 May 2023 12:00:32 -0700 Subject: [PATCH 494/654] Updating branding for hotfix --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 99787c728..5f1a7896f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 2 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing @@ -23,7 +23,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 13)) + $([MSBuild]::Add($(VersionFeature), 12)) From 50b2bc34ff112b490dcfe5a1d0a4a259cefecd69 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 2 May 2023 12:01:19 -0700 Subject: [PATCH 495/654] Update branding for hotfix --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index eb52c0fe4..40c17316c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,9 +8,9 @@ 7 0 3 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) @@ -23,7 +23,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 17)) + $([MSBuild]::Add($(VersionFeature), 16)) From b656da9d90d76ff90f4f5a7256626873cdae28a0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 11 May 2023 11:53:13 -0700 Subject: [PATCH 496/654] Update branding for 303 7.0.302 will end up shipping with 17.6.0 after a few internal rebuilds. Updating this branding to 303 to match. --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 40c17316c..7b4729b81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing @@ -23,7 +23,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 16)) + $([MSBuild]::Add($(VersionFeature), 15)) From e74a6d397c32e5d383d9dc5862b025029d296853 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 15 May 2023 14:18:55 -0700 Subject: [PATCH 497/654] [release/7.0.3xx] Update to 7.0.304 (#16403) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7b4729b81..2c2c858c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing @@ -23,7 +23,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 15)) + $([MSBuild]::Add($(VersionFeature), 14)) From b0b3054de5642b312228b9ed6053792ca5392868 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 19 May 2023 17:33:36 +0000 Subject: [PATCH 498/654] Merged PR 31377: Subtract an additional 1 from 60 Template version Revert this next month --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 712887014..2dce7d589 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ --> true true - $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(VersionFeature60), 2)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From 65eeecc57dcd9183c937b22e435ac60102ca8127 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 18:25:49 +0000 Subject: [PATCH 499/654] Merged PR 31117: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230504.19 - **Date Produced**: May 4, 2023 10:45:02 PM UTC - **Commit**: c67c38873cc5cd6d45b6954e4782ea80e0913345 - **Branch**: refs/heads/internal/release/7.0.302 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.300 to 7.0.302][9] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.300-rtm.23218.9 to 7.0.302-servicing.23254.19][9] - **Microsoft.NET.Sdk**: [from 7.0.300-rtm.23218.9 to 7.0.302-servicing.23254.19][9] - **Microsoft.TemplateEngine.Cli**: [from 7.0.300-rtm.23218.9 to 7.0.302-servicing.23254.19][9] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.6 to 7.0.5][10] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23213.14 to 7.0.5-servicing.23177.5][10] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.6-servicing.23213.14 to 7.0.5-servicing.23177.5][10] - **Microsoft.NETCore.App.Ref**: [from 7.0.6 to 7.0.5][11] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.5-servicing.23174.5][11] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.5][11] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.6 to 7.0.5][11] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.6 to 7.0.5][11] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.6 to 7.0.5][12] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.5][12] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **dotnet-dev-certs**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **dotnet-user-jwts**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **dotnet-user-secrets**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.6 to 7.0.5][10] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.6-servicing.23213.5 to 7.0.5-servicing.23175.1][13] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.6 to 7.0.5][10] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.6-servicing.23213.10 to 7.0.5-servicing.23176.1][14] - **NuGet.Build.Tasks**: [from 6.6.0-rc.66 to 6.6.0-preview.3.61][15] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.5-servicing.23174.5][11] - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: [from 7.0.6 to 7.0.5][16] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.5-servicing.... --- NuGet.config | 24 +++----- eng/Version.Details.xml | 118 ++++++++++++++++++++-------------------- eng/Versions.props | 48 ++++++++-------- 3 files changed, 92 insertions(+), 98 deletions(-) diff --git a/NuGet.config b/NuGet.config index 768f2c308..17e655b64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,21 @@ - - + - - + - - + - + - - + @@ -47,17 +43,15 @@ - + - - + - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67e807b32..e9b990d31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 77a647a7f1d75f63551fe656b350229562ac04a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 77a647a7f1d75f63551fe656b350229562ac04a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 77a647a7f1d75f63551fe656b350229562ac04a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 77a647a7f1d75f63551fe656b350229562ac04a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb94b17af2dd037d0b2e4d551efde34812083ba5 + 4046bbcae7c95a913ded86e1fc4a4572e2237b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb94b17af2dd037d0b2e4d551efde34812083ba5 + 4046bbcae7c95a913ded86e1fc4a4572e2237b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb94b17af2dd037d0b2e4d551efde34812083ba5 + 4046bbcae7c95a913ded86e1fc4a4572e2237b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb94b17af2dd037d0b2e4d551efde34812083ba5 + 4046bbcae7c95a913ded86e1fc4a4572e2237b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b3dce1f781e8f035f43da3d5eb11d4916d1be36f + 0fcdb8d3ba0a80a9d77518f1cc2a1f68875aed77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2c5505b6cdfe7e0be6283d8b2f9968139cc54087 + 671efc4e6651576c7e69408dbc8cacc4cf3d7ceb https://github.com/dotnet/fsharp @@ -144,36 +144,36 @@ linker - + https://github.com/dotnet/roslyn - d78a163b525fd73efb768f4f0095590f9ade3469 + c3cc1d0ceeab1a65da0217e403851a1e8a30086a - + https://github.com/dotnet/msbuild - 8ffc3fe3dc15b17ecf39a289deb5cd7fb65993a0 + 07e2947214f1a9f28a3517762c939d5bebb5f525 - + https://github.com/dotnet/msbuild - 8ffc3fe3dc15b17ecf39a289deb5cd7fb65993a0 + 07e2947214f1a9f28a3517762c939d5bebb5f525 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a + + https://github.com/nuget/nuget.client + 0fa557836fa35aee7d60776ef0c88176dbcd22ac https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - b0eec69ee7bdab81823db7d6482cb6cff9f07e48 + b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda - + https://github.com/dotnet/emsdk - b0eec69ee7bdab81823db7d6482cb6cff9f07e48 + b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 2dce7d589..137cda42f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.6-servicing.23213.5 + 7.0.7-servicing.23252.4 - 7.0.6-servicing.23213.10 + 7.0.7-servicing.23261.3 @@ -56,22 +56,22 @@ - 7.0.6 - 7.0.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 + 7.0.7 + 7.0.7 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 0.2.0 - 7.0.300 - 7.0.300-rtm.23218.9 - 7.0.300-rtm.23218.9 + 7.0.304 + 7.0.304-servicing.23269.7 + 7.0.304-servicing.23269.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.6-servicing.23212.12 - 7.0.6-servicing.23212.12 - 7.0.6 - 7.0.6 - 7.0.6 - 7.0.6 + 7.0.7-servicing.23268.2 + 7.0.7-servicing.23268.2 + 7.0.7 + 7.0.7 + 7.0.7 + 7.0.7 2.1.0 - 7.0.6-servicing.23213.14 - 7.0.6-servicing.23213.14 - 7.0.6 - 7.0.6 + 7.0.7-servicing.23267.3 + 7.0.7-servicing.23267.3 + 7.0.7 + 7.0.7 @@ -227,8 +227,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.6 - 7.0.6 + 7.0.7 + 7.0.7 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From a7c3fe9a782d53ee5b29fa240a6248d1bf2e5594 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 14:32:46 +0000 Subject: [PATCH 500/654] Merged PR 31404: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.7-servicing.23267.3 to 7.0.7-servicing.23269.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.7-servicing.23267.3 to 7.0.7-servicing.23269.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23252.4 to 7.0.7-servicing.23268.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.7-servicing.23261.3 to 7.0.7-servicing.23269.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **NuGet.Build.Tasks**: from 6.6.0-preview.3.61 to 6.6.0-rc.66 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230521.6 - **Date Produced**: May 22, 2023 6:18:47 AM UTC - **Commit**: fea33e20515e4362cef5b911309a4a184badd70b - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][6] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23269.7 to 7.0.304-servicing.23271.6][6] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23269.7 to 7.0.304-servicing.23271.6][6] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23269.7 to 7.0.304-servicing.23271.6][6] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.7 to 7.0.7][7] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23267.3 to 7.0.7-servicing.23269.4][7] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.7-servicing.23267.3 to 7.0.7-servicing.23269.4][7] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][7] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23252.4 to 7.0.7-servicing.23268.2][8] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][7] - **Micr... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 17e655b64..2bd4d0c6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9b990d31..cd5aff11f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 77a647a7f1d75f63551fe656b350229562ac04a4 + 2c4afc9f20969377bcf289b20c039cab44deddbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 77a647a7f1d75f63551fe656b350229562ac04a4 + 2c4afc9f20969377bcf289b20c039cab44deddbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 77a647a7f1d75f63551fe656b350229562ac04a4 + 2c4afc9f20969377bcf289b20c039cab44deddbd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 77a647a7f1d75f63551fe656b350229562ac04a4 + 2c4afc9f20969377bcf289b20c039cab44deddbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4046bbcae7c95a913ded86e1fc4a4572e2237b1c + fea33e20515e4362cef5b911309a4a184badd70b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4046bbcae7c95a913ded86e1fc4a4572e2237b1c + fea33e20515e4362cef5b911309a4a184badd70b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4046bbcae7c95a913ded86e1fc4a4572e2237b1c + fea33e20515e4362cef5b911309a4a184badd70b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4046bbcae7c95a913ded86e1fc4a4572e2237b1c + fea33e20515e4362cef5b911309a4a184badd70b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0fcdb8d3ba0a80a9d77518f1cc2a1f68875aed77 + fafc9aa56432f1e5728f082b222c3ef519b3dd59 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 671efc4e6651576c7e69408dbc8cacc4cf3d7ceb + bd4d958ccb657d11bbcd0d94f6f8a8c54e1c8c08 https://github.com/dotnet/fsharp @@ -158,9 +158,9 @@ 07e2947214f1a9f28a3517762c939d5bebb5f525 - - https://github.com/nuget/nuget.client - 0fa557836fa35aee7d60776ef0c88176dbcd22ac + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a diff --git a/eng/Versions.props b/eng/Versions.props index 137cda42f..4202e76a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23252.4 + 7.0.7-servicing.23268.2 - 7.0.7-servicing.23261.3 + 7.0.7-servicing.23269.2 @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23269.7 - 7.0.304-servicing.23269.7 + 7.0.304-servicing.23271.6 + 7.0.304-servicing.23271.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.7-servicing.23267.3 - 7.0.7-servicing.23267.3 + 7.0.7-servicing.23269.4 + 7.0.7-servicing.23269.4 7.0.7 7.0.7 From 20076b1bdea0868d3c4ff145f273ad6ce74c3f72 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:48:09 +0000 Subject: [PATCH 501/654] Merged PR 31448: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.4 to 7.0.7-servicing.23269.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.7-servicing.23269.4 to 7.0.7-servicing.23269.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23268.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.7-servicing.23269.2 to 7.0.7-servicing.23269.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++-------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2bd4d0c6e..249fd14cf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,19 +9,19 @@ - + - + - + - + @@ -43,15 +43,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd5aff11f..53603e17d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c4afc9f20969377bcf289b20c039cab44deddbd + 57b0d2bac14e817eca9a3267626bc4d76a229f9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c4afc9f20969377bcf289b20c039cab44deddbd + 57b0d2bac14e817eca9a3267626bc4d76a229f9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c4afc9f20969377bcf289b20c039cab44deddbd + 57b0d2bac14e817eca9a3267626bc4d76a229f9f https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c4afc9f20969377bcf289b20c039cab44deddbd + 57b0d2bac14e817eca9a3267626bc4d76a229f9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea33e20515e4362cef5b911309a4a184badd70b + 9460e4c1996834ffc8a0baed3993e8c932a07362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea33e20515e4362cef5b911309a4a184badd70b + 9460e4c1996834ffc8a0baed3993e8c932a07362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea33e20515e4362cef5b911309a4a184badd70b + 9460e4c1996834ffc8a0baed3993e8c932a07362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea33e20515e4362cef5b911309a4a184badd70b + 9460e4c1996834ffc8a0baed3993e8c932a07362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fafc9aa56432f1e5728f082b222c3ef519b3dd59 + 3632207d619ad47c9933baa5806b67b67d1a4b77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bd4d958ccb657d11bbcd0d94f6f8a8c54e1c8c08 + e43abfbcc8ce872b9ba591d87ec791e3f25423c0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4202e76a2..742a60852 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23268.2 + 7.0.7-servicing.23268.9 - 7.0.7-servicing.23269.2 + 7.0.7-servicing.23269.7 @@ -58,11 +58,11 @@ 7.0.7 7.0.7 - 7.0.7-servicing.23268.10 - 7.0.7-servicing.23268.10 - 7.0.7-servicing.23268.10 - 7.0.7-servicing.23268.10 - 7.0.7-servicing.23268.10 + 7.0.7-servicing.23269.11 + 7.0.7-servicing.23269.11 + 7.0.7-servicing.23269.11 + 7.0.7-servicing.23269.11 + 7.0.7-servicing.23269.11 0.2.0 @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23271.6 - 7.0.304-servicing.23271.6 + 7.0.304-servicing.23272.10 + 7.0.304-servicing.23272.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,8 +82,8 @@ - 7.0.7-servicing.23268.2 - 7.0.7-servicing.23268.2 + 7.0.7-servicing.23269.6 + 7.0.7-servicing.23269.6 7.0.7 7.0.7 7.0.7 @@ -92,8 +92,8 @@ - 7.0.7-servicing.23269.4 - 7.0.7-servicing.23269.4 + 7.0.7-servicing.23269.8 + 7.0.7-servicing.23269.8 7.0.7 7.0.7 From 783478bbb09f4cd5d7655f2d30233ac89cc687f1 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:21:23 -0700 Subject: [PATCH 502/654] Generate version for Roslyn packages (#15216) Co-authored-by: Forgind --- src/redist/targets/GenerateBundledVersions.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 60d7ecde1..32d6a9ece 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -335,6 +335,7 @@ Copyright (c) .NET Foundation. All rights reserved. %24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\')) %24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs + $(MicrosoftNetCompilersToolsetPackageVersion) $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppPackageVersion) From debb3b2f361fed3a106f9e4477f94a0babe1aaef Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 17 Mar 2023 11:19:18 -0700 Subject: [PATCH 503/654] Add version property for Roslyn (#15843) This will enable #15216 to use MicrosoftNetCompilersToolsetPackageVersion and have it automatically update using DARC. --- eng/Versions.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index 2c2c858c5..7db5c83fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -76,6 +76,10 @@ $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) + + + 4.6.0-2.23166.9 + 7.0.2 From baad58f5b400f11c63048909fca28f713a24f457 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 24 Mar 2023 16:42:13 -0700 Subject: [PATCH 504/654] Change property name (#15907) This means the package version property won't collide with MicrosoftNetCompilersToolsetPackageVersion, which is already in use for another package, albeit the core version of the same package. --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 32d6a9ece..5fdd24175 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -335,7 +335,7 @@ Copyright (c) .NET Foundation. All rights reserved. %24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\')) %24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs - $(MicrosoftNetCompilersToolsetPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppPackageVersion) From 1eb909edbc2a8124f920fbeaf9f491b953a749c9 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 9 May 2023 15:34:51 -0700 Subject: [PATCH 505/654] Change property name (#16341) Co-authored-by: Forgind --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 5fdd24175..ba7c4e305 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -335,7 +335,7 @@ Copyright (c) .NET Foundation. All rights reserved. %24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\')) %24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs - $(MicrosoftNetCompilersToolsetPackageVersion) + <_NetFrameworkHostedCompilersVersion>$(MicrosoftNetCompilersToolsetPackageVersion) $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppPackageVersion) From 9ad370329019ab1e3964813dcb6d2b5740ee9002 Mon Sep 17 00:00:00 2001 From: Forgind Date: Mon, 22 May 2023 13:19:04 -0700 Subject: [PATCH 506/654] Update roslyn version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7db5c83fd..69529c20a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,7 +78,7 @@ - 4.6.0-2.23166.9 + 4.6.0-3.23259.8 From fe2036f9347c01bfd272dc05500980d94db8661b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 23 May 2023 00:14:07 +0000 Subject: [PATCH 507/654] Merged PR 31475: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.8 to 7.0.7-servicing.23272.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.7-servicing.23269.8 to 7.0.7-servicing.23272.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.7-servicing.23269.7 to 7.0.7-servicing.23272.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230522.39 - **Date Produced**: May 22, 2023 11:53:01 PM UTC - **Commit**: dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23272.10 to 7.0.304-servicing.23272.39][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23272.10 to 7.0.304-servicing.23272.39][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23272.10 to 7.0.304-servicing.23272.39][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.8 to 7.0.7-servicing.23272.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.7-servicing.23269.8 to 7.0.7-servicing.23272.4][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.7-servicing.23269.7 to 7.0.7-servicing.232... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 249fd14cf..4f54a3acc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53603e17d..1d0e0f50c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 57b0d2bac14e817eca9a3267626bc4d76a229f9f + 2f39602907080719788f297c6393a1a24c10403b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 57b0d2bac14e817eca9a3267626bc4d76a229f9f + 2f39602907080719788f297c6393a1a24c10403b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 57b0d2bac14e817eca9a3267626bc4d76a229f9f + 2f39602907080719788f297c6393a1a24c10403b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 57b0d2bac14e817eca9a3267626bc4d76a229f9f + 2f39602907080719788f297c6393a1a24c10403b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9460e4c1996834ffc8a0baed3993e8c932a07362 + dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9460e4c1996834ffc8a0baed3993e8c932a07362 + dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9460e4c1996834ffc8a0baed3993e8c932a07362 + dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9460e4c1996834ffc8a0baed3993e8c932a07362 + dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3632207d619ad47c9933baa5806b67b67d1a4b77 + e3bf366a7361267ba472521190d62c9d22f39b14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e43abfbcc8ce872b9ba591d87ec791e3f25423c0 + 24923547018835429e8d08a35b6d1e9eec97b735 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 742a60852..76dc92d16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23268.9 + 7.0.7-servicing.23272.2 - 7.0.7-servicing.23269.7 + 7.0.7-servicing.23272.4 @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23272.10 - 7.0.304-servicing.23272.10 + 7.0.304-servicing.23272.39 + 7.0.304-servicing.23272.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.7-servicing.23269.8 - 7.0.7-servicing.23269.8 + 7.0.7-servicing.23272.4 + 7.0.7-servicing.23272.4 7.0.7 7.0.7 From 7e4953eb272ccad06297cd9497ae3cb847d767cf Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 23 May 2023 01:14:12 +0000 Subject: [PATCH 508/654] Merged PR 31476: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230522.42 - **Date Produced**: May 23, 2023 12:51:24 AM UTC - **Commit**: 1429e96e25ecaa470f1f5f54466dde336121ee0c - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23272.39 to 7.0.304-servicing.23272.42][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23272.39 to 7.0.304-servicing.23272.42][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23272.39 to 7.0.304-servicing.23272.42][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCdc6ed2e2c5&targetVersion=GC1429e96e25&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ca5481e4-f667-4dcd-b176-08db3b93de76) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4f54a3acc..63c584edf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d0e0f50c..dcac84365 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e + 1429e96e25ecaa470f1f5f54466dde336121ee0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e + 1429e96e25ecaa470f1f5f54466dde336121ee0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e + 1429e96e25ecaa470f1f5f54466dde336121ee0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e + 1429e96e25ecaa470f1f5f54466dde336121ee0c diff --git a/eng/Versions.props b/eng/Versions.props index 76dc92d16..26fef8aeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23272.39 - 7.0.304-servicing.23272.39 + 7.0.304-servicing.23272.42 + 7.0.304-servicing.23272.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11edefdc8936694ae451db6d13b9d0ab5fb38e72 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 23 May 2023 21:03:02 +0000 Subject: [PATCH 509/654] Merged PR 31503: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230523.13 - **Date Produced**: May 23, 2023 8:24:51 PM UTC - **Commit**: 7a7135bad0689c9c388d1e69dbbaddba65b6364d - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23272.42 to 7.0.304-servicing.23273.13][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23272.42 to 7.0.304-servicing.23273.13][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23272.42 to 7.0.304-servicing.23273.13][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1429e96e25&targetVersion=GC7a7135bad0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ca5481e4-f667-4dcd-b176-08db3b93de76) --- NuGet.config | 11 +++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 63c584edf..3a2f1c7f8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,18 +10,22 @@ + + + - + + @@ -43,14 +47,17 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dcac84365..ff41a4b1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1429e96e25ecaa470f1f5f54466dde336121ee0c + 7a7135bad0689c9c388d1e69dbbaddba65b6364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1429e96e25ecaa470f1f5f54466dde336121ee0c + 7a7135bad0689c9c388d1e69dbbaddba65b6364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1429e96e25ecaa470f1f5f54466dde336121ee0c + 7a7135bad0689c9c388d1e69dbbaddba65b6364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1429e96e25ecaa470f1f5f54466dde336121ee0c + 7a7135bad0689c9c388d1e69dbbaddba65b6364d diff --git a/eng/Versions.props b/eng/Versions.props index 26fef8aeb..6f5ac0338 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23272.42 - 7.0.304-servicing.23272.42 + 7.0.304-servicing.23273.13 + 7.0.304-servicing.23273.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e815cb91a8ca95f787fe6b612d310550700da88b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 25 May 2023 13:50:34 +0000 Subject: [PATCH 510/654] Merged PR 31525: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.2 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230524.11 - **Date Produced**: May 24, 2023 9:07:10 PM UTC - **Commit**: 616c6598add9d0166644bc20da2c4741b952b3ea - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23273.13 to 7.0.304-servicing.23274.11][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23273.13 to 7.0.304-servicing.23274.11][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23273.13 to 7.0.304-servicing.23274.11][1] - **Microsoft.NETCore.App.Ref**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.7 to 7.0.7][2] - **Microsoft.NETCore.Platforms**: [from 7.0.2 to 7.0.3][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4][2] [1]: https://dev.azure.com/dncen... --- NuGet.config | 15 +++++++++------ eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 10 +++++----- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a2f1c7f8..5c320fd91 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,21 +10,23 @@ + + - - + - + + @@ -48,16 +50,17 @@ + - - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff41a4b1a..e788659a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 2f39602907080719788f297c6393a1a24c10403b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7a7135bad0689c9c388d1e69dbbaddba65b6364d + 616c6598add9d0166644bc20da2c4741b952b3ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7a7135bad0689c9c388d1e69dbbaddba65b6364d + 616c6598add9d0166644bc20da2c4741b952b3ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7a7135bad0689c9c388d1e69dbbaddba65b6364d + 616c6598add9d0166644bc20da2c4741b952b3ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7a7135bad0689c9c388d1e69dbbaddba65b6364d + 616c6598add9d0166644bc20da2c4741b952b3ea diff --git a/eng/Versions.props b/eng/Versions.props index 6f5ac0338..373087388 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,20 +70,20 @@ 7.0.304 - 7.0.304-servicing.23273.13 - 7.0.304-servicing.23273.13 + 7.0.304-servicing.23274.11 + 7.0.304-servicing.23274.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.2 + 7.0.3 - 7.0.7-servicing.23269.6 - 7.0.7-servicing.23269.6 + 7.0.7-servicing.23274.4 + 7.0.7-servicing.23274.4 7.0.7 7.0.7 7.0.7 From 8ce8908424123f5f2811d0bfd294f02ab4de8ffe Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 25 May 2023 15:16:12 +0000 Subject: [PATCH 511/654] Merged PR 31548: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230525.3 - **Date Produced**: May 25, 2023 2:43:34 PM UTC - **Commit**: 6cdde441589050768345f112c683cf297e5fc29b - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23274.11 to 7.0.304-servicing.23275.3][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23274.11 to 7.0.304-servicing.23275.3][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23274.11 to 7.0.304-servicing.23275.3][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.7 to 7.0.7][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] - **dotnet-dev-certs**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] - **dotnet-user-jwts**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] - **dotnet-user-secrets**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC616c6598ad&targetVersion=GC6cdde44158&_a=files [2]: https://dev.azure.com/dnceng/i... --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5c320fd91..062b9368a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,9 +9,7 @@ - - - + @@ -22,7 +20,7 @@ - + @@ -49,14 +47,12 @@ - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e788659a3..a813705fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 616c6598add9d0166644bc20da2c4741b952b3ea + 6cdde441589050768345f112c683cf297e5fc29b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 616c6598add9d0166644bc20da2c4741b952b3ea + 6cdde441589050768345f112c683cf297e5fc29b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 616c6598add9d0166644bc20da2c4741b952b3ea + 6cdde441589050768345f112c683cf297e5fc29b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 616c6598add9d0166644bc20da2c4741b952b3ea + 6cdde441589050768345f112c683cf297e5fc29b diff --git a/eng/Versions.props b/eng/Versions.props index 373087388..e9eac2d55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.7 7.0.7 - 7.0.7-servicing.23269.11 - 7.0.7-servicing.23269.11 - 7.0.7-servicing.23269.11 - 7.0.7-servicing.23269.11 - 7.0.7-servicing.23269.11 + 7.0.7-servicing.23274.8 + 7.0.7-servicing.23274.8 + 7.0.7-servicing.23274.8 + 7.0.7-servicing.23274.8 + 7.0.7-servicing.23274.8 0.2.0 @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23274.11 - 7.0.304-servicing.23274.11 + 7.0.304-servicing.23275.3 + 7.0.304-servicing.23275.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7e794e2806b712f07d9e4c18aa6cfc8b9249e2fa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 25 May 2023 17:17:58 +0000 Subject: [PATCH 512/654] Merged PR 31554: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230525.9 - **Date Produced**: May 25, 2023 4:54:22 PM UTC - **Commit**: 9abb6bda1703918c0172e5170b66af31867fdeeb - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23275.3 to 7.0.304-servicing.23275.9][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23275.3 to 7.0.304-servicing.23275.9][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23275.3 to 7.0.304-servicing.23275.9][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5][4]... --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 062b9368a..d207f7815 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,12 +20,10 @@ - + - - - + @@ -52,12 +50,10 @@ - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a813705fa..ea514f006 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2f39602907080719788f297c6393a1a24c10403b + eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2f39602907080719788f297c6393a1a24c10403b + eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2f39602907080719788f297c6393a1a24c10403b + eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2f39602907080719788f297c6393a1a24c10403b + eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6cdde441589050768345f112c683cf297e5fc29b + 9abb6bda1703918c0172e5170b66af31867fdeeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6cdde441589050768345f112c683cf297e5fc29b + 9abb6bda1703918c0172e5170b66af31867fdeeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6cdde441589050768345f112c683cf297e5fc29b + 9abb6bda1703918c0172e5170b66af31867fdeeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6cdde441589050768345f112c683cf297e5fc29b + 9abb6bda1703918c0172e5170b66af31867fdeeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e3bf366a7361267ba472521190d62c9d22f39b14 + b4a5f0c6839363dea534f21736a9d0726c14b41c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 24923547018835429e8d08a35b6d1e9eec97b735 + 512eac4b458953da405f51ec0ae7766bcb7b32e5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e9eac2d55..c3af7944f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23272.2 + 7.0.7-servicing.23274.5 - 7.0.7-servicing.23272.4 + 7.0.7-servicing.23274.5 @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23275.3 - 7.0.304-servicing.23275.3 + 7.0.304-servicing.23275.9 + 7.0.304-servicing.23275.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.7-servicing.23272.4 - 7.0.7-servicing.23272.4 + 7.0.7-servicing.23275.3 + 7.0.7-servicing.23275.3 7.0.7 7.0.7 From fa51b0a82e32e87fd104b1ba82bc838e01fa7b44 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Jun 2023 13:11:06 -0700 Subject: [PATCH 513/654] Update branding to 7.0.305 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2c2c858c5..3f81bfc91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 949ee50d4d313b29555df7a40f0306fef55de5b4 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 6 Jun 2023 16:51:37 -0700 Subject: [PATCH 514/654] Temporarily lower the template by 2 instead of one This is more fallout of us skipping an SDK release. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3f81bfc91..dcfb7c293 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -125,7 +125,7 @@ true true $([MSBuild]::Subtract($(VersionFeature60), 1)) - $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) + $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 2)) From 2b65ad96f0180f72e9a9a59cbbd5de79d4bb39ca Mon Sep 17 00:00:00 2001 From: Forgind Date: Wed, 7 Jun 2023 10:24:50 -0700 Subject: [PATCH 515/654] Update roslyn version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 69529c20a..f4ea106f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,7 +78,7 @@ - 4.6.0-3.23259.8 + 4.6.0-3.23210.15 From d55fed3855d79e19790ec66def778ba666abc3e5 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 13 Jun 2023 10:31:41 -0700 Subject: [PATCH 516/654] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0845f4d59..4f7f640f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -128,7 +128,7 @@ --> true true - $([MSBuild]::Subtract($(VersionFeature60), 2)) + $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From eef57301fbae0ccbead73a12c2290eea562ccec6 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 13 Jun 2023 11:29:05 -0700 Subject: [PATCH 517/654] Update Windows SDK Projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 2bf456f30..fb41f0bad 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.28 - 10.0.18362.28 - 10.0.19041.28 - 10.0.20348.28 - 10.0.22000.28 - 10.0.22621.28 + 10.0.17763.29 + 10.0.18362.29 + 10.0.19041.29 + 10.0.20348.29 + 10.0.22000.29 + 10.0.22621.29 From b121f8feeb07d3a434cb47fbf76394b5b687de44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jun 2023 20:00:12 +0000 Subject: [PATCH 518/654] Update dependencies from https://github.com/dotnet/arcade build 20230531.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23281.4 --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 26 +++++++++++++------ .../templates/steps/component-governance.yml | 10 +++++++ global.json | 4 +-- 6 files changed, 43 insertions(+), 23 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/NuGet.config b/NuGet.config index d207f7815..0724b3029 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,20 +10,21 @@ + + + + - - - @@ -45,15 +46,14 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea514f006..a51aec545 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 7c5e5a782c67460b123c8e41d484ebcca8002c93 + 6a71ed4ba6a70e66abe9f9bdc4009fa1de35132f - + https://github.com/dotnet/arcade - 7c5e5a782c67460b123c8e41d484ebcca8002c93 + 6a71ed4ba6a70e66abe9f9bdc4009fa1de35132f - + https://github.com/dotnet/arcade - 7c5e5a782c67460b123c8e41d484ebcca8002c93 + 6a71ed4ba6a70e66abe9f9bdc4009fa1de35132f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 4f7f640f2..c93a90617 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23211.2 + 7.0.0-beta.23281.4 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e3ba93980..ef337eac5 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false - disableComponentGovernance: false + disableComponentGovernance: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -73,6 +73,10 @@ jobs: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - name: EnableRichCodeNavigation value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -81,7 +85,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -142,14 +146,20 @@ jobs: richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin continueOnError: true - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -217,7 +227,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -228,7 +238,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 550a365a9..d4c7ba82e 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.23211.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23281.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23281.4" } } From 51285ddca1080ffdf8fc79c88386e7cb07194d22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 20:27:17 +0000 Subject: [PATCH 519/654] [release/7.0.3xx] Update dependencies from dotnet/arcade (#16691) [release/7.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 5 ----- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0724b3029..ffac45e52 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,11 +14,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a51aec545..b3cbb5f9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 6a71ed4ba6a70e66abe9f9bdc4009fa1de35132f + 59ac824080b9807fd91dbc8a6d2b4447e74874ab - + https://github.com/dotnet/arcade - 6a71ed4ba6a70e66abe9f9bdc4009fa1de35132f + 59ac824080b9807fd91dbc8a6d2b4447e74874ab - + https://github.com/dotnet/arcade - 6a71ed4ba6a70e66abe9f9bdc4009fa1de35132f + 59ac824080b9807fd91dbc8a6d2b4447e74874ab https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c93a90617..f0f30eae3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23281.4 + 7.0.0-beta.23313.4 diff --git a/global.json b/global.json index d4c7ba82e..30cab30b8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.105", + "dotnet": "7.0.107", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23281.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23281.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23313.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23313.4" } } From 4f9a50fd1c7ffb6ef0019ab7fc9e6e46b08e7176 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 21:30:27 +0000 Subject: [PATCH 520/654] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230419.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23063.1 -> To Version 7.0.0-alpha.1.23219.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 b3cbb5f9f..a92a3984d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade 59ac824080b9807fd91dbc8a6d2b4447e74874ab - + https://github.com/dotnet/source-build-reference-packages - 9964206e0dd215eee4ed199b9041a94e16ba4c45 + 525b6c35cc5c5c9b80b47044be2e4e77858d505a From 3777d6aac5ecb4117da770301b1a970a107e7b30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Jun 2023 18:22:31 +0000 Subject: [PATCH 521/654] Update dependencies from https://github.com/dotnet/arcade build 20230616.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23313.4 -> To Version 7.0.0-beta.23316.4 --- NuGet.config | 6 ------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index ffac45e52..5ee25bfce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,9 +9,6 @@ - - - @@ -41,9 +38,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a92a3984d..fb01ce224 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 59ac824080b9807fd91dbc8a6d2b4447e74874ab + e5a90b587998f96289f8814de46553c0f9667eb8 - + https://github.com/dotnet/arcade - 59ac824080b9807fd91dbc8a6d2b4447e74874ab + e5a90b587998f96289f8814de46553c0f9667eb8 - + https://github.com/dotnet/arcade - 59ac824080b9807fd91dbc8a6d2b4447e74874ab + e5a90b587998f96289f8814de46553c0f9667eb8 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f0f30eae3..7ca80b170 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23313.4 + 7.0.0-beta.23316.4 diff --git a/global.json b/global.json index 30cab30b8..c39b8898d 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.23313.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23313.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23316.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23316.4" } } From 98ab45b66f640b766fdaabb7690b0c0ebacd60d7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 19 Jun 2023 16:15:48 +0000 Subject: [PATCH 522/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230619.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.304 -> To Version 7.0.305 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,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.7 -> To Version 7.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++ eng/Version.Details.xml | 116 ++++++++++++++++++++-------------------- eng/Versions.props | 52 +++++++++--------- 3 files changed, 94 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ee25bfce..e34a7cc19 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + + + + @@ -38,11 +44,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb01ce224..692a81a31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9abb6bda1703918c0172e5170b66af31867fdeeb + 2e8cd941158191d8a939d1b6cf65df42353cc8b9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9abb6bda1703918c0172e5170b66af31867fdeeb + 2e8cd941158191d8a939d1b6cf65df42353cc8b9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9abb6bda1703918c0172e5170b66af31867fdeeb + 2e8cd941158191d8a939d1b6cf65df42353cc8b9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9abb6bda1703918c0172e5170b66af31867fdeeb + 2e8cd941158191d8a939d1b6cf65df42353cc8b9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4a5f0c6839363dea534f21736a9d0726c14b41c + 8324ea1e8a1daabdee5390cf0150b63f9d61554c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 512eac4b458953da405f51ec0ae7766bcb7b32e5 + 0384a8ccb0b68916b599cf92419f895f6dabd1fa https://github.com/dotnet/fsharp @@ -133,9 +133,9 @@ 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/microsoft/vstest - 7933ee32f416745e48ff33cb6a3e82fd1ca38b87 + e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb @@ -149,13 +149,13 @@ c3cc1d0ceeab1a65da0217e403851a1e8a30086a - + https://github.com/dotnet/msbuild - 07e2947214f1a9f28a3517762c939d5bebb5f525 + 212455df784ee3d6bc40abd80a0b5f13174043e2 - + https://github.com/dotnet/msbuild - 07e2947214f1a9f28a3517762c939d5bebb5f525 + 212455df784ee3d6bc40abd80a0b5f13174043e2 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda + fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 - + https://github.com/dotnet/emsdk - b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda + fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 7ca80b170..ba019612c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23274.5 + 7.0.8-servicing.23314.7 - 7.0.7-servicing.23274.5 + 7.0.8-servicing.23314.7 @@ -56,22 +56,22 @@ - 7.0.7 - 7.0.7 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 + 7.0.8 + 7.0.8 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 0.2.0 - 7.0.304 - 7.0.304-servicing.23275.9 - 7.0.304-servicing.23275.9 + 7.0.305 + 7.0.305-servicing.23319.4 + 7.0.305-servicing.23319.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,24 +82,24 @@ - 7.0.3 + 7.0.4 - 7.0.7-servicing.23274.4 - 7.0.7-servicing.23274.4 - 7.0.7 - 7.0.7 - 7.0.7 - 7.0.7 + 7.0.8-servicing.23313.27 + 7.0.8-servicing.23313.27 + 7.0.8 + 7.0.8 + 7.0.8 + 7.0.8 2.1.0 - 7.0.7-servicing.23275.3 - 7.0.7-servicing.23275.3 - 7.0.7 - 7.0.7 + 7.0.8-servicing.23315.5 + 7.0.8-servicing.23315.5 + 7.0.8 + 7.0.8 @@ -197,7 +197,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-release-20230405-08 + 17.6.3-release-20230616-01 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.7 - 7.0.7 + 7.0.8 + 7.0.8 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 8eb4655e323c3beb4794174b0de7234da08620b0 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 19 Jun 2023 10:36:54 -0700 Subject: [PATCH 523/654] Update branding to 7.0.306 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7ca80b170..797c58f9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From f500069cb7cdd01b435961287361b9ad21203c67 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 13:13:33 +0000 Subject: [PATCH 524/654] Merged PR 32044: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.8-servicing.23315.5 to 7.0.9-servicing.23321.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.8-servicing.23315.5 to 7.0.9-servicing.23321.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.8-servicing.23313.27 to 7.0.9-servicing.23320.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.8-servicing.23314.7 to 7.0.9-servicing.23321.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.8-servicing.23314.7 to 7.0.9-servicing.23321.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 7.0.100-1.23211.1 to 7.0.100-1.23321.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.6.6 to 17.6.8 (parent: ... --- NuGet.config | 20 +++---- eng/Version.Details.xml | 114 ++++++++++++++++++++-------------------- eng/Versions.props | 48 ++++++++--------- 3 files changed, 91 insertions(+), 91 deletions(-) diff --git a/NuGet.config b/NuGet.config index e34a7cc19..2ae8fcee2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,22 @@ - + - + - + - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 692a81a31..b2371cf7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 @@ -50,36 +50,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e8cd941158191d8a939d1b6cf65df42353cc8b9 + ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e8cd941158191d8a939d1b6cf65df42353cc8b9 + ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e8cd941158191d8a939d1b6cf65df42353cc8b9 + ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e8cd941158191d8a939d1b6cf65df42353cc8b9 + ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8324ea1e8a1daabdee5390cf0150b63f9d61554c + dd121ee97234c7490f6111cf0c7bfa9235923f81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0384a8ccb0b68916b599cf92419f895f6dabd1fa + d41bd7da4139331ef02657deb7944df43b8a181c https://github.com/dotnet/fsharp @@ -138,9 +138,9 @@ e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb - + https://github.com/dotnet/linker - 9d4b3f3e0c100fe5ac4dc7f40d14d792178dbd0c + 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 linker @@ -149,13 +149,13 @@ c3cc1d0ceeab1a65da0217e403851a1e8a30086a - + https://github.com/dotnet/msbuild - 212455df784ee3d6bc40abd80a0b5f13174043e2 + c70978d4d2178cc5c53d3e1946d187a2ddc41931 - + https://github.com/dotnet/msbuild - 212455df784ee3d6bc40abd80a0b5f13174043e2 + c70978d4d2178cc5c53d3e1946d187a2ddc41931 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 + 9b227c1606a01920839873f840f6b76f7b492a66 - + https://github.com/dotnet/emsdk - fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 + 9b227c1606a01920839873f840f6b76f7b492a66 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 8ac45d6c9..669e80753 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.8-servicing.23314.7 + 7.0.9-servicing.23321.6 - 7.0.8-servicing.23314.7 + 7.0.9-servicing.23321.9 @@ -56,22 +56,22 @@ - 7.0.8 - 7.0.8 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 + 7.0.9 + 7.0.9 + 7.0.9-servicing.23321.10 + 7.0.9-servicing.23321.10 + 7.0.9-servicing.23321.10 + 7.0.9-servicing.23321.10 + 7.0.9-servicing.23321.10 0.2.0 - 7.0.305 - 7.0.305-servicing.23319.4 - 7.0.305-servicing.23319.4 + 7.0.306 + 7.0.306-servicing.23321.40 + 7.0.306-servicing.23321.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.8-servicing.23313.27 - 7.0.8-servicing.23313.27 - 7.0.8 - 7.0.8 - 7.0.8 - 7.0.8 + 7.0.9-servicing.23320.18 + 7.0.9-servicing.23320.18 + 7.0.9 + 7.0.9 + 7.0.9 + 7.0.9 2.1.0 - 7.0.8-servicing.23315.5 - 7.0.8-servicing.23315.5 - 7.0.8 - 7.0.8 + 7.0.9-servicing.23321.11 + 7.0.9-servicing.23321.11 + 7.0.9 + 7.0.9 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.8 - 7.0.8 + 7.0.9 + 7.0.9 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From fc5f6f47aafe3d255c8b2dace05780fc8fa6a56e Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 5 Jul 2023 14:39:01 -0700 Subject: [PATCH 525/654] Update branding to 7.0.307 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 797c58f9b..6b337c475 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 06 + 07 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 7381bec755bbfcd4571a658b0aaca72af9fba3dd Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 12 Jul 2023 01:42:25 -0700 Subject: [PATCH 526/654] Try to resolve source-build patch conflicts --- .../0002-Add-explicit-System.Text.Json-dependency.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch index 65d38d329..ced7ca579 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -32,7 +32,7 @@ index cdfa5f5e..86f02b44 100644 +++ b/eng/Version.Details.xml @@ -13,6 +13,10 @@ https://github.com/dotnet/command-line-api - e5861a73ad3f08c820319b56b302387a8832ed59 + c776cd4e906b669b9cce1017fee7d0ba9845d163 + + https://github.com/dotnet/runtime @@ -40,15 +40,15 @@ index cdfa5f5e..86f02b44 100644 + - + diff --git a/eng/Versions.props b/eng/Versions.props index 27582078..bccaf176 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,6 +20,8 @@ - 2.0.0-beta4.22430.1 - 0.4.0-alpha.22430.1 + 2.0.0-beta4.22504.1 + 0.4.0-alpha.22504.1 + + 6.0.8 From c94015165387683afeec5063631b23444f5d65b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 13:51:28 -0700 Subject: [PATCH 527/654] [release/7.0.3xx] Update dependencies from dotnet/arcade (#16962) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2ae8fcee2..4179b6715 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,20 @@ - + + - - + + @@ -44,14 +45,13 @@ - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2371cf7e..b2ef5add6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - e5a90b587998f96289f8814de46553c0f9667eb8 + cae11bc40b691f546d788f7ab37f7eaf0e24ded8 - + https://github.com/dotnet/arcade - e5a90b587998f96289f8814de46553c0f9667eb8 + cae11bc40b691f546d788f7ab37f7eaf0e24ded8 - + https://github.com/dotnet/arcade - e5a90b587998f96289f8814de46553c0f9667eb8 + cae11bc40b691f546d788f7ab37f7eaf0e24ded8 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 98c0cd847..e4e12c4f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23316.4 + 7.0.0-beta.23361.2 diff --git a/global.json b/global.json index 5bf585afe..d20ab2569 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.108", + "dotnet": "7.0.109", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23316.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23316.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23361.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23361.2" } } From ece5b130b11aad66e541d467f4af22bb1c3dd46d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 21:00:03 +0000 Subject: [PATCH 528/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.306 -> To Version 7.0.307 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,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.9 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 +++---- eng/Version.Details.xml | 114 ++++++++++++++++++++-------------------- eng/Versions.props | 52 +++++++++--------- 3 files changed, 93 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4179b6715..590969229 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,22 @@ - + + - - - + + + - - - + @@ -45,14 +44,15 @@ + + + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2ef5add6..3d182f16e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + f3874631f8761a385650af9a44d3254f8839e6e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + f3874631f8761a385650af9a44d3254f8839e6e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + f3874631f8761a385650af9a44d3254f8839e6e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + f3874631f8761a385650af9a44d3254f8839e6e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 + edfb43097f83ff132006d8dc427d7d33c2ddcfd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 + edfb43097f83ff132006d8dc427d7d33c2ddcfd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 + edfb43097f83ff132006d8dc427d7d33c2ddcfd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 + edfb43097f83ff132006d8dc427d7d33c2ddcfd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - dd121ee97234c7490f6111cf0c7bfa9235923f81 + 05b68f8296b45fa76b27abcb8e5666e73a4873b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d41bd7da4139331ef02657deb7944df43b8a181c + 5461ffc0ad318e6e60746a1440c67866d74b507e https://github.com/dotnet/fsharp @@ -133,7 +133,7 @@ 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/microsoft/vstest e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb @@ -144,18 +144,18 @@ linker - + https://github.com/dotnet/roslyn - c3cc1d0ceeab1a65da0217e403851a1e8a30086a + 5db000294db8cc634e7d8fc004844338c9747dbc - + https://github.com/dotnet/msbuild - c70978d4d2178cc5c53d3e1946d187a2ddc41931 + 2679cf5a9cbd13e6833ca8a59553716f3f2f2afa - + https://github.com/dotnet/msbuild - c70978d4d2178cc5c53d3e1946d187a2ddc41931 + 2679cf5a9cbd13e6833ca8a59553716f3f2f2afa @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 9b227c1606a01920839873f840f6b76f7b492a66 + 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d - + https://github.com/dotnet/emsdk - 9b227c1606a01920839873f840f6b76f7b492a66 + 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index e4e12c4f4..20f64b72a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.9-servicing.23321.6 + 7.0.10-servicing.23363.13 - 7.0.9-servicing.23321.9 + 7.0.10-servicing.23364.1 @@ -56,29 +56,29 @@ - 7.0.9 - 7.0.9 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 + 7.0.10 + 7.0.10 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 0.2.0 - 7.0.306 - 7.0.306-servicing.23321.40 - 7.0.306-servicing.23321.40 + 7.0.307 + 7.0.307-servicing.23367.12 + 7.0.307-servicing.23367.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.6.0-3.23210.15 + 4.6.0-3.23329.3 @@ -86,20 +86,20 @@ - 7.0.9-servicing.23320.18 - 7.0.9-servicing.23320.18 - 7.0.9 - 7.0.9 - 7.0.9 - 7.0.9 + 7.0.10-servicing.23363.12 + 7.0.10-servicing.23363.12 + 7.0.10 + 7.0.10 + 7.0.10 + 7.0.10 2.1.0 - 7.0.9-servicing.23321.11 - 7.0.9-servicing.23321.11 - 7.0.9 - 7.0.9 + 7.0.10-servicing.23364.4 + 7.0.10-servicing.23364.4 + 7.0.10 + 7.0.10 @@ -197,7 +197,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.3-release-20230616-01 + 17.6.3 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.9 - 7.0.9 + 7.0.10 + 7.0.10 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 6c0c0d063da21edc33c12ea623f05b525d45f244 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 17 Jul 2023 14:03:39 -0700 Subject: [PATCH 529/654] Remove applied source build patch --- ...explicit-System.Text.Json-dependency.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index 74e217fbe..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 26 Jun 2023 23:02:20 +0000 -Subject: [PATCH] Add explicit System.Text.Json dependency - -Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up -from PSB, via Microsoft.Build package. - -Backport: https://github.com/dotnet/sdk/pull/33618 ---- - src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -index 065f750f72..13d2c1ed99 100644 ---- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -+++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -@@ -23,6 +23,13 @@ - - - -+ -+ -+ -+ - - - From 2fd6547cc123bda1d7b4b99a5d2a7b4e675c3f35 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 21:10:50 +0000 Subject: [PATCH 530/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.306 -> To Version 7.0.307 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,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.9 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 590969229..754b226fd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d182f16e..13a1aa1be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f3874631f8761a385650af9a44d3254f8839e6e9 + 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f3874631f8761a385650af9a44d3254f8839e6e9 + 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f3874631f8761a385650af9a44d3254f8839e6e9 + 996ed6b07099f377a6b05581860a1f66a30aca00 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f3874631f8761a385650af9a44d3254f8839e6e9 + 996ed6b07099f377a6b05581860a1f66a30aca00 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edfb43097f83ff132006d8dc427d7d33c2ddcfd3 + 93655ee31e403d6dccf43195ebd7334dbedbffd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edfb43097f83ff132006d8dc427d7d33c2ddcfd3 + 93655ee31e403d6dccf43195ebd7334dbedbffd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edfb43097f83ff132006d8dc427d7d33c2ddcfd3 + 93655ee31e403d6dccf43195ebd7334dbedbffd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edfb43097f83ff132006d8dc427d7d33c2ddcfd3 + 93655ee31e403d6dccf43195ebd7334dbedbffd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 05b68f8296b45fa76b27abcb8e5666e73a4873b7 + 1f1ac283c5d3bb3302111f8aef567a3541863c49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5461ffc0ad318e6e60746a1440c67866d74b507e + 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 20f64b72a..c197a2a4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23363.13 + 7.0.10-servicing.23364.5 - 7.0.10-servicing.23364.1 + 7.0.10-servicing.23364.4 @@ -70,8 +70,8 @@ 7.0.307 - 7.0.307-servicing.23367.12 - 7.0.307-servicing.23367.12 + 7.0.307-servicing.23367.21 + 7.0.307-servicing.23367.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.10-servicing.23364.4 - 7.0.10-servicing.23364.4 + 7.0.10-servicing.23367.2 + 7.0.10-servicing.23367.2 7.0.10 7.0.10 From 536ba6ad9962efad823c9bc5bc86b12326b586b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jul 2023 18:02:21 +0000 Subject: [PATCH 531/654] Update dependencies from https://github.com/dotnet/arcade build 20230720.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23361.2 -> To Version 7.0.0-beta.23370.3 --- NuGet.config | 9 --------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4179b6715..a309f71c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,18 +12,12 @@ - - - - - - @@ -50,9 +44,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2ef5add6..74966f00a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + c9c125ccc43361cd94433c2d7f7069d465ad11a5 - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + c9c125ccc43361cd94433c2d7f7069d465ad11a5 - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + c9c125ccc43361cd94433c2d7f7069d465ad11a5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e4e12c4f4..f18973d2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23361.2 + 7.0.0-beta.23370.3 diff --git a/global.json b/global.json index d20ab2569..0df69a962 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.23361.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23361.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23370.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23370.3" } } From 1cc16c4f4d4be2ece0e43db48edd5e7db8fa030b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Aug 2023 11:01:14 -0700 Subject: [PATCH 532/654] Update branding to 7.0.308 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e4e12c4f4..9266d9f9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 07 + 08 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 13a9c8658383a104f88992e0c37760f70ec04bb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Aug 2023 23:59:03 +0000 Subject: [PATCH 533/654] Update dependencies from https://github.com/dotnet/arcade build 20230808.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23370.3 -> To Version 7.0.0-beta.23408.3 --- NuGet.config | 27 +++++++++++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 754b226fd..b885835bc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,33 @@ + + + + + + + + + + + + + + + @@ -44,14 +59,26 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f009c11c3..9d206477b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - c9c125ccc43361cd94433c2d7f7069d465ad11a5 + 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 - + https://github.com/dotnet/arcade - c9c125ccc43361cd94433c2d7f7069d465ad11a5 + 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 - + https://github.com/dotnet/arcade - c9c125ccc43361cd94433c2d7f7069d465ad11a5 + 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 226ec073b..ad9e76ac4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23370.3 + 7.0.0-beta.23408.3 diff --git a/global.json b/global.json index 0df69a962..bf1732f08 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.109", + "dotnet": "7.0.110", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23370.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23370.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23408.3" } } From c6505a010cfe757ffb4b6cb8d2791e6ca5b0ea1d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 21:30:42 +0000 Subject: [PATCH 534/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.308 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,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.10 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 45 ++++------------- eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 85 insertions(+), 112 deletions(-) diff --git a/NuGet.config b/NuGet.config index b885835bc..c074bb5a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,34 +10,19 @@ - - - - + - - - - + - - - - + - - - - + - - - - + @@ -59,27 +44,15 @@ - - - - + - - - - + - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d206477b..8910b7ae7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 2e82d9d2458c751ea103d1487b2695d62612fc2d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + 1a043efd50b1f70f42a00ddd5987b94d1d279c5a https://github.com/dotnet/fsharp @@ -138,9 +138,9 @@ e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb - + https://github.com/dotnet/linker - 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 + 53b3303c57b3fe659500fb362a0eef12991c1197 linker @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + fcd8602188cfe2f73c73f5ae57e33c0654ce9858 - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + fcd8602188cfe2f73c73f5ae57e33c0654ce9858 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 7db5fcb8c..1da481900 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.11-servicing.23415.5 - 7.0.10-servicing.23364.4 + 7.0.11-servicing.23415.5 @@ -56,22 +56,22 @@ - 7.0.10 - 7.0.10 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 + 7.0.11 + 7.0.11 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 0.2.0 - 7.0.307 - 7.0.307-servicing.23367.21 - 7.0.307-servicing.23367.21 + 7.0.308 + 7.0.308-servicing.23416.25 + 7.0.308-servicing.23416.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.10-servicing.23363.12 - 7.0.10-servicing.23363.12 - 7.0.10 - 7.0.10 - 7.0.10 - 7.0.10 + 7.0.11-servicing.23415.17 + 7.0.11-servicing.23415.17 + 7.0.11 + 7.0.11 + 7.0.11 + 7.0.11 2.1.0 - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.11-servicing.23415.7 + 7.0.11-servicing.23415.7 + 7.0.11 + 7.0.11 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 7e71db02945cb85e974dcf9b2eb25e9929438883 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:14:47 +0000 Subject: [PATCH 535/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.55 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.308 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,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.10 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index c074bb5a9..fe55a3a6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8910b7ae7..647c5821c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2e82d9d2458c751ea103d1487b2695d62612fc2d + 639189647d647da4008fa57fd63b1d415c84b487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1a043efd50b1f70f42a00ddd5987b94d1d279c5a + 8037dc673134da614f02f4b84f6a9a61e047ae60 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1da481900..f17bca02c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23415.5 + 7.0.11-servicing.23416.5 - 7.0.11-servicing.23415.5 + 7.0.11-servicing.23416.7 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23416.25 - 7.0.308-servicing.23416.25 + 7.0.308-servicing.23416.55 + 7.0.308-servicing.23416.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.11-servicing.23415.7 - 7.0.11-servicing.23415.7 + 7.0.11-servicing.23416.8 + 7.0.11-servicing.23416.8 7.0.11 7.0.11 From 359b356988e6d67aa830aea6adbaacaa26cde2e9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 17 Aug 2023 13:16:03 -0700 Subject: [PATCH 536/654] Remove inapplicable sourcebuild patch for format --- ...explicit-System.Text.Json-dependency.patch | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index ced7ca579..000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 26 Jun 2023 23:46:46 +0000 -Subject: [PATCH] Add explicit System.Text.Json dependency - -Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up -from PSB, via Microsoft.Build package. - -Backport: https://github.com/dotnet/format/pull/1887 ---- - Directory.Packages.props | 1 + - eng/Version.Details.xml | 4 ++++ - eng/Versions.props | 2 ++ - src/dotnet-format.csproj | 6 ++++++ - 4 files changed, 13 insertions(+) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 6b628c22..c9f86593 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -36,5 +36,6 @@ - - - -+ - - -\ No newline at end of file -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index cdfa5f5e..86f02b44 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -13,6 +13,10 @@ - https://github.com/dotnet/command-line-api - c776cd4e906b669b9cce1017fee7d0ba9845d163 - -+ -+ https://github.com/dotnet/runtime -+ 3241df7f2b0f3e2dada8d07229723c79fdbe4991 -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 27582078..bccaf176 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -20,6 +20,8 @@ - - 2.0.0-beta4.22504.1 - 0.4.0-alpha.22504.1 -+ -+ 6.0.8 - - -+ - - - From 1207a83f41885e65c9fec82fb179c39ca41d9d52 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 18:00:49 +0000 Subject: [PATCH 537/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 8 ++++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe55a3a6e..d32aa5b64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,10 +16,10 @@ - + - + @@ -47,9 +47,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 647c5821c..27f427750 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f228b17d671d0196fa19fb77fdf57ca5d7b9871b + ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f228b17d671d0196fa19fb77fdf57ca5d7b9871b + ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f228b17d671d0196fa19fb77fdf57ca5d7b9871b + ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f228b17d671d0196fa19fb77fdf57ca5d7b9871b + ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f diff --git a/eng/Versions.props b/eng/Versions.props index f17bca02c..36faaa323 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23416.55 - 7.0.308-servicing.23416.55 + 7.0.308-servicing.23422.7 + 7.0.308-servicing.23422.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.11-servicing.23415.17 - 7.0.11-servicing.23415.17 + 7.0.11-servicing.23418.12 + 7.0.11-servicing.23418.12 7.0.11 7.0.11 7.0.11 From 141c0a7453627adbc1f72e38071e4444d811ff35 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 22:24:02 +0000 Subject: [PATCH 538/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index d32aa5b64..43bad0279 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -44,15 +44,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27f427750..8945ff865 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f + 5e1f89ce74e9a890047bc6374af04d0f4a050eab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f + 5e1f89ce74e9a890047bc6374af04d0f4a050eab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f + 5e1f89ce74e9a890047bc6374af04d0f4a050eab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f + 5e1f89ce74e9a890047bc6374af04d0f4a050eab - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 639189647d647da4008fa57fd63b1d415c84b487 + 81760b1e789d848e1c44733615cf2939159603a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8037dc673134da614f02f4b84f6a9a61e047ae60 + aea83fde388f1f90c7068116c2653b12e31bac40 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 36faaa323..63da1f5ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23416.5 + 7.0.11-servicing.23422.3 - 7.0.11-servicing.23416.7 + 7.0.11-servicing.23422.2 @@ -58,11 +58,11 @@ 7.0.11 7.0.11 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 0.2.0 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23422.7 - 7.0.308-servicing.23422.7 + 7.0.308-servicing.23422.25 + 7.0.308-servicing.23422.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.11-servicing.23416.8 - 7.0.11-servicing.23416.8 + 7.0.11-servicing.23422.3 + 7.0.11-servicing.23422.3 7.0.11 7.0.11 From ad11d7f236395263aea24ee76c1adc7a23ecb5d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 16:01:57 +0000 Subject: [PATCH 539/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 43bad0279..2d3540811 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,13 +13,13 @@ - + - + - + @@ -47,9 +47,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8945ff865..abfc60fc0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 721967ad57b950287505e20f9953ff14b9a10485 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e1f89ce74e9a890047bc6374af04d0f4a050eab + 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e1f89ce74e9a890047bc6374af04d0f4a050eab + 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e1f89ce74e9a890047bc6374af04d0f4a050eab + 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e1f89ce74e9a890047bc6374af04d0f4a050eab + 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a @@ -169,11 +169,11 @@ https://github.com/dotnet/emsdk - fcd8602188cfe2f73c73f5ae57e33c0654ce9858 + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/emsdk - fcd8602188cfe2f73c73f5ae57e33c0654ce9858 + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 63da1f5ba..5c76d0db3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23422.25 - 7.0.308-servicing.23422.25 + 7.0.308-servicing.23425.20 + 7.0.308-servicing.23425.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.11-servicing.23418.12 - 7.0.11-servicing.23418.12 + 7.0.11-servicing.23424.27 + 7.0.11-servicing.23424.27 7.0.11 7.0.11 7.0.11 From 85f6922cb3b4a6115f1e3fde9c8c99da130346d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 19:00:44 +0000 Subject: [PATCH 540/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates 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 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2d3540811..f4c5be77c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abfc60fc0..1abc874bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a + f469d782833a83a3c210f3ed1807f2c05a2ba6d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a + f469d782833a83a3c210f3ed1807f2c05a2ba6d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a + f469d782833a83a3c210f3ed1807f2c05a2ba6d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a + f469d782833a83a3c210f3ed1807f2c05a2ba6d4 diff --git a/eng/Versions.props b/eng/Versions.props index 5c76d0db3..de74eb863 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.11 7.0.11 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 0.2.0 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23425.20 - 7.0.308-servicing.23425.20 + 7.0.308-servicing.23425.34 + 7.0.308-servicing.23425.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6c569fb358b5052929648fb24c7f20a79c145b8d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 21:44:28 +0000 Subject: [PATCH 541/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.45 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index f4c5be77c..cc1a1596f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1abc874bb..aefc4f1b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f469d782833a83a3c210f3ed1807f2c05a2ba6d4 + 3df19b5c2397628b241f0785320858fa0ab1d9aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f469d782833a83a3c210f3ed1807f2c05a2ba6d4 + 3df19b5c2397628b241f0785320858fa0ab1d9aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f469d782833a83a3c210f3ed1807f2c05a2ba6d4 + 3df19b5c2397628b241f0785320858fa0ab1d9aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f469d782833a83a3c210f3ed1807f2c05a2ba6d4 + 3df19b5c2397628b241f0785320858fa0ab1d9aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 81760b1e789d848e1c44733615cf2939159603a3 + 66db733312de7bd21ed3e73cee0b27fb75d91b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aea83fde388f1f90c7068116c2653b12e31bac40 + 6432861c5a360348a9e1a6cc76cced7bd25ab3f9 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index de74eb863..1eaede787 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23422.3 + 7.0.11-servicing.23425.2 - 7.0.11-servicing.23422.2 + 7.0.11-servicing.23425.6 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23425.34 - 7.0.308-servicing.23425.34 + 7.0.308-servicing.23425.45 + 7.0.308-servicing.23425.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.11-servicing.23422.3 - 7.0.11-servicing.23422.3 + 7.0.11-servicing.23425.5 + 7.0.11-servicing.23425.5 7.0.11 7.0.11 From 92332ccd3031ef9f5642a050835cec8972338141 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:27:07 -0700 Subject: [PATCH 542/654] Update branding to 7.0.309 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7db5fcb8c..e9798b657 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 08 + 09 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From c199984fafa8fb0fbf4134ff9c141544f0251224 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 23:55:47 +0000 Subject: [PATCH 543/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.309 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.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.11 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++---- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 83 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc1a1596f..369e59eb5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,19 @@ - + - + - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aefc4f1b5..033225070 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3df19b5c2397628b241f0785320858fa0ab1d9aa + c7d84fe8930df16f4204fbad3b515b7d9a8edb80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3df19b5c2397628b241f0785320858fa0ab1d9aa + c7d84fe8930df16f4204fbad3b515b7d9a8edb80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3df19b5c2397628b241f0785320858fa0ab1d9aa + c7d84fe8930df16f4204fbad3b515b7d9a8edb80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3df19b5c2397628b241f0785320858fa0ab1d9aa + c7d84fe8930df16f4204fbad3b515b7d9a8edb80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 66db733312de7bd21ed3e73cee0b27fb75d91b70 + eabb0b168f69e1afd828a0f38144405b311e310b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6432861c5a360348a9e1a6cc76cced7bd25ab3f9 + d2fc4e13cada6591f520f2245bf53a3aadb85357 https://github.com/dotnet/fsharp @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 9506882149df72322dba902cd42778ae4c4a6fbf - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 9506882149df72322dba902cd42778ae4c4a6fbf https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index aa10713a7..8f2b0fdaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23425.2 + 7.0.12-servicing.23463.13 - 7.0.11-servicing.23425.6 + 7.0.12-servicing.23463.6 @@ -56,22 +56,22 @@ - 7.0.11 - 7.0.11 - 7.0.11-servicing.23425.2 - 7.0.11-servicing.23425.2 - 7.0.11-servicing.23425.2 - 7.0.11-servicing.23425.2 - 7.0.11-servicing.23425.2 + 7.0.12 + 7.0.12 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 0.2.0 - 7.0.308 - 7.0.308-servicing.23425.45 - 7.0.308-servicing.23425.45 + 7.0.309 + 7.0.309-servicing.23464.37 + 7.0.309-servicing.23464.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.11-servicing.23424.27 - 7.0.11-servicing.23424.27 - 7.0.11 - 7.0.11 - 7.0.11 - 7.0.11 + 7.0.12-servicing.23463.5 + 7.0.12-servicing.23463.5 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 2.1.0 - 7.0.11-servicing.23425.5 - 7.0.11-servicing.23425.5 - 7.0.11 - 7.0.11 + 7.0.12-servicing.23463.5 + 7.0.12-servicing.23463.5 + 7.0.12 + 7.0.12 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.11 - 7.0.11 + 7.0.12 + 7.0.12 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 8f9c6a465f38a1b213ccfa7e64e9c091d1883997 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Sep 2023 20:34:14 +0000 Subject: [PATCH 544/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230915.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 Dependency coherency updates 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 From Version 7.0.12 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 369e59eb5..5357832cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 033225070..22e8f8926 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7d84fe8930df16f4204fbad3b515b7d9a8edb80 + e844526e3bb50d0cff599ec0a06fffe3148cbeea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7d84fe8930df16f4204fbad3b515b7d9a8edb80 + e844526e3bb50d0cff599ec0a06fffe3148cbeea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7d84fe8930df16f4204fbad3b515b7d9a8edb80 + e844526e3bb50d0cff599ec0a06fffe3148cbeea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7d84fe8930df16f4204fbad3b515b7d9a8edb80 + e844526e3bb50d0cff599ec0a06fffe3148cbeea diff --git a/eng/Versions.props b/eng/Versions.props index 8f2b0fdaf..7249b3ca5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 0.2.0 @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23464.37 - 7.0.309-servicing.23464.37 + 7.0.309-servicing.23465.23 + 7.0.309-servicing.23465.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4ac38fb5554ad7ef316a1e35cc7f92d2eed7596e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Sep 2023 22:26:37 +0000 Subject: [PATCH 545/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230915.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.12 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5357832cd..901e264ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22e8f8926..8943dc5b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e844526e3bb50d0cff599ec0a06fffe3148cbeea + 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e844526e3bb50d0cff599ec0a06fffe3148cbeea + 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e844526e3bb50d0cff599ec0a06fffe3148cbeea + 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e844526e3bb50d0cff599ec0a06fffe3148cbeea + 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - eabb0b168f69e1afd828a0f38144405b311e310b + b9a47bfae827dc3a7b38beb00ff6a68aeeb1a2b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d2fc4e13cada6591f520f2245bf53a3aadb85357 + 52e852eeeba7d94815f4aa698081af53fe313543 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7249b3ca5..6f148faef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.12-servicing.23463.13 + 7.0.12-servicing.23465.7 - 7.0.12-servicing.23463.6 + 7.0.12-servicing.23465.3 @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23465.23 - 7.0.309-servicing.23465.23 + 7.0.309-servicing.23465.30 + 7.0.309-servicing.23465.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.12-servicing.23463.5 - 7.0.12-servicing.23463.5 + 7.0.12-servicing.23465.4 + 7.0.12-servicing.23465.4 7.0.12 7.0.12 From 21a1321b35503fa3a093c9678cb61ce71df8284d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 18:48:29 +0000 Subject: [PATCH 546/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 901e264ee..24f7b04ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8943dc5b7..0464c4962 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 + afdaa753974497c5189c6f8713aac005589771a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 + afdaa753974497c5189c6f8713aac005589771a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 + afdaa753974497c5189c6f8713aac005589771a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 + afdaa753974497c5189c6f8713aac005589771a5 diff --git a/eng/Versions.props b/eng/Versions.props index 6f148faef..8d760f559 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23465.30 - 7.0.309-servicing.23465.30 + 7.0.309-servicing.23469.17 + 7.0.309-servicing.23469.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2f011300bfe17207409c41f17c50202c19483849 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 15:01:07 +0000 Subject: [PATCH 547/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.309 Dependency coherency updates 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.ILLink.Tasks From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 40 ++++------------------------------ eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index b885835bc..f49350550 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,34 +10,16 @@ - - - - + - - - - - - - - - - - - + - - - - @@ -59,27 +41,13 @@ - - - - + - - - - - - - - + - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d206477b..c0a143f4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 https://github.com/dotnet/test-templates @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 6757a33ea4a33570514d20dd278cd3ac6d363d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 6757a33ea4a33570514d20dd278cd3ac6d363d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 6757a33ea4a33570514d20dd278cd3ac6d363d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 6757a33ea4a33570514d20dd278cd3ac6d363d9b @@ -138,9 +138,9 @@ e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb - + https://github.com/dotnet/linker - 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 + 53b3303c57b3fe659500fb362a0eef12991c1197 linker diff --git a/eng/Versions.props b/eng/Versions.props index e9798b657..b0877ffc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ - 7.0.10 - 7.0.10 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 + 7.0.12 + 7.0.12 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 0.2.0 - 7.0.307 - 7.0.307-servicing.23367.21 - 7.0.307-servicing.23367.21 + 7.0.309 + 7.0.309-servicing.23478.8 + 7.0.309-servicing.23478.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ce6ed2d04a386b89e0bde38b81837f0003e1b8d6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 16:10:16 +0000 Subject: [PATCH 548/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.309 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.ILLink.Tasks,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.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++--------- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index f49350550..6cdf5e76c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,9 +15,10 @@ + - + @@ -44,8 +45,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0a143f4e..95e85fa0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6757a33ea4a33570514d20dd278cd3ac6d363d9b + 804aff807ca42d6f112bf7dd26dfe6161aa1f11b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6757a33ea4a33570514d20dd278cd3ac6d363d9b + 804aff807ca42d6f112bf7dd26dfe6161aa1f11b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6757a33ea4a33570514d20dd278cd3ac6d363d9b + 804aff807ca42d6f112bf7dd26dfe6161aa1f11b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6757a33ea4a33570514d20dd278cd3ac6d363d9b + 804aff807ca42d6f112bf7dd26dfe6161aa1f11b @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index b0877ffc7..920605f6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23478.8 - 7.0.309-servicing.23478.8 + 7.0.309-servicing.23478.17 + 7.0.309-servicing.23478.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,12 +86,12 @@ - 7.0.10-servicing.23363.12 - 7.0.10-servicing.23363.12 - 7.0.10 - 7.0.10 - 7.0.10 - 7.0.10 + 7.0.12-servicing.23477.20 + 7.0.12-servicing.23477.20 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 2.1.0 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 8b85dc17dd4d337d38e34e7e0231b4c53f76f47d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 29 Sep 2023 16:46:28 +0000 Subject: [PATCH 549/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++--- eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++--------- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6cdf5e76c..d94f950be 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,9 +18,10 @@ - + + @@ -42,14 +43,15 @@ - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95e85fa0c..ad565cffe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 804aff807ca42d6f112bf7dd26dfe6161aa1f11b + 2cabc043689054a1f0ddf5895d32572190515ae8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 804aff807ca42d6f112bf7dd26dfe6161aa1f11b + 2cabc043689054a1f0ddf5895d32572190515ae8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 804aff807ca42d6f112bf7dd26dfe6161aa1f11b + 2cabc043689054a1f0ddf5895d32572190515ae8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 804aff807ca42d6f112bf7dd26dfe6161aa1f11b + 2cabc043689054a1f0ddf5895d32572190515ae8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 75eafed7999075bca879940ad0b1a0794061ddb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + c94bac748138456f4feef271b3dc18e4b46453e6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 920605f6f..699696ef5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.12-servicing.23478.3 - 7.0.10-servicing.23364.4 + 7.0.12-servicing.23478.2 @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23478.17 - 7.0.309-servicing.23478.17 + 7.0.309-servicing.23479.6 + 7.0.309-servicing.23479.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,10 +96,10 @@ - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12 + 7.0.12 From f10d699fa9bccaf7eb3a962b98718f7b4129541c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Fri, 29 Sep 2023 17:27:12 +0000 Subject: [PATCH 550/654] Deleted 0002-Add-explicit-System.Text.Json-dependency.patch The patch is unable to be applied. --- ...explicit-System.Text.Json-dependency.patch | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index ced7ca579..000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 26 Jun 2023 23:46:46 +0000 -Subject: [PATCH] Add explicit System.Text.Json dependency - -Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up -from PSB, via Microsoft.Build package. - -Backport: https://github.com/dotnet/format/pull/1887 ---- - Directory.Packages.props | 1 + - eng/Version.Details.xml | 4 ++++ - eng/Versions.props | 2 ++ - src/dotnet-format.csproj | 6 ++++++ - 4 files changed, 13 insertions(+) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 6b628c22..c9f86593 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -36,5 +36,6 @@ - - - -+ - - -\ No newline at end of file -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index cdfa5f5e..86f02b44 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -13,6 +13,10 @@ - https://github.com/dotnet/command-line-api - c776cd4e906b669b9cce1017fee7d0ba9845d163 - -+ -+ https://github.com/dotnet/runtime -+ 3241df7f2b0f3e2dada8d07229723c79fdbe4991 -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 27582078..bccaf176 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -20,6 +20,8 @@ - - 2.0.0-beta4.22504.1 - 0.4.0-alpha.22504.1 -+ -+ 6.0.8 - - -+ - - - From e610891a41947d5e7d937dfc2e58db65b3439b69 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:02:58 +0000 Subject: [PATCH 551/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.68 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 Dependency coherency updates 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 From Version 7.0.12 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index d94f950be..ed994c9ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,18 +10,22 @@ - + + + - + + + @@ -43,14 +47,18 @@ - + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad565cffe..63e35eae3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cabc043689054a1f0ddf5895d32572190515ae8 + 5a48ee082690a5e3b6a0b51632071f89c2f8d725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cabc043689054a1f0ddf5895d32572190515ae8 + 5a48ee082690a5e3b6a0b51632071f89c2f8d725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cabc043689054a1f0ddf5895d32572190515ae8 + 5a48ee082690a5e3b6a0b51632071f89c2f8d725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cabc043689054a1f0ddf5895d32572190515ae8 + 5a48ee082690a5e3b6a0b51632071f89c2f8d725 diff --git a/eng/Versions.props b/eng/Versions.props index 699696ef5..70971a8cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23479.6 - 7.0.309-servicing.23479.6 + 7.0.309-servicing.23479.68 + 7.0.309-servicing.23479.68 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 552bd6c89b07627bc57be1c07b59e0e2c8934207 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:24:36 +0000 Subject: [PATCH 552/654] Merged PR 34164: [internal/release/frameshift/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774 - **Build**: 20230930.36 - **Date Produced**: October 1, 2023 2:06:09 AM UTC - **Commit**: f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a - **Branch**: refs/heads/internal/release/frameshift/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1] - **Microsoft.NET.Sdk**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC5a48ee0826&targetVersion=GCf44358c3c9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d52de2a0-7c5a-452e-752b-08dbbf92e774) --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed994c9ec..618382a29 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,19 +11,25 @@ + + + + - + + + @@ -47,18 +53,24 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63e35eae3..871ca7086 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a48ee082690a5e3b6a0b51632071f89c2f8d725 + f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a48ee082690a5e3b6a0b51632071f89c2f8d725 + f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a48ee082690a5e3b6a0b51632071f89c2f8d725 + f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a48ee082690a5e3b6a0b51632071f89c2f8d725 + f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a diff --git a/eng/Versions.props b/eng/Versions.props index 70971a8cd..65750b4b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23479.68 - 7.0.309-servicing.23479.68 + 7.0.309-servicing.23480.36 + 7.0.309-servicing.23480.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 07b77653a1401edf61e0f8fed93c41c7705a1e26 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:52 -0700 Subject: [PATCH 553/654] Update branding to 7.0.310 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index aa10713a7..c062b2ed5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 09 + 10 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 23c6cc482330c6a57fa6739740b45b4b633b1ec5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 17:13:57 +0000 Subject: [PATCH 554/654] [release/7.0.3xx] Update dependencies from dotnet/arcade (#17446) [release/7.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 9 --------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc1a1596f..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,14 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aefc4f1b5..cef41663f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c062b2ed5..6fc67f8b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23408.3 + 7.0.0-beta.23478.1 diff --git a/global.json b/global.json index bf1732f08..4a49aa951 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.110", + "dotnet": "7.0.111", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23408.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23478.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23478.1" } } From 8cf3bdf83c89c4764544f627f0e3501455046d8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 00:04:46 +0000 Subject: [PATCH 555/654] Update dependencies from https://github.com/dotnet/arcade build 20231011.9 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23478.1 -> To Version 7.0.0-beta.23511.9 --- NuGet.config | 28 ++++++++++++++++++---------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 618382a29..dfcd372fd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,23 +11,27 @@ + + + - - - - - + + + + + + @@ -55,15 +59,16 @@ + + + - - - - - + + + @@ -71,6 +76,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e553d283e..c36de20dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 + acb831a5b31a3cc4a744a8944b6bd172e6969234 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 02f83148d..adb213dc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23478.1 + 7.0.0-beta.23511.9 diff --git a/global.json b/global.json index 4a49aa951..07baaa447 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.111", + "dotnet": "7.0.112", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23478.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23478.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23511.9" } } From 7b19e53bf2680043bb5e1036138b3bca9b29d11a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 20:01:22 +0000 Subject: [PATCH 556/654] [release/7.0.3xx] Update dependencies from dotnet/arcade (#17530) [release/7.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 36 ------------------------------------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 45 deletions(-) diff --git a/NuGet.config b/NuGet.config index dfcd372fd..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,32 +10,14 @@ - - - - - - - - - - - - - - - - - - @@ -57,29 +39,11 @@ - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c36de20dc..88c09e5dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - acb831a5b31a3cc4a744a8944b6bd172e6969234 + 49ef9b336412d5bce043d4935166d8125a2e097d - + https://github.com/dotnet/arcade - acb831a5b31a3cc4a744a8944b6bd172e6969234 + 49ef9b336412d5bce043d4935166d8125a2e097d - + https://github.com/dotnet/arcade - acb831a5b31a3cc4a744a8944b6bd172e6969234 + 49ef9b336412d5bce043d4935166d8125a2e097d https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 349a148f3..51892008a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23511.9 + 7.0.0-beta.23513.2 diff --git a/global.json b/global.json index 07baaa447..97c00f8b7 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.23511.9", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23511.9" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23513.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23513.2" } } From eee9b654202f333bd3cffa76cd818b16162652dd Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:27:27 -0700 Subject: [PATCH 557/654] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0bad..57a4b6415 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From aa942314ca16d7dbe2f93b4f346d0b91456e7d28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 20:02:01 +0000 Subject: [PATCH 558/654] Update dependencies from https://github.com/dotnet/arcade build 20231017.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23513.2 -> To Version 7.0.0-beta.23517.4 --- 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 88c09e5dd..a250a1bf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 49ef9b336412d5bce043d4935166d8125a2e097d + cb3ccc523ed844c82a63898ed3fa269680396f26 - + https://github.com/dotnet/arcade - 49ef9b336412d5bce043d4935166d8125a2e097d + cb3ccc523ed844c82a63898ed3fa269680396f26 - + https://github.com/dotnet/arcade - 49ef9b336412d5bce043d4935166d8125a2e097d + cb3ccc523ed844c82a63898ed3fa269680396f26 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 51892008a..e7b66b011 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23513.2 + 7.0.0-beta.23517.4 diff --git a/global.json b/global.json index 97c00f8b7..07e79e2ed 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.23513.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23513.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23517.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23517.4" } } From 4705b63277c825b4ada9193fbe715673a9ae2b62 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Oct 2023 00:13:59 +0000 Subject: [PATCH 559/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.42 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.310 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.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.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 9 ++++ eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index d288f50a2..4a9fd8ab9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,14 +10,19 @@ + + + + + @@ -39,11 +44,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88c09e5dd..6429429b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a + 0380d41e80a8056a3cf92c3cccf229bf56e54766 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a + 0380d41e80a8056a3cf92c3cccf229bf56e54766 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a + 0380d41e80a8056a3cf92c3cccf229bf56e54766 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a + 0380d41e80a8056a3cf92c3cccf229bf56e54766 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 75eafed7999075bca879940ad0b1a0794061ddb0 + b49dcfadfab4004b26d61bf228d48baf599ce6cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c94bac748138456f4feef271b3dc18e4b46453e6 + f3ff7ac9e44dedf252fd0cf06ffe66e171d8bfb5 https://github.com/dotnet/fsharp @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 51892008a..5dac2c6be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.12-servicing.23478.3 + 7.0.13-servicing.23513.5 - 7.0.12-servicing.23478.2 + 7.0.13-servicing.23516.16 @@ -56,22 +56,22 @@ - 7.0.12 - 7.0.12 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 + 7.0.13 + 7.0.13 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 0.2.0 - 7.0.309 - 7.0.309-servicing.23480.36 - 7.0.309-servicing.23480.36 + 7.0.310 + 7.0.310-servicing.23517.42 + 7.0.310-servicing.23517.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.12-servicing.23477.20 - 7.0.12-servicing.23477.20 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 + 7.0.13-servicing.23516.30 + 7.0.13-servicing.23516.30 + 7.0.13 + 7.0.13 + 7.0.13 + 7.0.13 2.1.0 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12 - 7.0.12 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13 + 7.0.13 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.11 - 7.0.11 + 7.0.13 + 7.0.13 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 04962e30783af8d26f0fef53fe0d618e6d13a4d4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Oct 2023 03:22:59 +0000 Subject: [PATCH 560/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.56 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.310 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.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.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a9fd8ab9..54e83584a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6429429b7..8e8bc6611 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0380d41e80a8056a3cf92c3cccf229bf56e54766 + 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0380d41e80a8056a3cf92c3cccf229bf56e54766 + 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0380d41e80a8056a3cf92c3cccf229bf56e54766 + 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0380d41e80a8056a3cf92c3cccf229bf56e54766 + 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 diff --git a/eng/Versions.props b/eng/Versions.props index 5dac2c6be..ddf142319 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.310 - 7.0.310-servicing.23517.42 - 7.0.310-servicing.23517.42 + 7.0.310-servicing.23517.56 + 7.0.310-servicing.23517.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db57dadd26077ebb5f5efb107ac1a5fe99c8c0b4 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:23 -0700 Subject: [PATCH 561/654] Update branding to 7.0.311 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e7b66b011..7b760e184 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 10 + 11 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 5047ef9061c89bef3bf466c4ed2c1e06ffd82717 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 00:47:08 +0000 Subject: [PATCH 562/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.311 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.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.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 54e83584a..fe24c296a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e8bc6611..bc99e7fd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 + d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 + d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 + d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 + d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b diff --git a/eng/Versions.props b/eng/Versions.props index ddf142319..16387a82b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.310 - 7.0.310-servicing.23517.56 - 7.0.310-servicing.23517.56 + 7.0.311 + 7.0.311-servicing.23518.32 + 7.0.311-servicing.23518.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bedf712c818dbcf28465a75df33d6c69add35de1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 03:36:40 +0000 Subject: [PATCH 563/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.45 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++------ eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe24c296a..1bb6599c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,13 +16,13 @@ - + - + - + @@ -47,12 +47,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43ddee938..9be1d6bc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b + 1eef08a93bc30f2f46e11a592ef19af2c618b728 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b + 1eef08a93bc30f2f46e11a592ef19af2c618b728 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b + 1eef08a93bc30f2f46e11a592ef19af2c618b728 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b + 1eef08a93bc30f2f46e11a592ef19af2c618b728 diff --git a/eng/Versions.props b/eng/Versions.props index b1266a5da..250b8a02f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23518.32 - 7.0.311-servicing.23518.32 + 7.0.311-servicing.23518.45 + 7.0.311-servicing.23518.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.13-servicing.23516.30 - 7.0.13-servicing.23516.30 + 7.0.13-servicing.23517.18 + 7.0.13-servicing.23517.18 7.0.13 7.0.13 7.0.13 @@ -96,10 +96,10 @@ - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13 - 7.0.13 + 7.0.14-servicing.23518.5 + 7.0.14-servicing.23518.5 + 7.0.14 + 7.0.14 From ad876c0b5dcdd9de60b33b9274234367f9f141fe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 04:41:41 +0000 Subject: [PATCH 564/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.62 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1bb6599c4..67fd2b0ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9be1d6bc7..1d76f63d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1eef08a93bc30f2f46e11a592ef19af2c618b728 + 3c0f521024deeeb554b3992b5966a908db61fb36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1eef08a93bc30f2f46e11a592ef19af2c618b728 + 3c0f521024deeeb554b3992b5966a908db61fb36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1eef08a93bc30f2f46e11a592ef19af2c618b728 + 3c0f521024deeeb554b3992b5966a908db61fb36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1eef08a93bc30f2f46e11a592ef19af2c618b728 + 3c0f521024deeeb554b3992b5966a908db61fb36 diff --git a/eng/Versions.props b/eng/Versions.props index 250b8a02f..35c8377fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23518.45 - 7.0.311-servicing.23518.45 + 7.0.311-servicing.23518.62 + 7.0.311-servicing.23518.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9ea7744b1ad4f239dc2339138163f1f299cfb6f5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 23:27:17 +0000 Subject: [PATCH 565/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.56 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 38 +++++++++--------- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index 67fd2b0ed..6da99784a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,19 @@ - + - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d76f63d8..37ddaa987 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c0f521024deeeb554b3992b5966a908db61fb36 + 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c0f521024deeeb554b3992b5966a908db61fb36 + 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c0f521024deeeb554b3992b5966a908db61fb36 + 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c0f521024deeeb554b3992b5966a908db61fb36 + 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b49dcfadfab4004b26d61bf228d48baf599ce6cd + fa26bf7ef8dfe0a7c6c88c265a53534b9adeb432 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f3ff7ac9e44dedf252fd0cf06ffe66e171d8bfb5 + 70b1ca685a72453aac47b4f6b6c8aefc1fba7cdb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 35c8377fb..ee64bb239 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.13-servicing.23513.5 + 7.0.14-servicing.23518.4 - 7.0.13-servicing.23516.16 + 7.0.14-servicing.23518.12 @@ -56,13 +56,13 @@ - 7.0.13 - 7.0.13 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 + 7.0.14 + 7.0.14 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 0.2.0 @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23518.62 - 7.0.311-servicing.23518.62 + 7.0.311-servicing.23519.56 + 7.0.311-servicing.23519.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,18 +86,18 @@ - 7.0.13-servicing.23517.18 - 7.0.13-servicing.23517.18 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 + 7.0.14-servicing.23518.19 + 7.0.14-servicing.23518.19 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 2.1.0 - 7.0.14-servicing.23518.5 - 7.0.14-servicing.23518.5 + 7.0.14-servicing.23519.4 + 7.0.14-servicing.23519.4 7.0.14 7.0.14 From dfaab3bf57854ab72ce61d86fe682ba1fa8a7cdc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:52:56 +0000 Subject: [PATCH 566/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.79 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6da99784a..d7c53263a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,13 +13,13 @@ - + - + - + @@ -47,9 +47,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37ddaa987..7a6bc7069 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 + 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 + 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 + 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 + 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 + 942bfc8cb73e3cfea523cb0a2f08b415b2220358 - + https://github.com/dotnet/emsdk - 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 + 942bfc8cb73e3cfea523cb0a2f08b415b2220358 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index ee64bb239..df8f0360f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23519.56 - 7.0.311-servicing.23519.56 + 7.0.311-servicing.23519.79 + 7.0.311-servicing.23519.79 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.14-servicing.23518.19 - 7.0.14-servicing.23518.19 + 7.0.14-servicing.23519.10 + 7.0.14-servicing.23519.10 7.0.14 7.0.14 7.0.14 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.13 - 7.0.13 + 7.0.14 + 7.0.14 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 9b51b65fb383eb938beab1e883d3bd80950b6935 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 18:18:37 +0000 Subject: [PATCH 567/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7c53263a..be9a513b9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -44,15 +44,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a6bc7069..e8c914cc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 + d090ca31701d19e9c15a0da90695a70dbddca74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 + d090ca31701d19e9c15a0da90695a70dbddca74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 + d090ca31701d19e9c15a0da90695a70dbddca74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 + d090ca31701d19e9c15a0da90695a70dbddca74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fa26bf7ef8dfe0a7c6c88c265a53534b9adeb432 + 89f5db690a92e446dbb6eb1906d52788df1fe9a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 70b1ca685a72453aac47b4f6b6c8aefc1fba7cdb + e025c534b87f516425890f1401d052141898a574 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index df8f0360f..48a944016 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23518.4 + 7.0.14-servicing.23519.5 - 7.0.14-servicing.23518.12 + 7.0.14-servicing.23519.12 @@ -58,11 +58,11 @@ 7.0.14 7.0.14 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 0.2.0 @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23519.79 - 7.0.311-servicing.23519.79 + 7.0.311-servicing.23520.13 + 7.0.311-servicing.23520.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.14-servicing.23519.4 - 7.0.14-servicing.23519.4 + 7.0.14-servicing.23519.19 + 7.0.14-servicing.23519.19 7.0.14 7.0.14 From 550dd1a2bd16230cb91b60b6d1ad0b9d5dfe69a3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 21:33:41 +0000 Subject: [PATCH 568/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index be9a513b9..e36b3ed0c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8c914cc6..9d7878265 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d090ca31701d19e9c15a0da90695a70dbddca74f + c9c85c170a95b935a191087db36d021b88a84074 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d090ca31701d19e9c15a0da90695a70dbddca74f + c9c85c170a95b935a191087db36d021b88a84074 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d090ca31701d19e9c15a0da90695a70dbddca74f + c9c85c170a95b935a191087db36d021b88a84074 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d090ca31701d19e9c15a0da90695a70dbddca74f + c9c85c170a95b935a191087db36d021b88a84074 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 89f5db690a92e446dbb6eb1906d52788df1fe9a1 + 3cf1ad1e72ee7a06055165309a5b38081e91d9a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e025c534b87f516425890f1401d052141898a574 + 00ce9eab67537c1e291e8a7699323b86263803ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 48a944016..0e06c3ed3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23519.5 + 7.0.14-servicing.23519.17 - 7.0.14-servicing.23519.12 + 7.0.14-servicing.23519.17 @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23520.13 - 7.0.311-servicing.23520.13 + 7.0.311-servicing.23520.35 + 7.0.311-servicing.23520.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.14-servicing.23519.19 - 7.0.14-servicing.23519.19 + 7.0.14-servicing.23520.4 + 7.0.14-servicing.23520.4 7.0.14 7.0.14 From 51a1a5b8e42bef78d5961c0e42256b89f9b23e11 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 21 Oct 2023 03:13:18 +0000 Subject: [PATCH 569/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.57 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index e36b3ed0c..5845bd0c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d7878265..5c68a51f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9c85c170a95b935a191087db36d021b88a84074 + 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9c85c170a95b935a191087db36d021b88a84074 + 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9c85c170a95b935a191087db36d021b88a84074 + 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9c85c170a95b935a191087db36d021b88a84074 + 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3cf1ad1e72ee7a06055165309a5b38081e91d9a1 + f1570f38b63db12bfd8714a942ec33de2275edf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 00ce9eab67537c1e291e8a7699323b86263803ec + 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0e06c3ed3..68fa70689 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23519.17 + 7.0.14-servicing.23520.9 - 7.0.14-servicing.23519.17 + 7.0.14-servicing.23520.2 @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23520.35 - 7.0.311-servicing.23520.35 + 7.0.311-servicing.23520.57 + 7.0.311-servicing.23520.57 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.14-servicing.23520.4 - 7.0.14-servicing.23520.4 + 7.0.14-servicing.23520.7 + 7.0.14-servicing.23520.7 7.0.14 7.0.14 From 7d8cb778315cc3a6edd42f04718cb0486b8be73b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:19:49 +0000 Subject: [PATCH 570/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 Dependency coherency updates 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 From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5845bd0c1..6826d6846 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c68a51f7..82c91a189 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b + c4047673ed10f28cc58ad806c54e25037b0469d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b + c4047673ed10f28cc58ad806c54e25037b0469d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b + c4047673ed10f28cc58ad806c54e25037b0469d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b + c4047673ed10f28cc58ad806c54e25037b0469d8 diff --git a/eng/Versions.props b/eng/Versions.props index 68fa70689..7409139b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.14 7.0.14 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 0.2.0 @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23520.57 - 7.0.311-servicing.23520.57 + 7.0.311-servicing.23523.38 + 7.0.311-servicing.23523.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6a527262fc9b1b4831989323fff5f91eda4e0a1f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:24 -0800 Subject: [PATCH 571/654] Update branding to 7.0.312 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7b760e184..54b4ac0ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 11 + 12 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 5942138f873b92224a1ca0535cb0ff6453fc4e69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 20:11:52 +0000 Subject: [PATCH 572/654] [release/7.0.3xx] Update dependencies from dotnet/arcade (#17711) [release/7.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/post-build/common-variables.yml | 1 - global.json | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a250a1bf7..babb88c88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - cb3ccc523ed844c82a63898ed3fa269680396f26 + 0cf959c996dd33379cb6e87532c008669e0ae06f - + https://github.com/dotnet/arcade - cb3ccc523ed844c82a63898ed3fa269680396f26 + 0cf959c996dd33379cb6e87532c008669e0ae06f - + https://github.com/dotnet/arcade - cb3ccc523ed844c82a63898ed3fa269680396f26 + 0cf959c996dd33379cb6e87532c008669e0ae06f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7b760e184..fc15d751c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23517.4 + 7.0.0-beta.23556.6 diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a4..776bd9700 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,6 +1,5 @@ variables: - group: AzureDevOps-Artifact-Feeds-Pats - - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage - group: Publish-Build-Assets diff --git a/global.json b/global.json index 07e79e2ed..df223f963 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.23517.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23517.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23556.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23556.6" } } From 98f62919421b5d3ecba18abf412aacaa439110f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Nov 2023 23:30:42 +0000 Subject: [PATCH 573/654] Update dependencies from https://github.com/dotnet/arcade build 20231114.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23556.6 -> To Version 7.0.0-beta.23564.5 --- NuGet.config | 18 ++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6826d6846..6965e587b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,28 @@ + + + + + + + + + + @@ -44,14 +54,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25023f981..5a3d473a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 0cf959c996dd33379cb6e87532c008669e0ae06f + ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/arcade - 0cf959c996dd33379cb6e87532c008669e0ae06f + ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/arcade - 0cf959c996dd33379cb6e87532c008669e0ae06f + ca53a3149aaedb03e5d79ee0e259d31ac8719290 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 49f88c7d7..e964b522d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23556.6 + 7.0.0-beta.23564.5 diff --git a/global.json b/global.json index df223f963..154f5f035 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.112", + "dotnet": "7.0.113", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23556.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23556.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23564.5" } } From 6af34f16266eb99ba78e66dbe5a7dec756d72232 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 14:01:59 +0000 Subject: [PATCH 574/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.312 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.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.14 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 36 ++++----------- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 101 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6965e587b..25b3d1da7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,29 +10,19 @@ - - - + - - - + - - - + - - - + - - - + @@ -54,23 +44,15 @@ - - - + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a3d473a0..66d5805f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1570f38b63db12bfd8714a942ec33de2275edf6 + ce000d354195dfb9e0f8039a74d303f61afcf9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 + 226928a35528d63540ed0c8eb4f749d51c9667e9 https://github.com/dotnet/fsharp @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 942bfc8cb73e3cfea523cb0a2f08b415b2220358 + 33b038b591f6e19c32a390333d41292cbd86d93c - + https://github.com/dotnet/emsdk - 942bfc8cb73e3cfea523cb0a2f08b415b2220358 + 33b038b591f6e19c32a390333d41292cbd86d93c https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 3012a3afa..19fce438b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23520.9 + 7.0.15-servicing.23570.16 - 7.0.14-servicing.23520.2 + 7.0.15-servicing.23572.2 @@ -56,22 +56,22 @@ - 7.0.14 - 7.0.14 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 + 7.0.15 + 7.0.15 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 0.2.0 - 7.0.311 - 7.0.311-servicing.23523.38 - 7.0.311-servicing.23523.38 + 7.0.312 + 7.0.312-servicing.23573.14 + 7.0.312-servicing.23573.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.14-servicing.23519.10 - 7.0.14-servicing.23519.10 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 + 7.0.15-servicing.23572.26 + 7.0.15-servicing.23572.26 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 2.1.0 - 7.0.14-servicing.23520.7 - 7.0.14-servicing.23520.7 - 7.0.14 - 7.0.14 + 7.0.15-servicing.23572.3 + 7.0.15-servicing.23572.3 + 7.0.15 + 7.0.15 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.14 - 7.0.14 + 7.0.15 + 7.0.15 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 9840fd11dbffdee6c797f8daec3a15c8186e2cc2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 17:45:14 +0000 Subject: [PATCH 575/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.312 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.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.14 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 25b3d1da7..65e2ee623 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -44,15 +44,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66d5805f9..65785a115 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ce000d354195dfb9e0f8039a74d303f61afcf9c9 + 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 226928a35528d63540ed0c8eb4f749d51c9667e9 + aed20729942488335ab21d7bb03a92d87afdb9b1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 19fce438b..018a55ab1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23570.16 + 7.0.15-servicing.23573.3 - 7.0.15-servicing.23572.2 + 7.0.15-servicing.23573.2 @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 0.2.0 @@ -70,8 +70,8 @@ 7.0.312 - 7.0.312-servicing.23573.14 - 7.0.312-servicing.23573.14 + 7.0.312-servicing.23573.32 + 7.0.312-servicing.23573.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.15-servicing.23572.3 - 7.0.15-servicing.23572.3 + 7.0.15-servicing.23573.2 + 7.0.15-servicing.23573.2 7.0.15 7.0.15 From 5465d933ea269f8a784cdc7af14107f42ed026fe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 12:06:06 +0000 Subject: [PATCH 576/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.312 -> To Version 7.0.312 Dependency coherency updates 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 From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 65e2ee623..24168537a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65785a115..2b505f556 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda diff --git a/eng/Versions.props b/eng/Versions.props index 018a55ab1..96257c41d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 0.2.0 @@ -70,8 +70,8 @@ 7.0.312 - 7.0.312-servicing.23573.32 - 7.0.312-servicing.23573.32 + 7.0.312-servicing.23578.4 + 7.0.312-servicing.23578.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e58facf1b23bbd3ba7850272765e2d9354ed480c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Nov 2023 18:57:29 +0000 Subject: [PATCH 577/654] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231128.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23219.1 -> To Version 7.0.0-alpha.1.23578.1 --- NuGet.config | 27 --------------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6965e587b..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,29 +10,14 @@ - - - - - - - - - - - - - - - @@ -54,23 +39,11 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a3d473a0..e86c9c4ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/source-build-reference-packages - 525b6c35cc5c5c9b80b47044be2e4e77858d505a + 6d5841c05f04d60eccf3358588b8c8968215d9e2 From 9bf37478b6ca1e4e7251f1c4d47a9cce103f170f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 12:58:43 +0000 Subject: [PATCH 578/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.312 -> To Version 7.0.312 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 24168537a..529a9110e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59e1f894d..0dafb4b3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aed20729942488335ab21d7bb03a92d87afdb9b1 + 02d7f45dcacc192b40e725d6f6e77ec64e202c7a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 96257c41d..b5858e711 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23578.3 @@ -70,8 +70,8 @@ 7.0.312 - 7.0.312-servicing.23578.4 - 7.0.312-servicing.23578.4 + 7.0.312-servicing.23579.10 + 7.0.312-servicing.23579.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.15-servicing.23573.2 - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23579.2 + 7.0.15-servicing.23579.2 7.0.15 7.0.15 From 3c375371e94111e8ca72395e195c0b24f19e23fe Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 09:16:27 -0800 Subject: [PATCH 579/654] Update to source-build-externals 203140 --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dafb4b3c..d2b434cf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - - https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 From a36d95f8809690ca0f0d7bcec7d4da89e313eb85 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 29 Nov 2023 22:28:51 +0000 Subject: [PATCH 580/654] Merged PR 35684: Update source build externals and add internal auth - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. --- eng/Version.Details.xml | 4 ++-- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2b434cf4..0fad8e220 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 + badf0ef1064642a3047b9b720ddfec2113ffae99 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index dc33e0a03..0a9a2ddc0 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,8 +172,9 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> + Date: Thu, 30 Nov 2023 17:42:52 +0000 Subject: [PATCH 581/654] Update dependencies from https://github.com/dotnet/arcade build 20231130.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23564.5 -> To Version 7.0.0-beta.23580.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/post-build/common-variables.yml | 2 +- global.json | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e86c9c4ef..d2ead3a98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3012a3afa..b2a622e42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23564.5 + 7.0.0-beta.23580.4 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..8fda30bdc 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 84c1d0cc2..c305ae6bd 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d95792..49938f0c8 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518a..ac9a95778 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index c5fedd7f7..e8c6c2d09 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -87,7 +87,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb5..8dd2d355f 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 776bd9700..b504fe55c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -10,7 +10,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/global.json b/global.json index 154f5f035..d3f802679 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.23564.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23564.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23580.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23580.4" } } From 50ea9382a0cc905af05d79527580dc2a602b3f40 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 1 Dec 2023 20:00:07 +0000 Subject: [PATCH 582/654] Merged PR 35748: Update SBE for IdentityModel 6.35.0 - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Update SBE for IdentityModel 6.35.0 --- 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 02e1c50cd..4c531da6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - badf0ef1064642a3047b9b720ddfec2113ffae99 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From 059cd2aa3bb714bd4934b23f3eedc4564815ecce Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 21:52:43 +0000 Subject: [PATCH 583/654] Merged PR 35764: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.15 to 7.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20231201.26 - **Date Produced**: December 1, 2023 9:22:43 PM UTC - **Commit**: a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.312 to 7.0.312][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.312-servicing.23579.10 to 7.0.312-servicing.23601.26][1] - **Microsoft.NET.Sdk**: [from 7.0.312-servicing.23579.10 to 7.0.312-servicing.23601.26][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.312-servicing.23579.10 to 7.0.312-servicing.23601.26][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.15 to 7.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.15 to 7.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-dev-certs**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-user-jwts**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-user-secrets**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4e72473553&targetVersion=GCa87e751ac0... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 529a9110e..2102f9bcf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c531da6e..9a29a0c14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c diff --git a/eng/Versions.props b/eng/Versions.props index aa9d370e1..2db776d1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 0.2.0 @@ -70,8 +70,8 @@ 7.0.312 - 7.0.312-servicing.23579.10 - 7.0.312-servicing.23579.10 + 7.0.312-servicing.23601.26 + 7.0.312-servicing.23601.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fe9a639fb4b4509617a59f0d44a384478c5638fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 17:39:53 +0000 Subject: [PATCH 584/654] [release/7.0.3xx] Update dependencies from dotnet/arcade (#18012) [release/7.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- global.json | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2ead3a98..6cc0c1769 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b2a622e42..a82728ae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23580.4 + 7.0.0-beta.23620.3 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index ef337eac5..11c345c58 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -124,7 +124,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index e8c6c2d09..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index c051f1b65..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 @@ -272,7 +272,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/global.json b/global.json index d3f802679..73ab36895 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.23580.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23580.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" } } From 9a55503c824a8bca5589fb75188cafc41b0d1961 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:58:04 -0800 Subject: [PATCH 585/654] Update branding to 7.0.313 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a82728ae8..95123c15c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 12 + 13 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From a30a69fea1834bc988cedd1a5577e6773e0833c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 19:50:00 +0000 Subject: [PATCH 586/654] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.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 6cc0c1769..0c9f7c70d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From 3168133a01772e53f66b7748511b284b950df57d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 20:42:39 +0000 Subject: [PATCH 587/654] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.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 0c9f7c70d..e36277abf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - d6ad546c83ce94b3efb4662513bed71a3e6192ef + 4bed7bdd937666fac4c4f351b9b02adddf8d035b From 8e1ac043f8b4472ab7d95491d72003f3427abb9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:29:19 +0000 Subject: [PATCH 588/654] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23578.1 -> To Version 7.0.0-alpha.1.24059.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 6cc0c1769..b9d31b0bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/source-build-reference-packages - 6d5841c05f04d60eccf3358588b8c8968215d9e2 + 727ef4887d561dae6069d6b9c035773013dad041 From c5024f481376f38a4b480409e908feb600706b77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:53:37 +0000 Subject: [PATCH 589/654] Update dependencies from https://github.com/dotnet/arcade build 20240109.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23620.3 -> To Version 7.0.0-beta.24059.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cc0c1769..7a1d9e0d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 95123c15c..36c28d660 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23620.3 + 7.0.0-beta.24059.5 diff --git a/global.json b/global.json index 73ab36895..fd9164f9a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.113", + "dotnet": "7.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" } } From 48bc53793dab3cc1b9a911044ab90117d858a4ae Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 10 Jan 2024 08:47:54 -0600 Subject: [PATCH 590/654] Revert change for internal update --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 0a9a2ddc0..dc33e0a03 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,9 +172,8 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> - Date: Thu, 11 Jan 2024 20:17:01 +0000 Subject: [PATCH 591/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.312 -> To Version 7.0.313 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++++++---- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 3 files changed, 59 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2102f9bcf..fb6caa493 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,23 @@ - + + + + + - + - + @@ -44,15 +48,17 @@ - + + + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b80909b84..408592dd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 02d7f45dcacc192b40e725d6f6e77ec64e202c7a + 963a6a55dd6f72f604651fff7c1515dadcd37a39 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e2302f9ba..e6fe2f142 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23578.3 + 7.0.16-servicing.24060.7 @@ -56,22 +56,22 @@ - 7.0.15 - 7.0.15 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 + 7.0.16 + 7.0.16 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 0.2.0 - 7.0.312 - 7.0.312-servicing.23601.26 - 7.0.312-servicing.23601.26 + 7.0.313 + 7.0.313-servicing.24061.13 + 7.0.313-servicing.24061.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,10 +96,10 @@ - 7.0.15-servicing.23579.2 - 7.0.15-servicing.23579.2 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24060.13 + 7.0.16-servicing.24060.13 + 7.0.16 + 7.0.16 From fe5615852fd139d06ef3a3813e0e3d818e2a2e62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:03:46 -0800 Subject: [PATCH 592/654] [release/7.0.3xx] Update dependencies from dotnet/arcade (#18218) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2102f9bcf..280601a1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,26 @@ - + + + + + + + + @@ -44,14 +51,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b80909b84..bdd15b788 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e2302f9ba..fea881a17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24059.5 + 7.0.0-beta.24061.2 diff --git a/global.json b/global.json index fd9164f9a..45f2ad15f 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.24059.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24061.2" } } From 91c1a15716e1184388fa121e6473cd501dee0487 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 22:33:06 +0000 Subject: [PATCH 593/654] [release/7.0.3xx] Update dependencies from dotnet/arcade (#18262) [release/7.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 4 ++-- 5 files changed, 10 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 280601a1f..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,24 +12,12 @@ - - - - - - - - - - - - @@ -53,18 +41,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bdd15b788..73ed55f61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index fea881a17..099155591 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24061.2 + 7.0.0-beta.24065.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f13b74080..81ea06151 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index 45f2ad15f..30aff2051 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.24061.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24061.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4" } } From fa2462ce4ee7d7715b27b7280d7639d8b4081654 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:23:38 +0000 Subject: [PATCH 594/654] Merged PR 36620: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.15-servicing.23573.3 to 7.0.16-servicing.24060.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.16-servicing.24060.7 to 7.0.16-servicing.24060.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **NuGet.Build.Tasks**: from 6.6.0-rc.66 to 6.6.2-rc.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Mic... --- NuGet.config | 24 ++++------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++--------- 3 files changed, 75 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index fb6caa493..6f5b3eb00 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,23 +10,19 @@ - + - - - + - - - + - + - + @@ -48,17 +44,15 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 408592dd6..4743d6d1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1d272c1ef7277b7cc38148300732e6a72848bedc + b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 963a6a55dd6f72f604651fff7c1515dadcd37a39 + b05bc3d0cf33b94b37f8dec5d6b2829d508209eb https://github.com/dotnet/fsharp @@ -158,22 +158,22 @@ 2679cf5a9cbd13e6833ca8a59553716f3f2f2afa - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a + 07cf447d8f8b3d6b9e7bf641ab8ec7de966b1254 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index e6fe2f142..0d5bcdc87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23573.3 + 7.0.16-servicing.24060.7 - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24060.16 @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 0.2.0 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24061.13 - 7.0.313-servicing.24061.13 + 7.0.313-servicing.24068.18 + 7.0.313-servicing.24068.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,18 +86,18 @@ - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 - 7.0.15 - 7.0.15 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 + 7.0.16 + 7.0.16 + 7.0.16 + 7.0.16 2.1.0 - 7.0.16-servicing.24060.13 - 7.0.16-servicing.24060.13 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 7.0.16 7.0.16 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.15 - 7.0.15 + 7.0.16 + 7.0.16 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 0567446bee7ababba20744e3e1fa473c5c474762 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 23:41:02 +0000 Subject: [PATCH 595/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6f5b3eb00..07444b91d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4743d6d1f..38a0c4a79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 + 3d504675f930028236a0f09e47c900ad48bd3d6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b05bc3d0cf33b94b37f8dec5d6b2829d508209eb + 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0d5bcdc87..82de004e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24067.11 - 7.0.16-servicing.24060.16 + 7.0.16-servicing.24068.4 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.18 - 7.0.313-servicing.24068.18 + 7.0.313-servicing.24068.44 + 7.0.313-servicing.24068.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24068.4 + 7.0.16-servicing.24068.4 7.0.16 7.0.16 From 3bd45e79833ff0f4a17dad1295fb7dd036f55a94 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 01:37:57 +0000 Subject: [PATCH 596/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.58 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07444b91d..50c222de8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38a0c4a79..4496a1dc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 diff --git a/eng/Versions.props b/eng/Versions.props index 82de004e9..bbf9116cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.44 - 7.0.313-servicing.24068.44 + 7.0.313-servicing.24068.58 + 7.0.313-servicing.24068.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From da8e258b32b9c95aaf26f3f212b1a617d9929475 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 02:55:00 +0000 Subject: [PATCH 597/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.62 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 50c222de8..5549476fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4496a1dc6..e150f5306 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d diff --git a/eng/Versions.props b/eng/Versions.props index bbf9116cc..057dc7835 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.58 - 7.0.313-servicing.24068.58 + 7.0.313-servicing.24068.62 + 7.0.313-servicing.24068.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dd89f67b3269985002ccd1a77cc92c6638843478 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 18:36:49 +0000 Subject: [PATCH 598/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 Dependency coherency updates 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 From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5549476fc..1b1c47835 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23e106392..335b739c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 diff --git a/eng/Versions.props b/eng/Versions.props index 25873eb66..8c83c5c71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 0.2.0 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.62 - 7.0.313-servicing.24068.62 + 7.0.313-servicing.24069.10 + 7.0.313-servicing.24069.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a6060b24f354d352343c704e3118c0ad3000d1a7 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:22:53 -0800 Subject: [PATCH 599/654] Update branding to 7.0.314 (#18530) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e2e98877f..e5f1dc724 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 13 + 14 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 8ed51e2c1922eae6c54254d7197525bb812bd3c7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 6 Feb 2024 23:17:03 +0000 Subject: [PATCH 600/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b1c47835..759fbe1dd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,26 @@ + + + + + + - + + + @@ -44,14 +52,20 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 335b739c9..f9f1381c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e526ba29cdfac238c7dc40905b855b2ddc7d9d77 + 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e526ba29cdfac238c7dc40905b855b2ddc7d9d77 + 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e526ba29cdfac238c7dc40905b855b2ddc7d9d77 + 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e526ba29cdfac238c7dc40905b855b2ddc7d9d77 + 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 diff --git a/eng/Versions.props b/eng/Versions.props index fbfc34844..8a2f1854b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.313 - 7.0.313-servicing.24069.10 - 7.0.313-servicing.24069.10 + 7.0.314 + 7.0.314-servicing.24106.15 + 7.0.314-servicing.24106.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f7f55356b3ba70107e079405017d4313a6f5460a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Feb 2024 06:52:51 +0000 Subject: [PATCH 601/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.50 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 759fbe1dd..5dcb94172 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9f1381c6..8b2e6c813 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 + 1c59c729a144b86e3e781bef41d7e8b33f24caeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 + 1c59c729a144b86e3e781bef41d7e8b33f24caeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 + 1c59c729a144b86e3e781bef41d7e8b33f24caeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 + 1c59c729a144b86e3e781bef41d7e8b33f24caeb diff --git a/eng/Versions.props b/eng/Versions.props index 8a2f1854b..734b8376e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24106.15 - 7.0.314-servicing.24106.15 + 7.0.314-servicing.24106.50 + 7.0.314-servicing.24106.50 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 331c3a1909fa9415b023b44626bd5f7d4f0575f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 09:43:10 -0800 Subject: [PATCH 602/654] [release/7.0.3xx] Update WiX to latest release (#18601) Co-authored-by: Jacques Eloff --- eng/Versions.props | 3 ++- src/finalizer_shim/finalizer_shim.csproj | 3 ++- src/redist/targets/GenerateMSIs.targets | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e5f1dc724..d40ea3bdc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,7 +145,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548..e6cd301f7 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 527bc988c..495a51be3 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -11,7 +11,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From cb33239406eead37662f9901566f10eb0bc856df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:05:05 +0000 Subject: [PATCH 603/654] Update dependencies from https://github.com/dotnet/arcade build 20240214.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73ed55f61..66894993a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d40ea3bdc..3ed4b96cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24065.4 + 7.0.0-beta.24114.2 diff --git a/global.json b/global.json index 30aff2051..126e99650 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115", + "dotnet": "7.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.2" } } From 5f3a79178154a4a4348333c7fa38053edca8c6fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:07:13 +0000 Subject: [PATCH 604/654] Update dependencies from https://github.com/dotnet/arcade build 20240214.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2 From 932aab20dc43cd2437c36cb8c5c5fc957a7c06ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 15:59:14 +0000 Subject: [PATCH 605/654] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.4 --- 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 66894993a..a34794467 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3ed4b96cf..551034699 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.2 + 7.0.0-beta.24114.4 diff --git a/global.json b/global.json index 126e99650..5d42d1e74 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.24114.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" } } From bf88ec8a077abe4ded4f98f4b24e26704fd8e404 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 17:00:13 +0000 Subject: [PATCH 606/654] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.4 From 25f8bbf23092ef115872f11099598860d31064c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 15 Feb 2024 19:28:47 +0000 Subject: [PATCH 607/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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,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.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++--------- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++---------- 3 files changed, 61 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5dcb94172..65a0c72c2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,22 +10,16 @@ - - - + - - - + - - - + - + @@ -52,16 +46,12 @@ - - - + - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b2e6c813..9886560b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c59c729a144b86e3e781bef41d7e8b33f24caeb + 3c97a213ba0920a5dcb277d4c0482564d9ee7783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c59c729a144b86e3e781bef41d7e8b33f24caeb + 3c97a213ba0920a5dcb277d4c0482564d9ee7783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c59c729a144b86e3e781bef41d7e8b33f24caeb + 3c97a213ba0920a5dcb277d4c0482564d9ee7783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c59c729a144b86e3e781bef41d7e8b33f24caeb + 3c97a213ba0920a5dcb277d4c0482564d9ee7783 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 734b8376e..4e6dca7e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,13 +56,13 @@ - 7.0.16 - 7.0.16 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 + 7.0.17 + 7.0.17 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24106.50 - 7.0.314-servicing.24106.50 + 7.0.314-servicing.24115.27 + 7.0.314-servicing.24115.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,12 +86,12 @@ - 7.0.16-servicing.24066.29 - 7.0.16-servicing.24066.29 - 7.0.16 - 7.0.16 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24114.21 + 7.0.17-servicing.24114.21 + 7.0.17 + 7.0.17 + 7.0.17 + 7.0.17 2.1.0 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.16 - 7.0.16 + 7.0.17 + 7.0.17 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 498860c3467dd98db937e2f141ab2608a3fc0201 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 04:31:50 +0000 Subject: [PATCH 608/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.62 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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,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.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 65a0c72c2..2b3efcde7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9886560b2..a7e4ff451 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c97a213ba0920a5dcb277d4c0482564d9ee7783 + 8abbc186d03b1f1d96a40e4410f4d45744421e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c97a213ba0920a5dcb277d4c0482564d9ee7783 + 8abbc186d03b1f1d96a40e4410f4d45744421e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c97a213ba0920a5dcb277d4c0482564d9ee7783 + 8abbc186d03b1f1d96a40e4410f4d45744421e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c97a213ba0920a5dcb277d4c0482564d9ee7783 + 8abbc186d03b1f1d96a40e4410f4d45744421e23 diff --git a/eng/Versions.props b/eng/Versions.props index 4e6dca7e8..a4de145f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24115.27 - 7.0.314-servicing.24115.27 + 7.0.314-servicing.24115.62 + 7.0.314-servicing.24115.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3772ddc3aa828452a9503b01d95218f98aa61dbc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 06:38:43 +0000 Subject: [PATCH 609/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.73 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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,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.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2b3efcde7..13ed5dc24 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7e4ff451..dec7d7a4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8abbc186d03b1f1d96a40e4410f4d45744421e23 + 1b8dad6090439c845af7b824a639776d8cb6ebe0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8abbc186d03b1f1d96a40e4410f4d45744421e23 + 1b8dad6090439c845af7b824a639776d8cb6ebe0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8abbc186d03b1f1d96a40e4410f4d45744421e23 + 1b8dad6090439c845af7b824a639776d8cb6ebe0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8abbc186d03b1f1d96a40e4410f4d45744421e23 + 1b8dad6090439c845af7b824a639776d8cb6ebe0 diff --git a/eng/Versions.props b/eng/Versions.props index a4de145f0..774d72a74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24115.62 - 7.0.314-servicing.24115.62 + 7.0.314-servicing.24115.73 + 7.0.314-servicing.24115.73 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2b39998aead28fe77e4ddef17d194fe153eb3c51 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 20:12:22 +0000 Subject: [PATCH 610/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.314 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 +++++------ eng/Version.Details.xml | 78 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- 3 files changed, 62 insertions(+), 66 deletions(-) diff --git a/NuGet.config b/NuGet.config index 13ed5dc24..dbf1bdff6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,21 +10,19 @@ - + - + - + - - - + @@ -46,17 +44,15 @@ - + - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d05fd7abf..bb07d940e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b8dad6090439c845af7b824a639776d8cb6ebe0 + 38ea0239126356c96ddea4a29cb6dce03c6c8749 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b8dad6090439c845af7b824a639776d8cb6ebe0 + 38ea0239126356c96ddea4a29cb6dce03c6c8749 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b8dad6090439c845af7b824a639776d8cb6ebe0 + 38ea0239126356c96ddea4a29cb6dce03c6c8749 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b8dad6090439c845af7b824a639776d8cb6ebe0 + 38ea0239126356c96ddea4a29cb6dce03c6c8749 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3d504675f930028236a0f09e47c900ad48bd3d6e + fcbb04f265a8923c27ad55eaa51b1913b5db732e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb + 0b58a4b68b566568e74d51a6999f71108ff71f05 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e55b66af3..2981ec960 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24067.11 + 7.0.17-servicing.24115.10 - 7.0.16-servicing.24068.4 + 7.0.17-servicing.24115.3 @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 0.2.0 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24115.73 - 7.0.314-servicing.24115.73 + 7.0.314-servicing.24116.15 + 7.0.314-servicing.24116.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.17-servicing.24114.21 - 7.0.17-servicing.24114.21 + 7.0.17-servicing.24115.8 + 7.0.17-servicing.24115.8 7.0.17 7.0.17 7.0.17 @@ -96,10 +96,10 @@ - 7.0.16-servicing.24068.4 - 7.0.16-servicing.24068.4 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24115.4 + 7.0.17-servicing.24115.4 + 7.0.17 + 7.0.17 From 1a8e33984f500c5fd3c193d1ead5e6663ed2fd72 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 22:40:49 +0000 Subject: [PATCH 611/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.52 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.314 Dependency coherency updates 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 From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index dbf1bdff6..74b26ceb3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb07d940e..c9e046c4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38ea0239126356c96ddea4a29cb6dce03c6c8749 + c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38ea0239126356c96ddea4a29cb6dce03c6c8749 + c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38ea0239126356c96ddea4a29cb6dce03c6c8749 + c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38ea0239126356c96ddea4a29cb6dce03c6c8749 + c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 diff --git a/eng/Versions.props b/eng/Versions.props index 2981ec960..440507fea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 0.2.0 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24116.15 - 7.0.314-servicing.24116.15 + 7.0.314-servicing.24116.52 + 7.0.314-servicing.24116.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e8f7dba2626884fe02e61767c6401805a8f19ab8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:42:36 +0000 Subject: [PATCH 612/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.75 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.314 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 74b26ceb3..5583964f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9e046c4b..2301d1b57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 + 2a68379878acca145d5ad15e6624604f7d71df0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 + 2a68379878acca145d5ad15e6624604f7d71df0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 + 2a68379878acca145d5ad15e6624604f7d71df0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 + 2a68379878acca145d5ad15e6624604f7d71df0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fcbb04f265a8923c27ad55eaa51b1913b5db732e + a21b74e7f5e96ccb8d95dcde605669feb30f6c5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0b58a4b68b566568e74d51a6999f71108ff71f05 + 6b9b816bff16a1b507019fe6313b6baecb83b580 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 440507fea..579355226 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.17-servicing.24115.10 + 7.0.17-servicing.24116.2 - 7.0.17-servicing.24115.3 + 7.0.17-servicing.24116.10 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24116.52 - 7.0.314-servicing.24116.52 + 7.0.314-servicing.24116.75 + 7.0.314-servicing.24116.75 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.17-servicing.24115.4 - 7.0.17-servicing.24115.4 + 7.0.17-servicing.24116.11 + 7.0.17-servicing.24116.11 7.0.17 7.0.17 From 3698cb9b014d3e5b53bec3bd2ffcfc29955f6d33 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 01:50:54 +0000 Subject: [PATCH 613/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.90 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.314 Dependency coherency updates 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 From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5583964f5..b8a810353 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2301d1b57..fb72029e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a68379878acca145d5ad15e6624604f7d71df0e + 29d5d9072f662512c5d5a76f6595ea559846aa7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a68379878acca145d5ad15e6624604f7d71df0e + 29d5d9072f662512c5d5a76f6595ea559846aa7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a68379878acca145d5ad15e6624604f7d71df0e + 29d5d9072f662512c5d5a76f6595ea559846aa7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a68379878acca145d5ad15e6624604f7d71df0e + 29d5d9072f662512c5d5a76f6595ea559846aa7c diff --git a/eng/Versions.props b/eng/Versions.props index 579355226..8e2578fbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24116.75 - 7.0.314-servicing.24116.75 + 7.0.314-servicing.24116.90 + 7.0.314-servicing.24116.90 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f33042e2676e1a4c0e469694351ce84592991e09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:56:40 -0600 Subject: [PATCH 614/654] [release/7.0.3xx] Update dependencies from dotnet/source-build-reference-packages (#18734) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 9 --------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b1c47835..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,14 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57c1640f8..f3987a3c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/source-build-reference-packages - 727ef4887d561dae6069d6b9c035773013dad041 + c74756071d00a51bcd35510900719148b4182f34 From 4283e1fa5eff58f56b8899bc334ece0fcb372fd6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 02:44:31 +0000 Subject: [PATCH 615/654] Update dependencies from https://github.com/dotnet/arcade build 20240229.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24129.3 --- 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 f3987a3c4..447a02b4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index cec0d27c6..4adb975b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.4 + 7.0.0-beta.24129.3 diff --git a/global.json b/global.json index 5d42d1e74..562fedb86 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.24114.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.3" } } From f08697a21d4fdf886f3104009e942d6894d7fb4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 17:14:02 +0000 Subject: [PATCH 616/654] Update dependencies from https://github.com/dotnet/arcade build 20240229.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24129.5 --- 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 447a02b4e..afe963cbf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 4adb975b7..82d00e4a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24129.3 + 7.0.0-beta.24129.5 diff --git a/global.json b/global.json index 562fedb86..13804ed82 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.24129.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.5" } } From f6ef7ba8a7501f4f55e601d60bb50c6888ee3433 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:19 -0800 Subject: [PATCH 617/654] Update branding to 7.0.315 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index cec0d27c6..244192310 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 14 + 15 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 76ef86f8fbf5fb4d41538f6b527f69edea8a3e7f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 5 Mar 2024 23:24:40 +0000 Subject: [PATCH 618/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240305.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.315 --- NuGet.config | 25 +++++++++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index b8a810353..f217d26f2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,31 @@ + + + + + + + + + - + + + + @@ -45,13 +57,22 @@ + + + + + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb72029e8..8127102ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29d5d9072f662512c5d5a76f6595ea559846aa7c + 4ed4dbfbbf641b30672a80867c0187a11e9ba41b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29d5d9072f662512c5d5a76f6595ea559846aa7c + 4ed4dbfbbf641b30672a80867c0187a11e9ba41b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29d5d9072f662512c5d5a76f6595ea559846aa7c + 4ed4dbfbbf641b30672a80867c0187a11e9ba41b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29d5d9072f662512c5d5a76f6595ea559846aa7c + 4ed4dbfbbf641b30672a80867c0187a11e9ba41b diff --git a/eng/Versions.props b/eng/Versions.props index 8e2578fbf..900282fb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.314 - 7.0.314-servicing.24116.90 - 7.0.314-servicing.24116.90 + 7.0.315 + 7.0.315-servicing.24155.13 + 7.0.315-servicing.24155.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eb3b53bb68533e8f6313ff28664b265818981d31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 22:39:07 +0000 Subject: [PATCH 619/654] Update dependencies from https://github.com/dotnet/arcade build 20240305.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24129.5 -> To Version 7.0.0-beta.24155.3 --- 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 afe963cbf..e0f598088 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9fdfae5e8..373df2b74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24129.5 + 7.0.0-beta.24155.3 diff --git a/global.json b/global.json index 13804ed82..3d1e691f2 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.24129.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24155.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24155.3" } } From 4d50dca68fce99097266478c0c1c24b7cf489020 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 23:18:49 +0000 Subject: [PATCH 620/654] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4 --- 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 e0f598088..aea7d5d3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 4bed7bdd937666fac4c4f351b9b02adddf8d035b + beb06e4f3aa045bddf4082111fcf005f80ca9fa6 From 44583e7face27afbec31cf74ea6aed3c075fc40e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 01:36:33 +0000 Subject: [PATCH 621/654] Update dependencies from https://github.com/dotnet/arcade build 20240310.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24155.3 -> To Version 7.0.0-beta.24160.1 --- 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 e0f598088..b5487d42c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 373df2b74..3cd2b7e73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24155.3 + 7.0.0-beta.24160.1 diff --git a/global.json b/global.json index 3d1e691f2..58e631be4 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.24155.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24155.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24160.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24160.1" } } From 279ee7d5041ecc467272815ff8dbeae50930d1b8 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:19:06 -0700 Subject: [PATCH 622/654] [release/7.0.3xx] Add -pr version of pipeline --- .vsts-pr.yml | 394 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 394 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000..5e2cdc745 --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,394 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/3.* + - internal/release/5.* + - internal/release/6.* + - internal/release/7.* + +variables: +- name: _PublishUsingPipelines + value: false +- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: + - name: PostBuildSign + value: false +- ${{ else }}: + - name: PostBuildSign + value: true +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true + - group: DotNet-DotNetCli-Storage + - group: DotNet-Installer-SDLValidation-Params + - name: _PublishUsingPipelines + value: true + +# Default to running tests in PRs and public CI, but not in official builds +- name: _WindowsTestArg + value: '-test' +- name: _NonWindowsTestArg + value: '--test' +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _WindowsTestArg + value: '' + - name: _NonWindowsTestArg + value: '' + +- name: _InternalRuntimeDownloadArgs + value: '' + +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBuilds storage account read tokens + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) + +stages: +- stage: build + jobs: + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish Build Config + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_36_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.36' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Darwin + pool: + vmImage: 'macOS-latest' + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/common/templates/jobs/source-build.yml + + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + + # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball + + # https://github.com/dotnet/core-sdk/issues/248 + # - template: /eng/build.yml + # parameters: + # agentOs: FreeBSD + # queue: + # name: dnceng-freebsd-internal + # timeoutInMinutes: 180 + # matrix: + # Build_Release: + # _BuildConfig: Release + # _BuildArchitecture: 'x64' + # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2017.amd64 + + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: eng\common\templates\post-build\post-build.yml + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' From 1267eea058f9b9ef2d2913aa2abfe83731630557 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 15:56:12 +0000 Subject: [PATCH 623/654] Update dependencies from https://github.com/dotnet/source-build-externals build 20240312.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24158.4 -> To Version 7.0.0-alpha.1.24162.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 4d4f1da15..d5ae4cda8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - beb06e4f3aa045bddf4082111fcf005f80ca9fa6 + 936411dd5d047cef6674b47872104a3a59cf5754 From 1fbb0569de463849d7131206953e33fccdd46790 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 09:51:06 -0700 Subject: [PATCH 624/654] Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship --- eng/Versions.props | 7 ++++++- src/core-sdk-tasks/core-sdk-tasks.csproj | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3cd2b7e73..d82100764 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,12 @@ - 5.8.0 + 6.0.6-rc.4 + $(NuGetBuildTasksPackageVersion) + + + + 17.0.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5ad1f11af..f92da6189 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -9,12 +9,12 @@ - - + + - + From bd48163a324ebbd8cf1b2843e89cd63435a50522 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 12:49:25 -0700 Subject: [PATCH 625/654] Update to the 7.0.3xx versions --- eng/Versions.props | 4 ++-- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d82100764..66d18ca2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,12 +111,12 @@ - 6.0.6-rc.4 + 6.6.2-rc.1 $(NuGetBuildTasksPackageVersion) - 17.0.1 + 17.6.10 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index f92da6189..d9cdc0381 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -14,7 +14,7 @@ - + From f7b0d3f086aa9443ed8b04600fe693ec55838e8e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 21:21:28 +0000 Subject: [PATCH 626/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240312.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.315 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index f217d26f2..d2d0a5e4e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -67,7 +67,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8127102ae..2c7c72554 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4ed4dbfbbf641b30672a80867c0187a11e9ba41b + 61251c4f561e00d96db912fb6706ead4a79df08a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4ed4dbfbbf641b30672a80867c0187a11e9ba41b + 61251c4f561e00d96db912fb6706ead4a79df08a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4ed4dbfbbf641b30672a80867c0187a11e9ba41b + 61251c4f561e00d96db912fb6706ead4a79df08a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4ed4dbfbbf641b30672a80867c0187a11e9ba41b + 61251c4f561e00d96db912fb6706ead4a79df08a diff --git a/eng/Versions.props b/eng/Versions.props index 900282fb9..139693661 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.315 - 7.0.315-servicing.24155.13 - 7.0.315-servicing.24155.13 + 7.0.315-servicing.24162.24 + 7.0.315-servicing.24162.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3186053058224ac1c9fa65194d5a67da36160987 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 22:24:13 +0000 Subject: [PATCH 627/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240312.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.315 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index d2d0a5e4e..f3c976dbb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -67,7 +67,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c7c72554..5fef47685 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61251c4f561e00d96db912fb6706ead4a79df08a + 99bc1bdd006b22cc58af583529536b7ef292ae79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61251c4f561e00d96db912fb6706ead4a79df08a + 99bc1bdd006b22cc58af583529536b7ef292ae79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61251c4f561e00d96db912fb6706ead4a79df08a + 99bc1bdd006b22cc58af583529536b7ef292ae79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61251c4f561e00d96db912fb6706ead4a79df08a + 99bc1bdd006b22cc58af583529536b7ef292ae79 diff --git a/eng/Versions.props b/eng/Versions.props index 139693661..9650f09df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.315 - 7.0.315-servicing.24162.24 - 7.0.315-servicing.24162.24 + 7.0.315-servicing.24162.38 + 7.0.315-servicing.24162.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e1d9d7960ca67613261eac59d79ab0fb061625a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Mar 2024 08:26:35 +0000 Subject: [PATCH 628/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240313.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.315 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3c976dbb..e4c4eac3b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -67,7 +67,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fef47685..dd693fa00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99bc1bdd006b22cc58af583529536b7ef292ae79 + 2bf6302a18cea28ce0267f90fb8308a4b29034f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99bc1bdd006b22cc58af583529536b7ef292ae79 + 2bf6302a18cea28ce0267f90fb8308a4b29034f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99bc1bdd006b22cc58af583529536b7ef292ae79 + 2bf6302a18cea28ce0267f90fb8308a4b29034f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99bc1bdd006b22cc58af583529536b7ef292ae79 + 2bf6302a18cea28ce0267f90fb8308a4b29034f9 diff --git a/eng/Versions.props b/eng/Versions.props index 9650f09df..5d82d1531 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.315 - 7.0.315-servicing.24162.38 - 7.0.315-servicing.24162.38 + 7.0.315-servicing.24163.2 + 7.0.315-servicing.24163.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 030c98d9e1af80c4fedc5d7969919993704bc34d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 05:58:34 +0000 Subject: [PATCH 629/654] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24160.1 -> To Version 7.0.0-beta.24163.12 --- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +++++++++---------- eng/common/post-build/publish-using-darc.ps1 | 4 +-- .../templates/job/publish-build-assets.yml | 8 +++--- eng/common/templates/jobs/jobs.yml | 4 +-- .../templates/post-build/post-build.yml | 12 ++++----- global.json | 6 ++--- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5ae4cda8..0cd3a95c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8d7060124..176f1fb7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24160.1 + 7.0.0-beta.24163.12 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6e9972394..f3dc39a12 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 # Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) @@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern else { Write-Host "Package source $SourceName already present." } - - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } # Add a credential node for the specified source -function AddCredential($creds, $source, $username, $password) { +function AddCredential($creds, $source, $username, $pwd) { # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("key", "ClearTextPassword") $sourceElement.AppendChild($passwordElement) | Out-Null } - $passwordElement.SetAttribute("value", $Password) + + $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." ForEach ($PackageSource in $maestroPrivateSources) { Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd } } @@ -144,13 +144,13 @@ if ($disabledSources -ne $null) { $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password # 3.1 uses a different feed url format so it's handled differently here $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } $dotnetVersions = @('5','6','7') @@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } } -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 127948252..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -92,7 +92,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -101,7 +101,7 @@ jobs: Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - + - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -127,7 +127,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -154,4 +154,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 67a2e2c74..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: enabled: false # Optional: Include toolset dependencies in the generated graph files includeToolset: false - + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job jobs: [] @@ -47,7 +47,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 37bca799a..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -131,8 +131,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -227,9 +227,9 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true diff --git a/global.json b/global.json index 58e631be4..f6f1f44a5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.116", + "dotnet": "7.0.117", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24160.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24160.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24163.12", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24163.12" } } From b34bcf78d6762a221c42c123d582aeb522301b36 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 20:36:10 +0000 Subject: [PATCH 630/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.315 -> To Version 7.0.315 --- NuGet.config | 32 ++------------------------------ eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 39 deletions(-) diff --git a/NuGet.config b/NuGet.config index e4c4eac3b..cedaf8fab 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,31 +10,15 @@ - - - - - - - - - - - - - + - - - - @@ -56,24 +40,12 @@ - - - - - - - - - + - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58efe5390..0851c596d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2bf6302a18cea28ce0267f90fb8308a4b29034f9 + 368c2ecb23c44df979a5512c450ccb6ebaf06266 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2bf6302a18cea28ce0267f90fb8308a4b29034f9 + 368c2ecb23c44df979a5512c450ccb6ebaf06266 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2bf6302a18cea28ce0267f90fb8308a4b29034f9 + 368c2ecb23c44df979a5512c450ccb6ebaf06266 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2bf6302a18cea28ce0267f90fb8308a4b29034f9 + 368c2ecb23c44df979a5512c450ccb6ebaf06266 diff --git a/eng/Versions.props b/eng/Versions.props index 1aad64407..0c5388bcf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.315 - 7.0.315-servicing.24163.2 - 7.0.315-servicing.24163.2 + 7.0.315-servicing.24164.26 + 7.0.315-servicing.24164.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 814a3c1a615c3f31bac3f37db83e00d632a738c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 21:35:22 +0000 Subject: [PATCH 631/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.315 -> To Version 7.0.315 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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,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.17 -> To Version 7.0.18 (parent: Microsoft.NET.Sdk --- NuGet.config | 9 +++-- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++---------- 3 files changed, 61 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index cedaf8fab..7395ebaf9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,13 +10,16 @@ + + + - + @@ -40,10 +43,12 @@ + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0851c596d..fa4391dcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dff486f2d78d3f932d0f9bfa38043f85e358fb8c + e963835596dce0e4258709f53167661b91728a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dff486f2d78d3f932d0f9bfa38043f85e358fb8c + e963835596dce0e4258709f53167661b91728a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dff486f2d78d3f932d0f9bfa38043f85e358fb8c + e963835596dce0e4258709f53167661b91728a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dff486f2d78d3f932d0f9bfa38043f85e358fb8c + e963835596dce0e4258709f53167661b91728a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dff486f2d78d3f932d0f9bfa38043f85e358fb8c + e963835596dce0e4258709f53167661b91728a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dff486f2d78d3f932d0f9bfa38043f85e358fb8c + e963835596dce0e4258709f53167661b91728a62 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 + 27cdc53a6e3d9ffc52197b69919380cb63f4d88f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 + 27cdc53a6e3d9ffc52197b69919380cb63f4d88f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 + 27cdc53a6e3d9ffc52197b69919380cb63f4d88f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 + 27cdc53a6e3d9ffc52197b69919380cb63f4d88f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 + 27cdc53a6e3d9ffc52197b69919380cb63f4d88f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 + 27cdc53a6e3d9ffc52197b69919380cb63f4d88f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 + 27cdc53a6e3d9ffc52197b69919380cb63f4d88f https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 368c2ecb23c44df979a5512c450ccb6ebaf06266 + 157bbc049f3fc5b1c1807043266dc411930dd181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 368c2ecb23c44df979a5512c450ccb6ebaf06266 + 157bbc049f3fc5b1c1807043266dc411930dd181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 368c2ecb23c44df979a5512c450ccb6ebaf06266 + 157bbc049f3fc5b1c1807043266dc411930dd181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 368c2ecb23c44df979a5512c450ccb6ebaf06266 + 157bbc049f3fc5b1c1807043266dc411930dd181 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ec6dc98ec8a69a8eed65d46fda484669a963626d + c7ba18beef256b26d58783c659f083fe194f0e11 - + https://github.com/dotnet/emsdk - ec6dc98ec8a69a8eed65d46fda484669a963626d + c7ba18beef256b26d58783c659f083fe194f0e11 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 0c5388bcf..29315bb03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,13 +56,13 @@ - 7.0.17 - 7.0.17 - 7.0.17-servicing.24116.13 - 7.0.17-servicing.24116.13 - 7.0.17-servicing.24116.13 - 7.0.17-servicing.24116.13 - 7.0.17-servicing.24116.13 + 7.0.18 + 7.0.18 + 7.0.18-servicing.24168.12 + 7.0.18-servicing.24168.12 + 7.0.18-servicing.24168.12 + 7.0.18-servicing.24168.12 + 7.0.18-servicing.24168.12 0.2.0 @@ -70,8 +70,8 @@ 7.0.315 - 7.0.315-servicing.24164.26 - 7.0.315-servicing.24164.26 + 7.0.315-servicing.24169.26 + 7.0.315-servicing.24169.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,12 +86,12 @@ - 7.0.17-servicing.24115.8 - 7.0.17-servicing.24115.8 - 7.0.17 - 7.0.17 - 7.0.17 - 7.0.17 + 7.0.18-servicing.24163.20 + 7.0.18-servicing.24163.20 + 7.0.18 + 7.0.18 + 7.0.18 + 7.0.18 2.1.0 @@ -238,8 +238,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.17 - 7.0.17 + 7.0.18 + 7.0.18 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 49af6a3e032e13f49a9b74f60603c929dab17fe7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 00:01:56 +0000 Subject: [PATCH 632/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.315 -> To Version 7.0.315 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.17 -> To Version 7.0.18 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7395ebaf9..12049119f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,9 +19,10 @@ - + + @@ -48,9 +49,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa4391dcb..83a4df91a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8e24710202fffe3656e6d26d6a03e53b3de83484 + 769e1471d5b304a50d0dbaa45d9be58c5764d140 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8e24710202fffe3656e6d26d6a03e53b3de83484 + 769e1471d5b304a50d0dbaa45d9be58c5764d140 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8e24710202fffe3656e6d26d6a03e53b3de83484 + 769e1471d5b304a50d0dbaa45d9be58c5764d140 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8e24710202fffe3656e6d26d6a03e53b3de83484 + 769e1471d5b304a50d0dbaa45d9be58c5764d140 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 157bbc049f3fc5b1c1807043266dc411930dd181 + 6d1d38d86a610aef1373541060594bc3751f486e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 157bbc049f3fc5b1c1807043266dc411930dd181 + 6d1d38d86a610aef1373541060594bc3751f486e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 157bbc049f3fc5b1c1807043266dc411930dd181 + 6d1d38d86a610aef1373541060594bc3751f486e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 157bbc049f3fc5b1c1807043266dc411930dd181 + 6d1d38d86a610aef1373541060594bc3751f486e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a21b74e7f5e96ccb8d95dcde605669feb30f6c5b + 825dfb818b455c03681f7215ce60ca304b3456d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6b9b816bff16a1b507019fe6313b6baecb83b580 + 4ee6b308b4cc05cf92d7552cb00f52041a1e4793 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 29315bb03..963fc50fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.17-servicing.24116.2 + 7.0.18-servicing.24164.4 - 7.0.17-servicing.24116.10 + 7.0.18-servicing.24168.10 @@ -70,8 +70,8 @@ 7.0.315 - 7.0.315-servicing.24169.26 - 7.0.315-servicing.24169.26 + 7.0.315-servicing.24169.43 + 7.0.315-servicing.24169.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,10 +96,10 @@ - 7.0.17-servicing.24116.11 - 7.0.17-servicing.24116.11 - 7.0.17 - 7.0.17 + 7.0.18-servicing.24169.11 + 7.0.18-servicing.24169.11 + 7.0.18 + 7.0.18 From 24fe4d74936b94bd5569bc41261fefd670572948 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 01:25:29 +0000 Subject: [PATCH 633/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.315 -> To Version 7.0.315 Dependency coherency updates 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 From Version 7.0.18 -> To Version 7.0.18 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 12049119f..5d45690bf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83a4df91a..74207a099 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27cdc53a6e3d9ffc52197b69919380cb63f4d88f + f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27cdc53a6e3d9ffc52197b69919380cb63f4d88f + f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27cdc53a6e3d9ffc52197b69919380cb63f4d88f + f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27cdc53a6e3d9ffc52197b69919380cb63f4d88f + f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27cdc53a6e3d9ffc52197b69919380cb63f4d88f + f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27cdc53a6e3d9ffc52197b69919380cb63f4d88f + f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27cdc53a6e3d9ffc52197b69919380cb63f4d88f + f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d1d38d86a610aef1373541060594bc3751f486e + 1ef524bf9b94dd66b3cfc5dc86677bc86881e30b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d1d38d86a610aef1373541060594bc3751f486e + 1ef524bf9b94dd66b3cfc5dc86677bc86881e30b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d1d38d86a610aef1373541060594bc3751f486e + 1ef524bf9b94dd66b3cfc5dc86677bc86881e30b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d1d38d86a610aef1373541060594bc3751f486e + 1ef524bf9b94dd66b3cfc5dc86677bc86881e30b diff --git a/eng/Versions.props b/eng/Versions.props index 963fc50fe..5648d6f2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.18 7.0.18 - 7.0.18-servicing.24168.12 - 7.0.18-servicing.24168.12 - 7.0.18-servicing.24168.12 - 7.0.18-servicing.24168.12 - 7.0.18-servicing.24168.12 + 7.0.18-servicing.24169.9 + 7.0.18-servicing.24169.9 + 7.0.18-servicing.24169.9 + 7.0.18-servicing.24169.9 + 7.0.18-servicing.24169.9 0.2.0 @@ -70,8 +70,8 @@ 7.0.315 - 7.0.315-servicing.24169.43 - 7.0.315-servicing.24169.43 + 7.0.315-servicing.24169.56 + 7.0.315-servicing.24169.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9590e19c9326cd67b86f350b383bf3f0e86e152d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 04:43:24 +0000 Subject: [PATCH 634/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.315 -> To Version 7.0.315 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.18 -> To Version 7.0.18 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 8 ++++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5d45690bf..01a9aa327 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,10 +16,10 @@ - + - + @@ -47,9 +47,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74207a099..c47e60923 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 769e1471d5b304a50d0dbaa45d9be58c5764d140 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e963835596dce0e4258709f53167661b91728a62 + 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e963835596dce0e4258709f53167661b91728a62 + 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e963835596dce0e4258709f53167661b91728a62 + 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e963835596dce0e4258709f53167661b91728a62 + 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e963835596dce0e4258709f53167661b91728a62 + 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e963835596dce0e4258709f53167661b91728a62 + 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ef524bf9b94dd66b3cfc5dc86677bc86881e30b + eef38b39d27ad165b613657a7ee961df56da9cdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ef524bf9b94dd66b3cfc5dc86677bc86881e30b + eef38b39d27ad165b613657a7ee961df56da9cdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ef524bf9b94dd66b3cfc5dc86677bc86881e30b + eef38b39d27ad165b613657a7ee961df56da9cdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ef524bf9b94dd66b3cfc5dc86677bc86881e30b + eef38b39d27ad165b613657a7ee961df56da9cdf diff --git a/eng/Versions.props b/eng/Versions.props index 5648d6f2e..a57f10b1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.315 - 7.0.315-servicing.24169.56 - 7.0.315-servicing.24169.56 + 7.0.315-servicing.24169.78 + 7.0.315-servicing.24169.78 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.18-servicing.24163.20 - 7.0.18-servicing.24163.20 + 7.0.18-servicing.24169.14 + 7.0.18-servicing.24169.14 7.0.18 7.0.18 7.0.18 From 3e5229a49bb2b324fc629f0ad46c938a942b6aa2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 19:01:40 +0000 Subject: [PATCH 635/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.315 -> To Version 7.0.315 Dependency coherency updates 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 From Version 7.0.18 -> To Version 7.0.18 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 01a9aa327..0ef65273d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c47e60923..001c71873 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 + f050ae044be8bddc002ab88736e4bf78dc822122 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 + f050ae044be8bddc002ab88736e4bf78dc822122 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 + f050ae044be8bddc002ab88736e4bf78dc822122 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 + f050ae044be8bddc002ab88736e4bf78dc822122 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 + f050ae044be8bddc002ab88736e4bf78dc822122 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 + f050ae044be8bddc002ab88736e4bf78dc822122 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0ffaf8b804ca6ed5b1bba93eacf953a0adc95f5 + f050ae044be8bddc002ab88736e4bf78dc822122 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eef38b39d27ad165b613657a7ee961df56da9cdf + a446a1ac950a30622f3ea9273bd8d0225a82513b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eef38b39d27ad165b613657a7ee961df56da9cdf + a446a1ac950a30622f3ea9273bd8d0225a82513b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eef38b39d27ad165b613657a7ee961df56da9cdf + a446a1ac950a30622f3ea9273bd8d0225a82513b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eef38b39d27ad165b613657a7ee961df56da9cdf + a446a1ac950a30622f3ea9273bd8d0225a82513b diff --git a/eng/Versions.props b/eng/Versions.props index a57f10b1e..a5b135c8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.18 7.0.18 - 7.0.18-servicing.24169.9 - 7.0.18-servicing.24169.9 - 7.0.18-servicing.24169.9 - 7.0.18-servicing.24169.9 - 7.0.18-servicing.24169.9 + 7.0.18-servicing.24169.24 + 7.0.18-servicing.24169.24 + 7.0.18-servicing.24169.24 + 7.0.18-servicing.24169.24 + 7.0.18-servicing.24169.24 0.2.0 @@ -70,8 +70,8 @@ 7.0.315 - 7.0.315-servicing.24169.78 - 7.0.315-servicing.24169.78 + 7.0.315-servicing.24170.5 + 7.0.315-servicing.24170.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0abc758ff20e2367ed7e702f680b59fc72bb7050 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 22:22:59 +0000 Subject: [PATCH 636/654] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.315 -> To Version 7.0.315 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.18 -> To Version 7.0.18 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0ef65273d..d0675ea4f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 001c71873..8de4b16dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 769e1471d5b304a50d0dbaa45d9be58c5764d140 + af494c5c30f33cdb12a68420c4d4a7d791b21ed0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 769e1471d5b304a50d0dbaa45d9be58c5764d140 + af494c5c30f33cdb12a68420c4d4a7d791b21ed0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 769e1471d5b304a50d0dbaa45d9be58c5764d140 + af494c5c30f33cdb12a68420c4d4a7d791b21ed0 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 769e1471d5b304a50d0dbaa45d9be58c5764d140 + af494c5c30f33cdb12a68420c4d4a7d791b21ed0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a446a1ac950a30622f3ea9273bd8d0225a82513b + 391e66d15f8c5cf6e14056a7d3df2671d535b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a446a1ac950a30622f3ea9273bd8d0225a82513b + 391e66d15f8c5cf6e14056a7d3df2671d535b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a446a1ac950a30622f3ea9273bd8d0225a82513b + 391e66d15f8c5cf6e14056a7d3df2671d535b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a446a1ac950a30622f3ea9273bd8d0225a82513b + 391e66d15f8c5cf6e14056a7d3df2671d535b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 825dfb818b455c03681f7215ce60ca304b3456d5 + 1a5db9acafb5677490e44ad00d91cfff0dc11ddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ee6b308b4cc05cf92d7552cb00f52041a1e4793 + 71273b560061b69cef763838282ef085e53a73cb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a5b135c8e..6b7dd0e02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.18-servicing.24164.4 + 7.0.18-servicing.24169.17 - 7.0.18-servicing.24168.10 + 7.0.18-servicing.24169.14 @@ -70,8 +70,8 @@ 7.0.315 - 7.0.315-servicing.24170.5 - 7.0.315-servicing.24170.5 + 7.0.315-servicing.24170.15 + 7.0.315-servicing.24170.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.18-servicing.24169.11 - 7.0.18-servicing.24169.11 + 7.0.18-servicing.24170.3 + 7.0.18-servicing.24170.3 7.0.18 7.0.18 From 6405cddfd4775c91de99c75901ac6b43fd360fc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Mar 2024 22:36:08 +0000 Subject: [PATCH 637/654] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24171.2 --- NuGet.config | 9 - eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 276 +++++++++++++++++ .../templates-official/job/onelocbuild.yml | 112 +++++++ .../job/publish-build-assets.yml | 162 ++++++++++ .../templates-official/job/source-build.yml | 64 ++++ .../job/source-index-stage1.yml | 68 ++++ .../templates-official/jobs/codeql-build.yml | 31 ++ eng/common/templates-official/jobs/jobs.yml | 97 ++++++ .../templates-official/jobs/source-build.yml | 46 +++ .../post-build/common-variables.yml | 25 ++ .../post-build/post-build.yml | 290 ++++++++++++++++++ .../post-build/setup-maestro-vars.yml | 70 +++++ .../post-build/trigger-subscription.yml | 13 + .../steps/add-build-to-channel.yml | 13 + .../steps/component-governance.yml | 10 + .../steps/execute-codeql.yml | 32 ++ .../steps/generate-sbom.yml | 44 +++ .../templates-official/steps/publish-logs.yml | 23 ++ .../templates-official/steps/retain-build.yml | 28 ++ .../steps/send-to-helix.yml | 91 ++++++ .../templates-official/steps/source-build.yml | 108 +++++++ .../variables/sdl-variables.yml | 7 + global.json | 4 +- 25 files changed, 1619 insertions(+), 18 deletions(-) create mode 100644 eng/common/templates-official/job/job.yml create mode 100644 eng/common/templates-official/job/onelocbuild.yml create mode 100644 eng/common/templates-official/job/publish-build-assets.yml create mode 100644 eng/common/templates-official/job/source-build.yml create mode 100644 eng/common/templates-official/job/source-index-stage1.yml create mode 100644 eng/common/templates-official/jobs/codeql-build.yml create mode 100644 eng/common/templates-official/jobs/jobs.yml create mode 100644 eng/common/templates-official/jobs/source-build.yml create mode 100644 eng/common/templates-official/post-build/common-variables.yml create mode 100644 eng/common/templates-official/post-build/post-build.yml create mode 100644 eng/common/templates-official/post-build/setup-maestro-vars.yml create mode 100644 eng/common/templates-official/post-build/trigger-subscription.yml create mode 100644 eng/common/templates-official/steps/add-build-to-channel.yml create mode 100644 eng/common/templates-official/steps/component-governance.yml create mode 100644 eng/common/templates-official/steps/execute-codeql.yml create mode 100644 eng/common/templates-official/steps/generate-sbom.yml create mode 100644 eng/common/templates-official/steps/publish-logs.yml create mode 100644 eng/common/templates-official/steps/retain-build.yml create mode 100644 eng/common/templates-official/steps/send-to-helix.yml create mode 100644 eng/common/templates-official/steps/source-build.yml create mode 100644 eng/common/templates-official/variables/sdl-variables.yml diff --git a/NuGet.config b/NuGet.config index b8a810353..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,14 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 187dfbfe1..0a670fbd7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - bbc75d8a5897763eaf6945c263759930e02dd32b + bc35747acd136d5aca170df4ec527c346db76c8e - + https://github.com/dotnet/arcade - bbc75d8a5897763eaf6945c263759930e02dd32b + bc35747acd136d5aca170df4ec527c346db76c8e - + https://github.com/dotnet/arcade - bbc75d8a5897763eaf6945c263759930e02dd32b + bc35747acd136d5aca170df4ec527c346db76c8e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index bcedf3fbd..9f8344700 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24163.12 + 7.0.0-beta.24171.2 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml new file mode 100644 index 000000000..a1bb79c43 --- /dev/null +++ b/eng/common/templates-official/job/job.yml @@ -0,0 +1,276 @@ +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +parameters: +# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + cancelTimeoutInMinutes: '' + condition: '' + container: '' + continueOnError: false + dependsOn: '' + displayName: '' + pool: '' + steps: [] + strategy: '' + timeoutInMinutes: '' + variables: [] + workspace: '' + templateContext: '' + +# Job base template specific parameters + # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md + artifacts: '' + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishBuildAssets: false + enablePublishTestResults: false + enablePublishUsingPipelines: false + disableComponentGovernance: '' + mergeTestResults: false + testRunTitle: '' + testResultsFormat: '' + name: '' + preSteps: [] + runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + +jobs: +- job: ${{ parameters.name }} + + ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: + cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} + + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + + ${{ if ne(parameters.container, '') }}: + container: ${{ parameters.container }} + + ${{ if ne(parameters.continueOnError, '') }}: + continueOnError: ${{ parameters.continueOnError }} + + ${{ if ne(parameters.dependsOn, '') }}: + dependsOn: ${{ parameters.dependsOn }} + + ${{ if ne(parameters.displayName, '') }}: + displayName: ${{ parameters.displayName }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + + ${{ if ne(parameters.timeoutInMinutes, '') }}: + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + + variables: + - ${{ if ne(parameters.enableTelemetry, 'false') }}: + - name: DOTNET_CLI_TELEMETRY_PROFILE + value: '$(Build.Repository.Uri)' + - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: + - name: EnableRichCodeNavigation + value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 + - ${{ each variable in parameters.variables }}: + # handle name-value variable syntax + # example: + # - name: [key] + # value: [value] + - ${{ if ne(variable.name, '') }}: + - name: ${{ variable.name }} + value: ${{ variable.value }} + + # handle variable groups + - ${{ if ne(variable.group, '') }}: + - group: ${{ variable.group }} + + # handle key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: + - ${{ each pair in variable }}: + - name: ${{ pair.key }} + value: ${{ pair.value }} + + # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds + - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + + ${{ if ne(parameters.workspace, '') }}: + workspace: ${{ parameters.workspace }} + + steps: + - ${{ if ne(parameters.preSteps, '') }}: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - task: MicroBuildSigningPlugin@3 + displayName: Install MicroBuild plugin + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + env: + TeamName: $(_TeamName) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + + - task: NuGetAuthenticate@1 + + - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: current + artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} + targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} + itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} + + - ${{ each step in parameters.steps }}: + - ${{ step }} + + - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: + - task: RichCodeNavIndexer@0 + displayName: RichCodeNav Upload + inputs: + languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} + richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + continueOnError: true + + - template: /eng/common/templates-official/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + env: + TeamName: $(_TeamName) + + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if or(eq(parameters.artifacts.publish.artifacts, 'true'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - task: CopyFiles@2 + displayName: Gather binaries for publish to artifacts + inputs: + SourceFolder: 'artifacts/bin' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' + - task: CopyFiles@2 + displayName: Gather packages for publish to artifacts + inputs: + SourceFolder: 'artifacts/packages' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish pipeline artifacts + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} + continueOnError: true + condition: always() + - ${{ if or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}: + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: 'artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' + continueOnError: true + condition: always() + + - ${{ if or(eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.ArtifactStagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: + - task: PublishTestResults@2 + displayName: Publish XUnit Test Results + inputs: + testResultsFormat: 'xUnit' + testResultsFiles: '*.xml' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: + - task: PublishTestResults@2 + displayName: Publish TRX Test Results + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '*.trx' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + + - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.StagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates-official/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 000000000..52b4d05d3 --- /dev/null +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -0,0 +1,112 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: '' + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(Build.SourcesDirectory) + CreatePr: true + AutoCompletePr: false + ReusePr: true + UseLfLineEndings: true + UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main + condition: '' + JobNameSuffix: '' + +jobs: +- job: OneLocBuild${{ parameters.JobNameSuffix }} + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/templates-official/variables/pool-providers.yml + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: eng/Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Localization Files + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish LocProject.json + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml new file mode 100644 index 000000000..d0073ea8a --- /dev/null +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,162 @@ +parameters: + configuration: 'Debug' + + # Optional: condition for the job to run + condition: '' + + # Optional: 'true' if future jobs should run even if this job fails + continueOnError: false + + # Optional: dependencies of the job + dependsOn: '' + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: {} + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishUsingPipelines: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishAssetsImmediately: false + + artifactsPublishingAdditionalParameters: '' + + signingValidationAdditionalParameters: '' + +jobs: +- job: Asset_Registry_Publish + + dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 + + ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + displayName: Publish Assets + ${{ else }}: + displayName: Publish to Build Asset Registry + + variables: + - template: /eng/common/templates-official/variables/pool-providers.yml + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: runCodesignValidationInjection + value: false + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates-official/post-build/common-variables.yml + + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download artifact + inputs: + artifactName: AssetManifests + downloadPath: '$(Build.StagingDirectory)/Download' + checkDownloadedFiles: true + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Enable cross-org NuGet feed authentication + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) + + - task: PowerShell@2 + displayName: Publish Build Assets + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' + /p:BuildAssetRegistryToken=$(MaestroAccessToken) + /p:MaestroApiEndpoint=https://maestro.dot.net + /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} + /p:OfficialBuildId=$(Build.BuildNumber) + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: powershell@2 + displayName: Create ReleaseConfigs Artifact + inputs: + targetType: inline + script: | + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish ReleaseConfigs Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - task: powershell@2 + displayName: Check if SymbolPublishingExclusionsFile.txt exists + inputs: + targetType: inline + script: | + $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + if(Test-Path -Path $symbolExclusionfile) + { + Write-Host "SymbolExclusionFile exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" + } + else{ + Write-Host "Symbols Exclusion file does not exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" + } + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish SymbolPublishingExclusionsFile Artifact + condition: eq(variables['SymbolExclusionFile'], 'true') + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates-official/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion 3 + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - template: /eng/common/templates-official/steps/publish-logs.yml + parameters: + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml new file mode 100644 index 000000000..f5fa09f41 --- /dev/null +++ b/eng/common/templates-official/job/source-build.yml @@ -0,0 +1,64 @@ +parameters: + # This template adds arcade-powered source-build to CI. The template produces a server job with a + # default ID 'Source_Build_Complete' to put in a dependency list if necessary. + + # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. + jobNamePrefix: 'Source_Build' + + # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for + # managed-only repositories. This is an object with these properties: + # + # name: '' + # The name of the job. This is included in the job ID. + # targetRID: '' + # The name of the target RID to use, instead of the one auto-detected by Arcade. + # nonPortable: false + # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than + # linux-x64), and compiling against distro-provided packages rather than portable ones. + # skipPublishValidation: false + # Disables publishing validation. By default, a check is performed to ensure no packages are + # published by source-build. + # container: '' + # A container to use. Runs in docker. + # pool: {} + # A pool to use. Runs directly on an agent. + # buildScript: '' + # Specifies the build script to invoke to perform the build in the repo. The default + # './build.sh' should work for typical Arcade repositories, but this is customizable for + # difficult situations. + # jobProperties: {} + # A list of job properties to inject at the top level, for potential extensibility beyond + # container and pool. + platform: {} + +jobs: +- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} + displayName: Source-Build (${{ parameters.platform.name }}) + + ${{ each property in parameters.platform.jobProperties }}: + ${{ property.key }}: ${{ property.value }} + + ${{ if ne(parameters.platform.container, '') }}: + container: ${{ parameters.platform.container }} + + ${{ if eq(parameters.platform.pool, '') }}: + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-mariner-2 + os: linux + ${{ if ne(parameters.platform.pool, '') }}: + pool: ${{ parameters.platform.pool }} + + workspace: + clean: all + + steps: + - template: /eng/common/templates-official/steps/source-build.yml + parameters: + platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml new file mode 100644 index 000000000..73bf386ed --- /dev/null +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -0,0 +1,68 @@ +parameters: + runAsPublic: false + sourceIndexPackageVersion: 1.0.1-20220804.1 + sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json + sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" + preSteps: [] + binlogPath: artifacts/log/Debug/Build.binlog + condition: '' + dependsOn: '' + pool: '' + +jobs: +- job: SourceIndexStage1 + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} + variables: + - name: SourceIndexPackageVersion + value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexPackageSource + value: ${{ parameters.sourceIndexPackageSource }} + - name: BinlogPath + value: ${{ parameters.binlogPath }} + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: source-dot-net stage1 variables + - template: /eng/common/templates-official/variables/pool-providers.yml + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET Core sdk 3.1 + inputs: + packageType: sdk + version: 3.1.x + installationPath: $(Agent.TempDirectory)/dotnet + workingDirectory: $(Agent.TempDirectory) + + - script: | + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + displayName: Download Tools + # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. + workingDirectory: $(Agent.TempDirectory) + + - script: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + displayName: Process Binlog into indexable sln + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + displayName: Upload stage1 artifacts to source index + env: + BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/eng/common/templates-official/jobs/codeql-build.yml b/eng/common/templates-official/jobs/codeql-build.yml new file mode 100644 index 000000000..b68d3c2f3 --- /dev/null +++ b/eng/common/templates-official/jobs/codeql-build.yml @@ -0,0 +1,31 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + +jobs: +- template: /eng/common/templates-official/jobs/jobs.yml + parameters: + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishTestResults: false + enablePublishBuildAssets: false + enablePublishUsingPipelines: false + enableTelemetry: true + + variables: + - group: Publish-Build-Assets + # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in + # sync with the packages.config file. + - name: DefaultGuardianVersion + value: 0.109.0 + - name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + - name: GuardianVersion + value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + + jobs: ${{ parameters.jobs }} + diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml new file mode 100644 index 000000000..857a0f8ba --- /dev/null +++ b/eng/common/templates-official/jobs/jobs.yml @@ -0,0 +1,97 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: Enable publishing using release pipelines + enablePublishUsingPipelines: false + + # Optional: Enable running the source-build jobs to build repo from source + enableSourceBuild: false + + # Optional: Parameters for source-build template. + # See /eng/common/templates-official/jobs/source-build.yml for options + sourceBuildParameters: [] + + graphFileGeneration: + # Optional: Enable generating the graph files at the end of the build + enabled: false + # Optional: Include toolset dependencies in the generated graph files + includeToolset: false + + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + + # Optional: Override automatically derived dependsOn value for "publish build assets" job + publishBuildAssetsDependsOn: '' + + # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. + publishAssetsImmediately: false + + # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) + artifactsPublishingAdditionalParameters: '' + signingValidationAdditionalParameters: '' + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + enableSourceIndex: false + sourceIndexParams: {} + +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +jobs: +- ${{ each job in parameters.jobs }}: + - template: ../job/job.yml + parameters: + # pass along parameters + ${{ each parameter in parameters }}: + ${{ if ne(parameter.key, 'jobs') }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # pass along job properties + ${{ each property in job }}: + ${{ if ne(property.key, 'job') }}: + ${{ property.key }}: ${{ property.value }} + + name: ${{ job.job }} + +- ${{ if eq(parameters.enableSourceBuild, true) }}: + - template: /eng/common/templates-official/jobs/source-build.yml + parameters: + allCompletedJobId: Source_Build_Complete + ${{ each parameter in parameters.sourceBuildParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if eq(parameters.enableSourceIndex, 'true') }}: + - template: ../job/source-index-stage1.yml + parameters: + runAsPublic: ${{ parameters.runAsPublic }} + ${{ each parameter in parameters.sourceIndexParams }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - template: ../job/publish-build-assets.yml + parameters: + continueOnError: ${{ parameters.continueOnError }} + dependsOn: + - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.publishBuildAssetsDependsOn }}: + - ${{ job.job }} + - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.jobs }}: + - ${{ job.job }} + - ${{ if eq(parameters.enableSourceBuild, true) }}: + - Source_Build_Complete + + runAsPublic: ${{ parameters.runAsPublic }} + publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} + enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml new file mode 100644 index 000000000..a5168eb35 --- /dev/null +++ b/eng/common/templates-official/jobs/source-build.yml @@ -0,0 +1,46 @@ +parameters: + # This template adds arcade-powered source-build to CI. A job is created for each platform, as + # well as an optional server job that completes when all platform jobs complete. + + # The name of the "join" job for all source-build platforms. If set to empty string, the job is + # not included. Existing repo pipelines can use this job depend on all source-build jobs + # completing without maintaining a separate list of every single job ID: just depend on this one + # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. + allCompletedJobId: '' + + # See /eng/common/templates-official/job/source-build.yml + jobNamePrefix: 'Source_Build' + + # This is the default platform provided by Arcade, intended for use by a managed-only repo. + defaultManagedPlatform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' + + # Defines the platforms on which to run build jobs. One job is created for each platform, and the + # object in this array is sent to the job template as 'platform'. If no platforms are specified, + # one job runs on 'defaultManagedPlatform'. + platforms: [] + +jobs: + +- ${{ if ne(parameters.allCompletedJobId, '') }}: + - job: ${{ parameters.allCompletedJobId }} + displayName: Source-Build Complete + pool: server + dependsOn: + - ${{ each platform in parameters.platforms }}: + - ${{ parameters.jobNamePrefix }}_${{ platform.name }} + - ${{ if eq(length(parameters.platforms), 0) }}: + - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} + +- ${{ each platform in parameters.platforms }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ platform }} + +- ${{ if eq(length(parameters.platforms), 0) }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ parameters.defaultManagedPlatform }} diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml new file mode 100644 index 000000000..b504fe55c --- /dev/null +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -0,0 +1,25 @@ +variables: + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-DotNetCli-Storage + - group: DotNet-MSRC-Storage + - group: Publish-Build-Assets + + # Whether the build is internal or not + - name: IsInternalBuild + value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + + # Default Maestro++ API Endpoint and API Version + - name: MaestroApiEndPoint + value: "https://maestro.dot.net" + - name: MaestroApiAccessToken + value: $(MaestroAccessToken) + - name: MaestroApiVersion + value: "2020-02-20" + + - name: SourceLinkCLIVersion + value: 3.0.0 + - name: SymbolToolVersion + value: 1.0.1 + + - name: runCodesignValidationInjection + value: false diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml new file mode 100644 index 000000000..35976adb7 --- /dev/null +++ b/eng/common/templates-official/post-build/post-build.yml @@ -0,0 +1,290 @@ +parameters: + # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. + # Publishing V1 is no longer supported + # Publishing V2 is no longer supported + # Publishing V3 is the default + - name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + + - name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + + - name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + + - name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + + - name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + + - name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + + - name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + + # These parameters let the user customize the call to sdk-task.ps1 for publishing + # symbols & general artifacts as well as for signing validation + - name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + + - name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + + - name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + + # Which stages should finish execution before post-build stages start + - name: validateDependsOn + type: object + default: + - build + + - name: publishDependsOn + type: object + default: + - Validate + + # Optional: Call asset publishing rather than running in a separate stage + - name: publishAssetsImmediately + type: boolean + default: false + +stages: +- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + - stage: Validate + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Validate Build Assets + variables: + - template: common-variables.yml + - template: /eng/common/templates-official/variables/pool-providers.yml + jobs: + - job: + displayName: NuGet Validation + condition: eq( ${{ parameters.enableNugetValidation }}, 'true') + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + + - job: + displayName: Signing Validation + condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + itemPattern: | + ** + !**/Microsoft.SourceBuild.Intermediate.*.nupkg + + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@1 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: ../steps/publish-logs.yml + parameters: + StageLabel: 'Validation' + JobLabel: 'Signing' + + - job: + displayName: SourceLink Validation + condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true + +- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: + - stage: publish_using_darc + ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.publishDependsOn }} + ${{ else }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: common-variables.yml + - template: /eng/common/templates-official/variables/pool-providers.yml + jobs: + - job: + displayName: Publish Using Darc + timeoutInMinutes: 120 + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml new file mode 100644 index 000000000..0c87f149a --- /dev/null +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -0,0 +1,70 @@ +parameters: + BARBuildId: '' + PromoteToChannelIds: '' + +steps: + - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs + inputs: + buildType: current + artifactName: ReleaseConfigs + checkDownloadedFiles: true + + - task: PowerShell@2 + name: setReleaseVars + displayName: Set Release Configs Vars + inputs: + targetType: inline + pwsh: true + script: | + try { + if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { + $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt + + $BarId = $Content | Select -Index 0 + $Channels = $Content | Select -Index 1 + $IsStableBuild = $Content | Select -Index 2 + + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId + } + else { + $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + + $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $apiHeaders.Add('Accept', 'application/json') + $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") + + $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + + $BarId = $Env:BARBuildId + $Channels = $Env:PromoteToMaestroChannels -split "," + $Channels = $Channels -join "][" + $Channels = "[$Channels]" + + $IsStableBuild = $buildInfo.stable + $AzureDevOpsProject = $buildInfo.azureDevOpsProject + $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId + $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId + } + + Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" + Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" + Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" + + Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" + Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" + Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" + } + catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + exit 1 + } + env: + MAESTRO_API_TOKEN: $(MaestroApiAccessToken) + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates-official/post-build/trigger-subscription.yml b/eng/common/templates-official/post-build/trigger-subscription.yml new file mode 100644 index 000000000..da669030d --- /dev/null +++ b/eng/common/templates-official/post-build/trigger-subscription.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Triggering subscriptions + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + arguments: -SourceRepo $(Build.Repository.Uri) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml new file mode 100644 index 000000000..f67a210d6 --- /dev/null +++ b/eng/common/templates-official/steps/add-build-to-channel.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Add Build to Channel + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/eng/common/templates-official/steps/execute-codeql.yml b/eng/common/templates-official/steps/execute-codeql.yml new file mode 100644 index 000000000..9b4a5ffa3 --- /dev/null +++ b/eng/common/templates-official/steps/execute-codeql.yml @@ -0,0 +1,32 @@ +parameters: + # Language that should be analyzed. Defaults to csharp + language: csharp + # Build Commands + buildCommands: '' + overrideParameters: '' # Optional: to override values for parameters. + additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth + # diagnosis of problems with specific tool configurations. + publishGuardianDirectoryToPipeline: false + # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL + # parameters rather than relying on YAML. It may be better to use a local script, because you can + # reproduce results locally without piecing together a command based on the YAML. + executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1' + # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named + # 'continueOnError', the parameter value is not correctly picked up. + # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter + # optional: determines whether to continue the build if the step errors; + sdlContinueOnError: false + +steps: +- template: /eng/common/templates-official/steps/execute-sdl.yml + parameters: + overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} + executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} + overrideParameters: ${{ parameters.overrideParameters }} + additionalParameters: '${{ parameters.additionalParameters }} + -CodeQLAdditionalRunConfigParams @("BuildCommands < ${{ parameters.buildCommands }}", "Language < ${{ parameters.language }}")' + publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} + sdlContinueOnError: ${{ parameters.sdlContinueOnError }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml new file mode 100644 index 000000000..f98fe1d2f --- /dev/null +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -0,0 +1,44 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed + +parameters: + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + sbomContinueOnError: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }} + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml new file mode 100644 index 000000000..04012fed1 --- /dev/null +++ b/eng/common/templates-official/steps/publish-logs.yml @@ -0,0 +1,23 @@ +parameters: + StageLabel: '' + JobLabel: '' + +steps: +- task: Powershell@2 + displayName: Prepare Binlogs to Upload + inputs: + targetType: inline + script: | + New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + continueOnError: true + condition: always() + +- task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PublishLocation: Container + ArtifactName: PostBuildLogs + continueOnError: true + condition: always() diff --git a/eng/common/templates-official/steps/retain-build.yml b/eng/common/templates-official/steps/retain-build.yml new file mode 100644 index 000000000..83d97a26a --- /dev/null +++ b/eng/common/templates-official/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml new file mode 100644 index 000000000..2f51ef5b9 --- /dev/null +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -0,0 +1,91 @@ +# Please remember to update the documentation if you make changes to these parameters! +parameters: + HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' + HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number + HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixConfiguration: '' # optional -- additional property attached to a job + HelixPreCommands: '' # optional -- commands to run before Helix work item execution + HelixPostCommands: '' # optional -- commands to run after Helix work item execution + WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects + WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects + WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects + CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload + XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true + XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects + XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects + XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner + XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects + IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." + IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set + HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) + Creator: '' # optional -- if the build is external, use this to specify who is sending the job + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() + continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + +steps: + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml new file mode 100644 index 000000000..a7f27ce8e --- /dev/null +++ b/eng/common/templates-official/steps/source-build.yml @@ -0,0 +1,108 @@ +parameters: + # This template adds arcade-powered source-build to CI. + + # This is a 'steps' template, and is intended for advanced scenarios where the existing build + # infra has a careful build methodology that must be followed. For example, a repo + # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline + # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to + # GitHub. Using this steps template leaves room for that infra to be included. + + # Defines the platform on which to run the steps. See 'eng/common/templates-official/job/source-build.yml' + # for details. The entire object is described in the 'job' template for simplicity, even though + # the usage of the properties on this object is split between the 'job' and 'steps' templates. + platform: {} + +steps: +# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) +- script: | + set -x + df -h + + # If building on the internal project, the artifact feeds variable may be available (usually only if needed) + # In that case, call the feed setup script to add internal feeds corresponding to public ones. + # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. + # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those + # changes. + internalRestoreArgs= + if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then + # Temporarily work around https://github.com/dotnet/arcade/issues/7709 + chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' + + # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. + # This only works if there is a username/email configured, which won't be the case in most CI runs. + git config --get user.email + if [ $? -ne 0 ]; then + git config user.email dn-bot@microsoft.com + git config user.name dn-bot + fi + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # In that case, add variables to allow the download of internal runtimes if the specified versions are not found + # in the default public locations. + internalRuntimeDownloadArgs= + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + fi + + buildConfig=Release + # Check if AzDO substitutes in a build config from a variable, and use it if so. + if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then + buildConfig='$(_BuildConfig)' + fi + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + targetRidArgs= + if [ '${{ parameters.platform.targetRID }}' != '' ]; then + targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' + fi + + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true + displayName: Build + +# Upload build logs for diagnosis. +- task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + SourceFolder: '$(Build.SourcesDirectory)' + Contents: | + **/*.log + **/*.binlog + artifacts/source-build/self/prebuilt-report/** + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish BuildLogs + inputs: + targetPath: '$(Build.StagingDirectory)/BuildLogs' + artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) + continueOnError: true + condition: succeededOrFailed() diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml new file mode 100644 index 000000000..dbdd66d4a --- /dev/null +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -0,0 +1,7 @@ +variables: +# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in +# sync with the packages.config file. +- name: DefaultGuardianVersion + value: 0.109.0 +- name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/global.json b/global.json index f6f1f44a5..c79633e8a 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.24163.12", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24163.12" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.2" } } From f924bc41bc7364bf9e3266e750add54be629f87f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Mar 2024 22:40:50 +0000 Subject: [PATCH 638/654] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24171.2 From 46811d24893e2f8281a0b1f9143f1e7b5c78c98e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 03:40:45 +0000 Subject: [PATCH 639/654] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24171.6 --- eng/Version.Details.xml | 12 ++--- eng/Versions.props | 2 +- .../variables/pool-providers.yml | 45 +++++++++++++++++++ global.json | 4 +- 4 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a670fbd7..71562c711 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9f8344700..d8ac2a195 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24171.2 + 7.0.0-beta.24171.6 diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml new file mode 100644 index 000000000..beab7d1bf --- /dev/null +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -0,0 +1,45 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage it can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates-official/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) +# +# pool: +# name: $(DncEngInternalBuildPool) +# image: 1es-windows-2022-pt + +variables: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/global.json b/global.json index c79633e8a..6eb189856 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.24171.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.6" } } From 5ae0d7486c6c97a197b370c41715272ba698b499 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 03:45:11 +0000 Subject: [PATCH 640/654] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24171.6 From 5547d2b40ab852f288740ad684c26d7bb643738b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Mar 2024 12:31:55 +0000 Subject: [PATCH 641/654] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24172.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71562c711..03d0369cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + a14feb9f4edafbe99fc870b306615b639af6ae43 - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + a14feb9f4edafbe99fc870b306615b639af6ae43 - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + a14feb9f4edafbe99fc870b306615b639af6ae43 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d8ac2a195..9f386d099 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24171.6 + 7.0.0-beta.24172.6 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a1bb79c43..cd21848f4 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -116,7 +116,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) diff --git a/global.json b/global.json index 6eb189856..9d1d64240 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.24171.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24172.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24172.6" } } From c6738c96b9ce07a817b9b2903cf2db95a88a64c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Mar 2024 15:48:04 +0000 Subject: [PATCH 642/654] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24175.1 --- 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 03d0369cb..344f7f58a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - a14feb9f4edafbe99fc870b306615b639af6ae43 + 84988fee39220970768c4f82c545d7b352274e02 - + https://github.com/dotnet/arcade - a14feb9f4edafbe99fc870b306615b639af6ae43 + 84988fee39220970768c4f82c545d7b352274e02 - + https://github.com/dotnet/arcade - a14feb9f4edafbe99fc870b306615b639af6ae43 + 84988fee39220970768c4f82c545d7b352274e02 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9f386d099..e7bdf09cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24172.6 + 7.0.0-beta.24175.1 diff --git a/global.json b/global.json index 9d1d64240..d0480ff21 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.24172.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24172.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24175.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24175.1" } } From 8d71d7bdadc05cb3e570dd2dae560af5ae2c3e60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Mar 2024 02:06:40 +0000 Subject: [PATCH 643/654] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24176.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 1 + global.json | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 344f7f58a..c963c49c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 84988fee39220970768c4f82c545d7b352274e02 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 - + https://github.com/dotnet/arcade - 84988fee39220970768c4f82c545d7b352274e02 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 - + https://github.com/dotnet/arcade - 84988fee39220970768c4f82c545d7b352274e02 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e7bdf09cd..489cfa9a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24175.1 + 7.0.0-beta.24176.7 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index cd21848f4..ecaa096b8 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -124,6 +124,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/global.json b/global.json index d0480ff21..86cac79b9 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.24175.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24175.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24176.7", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24176.7" } } From ce1d0177b70c5e5f101106cc1ae33316d8d8ddeb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Apr 2024 00:30:18 +0000 Subject: [PATCH 644/654] Update dependencies from https://github.com/dotnet/arcade build 20240329.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24179.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/variables/pool-providers.yml | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c963c49c7..22077ded2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ea5ae5b4a608862561d02a158dfaac443fbaaff1 + d0ab6f8c61222a6383dc2109d039b437ba9afa92 - + https://github.com/dotnet/arcade - ea5ae5b4a608862561d02a158dfaac443fbaaff1 + d0ab6f8c61222a6383dc2109d039b437ba9afa92 - + https://github.com/dotnet/arcade - ea5ae5b4a608862561d02a158dfaac443fbaaff1 + d0ab6f8c61222a6383dc2109d039b437ba9afa92 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 489cfa9a4..115d0b587 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24176.7 + 7.0.0-beta.24179.7 diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1bf..1f308b24e 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022-pt +# image: 1es-windows-2022 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index 86cac79b9..f1d52ca39 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.24176.7", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24176.7" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24179.7", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24179.7" } } From fd522ffc7f49d2be0708b0c6ba153efd74ae0317 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Apr 2024 11:55:49 -0700 Subject: [PATCH 645/654] Update branding to 7.0.316 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index bcedf3fbd..9e8958149 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 15 + 16 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 2e08b0bc5049ca64cae671a1ed79c3eddf758c44 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 2 Apr 2024 15:02:56 -0700 Subject: [PATCH 646/654] [7.0.3xx] Migrate to 1ES templates for internal builds (#19200) Co-authored-by: dotnet-maestro[bot] --- .vsts-ci.yml | 690 +++++++++--------- .vsts-pr.yml | 35 +- eng/build-pr.yml | 156 ++++ eng/build.yml | 14 +- eng/source-build-tarball-build-official.yml | 26 +- eng/source-build-tarball-build.yml | 14 - .../job/source-build-build-tarball-pr.yml | 252 +++++++ .../job/source-build-build-tarball.yml | 14 +- .../job/source-build-create-tarball-pr.yml | 85 +++ .../job/source-build-create-tarball.yml | 20 +- .../job/source-build-run-tarball-build-pr.yml | 147 ++++ .../job/source-build-run-tarball-build.yml | 14 +- 12 files changed, 1057 insertions(+), 410 deletions(-) create mode 100644 eng/build-pr.yml delete mode 100644 eng/source-build-tarball-build.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5e2cdc745..d53d48105 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,3 +1,5 @@ +# Pipeline: https://dnceng.visualstudio.com/internal/_build?definitionId=286 + trigger: batch: true branches: @@ -26,7 +28,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -37,358 +38,375 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - name: _InternalRuntimeDownloadArgs value: '' - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) +- name: DncEngPublicBuildPool + value: NetCore-Svc-Public +- name: DncEngInternalBuildPool + value: NetCore1ESPool-Svc-Internal +# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning. +- name: MicroBuildOutputFolderOverride + value: $(Agent.TempDirectory) -stages: -- stage: build - jobs: - - job: Publish_Build_Configuration - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish Build Config - - template: /eng/build.yml - parameters: - agentOs: Windows_NT - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Public-only builds - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x64: - _BuildConfig: Debug - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - # Internal-only builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml - parameters: - agentOs: Windows_NT +extends: + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: + containers: + fedora38: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + sdl: + sourceAnalysisPool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + stages: + - stage: build + jobs: + # Build Retry Configuration + - job: Publish_Build_Configuration pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - # Never run tests on PGO bits - _TestArg: '' - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - pgoInstrument: true + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + steps: + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Build Config + inputs: + targetPath: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifactName: BuildConfiguration + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_18_04_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Fedora_36_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.36' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker centos' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Debian_11_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker debian' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _AdditionalBuildParameters: '/p:BuildSdkDeb=true' - _TestArg: $(_NonWindowsTestArg) - Build_Arm64_Debug: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Arm_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - # Never run tests on arm - _TestArg: '' - Build_Arm64_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_arm: - _BuildConfig: Release - # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm' - _BuildArchitecture: 'arm' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm - _TestArg: '' - Build_Linux_musl_Release_arm64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm64' - _BuildArchitecture: 'arm64' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - Build_Linux_Portable_Deb_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker centos' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_Arm64: - _BuildConfig: Release - _DockerParameter: '--docker centos' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' - # Never run tests on arm64 - _TestArg: '' - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - pgoInstrument: true + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-ubuntu-2004-open + os: linux + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_36_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.36' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) - - template: /eng/build.yml - parameters: - agentOs: Darwin - pool: - vmImage: 'macOS-latest' - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_arm64: - _BuildConfig: Release - _RuntimeIdentifier: '--runtime-id osx-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true - - template: /eng/common/templates/jobs/source-build.yml + - template: /eng/build.yml@self + parameters: + agentOs: Darwin + pool: + name: Azure Pipelines + image: macOS-latest + os: macOS + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + - template: /eng/common/templates-official/jobs/source-build.yml@self - # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. - # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml@self - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/job/publish-build-assets.yml@self + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/job/publish-build-assets.yml - parameters: - dependsOn: - - Windows_NT - - Linux - - Darwin - - Source_Build_Managed - - Source_Build_Create_Tarball - - PGO_Linux - - PGO_Windows_NT - publishUsingPipelines: true - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2017.amd64 - - -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: eng\common\templates\post-build\post-build.yml - parameters: - publishingInfraVersion: 3 - enableSymbolValidation: false - enableSigningValidation: false - enableNugetValidation: false - enableSourceLinkValidation: false - publishInstallersAndChecksums: true - SDLValidationParameters: - enable: false - params: ' -SourceToolsList @("policheck","credscan") - -TsaInstanceURL $(_TsaInstanceURL) - -TsaProjectName $(_TsaProjectName) - -TsaNotificationEmail $(_TsaNotificationEmail) - -TsaCodebaseAdmin $(_TsaCodebaseAdmin) - -TsaBugAreaPath $(_TsaBugAreaPath) - -TsaIterationPath $(_TsaIterationPath) - -TsaRepositoryName "dotnet-installer" - -TsaCodebaseName "dotnet-installer" - -TsaPublish $True' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/post-build/post-build.yml@self + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 5e2cdc745..2f14d2054 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -26,7 +26,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -37,10 +36,8 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - name: _InternalRuntimeDownloadArgs value: '' - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs @@ -63,7 +60,7 @@ stages: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration displayName: Publish Build Config - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -107,7 +104,7 @@ stages: _TestArg: '' - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -139,7 +136,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -283,7 +280,7 @@ stages: _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -309,7 +306,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Darwin pool: @@ -332,26 +329,7 @@ stages: - template: /eng/common/templates/jobs/source-build.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. - # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball - - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/templates/job/publish-build-assets.yml @@ -370,7 +348,6 @@ stages: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2017.amd64 - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml parameters: diff --git a/eng/build-pr.yml b/eng/build-pr.yml new file mode 100644 index 000000000..69d1e3f0f --- /dev/null +++ b/eng/build-pr.yml @@ -0,0 +1,156 @@ +parameters: + # Agent OS identifier and used as job name + agentOs: '' + + # Agent pool + pool: {} + + # Additional variables + variables: {} + + # Build strategy - matrix + strategy: {} + + # Job timeout + timeoutInMinutes: 180 + + # Publish using pipelines + enablePublishUsingPipelines: true + +phases: +- template: /eng/common/templates/job/job.yml + parameters: + ${{ if parameters.pgoInstrument }}: + name: PGO_${{ parameters.agentOs }} + ${{ if not(parameters.pgoInstrument) }}: + name: ${{ parameters.agentOs }} + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + enableMicrobuild: true + enablePublishBuildAssets: true + enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} + enableTelemetry: true + helixRepo: dotnet/installer + pool: ${{ parameters.pool }} + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + workspace: + clean: all + + variables: + - _PgoInstrument: '' + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '-pack' + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '--pack' + - ${{ if parameters.pgoInstrument }}: + - _PgoInstrument: '/p:PgoInstrument=true' + - _PackArg: '' + - _AgentOSName: ${{ parameters.agentOs }} + - _TeamName: Roslyn-Project-System + - _SignType: test + - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-Symbol-Server-PATs + - group: DotNet-HelixApi-Access + - group: DotNet-Blob-Feed + - _DotNetPublishToBlobFeed: true + - _PushToVSFeed: true + - _SignType: real + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + $(_PgoInstrument) + + steps: + - checkout: self + clean: true + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: build.cmd + $(_TestArg) $(_PackArg) + -publish -ci -sign + -Configuration $(_BuildConfig) + -Architecture $(_BuildArchitecture) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + env: + DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) + + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - ${{ if eq(parameters.agentOs, 'Linux') }}: + - script: ./build.sh + $(_TestArg) $(_PackArg) + --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + $(_DockerParameter) + --architecture $(_BuildArchitecture) + $(_LinuxPortable) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: + - script: ./build.sh + $(_TestArg) + --pack --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + --architecture $(_BuildArchitecture) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - task: PublishTestResults@2 + displayName: Publish Test Results + inputs: + testRunner: XUnit + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + platform: '$(BuildPlatform)' + configuration: '$(_BuildConfig)' + condition: ne(variables['_TestArg'], '') + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true + condition: always() + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: always() diff --git a/eng/build.yml b/eng/build.yml index 35c829867..d486c47ec 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -18,7 +18,7 @@ parameters: enablePublishUsingPipelines: true phases: -- template: /eng/common/templates/job/job.yml +- template: /eng/common/templates-official/job/job.yml parameters: ${{ if parameters.pgoInstrument }}: name: PGO_${{ parameters.agentOs }} @@ -28,9 +28,6 @@ phases: ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true enablePublishBuildAssets: true - # Don't use built-in arcade logic for publishing artifacts and test results, as we manually do this and give better names - #enablePublishBuildArtifacts: true - #enablePublishTestResults: true enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} enableTelemetry: true helixRepo: dotnet/installer @@ -49,12 +46,10 @@ phases: - ${{ if parameters.pgoInstrument }}: - _PgoInstrument: '/p:PgoInstrument=true' - _PackArg: '' - - _AgentOSName: ${{ parameters.agentOs }} - _TeamName: Roslyn-Project-System - _SignType: test - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access @@ -101,6 +96,7 @@ phases: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.agentOs, 'Linux') }}: - script: ./build.sh $(_TestArg) $(_PackArg) @@ -144,13 +140,13 @@ phases: inputs: SourceFolder: '$(Build.SourcesDirectory)/artifacts' Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 + - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs to VSTS inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index aa1de43eb..f93d87fef 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -1,5 +1,6 @@ trigger: none pr: none + resources: pipelines: - pipeline: installer-build-resource @@ -19,10 +20,23 @@ resources: - internal/release/7.0.4xx stages: - build + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + sdl: + sourceAnalysisPool: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022 + os: windows + stages: + - stage: build + jobs: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml@self + parameters: + installerBuildResourceId: installer-build-resource diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml deleted file mode 100644 index da87d93cf..000000000 --- a/eng/source-build-tarball-build.yml +++ /dev/null @@ -1,14 +0,0 @@ -trigger: none -pr: none -resources: - pipelines: - - pipeline: installer-build-resource - source: installer - trigger: none - -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml new file mode 100644 index 000000000..abb9035fd --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml @@ -0,0 +1,252 @@ +# Builds a source-build tarball + +parameters: + # Architecture to build + architecture: + + # Custom condition to apply to the job + condition: + + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Skip running the SDK content smoke-tests + excludeSdkContentTests: false + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: + + # Matrix to run jobs over + matrix: + + # Job name + name: + + # Agent pool to use + pool: + + # Build using the previous source-build artifacts + usePreviousArtifacts: false + +jobs: +- job: ${{ parameters.name }} + condition: ${{ parameters.condition }} + dependsOn: ${{ parameters.dependsOn }} + pool: ${{ parameters.pool }} + strategy: + matrix: ${{ parameters.matrix }} + timeoutInMinutes: 300 + variables: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - group: AzureDevOps-Artifact-Feeds-Pats + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - name: additionalBuildArgs + value: --with-sdk /tarball/.dotnet + - name: tarballDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory) + ${{ else }}: + value: $(Build.StagingDirectory)/tarball + - name: installerSrcDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory)/src/installer + ${{ else }}: + value: $(Build.SourcesDirectory) + workspace: + clean: all + + steps: + - checkout: self + clean: true + + - ${{ if ne(parameters.installerBuildResourceId, '') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Source Tarball + + - script: | + set -x + + resourceIdPathSegment= + if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' + fi + + mkdir -p "$(tarballDir)" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: cp $(installerSrcDir)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + displayName: Copy Test NuGet Config + + - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' + displayName: Download MSFT sdk Tarball + + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - download: current + artifact: $(_PreviousSourceBuildArtifact) + patterns: '*.tar.gz' + displayName: Download Previous Source Build Artifacts + + - task: CopyFiles@2 + displayName: Copy Previous Source Build Artifacts + inputs: + SourceFolder: $(PIPELINE.WORKSPACE)/$(_PreviousSourceBuildArtifact) + Contents: '*.tar.gz' + TargetFolder: $(tarballDir)/packages/archive/ + + - script: | + set -euo pipefail + + sourceBuiltSDKUrl="https://dotnetcli.azureedge.net/source-built-artifacts/sdks/" + packageVersionsPath="$(Build.SourcesDirectory)/eng/Versions.props" + notFoundMessage="No source-built SDK found to download..." + + echo "Looking for source-built SDK to download..." + archiveVersionLine=`grep -m 1 "" "$packageVersionsPath" || :` + versionPattern="(.*)" + + if [[ $archiveVersionLine =~ $versionPattern ]]; then + filename="dotnet-sdk-${BASH_REMATCH[1]}-centos.8-x64.tar.gz" + archiveUrl="${sourceBuiltSDKUrl}${filename}" + downloadDir=$(mktemp -d) + (cd $downloadDir && curl --retry 5 -O $archiveUrl) + + mkdir $(tarballDir)/.dotnet + tar -xzf $downloadDir/$filename -C $(tarballDir)/.dotnet + rm -rf $downloadDir + else + echo "$notFoundMessage" + exit 1 + fi + + echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /tarball/.dotnet" + displayName: Setup Previously Source-Built SDK + condition: eq(variables._WithPreviousSDK, 'true') + + - script: | + set -x + + if [[ '${{ parameters.usePreviousArtifacts }}' != 'true' ]]; then + customPrepArgs= + if [[ '$(_BootstrapPrep)' == 'true' ]]; then + customPrepArgs='--bootstrap' + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs} + else + mkdir $(tarballDir)/.dotnet + tarballFilePath="$(tarballDir)/packages/archive/dotnet-sdk-*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)/.dotnet" + eval rm -f "$tarballFilePath" + fi + displayName: Prep Tarball + + - script: | + set -x + df -h + + customRunArgs= + customBuildArgs= + if [[ '$(_RunOnline)' == 'true' ]]; then + customBuildArgs='--online' + else + customRunArgs='--network none' + fi + + # See https://github.com/dotnet/source-build/issues/3712 + if [[ '$(_OverrideDistroDisablingSha1)' == 'true' ]]; then + customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + customBuildArgs="$customBuildArgs --poison" + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball ${customRunArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) + displayName: Build Tarball + + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerSrcDir)/eng/common/SetupNugetSources.sh + arguments: $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - script: | + set -x + + dockerVolumeArgs="-v $(tarballDir):/tarball" + dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" + poisonArg='' + + if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then + dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" + platform="linux" + docker run --rm $(_Container) /bin/sh -c "cat /etc/os-release | grep -q alpine" + if [[ $? == 0 ]]; then + platform="$platform-musl" + fi + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + poisonArg='--poison' + dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" + fi + + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs $(_Container) ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- /p:SmokeTestConsoleVerbosity=detailed + displayName: Run Tests + + # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. + - script: | + set -x + + targetFolder=$(Build.StagingDirectory)/BuildLogs/ + mkdir -p ${targetFolder} + + cd "$(tarballDir)" + find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; + displayName: Prepare BuildLogs staging directory + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + + - task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + continueOnError: true + inputs: + testRunner: vSTest + testResultsFiles: 'test/**/*.trx' + searchFolder: $(tarballDir) + mergeTestResults: true + publishRunAttachments: true + testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) + + - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts + condition: succeededOrFailed() + continueOnError: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index abb9035fd..aa3cf6b96 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -227,9 +227,11 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() @@ -245,8 +247,10 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' - artifact: $(Agent.JobName)_Artifacts + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish Artifacts - condition: succeededOrFailed() + inputs: + targetPath: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/ + artifactName: $(Agent.JobName)_Artifacts continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml new file mode 100644 index 000000000..347f61cf8 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml @@ -0,0 +1,85 @@ +# Creates a source-build tarball + +jobs: +- job: Source_Build_Create_Tarball + container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + displayName: Source-Build Create Tarball + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ else }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + + variables: + - name: _BuildConfig + value: Release + + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNet-Source-Build-All-Orgs-Source-Access + workspace: + clean: all + + steps: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: | + set -x + df -h + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # In that case, add variables to allow the download of internal runtimes if the specified versions are not found + # in the default public locations. + internalRuntimeDownloadArgs= + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + fi + + ./build.sh \ + --ci \ + --configuration $(_BuildConfig) \ + --publish \ + -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + /p:DotNetPublishUsingPipelines=true \ + /p:ArcadeBuildTarball=true \ + /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw) + displayName: Create Tarball + + - task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + Contents: | + **/*.log + **/*.binlog + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 347f61cf8..7cba0c4ea 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -2,23 +2,27 @@ jobs: - job: Source_Build_Create_Tarball - container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + container: fedora38 displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ else }}: name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux ${{ else }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux variables: - name: _BuildConfig @@ -78,8 +82,10 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml new file mode 100644 index 000000000..6e9c404c5 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml @@ -0,0 +1,147 @@ +# Builds a source-build tarball + +parameters: + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: current + + # The following parameters aren't expected to be passed in rather they are used for encapsulation + # ----------------------------------------------------------------------------------------------- + alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 + centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 + debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 + poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalArm64: + name: Docker-Linux-Arm-Internal + poolPublicAmd64: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + +jobs: +- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + dependsOn: ${{ parameters.dependsOn }} + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + CentOSStream8-Online: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: true + _WithPreviousSDK: false + CentOSStream8-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: false + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + Alpine317-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine317Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + CentOSStream8-WithPreviousSDK: + _BootstrapPrep: false + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: true + CentOSStream9-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream9Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: true + _RunOnline: false + _WithPreviousSDK: false + Fedora38-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: true + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + Ubuntu2004-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.ubuntu2004Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64 + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + ${{ parameters.poolInternalAmd64PR }} + ${{ else }}: + ${{ parameters.poolInternalAmd64 }} + +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: arm64 + dependsOn: ${{ parameters.dependsOn }} + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Debian11-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian11Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_arm64 + pool: ${{ parameters.poolInternalArm64 }} + +- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. + # The bootstrap build will shortcut if the stage 1 build failed. + condition: succeededOrFailed() + dependsOn: Build_Tarball_x64 + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Fedora38-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64_Using_Previous + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ parameters.poolInternalAmd64 }} + usePreviousArtifacts: true 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 307cb7307..f7f9cdb48 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 @@ -17,15 +17,21 @@ parameters: ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalAmd64PR: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalArm64: name: Docker-Linux-Arm-Internal + image: Mariner-2-Docker-ARM64 + os: linux + hostArchitecture: Arm64 poolPublicAmd64: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -123,7 +129,7 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: 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. + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. condition: succeededOrFailed() dependsOn: Build_Tarball_x64 From 57723c39e7e2d1ba4ffe09e0653089da15fa15fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:05:06 -0700 Subject: [PATCH 647/654] [release/7.0.3xx] Update dependencies from dotnet/source-build-reference-packages (#19152) Co-authored-by: dotnet-maestro[bot] --- 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 22077ded2..ee7ffb5e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade d0ab6f8c61222a6383dc2109d039b437ba9afa92 - + https://github.com/dotnet/source-build-reference-packages - c74756071d00a51bcd35510900719148b4182f34 + 61fe34f8b2f37ae69875ba7206628df11d6abfe2 From 227eecbdda6b6d5862ed02ffe994169cf48e255e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:11:36 -0700 Subject: [PATCH 648/654] [release/7.0.3xx] Update dependencies from dotnet/source-build-externals (#19147) Co-authored-by: dotnet-maestro[bot] --- 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 ee7ffb5e7..c0a094e02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 936411dd5d047cef6674b47872104a3a59cf5754 + 3099976c92865c40a0edd6ff80926dc85acd7b13 From a31b115900bc9c85b21ec44ea3cc35bd638c6efb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Apr 2024 16:10:03 +0000 Subject: [PATCH 649/654] Update dependencies from https://github.com/dotnet/arcade build 20240404.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24179.7 -> To Version 7.0.0-beta.24204.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../steps/component-governance.yml | 2 +- eng/common/templates/steps/component-governance.yml | 2 +- global.json | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0a094e02..eca40dfb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - d0ab6f8c61222a6383dc2109d039b437ba9afa92 + 31d070a59ea56ea0c25736318e4287bdd883d05f - + https://github.com/dotnet/arcade - d0ab6f8c61222a6383dc2109d039b437ba9afa92 + 31d070a59ea56ea0c25736318e4287bdd883d05f - + https://github.com/dotnet/arcade - d0ab6f8c61222a6383dc2109d039b437ba9afa92 + 31d070a59ea56ea0c25736318e4287bdd883d05f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b55f0b7c9..3bf13e08c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24179.7 + 7.0.0-beta.24204.2 diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index babc2757d..12527b80e 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index babc2757d..12527b80e 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index f1d52ca39..5bc0b5e47 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.24179.7", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24179.7" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24204.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24204.2" } } From bb04692b9333596256eccabd97d7988f36f67837 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Apr 2024 15:42:25 +0000 Subject: [PATCH 650/654] Update dependencies from https://github.com/dotnet/arcade build 20240409.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24204.2 -> To Version 7.0.0-beta.24209.2 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index d0675ea4f..c522b6bac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,25 @@ + + + + - + + + + @@ -44,14 +51,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 184440960..81a7779ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 31d070a59ea56ea0c25736318e4287bdd883d05f + 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 - + https://github.com/dotnet/arcade - 31d070a59ea56ea0c25736318e4287bdd883d05f + 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 - + https://github.com/dotnet/arcade - 31d070a59ea56ea0c25736318e4287bdd883d05f + 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 708926d72..2d6e7d3f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24204.2 + 7.0.0-beta.24209.2 diff --git a/global.json b/global.json index 5bc0b5e47..53a34d119 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.117", + "dotnet": "7.0.118", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24204.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24204.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24209.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24209.2" } } From 0bdf76fe00ac59332c90c4bd712886e237c80fb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Apr 2024 17:11:56 +0000 Subject: [PATCH 651/654] Update dependencies from https://github.com/dotnet/arcade build 20240409.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24204.2 -> To Version 7.0.0-beta.24209.2 From 38f3a6ebeaf7890b331a8f0915d40b6516d46698 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Apr 2024 18:59:21 +0000 Subject: [PATCH 652/654] Update dependencies from https://github.com/dotnet/source-build-externals build 20240410.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24201.2 -> To Version 7.0.0-alpha.1.24210.1 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index d0675ea4f..c522b6bac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,25 @@ + + + + - + + + + @@ -44,14 +51,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 184440960..ded4cf7f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 3099976c92865c40a0edd6ff80926dc85acd7b13 + 3006a6cbf9c47169eee8371475f4047528af252f From 6d2926d16a57a27d984bfee76e20ff8f7da1f122 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Apr 2024 16:52:15 +0000 Subject: [PATCH 653/654] Update dependencies from https://github.com/dotnet/arcade build 20240412.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24209.2 -> To Version 7.0.0-beta.24212.2 --- NuGet.config | 12 ------------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index c522b6bac..acc76c0bb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,6 @@ - - - @@ -22,9 +19,6 @@ - - - @@ -51,15 +45,9 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f70c1aa5d..ab3abb2b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 + ace2922d5d1ecf83ec52ccc09324cfd325dcc233 - + https://github.com/dotnet/arcade - 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 + ace2922d5d1ecf83ec52ccc09324cfd325dcc233 - + https://github.com/dotnet/arcade - 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 + ace2922d5d1ecf83ec52ccc09324cfd325dcc233 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 283518304..3cb02d296 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24209.2 + 7.0.0-beta.24212.2 diff --git a/global.json b/global.json index 53a34d119..e2f2cce05 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.24209.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24209.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24212.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24212.2" } } From 660ffb0f150bd1162f68d1061c3440986c9d5e16 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 12 Apr 2024 10:16:00 -0700 Subject: [PATCH 654/654] Update WiX to 3.14.8722 (#19409) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 283518304..b1312ce42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,7 +146,7 @@ - 3.14.0.8606 + 3.14.1.8722