From e5c70c78d5f882aae74561d0e953f5a1e691557a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Jun 2023 17:55:10 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/installer build 20230607.14 Microsoft.Dotnet.Sdk.Internal From Version 7.0.204-servicing.23214.3 -> To Version 7.0.305-servicing.23307.14 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.23062.2 -> To Version 7.0.100-1.23207.1 (parent: Microsoft.Dotnet.Sdk.Internal --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index a69e634e942..6fbacd9c8dc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3b51966626..afa734968dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,12 +1,12 @@ - + https://github.com/dotnet/installer - 2c6d66877c56908882eb52d5e2125b13929a0187 + 27c33cba6d12c7b5c316f548679cfeb5f874f086 - + https://github.com/dotnet/linker - 19fa656d35252ccf926e6a6d783b16a2f094aaef + 08a09f27f664fb84368aa4b9eb862b13bf808579 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 40e2440bb45..311590cc991 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,8 +1,8 @@ - 7.0.204-servicing.23214.3 - 7.0.100-1.23062.2 + 7.0.305-servicing.23307.14 + 7.0.100-1.23207.1 7.0.6 7.0.0-beta.22103.1 7.0.0-beta.22103.1 From c352e0c7b1d30c8497b2200bc35dccb024608276 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 3 May 2023 16:42:19 -0500 Subject: [PATCH 2/6] dotnet/runtime 6.0.18 --- NuGet.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6fbacd9c8dc..9859edc10e6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,9 +19,9 @@ - + - + From ec58eb44e8369da0f5088749c126dfc20c2813e0 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 12 Jun 2023 10:40:33 -0500 Subject: [PATCH 3/6] dotnet/runtime 6.0.19 On the `release/6.0.4xx` branch I ran this to get these feeds: darc update-dependencies --id 180912 Using the build from: https://maestro-prod.westus2.cloudapp.azure.com/1296/https:%2F%2Fdev.azure.com%2Fdnceng%2Finternal%2F_git%2Fdotnet-runtime/latest/graph --- NuGet.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9859edc10e6..cdbac21d497 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,9 +19,9 @@ - - - + + + From 54ceb24aa54ac64b68d749b14db928a963a89345 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 12:47:01 -0500 Subject: [PATCH 4/6] [release/7.0.2xx] Update dependencies from dotnet/runtime (#8019) * Update dependencies from https://github.com/dotnet/runtime build 20230503.17 Microsoft.NETCore.App.Ref From Version 7.0.6 -> To Version 7.0.7 * dotnet/runtime 6.0.18 * Update dependencies from https://github.com/dotnet/runtime build 20230522.13 Microsoft.NETCore.App.Ref From Version 7.0.6 -> To Version 7.0.7 Dependency coherency updates Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.6 -> To Version 7.0.7 (parent: Microsoft.NETCore.App.Ref * Update dependencies from https://github.com/dotnet/runtime build 20230522.13 Microsoft.NETCore.App.Ref From Version 7.0.6 -> To Version 7.0.7 Dependency coherency updates Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.6 -> To Version 7.0.7 (parent: Microsoft.NETCore.App.Ref * Update dependencies from https://github.com/dotnet/runtime build 20230606.6 Microsoft.NETCore.App.Ref From Version 7.0.6 -> To Version 7.0.8 Dependency coherency updates Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.6 -> To Version 7.0.7 (parent: Microsoft.NETCore.App.Ref * dotnet/runtime 6.0.19 On the `release/6.0.4xx` branch I ran this to get these feeds: darc update-dependencies --id 180912 Using the build from: https://maestro-prod.westus2.cloudapp.azure.com/1296/https:%2F%2Fdev.azure.com%2Fdnceng%2Finternal%2F_git%2Fdotnet-runtime/latest/graph * [release/7.0.2xx] Update dependencies from dotnet/installer (#8010) * Update dependencies from https://github.com/dotnet/installer build 20230502.5 Microsoft.Dotnet.Sdk.Internal From Version 7.0.204-servicing.23214.3 -> To Version 7.0.205-servicing.23252.5 * dotnet/runtime 6.0.18 * Update dependencies from https://github.com/dotnet/installer build 20230504.11 Microsoft.Dotnet.Sdk.Internal From Version 7.0.204-servicing.23214.3 -> To Version 7.0.206-servicing.23254.11 * dotnet/runtime 6.0.19 On the `release/6.0.4xx` branch I ran this to get these feeds: darc update-dependencies --id 180912 Using the build from: https://maestro-prod.westus2.cloudapp.azure.com/1296/https:%2F%2Fdev.azure.com%2Fdnceng%2Finternal%2F_git%2Fdotnet-runtime/latest/graph --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jonathan Peppers * Revert "[release/7.0.2xx] Update dependencies from dotnet/installer (#8010)" This reverts commit 953fe11620a5823b99084d8697ddd45c35d3866c. --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jonathan Peppers Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> --- NuGet.config | 6 ++---- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index cdbac21d497..47f624a97ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,12 +4,10 @@ - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afa734968dd..468afebb63a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,17 +8,17 @@ https://github.com/dotnet/linker 08a09f27f664fb84368aa4b9eb862b13bf808579 - + https://github.com/dotnet/runtime - 43b5822e3add9e0c7c7bf8057ddadb7169c76dd3 + 0db8a39b9ed06e20f1078be1a5bf465633ee4d78 - + https://github.com/dotnet/emsdk - b0eec69ee7bdab81823db7d6482cb6cff9f07e48 + b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda - + https://github.com/dotnet/emsdk - b0eec69ee7bdab81823db7d6482cb6cff9f07e48 + b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda diff --git a/eng/Versions.props b/eng/Versions.props index 311590cc991..3ae743f4d48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,10 +3,10 @@ 7.0.305-servicing.23307.14 7.0.100-1.23207.1 - 7.0.6 + 7.0.8 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 7.0.6 + 7.0.7 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) 7.0.100-rc.1.22410.7 From 5253c078170f4259133c1b2b436cb15891af07a4 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 13 Jun 2023 12:49:29 -0500 Subject: [PATCH 5/6] Fix whitespace --- NuGet.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 47f624a97ae..2332aa300a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + From abeaea7af8a9afc129c1312eebf1ba26b7507cde Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 14 Jun 2023 08:30:01 -0500 Subject: [PATCH 6/6] Update to MSBuild.StructuredLogger 2.1.787 System.NotSupportedException : Unsupported log file format. Latest supported version is 15, the log file has version 16. --- tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj index 2aebfdb3f47..1950b7df9c8 100644 --- a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj +++ b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj @@ -35,7 +35,7 @@ - +