From 7d85b4f9a9c6e0647b76d91de622263cbd83ea09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 12:00:20 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/arcade build 20221013.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22513.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c658e58f0b4..227f5d491d89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -271,22 +271,22 @@ - + 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/arcade - f760da39566d1cfa90c89e38d8dfafb3d43f9cae + 02e28316bf35d1028683ee313f0794776bff18d1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1460f902048c..a9d5ab6545c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22511.2 + 7.0.0-beta.22513.4 7.0.0-preview.22423.2 7.0.0 4.3.0 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22511.2 + 7.0.0-beta.22513.4 4.8.2 6.0.0-beta.22262.1 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index c35087a06019..39be08d4b16c 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 aba6308ad313..449126943299 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 6406b45210fd..6d4be896063e 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 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22511.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22511.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22513.4" } } From 26cedb7888fa6b5681b716e619a1844452596d95 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Oct 2022 00:47:10 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/arcade build 20221014.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22514.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 227f5d491d89..0668a541c7f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -271,22 +271,22 @@ - + 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/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3083cc93619dbb153fdb7907b332efa18908f039 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a9d5ab6545c3..8e9c9358cf5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22513.4 + 7.0.0-beta.22514.3 7.0.0-preview.22423.2 7.0.0 4.3.0 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22513.4 + 7.0.0-beta.22514.3 4.8.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index 6d4be896063e..3dab91dd268d 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22513.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22514.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22514.3" } } From 02b89b34fa8781da5310571d7e34b14b7d643a79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Nov 2022 16:37:18 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/arcade build 20221031.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22531.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0668a541c7f9..03805b6086e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -271,22 +271,22 @@ - + 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/arcade - 3083cc93619dbb153fdb7907b332efa18908f039 + e5703ddc4d3434bca1c86c9984a2162d9608093a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8e9c9358cf5c..f469a5ce51fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22514.3 + 7.0.0-beta.22531.4 7.0.0-preview.22423.2 7.0.0 4.3.0 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22514.3 + 7.0.0-beta.22531.4 4.8.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index 3dab91dd268d..39032a7e0a2c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22514.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22514.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22531.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22531.4" } } From f8fba629f2da6e6c4fa2147310ae0dfcb34b8fad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 18:55:57 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/arcade build 20221107.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22557.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03805b6086e3..e44ea82933c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -271,22 +271,22 @@ - + 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/arcade - e5703ddc4d3434bca1c86c9984a2162d9608093a + dd38487d8af0ff04aa549142356cb0eaed11129b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f469a5ce51fe..8efc1c1ee532 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22531.4 + 7.0.0-beta.22557.1 7.0.0-preview.22423.2 7.0.0 4.3.0 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22531.4 + 7.0.0-beta.22557.1 4.8.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index 39032a7e0a2c..2bdb7f740be7 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22531.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22531.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22557.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22557.1" } } From d4ff0c66d5a11ebca5d534d469232777082ec6f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Nov 2022 15:46:14 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/arcade build 20221108.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22558.4 --- NuGet.config | 2 -- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 6 +++--- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index abd0203f3b6c..cf26c6c8b14e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e44ea82933c9..8869f346b869 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -271,22 +271,22 @@ - + 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/arcade - dd38487d8af0ff04aa549142356cb0eaed11129b + 3f3c360819c5c092d0e4505a67dfe59a33fba557 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8efc1c1ee532..f0dbdd346465 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22557.1 + 7.0.0-beta.22558.4 7.0.0-preview.22423.2 7.0.0 4.3.0 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22557.1 + 7.0.0-beta.22558.4 4.8.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index 2bdb7f740be7..182a0b637120 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 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22557.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22557.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22558.4" } } From 4b10d780f56132585368d805b66122e15112b2a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Nov 2022 18:20:17 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/arcade build 20221111.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22561.2 --- NuGet.config | 1 - eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index cf26c6c8b14e..0815f41ac8a4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8869f346b869..4684adc5d4db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -271,22 +271,22 @@ - + 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/arcade - 3f3c360819c5c092d0e4505a67dfe59a33fba557 + f36ea231c234560514ede4c2747897a737ced28f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f0dbdd346465..91e74cafdcd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22558.4 + 7.0.0-beta.22561.2 7.0.0-preview.22423.2 7.0.0 4.3.0 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22558.4 + 7.0.0-beta.22561.2 4.8.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index 182a0b637120..f695898c047e 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22558.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22561.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22561.2" } }