From 04bf45ed6ed8f3db69bbb6d570d264367a2d87c3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 15 Jun 2023 08:03:37 +0000 Subject: [PATCH 1/7] [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.Build: from 17.4.4 to 17.4.6 (parent: Microsoft.NET.Sdk) --- NuGet.config | 16 +++++++++------- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index fb9bd53aa..5e70fca1b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,23 +8,25 @@ + + + + - + - - + - @@ -46,15 +48,15 @@ + + - - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 811773cf7..8307f8d3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e0a72cb669f111b49ae42a5666e6306889ccc6 + 55a9757a052de9da9c0d5a66c17ff5676e5cf302 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e0a72cb669f111b49ae42a5666e6306889ccc6 + 55a9757a052de9da9c0d5a66c17ff5676e5cf302 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e0a72cb669f111b49ae42a5666e6306889ccc6 + 55a9757a052de9da9c0d5a66c17ff5676e5cf302 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e0a72cb669f111b49ae42a5666e6306889ccc6 + 55a9757a052de9da9c0d5a66c17ff5676e5cf302 @@ -149,9 +149,9 @@ 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db - + https://github.com/dotnet/msbuild - 8e9cb295288f13095e9b7739cc4cbb04e9d246d2 + 020b625cf1f16f4a4f22b3c15a015c1160467ed5 diff --git a/eng/Versions.props b/eng/Versions.props index a69885a3e..625c317cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.107 - 7.0.107-servicing.23275.8 - 7.0.107-servicing.23275.8 + 7.0.108 + 7.0.108-servicing.23314.6 + 7.0.108-servicing.23314.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 53e9a51eb5f69b1e94e6058cab0b934958074bb6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Jun 2023 19:25:33 +0000 Subject: [PATCH 2/7] [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.7-servicing.23275.3 to 7.0.8-servicing.23315.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.7-servicing.23275.3 to 7.0.8-servicing.23315.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.7-servicing.23274.4 to 7.0.8-servicing.23313.27 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.7-servicing.23274.5 to 7.0.8-servicing.23314.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.7-servicing.23274.5 to 7.0.8-servicing.23314.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.7-servicing.23274.4 to 7.0.8-servicing.23313.27 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100: from 7.0.7 to 7.0.8 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.7-servicing.23274.4 to 7.0.8-servicing.23313.27 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100: from 7.0.7 to 7.0.8 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) --- NuGet.config | 22 ++++----- eng/Version.Details.xml | 102 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 84 insertions(+), 88 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5e70fca1b..2337fad73 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,22 @@ - - - + - - - - - + + - + + @@ -48,15 +44,15 @@ - - - + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85cc11e2d..ffee20318 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 55a9757a052de9da9c0d5a66c17ff5676e5cf302 + 578b4bb4995d42b87bcf783167f1e60c10831230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 55a9757a052de9da9c0d5a66c17ff5676e5cf302 + 578b4bb4995d42b87bcf783167f1e60c10831230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 55a9757a052de9da9c0d5a66c17ff5676e5cf302 + 578b4bb4995d42b87bcf783167f1e60c10831230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 55a9757a052de9da9c0d5a66c17ff5676e5cf302 + 578b4bb4995d42b87bcf783167f1e60c10831230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4a5f0c6839363dea534f21736a9d0726c14b41c + 8324ea1e8a1daabdee5390cf0150b63f9d61554c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 512eac4b458953da405f51ec0ae7766bcb7b32e5 + 0384a8ccb0b68916b599cf92419f895f6dabd1fa https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda + fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 - + https://github.com/dotnet/emsdk - b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda + fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 3d0a49305..21997d251 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23274.5 + 7.0.8-servicing.23314.7 - 7.0.7-servicing.23274.5 + 7.0.8-servicing.23314.7 @@ -56,13 +56,13 @@ - 7.0.7 - 7.0.7 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 + 7.0.8 + 7.0.8 + 7.0.8-servicing.23314.7 + 7.0.8-servicing.23314.7 + 7.0.8-servicing.23314.7 + 7.0.8-servicing.23314.7 + 7.0.8-servicing.23314.7 0.2.0 @@ -70,32 +70,32 @@ 7.0.108 - 7.0.108-servicing.23314.6 - 7.0.108-servicing.23314.6 + 7.0.108-servicing.23315.40 + 7.0.108-servicing.23315.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.3 + 7.0.4 - 7.0.7-servicing.23274.4 - 7.0.7-servicing.23274.4 - 7.0.7 - 7.0.7 - 7.0.7 - 7.0.7 + 7.0.8-servicing.23313.27 + 7.0.8-servicing.23313.27 + 7.0.8 + 7.0.8 + 7.0.8 + 7.0.8 2.1.0 - 7.0.7-servicing.23275.3 - 7.0.7-servicing.23275.3 - 7.0.7 - 7.0.7 + 7.0.8-servicing.23315.5 + 7.0.8-servicing.23315.5 + 7.0.8 + 7.0.8 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.7 - 7.0.7 + 7.0.8 + 7.0.8 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From a0f1d99cf7e91193b50d38bfb4f308d2b0f074fc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Jun 2023 22:23:25 +0000 Subject: [PATCH 3/7] [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.8 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.8 to 7.0.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk) --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2337fad73..99211be6b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffee20318..15d16b61e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 578b4bb4995d42b87bcf783167f1e60c10831230 + 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 578b4bb4995d42b87bcf783167f1e60c10831230 + 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 578b4bb4995d42b87bcf783167f1e60c10831230 + 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 578b4bb4995d42b87bcf783167f1e60c10831230 + 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 diff --git a/eng/Versions.props b/eng/Versions.props index 21997d251..32dc1550b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.8 7.0.8 - 7.0.8-servicing.23314.7 - 7.0.8-servicing.23314.7 - 7.0.8-servicing.23314.7 - 7.0.8-servicing.23314.7 - 7.0.8-servicing.23314.7 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 0.2.0 @@ -70,8 +70,8 @@ 7.0.108 - 7.0.108-servicing.23315.40 - 7.0.108-servicing.23315.40 + 7.0.108-servicing.23316.35 + 7.0.108-servicing.23316.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8fa4a8d83bb9de77ae5229b36a63c13f0dfa7f1e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 13:13:28 +0000 Subject: [PATCH 4/7] Merged PR 32045: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.8-servicing.23315.5 to 7.0.9-servicing.23321.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.8-servicing.23315.5 to 7.0.9-servicing.23321.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.8-servicing.23313.27 to 7.0.9-servicing.23320.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.8-servicing.23314.7 to 7.0.9-servicing.23321.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.8-servicing.23314.7 to 7.0.9-servicing.23321.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.Build**: from 17.4.6 to 17.4.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.8-servicing.23313.27 t... --- NuGet.config | 20 ++++---- eng/Version.Details.xml | 106 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++--------- 3 files changed, 87 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99211be6b..07a65d2c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,22 @@ - + - + - + - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15d16b61e..a6bbb65f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 @@ -50,36 +50,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 + 02690a4117050269e2100f67e6bb1d5abb5cb694 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 + 02690a4117050269e2100f67e6bb1d5abb5cb694 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 + 02690a4117050269e2100f67e6bb1d5abb5cb694 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 + 02690a4117050269e2100f67e6bb1d5abb5cb694 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8324ea1e8a1daabdee5390cf0150b63f9d61554c + dd121ee97234c7490f6111cf0c7bfa9235923f81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0384a8ccb0b68916b599cf92419f895f6dabd1fa + d41bd7da4139331ef02657deb7944df43b8a181c https://github.com/dotnet/fsharp @@ -149,9 +149,9 @@ 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db - + https://github.com/dotnet/msbuild - 020b625cf1f16f4a4f22b3c15a015c1160467ed5 + 6918b863aa37ad0699f98482fbab9f7a52e65a92 @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 + 9b227c1606a01920839873f840f6b76f7b492a66 - + https://github.com/dotnet/emsdk - fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 + 9b227c1606a01920839873f840f6b76f7b492a66 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 0d271ac80..9907f4ab3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.8-servicing.23314.7 + 7.0.9-servicing.23321.6 - 7.0.8-servicing.23314.7 + 7.0.9-servicing.23321.9 @@ -56,22 +56,22 @@ - 7.0.8 - 7.0.8 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 + 7.0.9 + 7.0.9 + 7.0.9-servicing.23321.10 + 7.0.9-servicing.23321.10 + 7.0.9-servicing.23321.10 + 7.0.9-servicing.23321.10 + 7.0.9-servicing.23321.10 0.2.0 - 7.0.108 - 7.0.108-servicing.23316.35 - 7.0.108-servicing.23316.35 + 7.0.109 + 7.0.109-servicing.23321.34 + 7.0.109-servicing.23321.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.8-servicing.23313.27 - 7.0.8-servicing.23313.27 - 7.0.8 - 7.0.8 - 7.0.8 - 7.0.8 + 7.0.9-servicing.23320.18 + 7.0.9-servicing.23320.18 + 7.0.9 + 7.0.9 + 7.0.9 + 7.0.9 2.1.0 - 7.0.8-servicing.23315.5 - 7.0.8-servicing.23315.5 - 7.0.8 - 7.0.8 + 7.0.9-servicing.23321.11 + 7.0.9-servicing.23321.11 + 7.0.9 + 7.0.9 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.8 - 7.0.8 + 7.0.9 + 7.0.9 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 2b8b3238efe3503bc2679af1d5de6053e107f535 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 17:23:28 +0000 Subject: [PATCH 5/7] Merged PR 32177: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230622.6 - **Date Produced**: June 22, 2023 4:39:37 PM UTC - **Commit**: e4f279b13323ec1e4ca16a5f0d44abf1bba14326 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.109 to 7.0.109][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.109-servicing.23321.34 to 7.0.109-servicing.23322.6][1] - **Microsoft.NET.Sdk**: [from 7.0.109-servicing.23321.34 to 7.0.109-servicing.23322.6][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.109-servicing.23321.34 to 7.0.109-servicing.23322.6][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC02690a4117&targetVersion=GCe4f279b133&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07a65d2c0..d977b32d7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6bbb65f2..36e803a0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02690a4117050269e2100f67e6bb1d5abb5cb694 + e4f279b13323ec1e4ca16a5f0d44abf1bba14326 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02690a4117050269e2100f67e6bb1d5abb5cb694 + e4f279b13323ec1e4ca16a5f0d44abf1bba14326 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02690a4117050269e2100f67e6bb1d5abb5cb694 + e4f279b13323ec1e4ca16a5f0d44abf1bba14326 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02690a4117050269e2100f67e6bb1d5abb5cb694 + e4f279b13323ec1e4ca16a5f0d44abf1bba14326 diff --git a/eng/Versions.props b/eng/Versions.props index 9907f4ab3..c53aeef9f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.109 - 7.0.109-servicing.23321.34 - 7.0.109-servicing.23321.34 + 7.0.109-servicing.23322.6 + 7.0.109-servicing.23322.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1dbbc5252014f8b5233c91a722fce75bbeecb46c Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 22 Jun 2023 22:11:11 +0000 Subject: [PATCH 6/7] Merged PR 32192: Set OmniSharp run script to be executable Backport of https://github.com/dotnet/installer/pull/16772 --- .../Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index 56f14043b..f8d6ce417 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -6,6 +6,7 @@ using System; using System.Diagnostics; using System.IO; using System.Net.Http; +using System.Security.AccessControl; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -66,6 +67,9 @@ public class OmniSharpTests : SmokeTests Directory.CreateDirectory(OmniSharpDirectory); ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {omniSharpTarballFile} -C {OmniSharpDirectory}", OutputHelper); + + // Ensure the run script is executable (see https://github.com/OmniSharp/omnisharp-roslyn/issues/2547) + File.SetUnixFileMode($"{OmniSharpDirectory}/run", UnixFileMode.UserRead | UnixFileMode.UserExecute); } } } From a975c9588df0b05f7dda9ea6a6ad29ecf7577c7b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 23 Jun 2023 00:24:11 +0000 Subject: [PATCH 7/7] Merged PR 32191: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230622.18 - **Date Produced**: June 22, 2023 7:43:04 PM UTC - **Commit**: 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.109 to 7.0.109][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.109-servicing.23322.6 to 7.0.109-servicing.23322.18][1] - **Microsoft.NET.Sdk**: [from 7.0.109-servicing.23322.6 to 7.0.109-servicing.23322.18][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.109-servicing.23322.6 to 7.0.109-servicing.23322.18][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe4f279b133&targetVersion=GC2b3241fd09&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index d977b32d7..704eeb938 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36e803a0f..fba6bea06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4f279b13323ec1e4ca16a5f0d44abf1bba14326 + 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4f279b13323ec1e4ca16a5f0d44abf1bba14326 + 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4f279b13323ec1e4ca16a5f0d44abf1bba14326 + 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4f279b13323ec1e4ca16a5f0d44abf1bba14326 + 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 diff --git a/eng/Versions.props b/eng/Versions.props index c53aeef9f..a8fd47da5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.109 - 7.0.109-servicing.23322.6 - 7.0.109-servicing.23322.6 + 7.0.109-servicing.23322.18 + 7.0.109-servicing.23322.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)