From 5db1934e433f8bb48e2c20a1a4691025406ff70b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jul 2023 13:05:29 +0000 Subject: [PATCH 1/7] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230714.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.120-servicing.23322.14 -> To Version 6.0.121-servicing.23364.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.20 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk --- NuGet.config | 9 ++++ eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 80 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd632b04b..0b20f805d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,21 @@ + + + + + @@ -37,13 +42,17 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95730dc2c..0017d06b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 080b813fcf9f2417d6f0d50a6853d1b71034482b + b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 080b813fcf9f2417d6f0d50a6853d1b71034482b + b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 080b813fcf9f2417d6f0d50a6853d1b71034482b + b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f82b9fbd6d2ed0076ed2ea733330ba98130a109 + f46a9672ea5b9c9fc5e40f9b0ca405664115394c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f82b9fbd6d2ed0076ed2ea733330ba98130a109 + f46a9672ea5b9c9fc5e40f9b0ca405664115394c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 + c4dcb2663686315258f2f687c51f1ff5bb7d0aea https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 6c7f38c614304c93cd392907df7d5e770d5cf7f1 + 60d640a5c1025d1e9e89188cabe41e692d0f5468 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index e7d31888f..d6d900ba1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.20-servicing.23321.4 + 6.0.21-servicing.23363.11 - 6.0.20-servicing.23321.8 + 6.0.21-servicing.23363.8 - 6.0.120 + 6.0.121 @@ -44,20 +44,20 @@ - 6.0.20 - 6.0.20 - 6.0.20-servicing.23321.6 - 6.0.20-servicing.23321.6 - 6.0.20-servicing.23321.6 - 6.0.20-servicing.23321.6 + 6.0.21 + 6.0.21 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 0.2.0 - 6.0.120-servicing.23322.14 - 6.0.120-servicing.23322.14 + 6.0.121-servicing.23364.11 + 6.0.121-servicing.23364.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 - 6.0.20 - 6.0.20 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23363.11 + 6.0.21-servicing.23363.11 + 6.0.21 + 6.0.21 + 6.0.21 + 6.0.21 2.1.0 - 6.0.20-servicing.23321.10 - 6.0.20-servicing.23321.10 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23364.1 + 6.0.21-servicing.23364.1 + 6.0.21 + 6.0.21 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.120 + 6.0.121 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.20 + 6.0.21 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 08035c40749605b571e8169eb29c66596ffb358b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 19:29:33 +0000 Subject: [PATCH 2/7] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23364.11 -> To Version 6.0.121-servicing.23367.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,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 6.0.21 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b20f805d..7b4f90a94 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0017d06b3..8849d0ad4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f46a9672ea5b9c9fc5e40f9b0ca405664115394c + 1f77c362a752e25c643140f014af4ee0a05fce4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f46a9672ea5b9c9fc5e40f9b0ca405664115394c + 1f77c362a752e25c643140f014af4ee0a05fce4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 + 052009561f916cf06df82d89297ae3ed66cf5d2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c4dcb2663686315258f2f687c51f1ff5bb7d0aea + fa467fd679da61d9e429ce2654ef63766afcd7f5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d6d900ba1..7d7dff33f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.21-servicing.23363.11 + 6.0.21-servicing.23364.6 - 6.0.21-servicing.23363.8 + 6.0.21-servicing.23364.5 @@ -46,18 +46,18 @@ 6.0.21 6.0.21 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 + 6.0.21-servicing.23364.38 + 6.0.21-servicing.23364.38 + 6.0.21-servicing.23364.38 + 6.0.21-servicing.23364.38 0.2.0 - 6.0.121-servicing.23364.11 - 6.0.121-servicing.23364.11 + 6.0.121-servicing.23367.13 + 6.0.121-servicing.23367.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.21-servicing.23364.1 - 6.0.21-servicing.23364.1 + 6.0.21-servicing.23367.3 + 6.0.21-servicing.23367.3 6.0.21 6.0.21 From 00e4340849d26c84e65f750acb91355d4c40f9ae Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 17 Jul 2023 22:00:26 +0000 Subject: [PATCH 3/7] Merged PR 32708: Remove applied source build patch - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. 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 2a433a301fc9d79ec14e20fa5e083288f557445e Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 8 Aug 2023 14:56:41 -0400 Subject: [PATCH 4/7] [release/6.01xx] Update source-build CI to Fedora 38 (#16649) --- .../templates/job/source-build-run-tarball-build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 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 c3c5a5fca..1dc1503c5 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 @@ -14,7 +14,7 @@ parameters: centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b debian9Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-arm64v8-20220405201138-a251961 - fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-20230609193134-47458d2 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b poolInternalAmd64: name: NetCore1ESPool-Svc-Internal @@ -62,9 +62,9 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false - Fedora33-Offline: + Fedora38-Offline: _BootstrapPrep: false - _Container: ${{ parameters.fedora33Container }} + _Container: ${{ parameters.fedora38Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _RunOnline: false @@ -111,9 +111,9 @@ jobs: excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Fedora33-Offline: - _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora33-Offline_Artifacts - _Container: ${{ parameters.fedora33Container }} + Fedora38-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts + _Container: ${{ parameters.fedora38Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false From 4ace1423c373c74350c56bd691d5e35e804cad15 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 8 Aug 2023 15:32:35 -0500 Subject: [PATCH 5/7] Remove extra XML doc entry --- .../assets/baselines/MissingXmlDoc.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index bde73ece6..38f80e186 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,7 +1,6 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml From f2a927934b2b8f18195b1e89230fb33bf0facefe Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:18:30 -0500 Subject: [PATCH 6/7] .NET Source-Build 6.0.121 August 2023 Updates (#17149) --- eng/Versions.props | 2 +- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- src/SourceBuild/tarball/content/prep.sh | 4 ++-- .../assets/baselines/MissingXmlDoc.txt | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d3893f5c2..2a3fffae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,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. --> - 6.0.120 + 6.0.121 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 323f7a038..4ee92a5e1 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -322,7 +322,7 @@ - + diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 0f6503072..e981a599e 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.120" + "dotnet": "6.0.121" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index e7fc6d550..429173290 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -79,13 +79,13 @@ while read -r line; do if [[ $line == *"Private.SourceBuilt.Artifacts"* ]]; then if [ "$downloadArtifacts" == "true" ]; then echo " Downloading source-built artifacts from $line..." - (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) + (cd $SCRIPT_ROOT/packages/archive/ && curl --fail --retry 5 -O $line) fi fi if [[ $line == *"Private.SourceBuilt.Prebuilts"* ]]; then if [ "$downloadPrebuilts" == "true" ]; then echo " Downloading source-built prebuilts from $line..." - (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) + (cd $SCRIPT_ROOT/packages/archive/ && curl --fail --retry 5 -O $line) fi fi done < $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index 38f80e186..bde73ece6 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,6 +1,7 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml +Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml From 936590bd4957956814471058e15bf04bccdc7267 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 10:25:31 -0700 Subject: [PATCH 7/7] [release/6.0.1xx] Update dependencies from dotnet/arcade (#17161) Co-authored-by: dotnet-maestro[bot] --- 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 7b4f90a94..a5401b038 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,27 @@ + + + + - + + + + @@ -42,16 +49,21 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8849d0ad4..5581ce16f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2a3fffae8..98528e76f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23361.3 + 6.0.0-beta.23408.5 diff --git a/global.json b/global.json index 3364ad030..327cfe027 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.120", + "dotnet": "6.0.121", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23361.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" } }