From 825ca3438663e371689d2ee1618895498a1992df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Oct 2022 22:58:29 +0000 Subject: [PATCH 01/23] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221004.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22479.1 -> To Version 7.0.0-alpha.1.22504.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88799d2a1..16dd45ca5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,9 +206,9 @@ https://github.com/dotnet/arcade 720af493900b2f2bdc48e9ee12577983a5c9be36 - + https://github.com/dotnet/source-build-reference-packages - 27fbf63a91da8ef12b758fb642c039e8c1ab5d2a + 8366acfc3e0660ceef6bddbe7794044e5d503521 From 70bb35b3dfe71f62316554fac60a595b813d924a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Oct 2022 15:52:57 +0000 Subject: [PATCH 02/23] Update dependencies from https://github.com/dotnet/source-build-externals build 20221005.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22463.5 -> To Version 7.0.0-alpha.1.22505.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88799d2a1..715b95f39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,9 +181,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 6e9ede1f2771f59d80a4050c02d051bbbd457c77 + c47ba6c19d50081f90008da8bc61b3ac20348f20 From 223a0ebc50a1d31690a0e08c51c83ddd22bb273a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Oct 2022 23:10:39 +0000 Subject: [PATCH 03/23] 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 81e824d9e539afd9c57ff17fcb1d3a802d66e06a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 17:13:41 +0000 Subject: [PATCH 04/23] Update dependencies from https://github.com/dotnet/arcade build 20221007.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22464.4 -> To Version 7.0.0-beta.22507.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd3ddf2e7..a2e211bc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 7b21b46b59a5731165568690f3d82d3486201040 + c4f77b4e80e942941e73d70cec045eddbfd7b4eb - + https://github.com/dotnet/arcade - 7b21b46b59a5731165568690f3d82d3486201040 + c4f77b4e80e942941e73d70cec045eddbfd7b4eb - + https://github.com/dotnet/arcade - 7b21b46b59a5731165568690f3d82d3486201040 + c4f77b4e80e942941e73d70cec045eddbfd7b4eb https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 6e70ddf3c..648a5fd5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22504.3 + 7.0.0-beta.22507.2 diff --git a/global.json b/global.json index d599b7ce8..4ac53c9bc 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22504.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22504.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22507.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22507.2" } } From 860067bade6be3fbda19a3162abde99286c82df1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 09:00:08 -0500 Subject: [PATCH 05/23] [release/7.0.1xx] Update dependencies from dotnet/sdk (#14692) * Update dependencies from https://github.com/dotnet/sdk build 20221007.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.100-rtm.22507.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221007.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.100-rtm.22507.16 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221007.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.100-rtm.22507.19 * Update dependencies from https://github.com/dotnet/sdk build 20221007.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22507.19 -> To Version 7.0.100-rtm.22507.25 * Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 36 ++++++++--------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70ba1d1a1..7c0a9db85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e5f1b07e2b0e290412cca52d87508ce738882eff https://github.com/dotnet/llvm-project 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae @@ -53,9 +53,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae https://github.com/dotnet/aspnetcore @@ -103,39 +103,39 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + f22b2f81c736691aca92af4c425e41b219adc0e1 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + f22b2f81c736691aca92af4c425e41b219adc0e1 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + f22b2f81c736691aca92af4c425e41b219adc0e1 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + f22b2f81c736691aca92af4c425e41b219adc0e1 - + https://github.com/dotnet/winforms - 993983be2ce14ca67f7ff09b8b04e9b8391b3339 + b718d35e98c370ff27249f8f6c57325033a27c7e - + https://github.com/dotnet/wpf - a956caa0747c27f0b0776d845fafe0b05b2c7337 + 8091341440149a2ff67ed5af6efbb43c349ee537 - + https://github.com/dotnet/fsharp - f07ccb1bc4325861cb4306733f59b23f6d4344f7 + 532a074f9b304325d8bcd554ac73a1183b74a8f0 - + https://github.com/dotnet/fsharp - f07ccb1bc4325861cb4306733f59b23f6d4344f7 + 532a074f9b304325d8bcd554ac73a1183b74a8f0 @@ -154,9 +154,9 @@ 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb - + https://github.com/dotnet/msbuild - 20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef + 9e6f1455a81e01cb7780f1e8ed5041f20cd396a3 @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 77c2667993976295017e2759f075550bcf606fc1 + daca2015ce74956591df9c9dc7ee732af7863b42 - + https://github.com/dotnet/emsdk - 77c2667993976295017e2759f075550bcf606fc1 + daca2015ce74956591df9c9dc7ee732af7863b42 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 14ef392eb..47c98cda6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22476.8 + 7.0.0-rtm.22506.1 - 7.0.0-rtm.22476.6 + 7.0.0-rtm.22506.9 @@ -63,33 +63,33 @@ - 7.0.100-rtm.22506.24 - 7.0.100-rtm.22506.24 - 7.0.100-rtm.22506.24 + 7.0.100-rtm.22507.25 + 7.0.100-rtm.22507.25 + 7.0.100-rtm.22507.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22505.15 + 7.0.0-rtm.22507.1 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 2.1.0 - 7.0.0-rtm.22478.5 - 7.0.0-rtm.22478.5 - 7.0.0-rtm.22478.5 - 7.0.0-rtm.22478.5 + 7.0.0-rtm.22507.2 + 7.0.0-rtm.22507.2 + 7.0.0-rtm.22507.2 + 7.0.0-rtm.22507.2 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rtm.22476.2 - 7.0.0-rtm.22476.2 + 7.0.0-rtm.22504.3 + 7.0.0-rtm.22504.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 24a021275381d7ad78581c1c76173345bbc11778 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 5 Oct 2022 16:29:15 +0000 Subject: [PATCH 06/23] Condition sourcelink generation --- .../content/ArcadeOverrides/SourceBuildArcadeBuild.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets index eeea55fcc..6ee80ed90 100644 --- a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets +++ b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets @@ -86,9 +86,9 @@ $(InnerBuildArgs) /p:SourceBuiltBlobFeedDir=$(SourceBuiltBlobFeedDir) - $(InnerBuildArgs) /p:EnableSourceControlManagerQueries=false - $(InnerBuildArgs) /p:EnableSourceLink=false - $(InnerBuildArgs) /p:DeterministicSourcePaths=false + $(InnerBuildArgs) /p:EnableSourceControlManagerQueries=false + $(InnerBuildArgs) /p:EnableSourceLink=false + $(InnerBuildArgs) /p:DeterministicSourcePaths=false $(InnerBuildArgs) /p:DotNetBuildOffline=true $(InnerBuildArgs) /p:DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath) From 837b3a13610161b0e446c235d6e5c05e4a516b54 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Fri, 7 Oct 2022 16:25:20 +0000 Subject: [PATCH 07/23] Remove redundant arguments - these properties are set by repos based on value of DisableSourceLink property --- .../content/ArcadeOverrides/SourceBuildArcadeBuild.targets | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets index 6ee80ed90..94d7777c3 100644 --- a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets +++ b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets @@ -85,10 +85,6 @@ $(InnerBuildArgs) /p:SourceBuildOutputDir=$(SourceBuildOutputDir) $(InnerBuildArgs) /p:SourceBuiltBlobFeedDir=$(SourceBuiltBlobFeedDir) - - $(InnerBuildArgs) /p:EnableSourceControlManagerQueries=false - $(InnerBuildArgs) /p:EnableSourceLink=false - $(InnerBuildArgs) /p:DeterministicSourcePaths=false $(InnerBuildArgs) /p:DotNetBuildOffline=true $(InnerBuildArgs) /p:DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath) From dc021278a8054118b027aa766215fe6dfb18e550 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Oct 2022 11:20:50 -0500 Subject: [PATCH 08/23] Remove questionable license cleanup logic (#14681) --- .../Arcade/tools/SourceBuildArcadeTarball.targets | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 1a652650a..e7a9698c6 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -262,19 +262,8 @@ $(TarballSourceDir)runtime*\src\installer\pkg\**\*%(TarballSrcBinaryExtension.Identity)" /> + - - - - - - - - - - From e1d19eb3fa40813d1a6e2e45d4dc00b08cd835e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 18:13:26 +0000 Subject: [PATCH 09/23] Update dependencies from https://github.com/dotnet/sdk build 20221010.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c0a9db85..035010d46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - f22b2f81c736691aca92af4c425e41b219adc0e1 + 39b57e7c15ec09a0c230dade5f014d17be960b42 - + https://github.com/dotnet/sdk - f22b2f81c736691aca92af4c425e41b219adc0e1 + 39b57e7c15ec09a0c230dade5f014d17be960b42 - + https://github.com/dotnet/sdk - f22b2f81c736691aca92af4c425e41b219adc0e1 + 39b57e7c15ec09a0c230dade5f014d17be960b42 - + https://github.com/dotnet/sdk - f22b2f81c736691aca92af4c425e41b219adc0e1 + 39b57e7c15ec09a0c230dade5f014d17be960b42 @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb + 7971633700e06fdd0a46dbae78908582ee533c2a diff --git a/eng/Versions.props b/eng/Versions.props index 47c98cda6..481f4a2e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22507.25 - 7.0.100-rtm.22507.25 - 7.0.100-rtm.22507.25 + 7.0.100-rtm.22510.8 + 7.0.100-rtm.22510.8 + 7.0.100-rtm.22510.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18a6bff6a69ffebcdd18c171747ca1be30b6ef95 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Oct 2022 13:46:25 -0500 Subject: [PATCH 10/23] Fix source-build CI to not run tarball build when tarball creation fails (#14678) * Fix source-build CI to not run tarball build when tarball creation failed * Bad fix * Revert test patch --- .../templates/job/source-build-run-tarball-build.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index dd39d4e2d..60b39b652 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -1,9 +1,6 @@ # Builds a source-build tarball parameters: - # Custom condition to apply to the job - condition: true - # Dependent jobs that must be completed before this job will run dependsOn: @@ -30,7 +27,6 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - condition: ${{ parameters.condition }} dependsOn: ${{ parameters.dependsOn }} ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: excludeSdkContentTests: true @@ -78,7 +74,6 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: arm64 - condition: ${{ parameters.condition }} dependsOn: ${{ parameters.dependsOn }} ${{ if in(variables['Build.Reason'], 'PullRequest') }}: excludeSdkContentTests: true @@ -100,7 +95,7 @@ jobs: architecture: x64 # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. - condition: and(${{ parameters.condition }}, succeededOrFailed()) + condition: succeededOrFailed() dependsOn: Build_Tarball_x64 excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} From 5449eb59d38ec8e370b1db25aeff4ee007170ad3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 21:01:47 +0000 Subject: [PATCH 11/23] Update dependencies from https://github.com/dotnet/sdk build 20221010.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 035010d46..4f9afc01b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 39b57e7c15ec09a0c230dade5f014d17be960b42 + f9280d1aafb6735d0f2df431b4e05de365d0c793 - + https://github.com/dotnet/sdk - 39b57e7c15ec09a0c230dade5f014d17be960b42 + f9280d1aafb6735d0f2df431b4e05de365d0c793 - + https://github.com/dotnet/sdk - 39b57e7c15ec09a0c230dade5f014d17be960b42 + f9280d1aafb6735d0f2df431b4e05de365d0c793 - + https://github.com/dotnet/sdk - 39b57e7c15ec09a0c230dade5f014d17be960b42 + f9280d1aafb6735d0f2df431b4e05de365d0c793 diff --git a/eng/Versions.props b/eng/Versions.props index 481f4a2e5..71814b15e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22510.8 - 7.0.100-rtm.22510.8 - 7.0.100-rtm.22510.8 + 7.0.100-rtm.22510.10 + 7.0.100-rtm.22510.10 + 7.0.100-rtm.22510.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ffedce380ba93630a621475c2ed735ac8e4c155f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 23:29:44 +0000 Subject: [PATCH 12/23] Update dependencies from https://github.com/dotnet/sdk build 20221010.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.16 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f9afc01b..4ebae28fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - f9280d1aafb6735d0f2df431b4e05de365d0c793 + 047029f55d17036beb6461c894174127a8252810 - + https://github.com/dotnet/sdk - f9280d1aafb6735d0f2df431b4e05de365d0c793 + 047029f55d17036beb6461c894174127a8252810 - + https://github.com/dotnet/sdk - f9280d1aafb6735d0f2df431b4e05de365d0c793 + 047029f55d17036beb6461c894174127a8252810 - + https://github.com/dotnet/sdk - f9280d1aafb6735d0f2df431b4e05de365d0c793 + 047029f55d17036beb6461c894174127a8252810 diff --git a/eng/Versions.props b/eng/Versions.props index 71814b15e..6b908a727 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22510.10 - 7.0.100-rtm.22510.10 - 7.0.100-rtm.22510.10 + 7.0.100-rtm.22510.16 + 7.0.100-rtm.22510.16 + 7.0.100-rtm.22510.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26501197562333dacac457c8ae6d3ae430888cb0 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 10 Oct 2022 22:57:01 -0700 Subject: [PATCH 13/23] 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 f4c549308896b05879e3b99a1bdbc3de81d61521 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 16:37:13 +0000 Subject: [PATCH 14/23] 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 31164151680785cb885b3b40114aa5535850e5c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 12:00:12 +0000 Subject: [PATCH 15/23] 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 6b0a8bb0bc9cabbfe455b5ab5aa27a3a623aeee7 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 14 Oct 2022 15:09:49 -0500 Subject: [PATCH 16/23] 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 f50cd347adc6b2675b7d1870b69989137751887b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Oct 2022 00:47:02 +0000 Subject: [PATCH 17/23] 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 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 18/23] 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 411ffbecaf355f27771106e86d3c184e84cc17c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Oct 2022 16:58:45 +0000 Subject: [PATCH 19/23] 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 2666ae8f0af5b165dbc3c7f54e50e22d062d864d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 Oct 2022 13:54:52 +0000 Subject: [PATCH 20/23] 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 62124919b9d4806c171b038e794f29405b900ea5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Nov 2022 14:35:23 +0000 Subject: [PATCH 21/23] 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 22/23] 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 23/23] 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