From 1de16913b70ae44a314ad3a53f86bc9a088bfe49 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Aug 2022 18:38:35 +0000 Subject: [PATCH 01/14] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.8 to 6.0.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.8-servicing.22368.4 to 6.0.9-servicing.22413.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.8-servicing.22368.4 to 6.0.9-servicing.22413.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.8 to 6.0.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.8-servicing.22363.6 to 6.0.9-servicing.22413.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.8 to 6.0.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.8 to 6.0.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.8 to 6.0.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.8 to 6.0.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.8-servicing.22363.16 to 6.0.9-servicing.22412.17 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.8 to 6.0.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.8-servicing.22363.16 to 6.0.9-servicing.22412.17 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.8-servicing.22363.16 to 6.0.9-servicing.22412.17 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.8-servicing.22363.16 to 6.0.9-servicing.22412.17 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.108 to 6.0.109 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.108-servicing.22363.24 to 6.0.109-servicing.22413.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.108 to 6.0.109 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.8 to 6.0.9 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.8-servicing.22368.4 to 6.0.9-servicing.22412.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.8 to 6.0.9 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.8-servicing.22368.7 to 6.0.9-servicing.22412.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.8-servicing.22363.6 to 6.0.9-servicing.22413.8 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.4 to 6.0.8 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) --- 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 9ee0fa704..2f11754ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,21 @@ + + + + + @@ -37,11 +42,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21d61a26d..47d967f1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 733440663a189f4c4de64f53bab82fd9382b9a3a + 30c02ede51e1cacedde7d6714b25119ff7b332c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 733440663a189f4c4de64f53bab82fd9382b9a3a + 30c02ede51e1cacedde7d6714b25119ff7b332c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 733440663a189f4c4de64f53bab82fd9382b9a3a + 30c02ede51e1cacedde7d6714b25119ff7b332c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17ea4a71a1adac805a17c272977139ddc6200bf9 + 778dbec89b2b7a99e703b694a92e9bb3774a5315 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17ea4a71a1adac805a17c272977139ddc6200bf9 + 778dbec89b2b7a99e703b694a92e9bb3774a5315 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcdb000de284571bf5267aa3d052dee7918c1e6e + 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7a75fd34f53bc300206bd8cfc636527934dd17af + 40c4c0c7ea7ef93bf9876838aa895402464a69ea https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 52e9452f82e26f9fcae791e84c082ae22f1ef66f + 1026ad55ddb8587bf68829d3f5e8abafa65548fe https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index dcf2435ae..d432dbf36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.8-servicing.22368.4 + 6.0.9-servicing.22412.3 - 6.0.8-servicing.22368.7 + 6.0.9-servicing.22412.12 - 6.0.108 + 6.0.109 @@ -44,20 +44,20 @@ - 6.0.8 - 6.0.8 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 + 6.0.9 + 6.0.9 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 0.2.0 - 6.0.108-servicing.22368.19 - 6.0.108-servicing.22368.19 + 6.0.109-servicing.22414.6 + 6.0.109-servicing.22414.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.8-servicing.22363.6 - 6.0.8-servicing.22363.6 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22413.8 + 6.0.9-servicing.22413.8 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 2.1.0 - 6.0.8-servicing.22368.4 - 6.0.8-servicing.22368.4 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22413.1 + 6.0.9-servicing.22413.1 + 6.0.9 + 6.0.9 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.108 + 6.0.109 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.4 + 6.0.8 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 9e5f0c431314e3c2abe55ee7ef7ae7018b376689 Mon Sep 17 00:00:00 2001 From: Joshua Larkin <70237359+j0shuams@users.noreply.github.com> Date: Tue, 16 Aug 2022 14:51:28 -0400 Subject: [PATCH 02/14] Update ManualVersions.props for upcoming Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ .../targets/GenerateBundledVersions.targets | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index efb09817f..7707ace1a 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.26 - 10.0.18362.26 - 10.0.19041.26 - 10.0.20348.26 - 10.0.22000.26 - 10.0.22621.26 + 10.0.17763.27 + 10.0.18362.27 + 10.0.19041.27 + 10.0.20348.27 + 10.0.22000.27 + 10.0.22621.27 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index b67a1e22a..f98379cb9 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -673,11 +673,18 @@ Copyright (c) .NET Foundation. All rights reserved. - - - - - + + + + + + + + + + + + From b656e9d5b50fb0f395aa8bc5058104b87e58f983 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Aug 2022 19:51:37 +0000 Subject: [PATCH 03/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.109-servicing.22414.6 -> To Version 6.0.109-servicing.22416.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.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.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 +++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2f11754ee..4353c1355 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,21 @@ - + - + - + - + - + @@ -42,15 +42,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47d967f1b..16e5b3c5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + 4ac1b1bd5b856af84944d4e4382d6dddd56526fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + 4ac1b1bd5b856af84944d4e4382d6dddd56526fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + 4ac1b1bd5b856af84944d4e4382d6dddd56526fe https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + 4ac1b1bd5b856af84944d4e4382d6dddd56526fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 30c02ede51e1cacedde7d6714b25119ff7b332c1 + ee1c59571f7b758419f83fac5c6c65587050a559 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 30c02ede51e1cacedde7d6714b25119ff7b332c1 + ee1c59571f7b758419f83fac5c6c65587050a559 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 30c02ede51e1cacedde7d6714b25119ff7b332c1 + ee1c59571f7b758419f83fac5c6c65587050a559 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 778dbec89b2b7a99e703b694a92e9bb3774a5315 + 1034c982d07cc1ecbb994bae54c04b46f5a9bed7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 778dbec89b2b7a99e703b694a92e9bb3774a5315 + 1034c982d07cc1ecbb994bae54c04b46f5a9bed7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb + eb003bd0bb9cb6aec94234c0f6347539d5c20864 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 40c4c0c7ea7ef93bf9876838aa895402464a69ea + df4d286a001fa1e0bd05d54e590ffb86c75a3313 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 1026ad55ddb8587bf68829d3f5e8abafa65548fe + b4a0ddac972ee1a94a7bd0f81339aa618ff92afc https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index d432dbf36..c31a86df4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22412.3 + 6.0.9-servicing.22415.4 - 6.0.9-servicing.22412.12 + 6.0.9-servicing.22415.13 @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 + 6.0.9-servicing.22416.1 + 6.0.9-servicing.22416.1 + 6.0.9-servicing.22416.1 + 6.0.9-servicing.22416.1 0.2.0 - 6.0.109-servicing.22414.6 - 6.0.109-servicing.22414.6 + 6.0.109-servicing.22416.13 + 6.0.109-servicing.22416.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22413.8 - 6.0.9-servicing.22413.8 + 6.0.9-servicing.22415.12 + 6.0.9-servicing.22415.12 6.0.9 6.0.9 6.0.9 @@ -78,8 +78,8 @@ - 6.0.9-servicing.22413.1 - 6.0.9-servicing.22413.1 + 6.0.9-servicing.22416.2 + 6.0.9-servicing.22416.2 6.0.9 6.0.9 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.8 + 6.0.9 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From ea23c6899d309490eb99c224cc316b15a118e2eb Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 17 Aug 2022 00:28:54 +0000 Subject: [PATCH 04/14] Updated TestsToSkipPortableLinux.xml to add a similar test that failed for a similar reason. Likely related to ulimit --- test/SdkTests/TestsToSkipPortableLinux.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/SdkTests/TestsToSkipPortableLinux.xml b/test/SdkTests/TestsToSkipPortableLinux.xml index d0ea16a8d..f9fe2c166 100644 --- a/test/SdkTests/TestsToSkipPortableLinux.xml +++ b/test/SdkTests/TestsToSkipPortableLinux.xml @@ -3,5 +3,9 @@ + + From b5dc7a20edcda3c5571de1ee5b8cc17a6129dc98 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 02:11:42 +0000 Subject: [PATCH 05/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.32 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.109-servicing.22414.6 -> To Version 6.0.109-servicing.22416.32 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.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16e5b3c5f..d5f8ffe8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ee1c59571f7b758419f83fac5c6c65587050a559 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1034c982d07cc1ecbb994bae54c04b46f5a9bed7 + e5917460a8f8007504c921b151f0e77b899e7dcc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1034c982d07cc1ecbb994bae54c04b46f5a9bed7 + e5917460a8f8007504c921b151f0e77b899e7dcc diff --git a/eng/Versions.props b/eng/Versions.props index c31a86df4..1f65d0917 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.109-servicing.22416.13 - 6.0.109-servicing.22416.13 + 6.0.109-servicing.22416.32 + 6.0.109-servicing.22416.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 949d3a9281fb4479391aabdf0c5744ab2b6a8520 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Aug 2022 06:38:55 +0000 Subject: [PATCH 06/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.47 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.109-servicing.22416.32 -> To Version 6.0.109-servicing.22417.47 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5f8ffe8e..9cca3d60d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ee1c59571f7b758419f83fac5c6c65587050a559 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5917460a8f8007504c921b151f0e77b899e7dcc + 6cb3166fe5a77ab1d677dfd575c0f6068f6e5fa7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5917460a8f8007504c921b151f0e77b899e7dcc + 6cb3166fe5a77ab1d677dfd575c0f6068f6e5fa7 diff --git a/eng/Versions.props b/eng/Versions.props index 1f65d0917..756b369d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.109-servicing.22416.32 - 6.0.109-servicing.22416.32 + 6.0.109-servicing.22417.47 + 6.0.109-servicing.22417.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9cae289e54d4bfb3fce33d55e127c4d0b7a1cf91 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Aug 2022 07:42:29 +0000 Subject: [PATCH 07/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.49 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.109-servicing.22416.32 -> To Version 6.0.109-servicing.22417.49 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 From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4353c1355..a98e00e54 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,13 +15,13 @@ - + - + - + @@ -42,15 +42,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cca3d60d..227e38ac3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4ac1b1bd5b856af84944d4e4382d6dddd56526fe + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4ac1b1bd5b856af84944d4e4382d6dddd56526fe + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4ac1b1bd5b856af84944d4e4382d6dddd56526fe + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4ac1b1bd5b856af84944d4e4382d6dddd56526fe + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ee1c59571f7b758419f83fac5c6c65587050a559 + 0d6217016675ceaca8a699e41a41a65343d5fbcd - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ee1c59571f7b758419f83fac5c6c65587050a559 + 0d6217016675ceaca8a699e41a41a65343d5fbcd https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ee1c59571f7b758419f83fac5c6c65587050a559 + 0d6217016675ceaca8a699e41a41a65343d5fbcd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6cb3166fe5a77ab1d677dfd575c0f6068f6e5fa7 + 31309d1199d6839e91b6bcb1b2b844359e8accae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6cb3166fe5a77ab1d677dfd575c0f6068f6e5fa7 + 31309d1199d6839e91b6bcb1b2b844359e8accae - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - eb003bd0bb9cb6aec94234c0f6347539d5c20864 + 5d275019237fbf9f4bf5d867f779c616ec264718 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - df4d286a001fa1e0bd05d54e590ffb86c75a3313 + c5b159a97f5af3c690d6515f35241c04c16b2b80 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 756b369d6..9c8a8c4d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22415.4 + 6.0.9-servicing.22417.1 - 6.0.9-servicing.22415.13 + 6.0.9-servicing.22417.4 @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22416.1 - 6.0.9-servicing.22416.1 - 6.0.9-servicing.22416.1 - 6.0.9-servicing.22416.1 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 0.2.0 - 6.0.109-servicing.22417.47 - 6.0.109-servicing.22417.47 + 6.0.109-servicing.22417.49 + 6.0.109-servicing.22417.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22415.12 - 6.0.9-servicing.22415.12 + 6.0.9-servicing.22416.9 + 6.0.9-servicing.22416.9 6.0.9 6.0.9 6.0.9 @@ -78,8 +78,8 @@ - 6.0.9-servicing.22416.2 - 6.0.9-servicing.22416.2 + 6.0.9-servicing.22417.4 + 6.0.9-servicing.22417.4 6.0.9 6.0.9 From 310d66ae4d2dfbba5061eb1e69c13a60e4019e90 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 20 Aug 2022 21:03:21 +0000 Subject: [PATCH 08/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220820.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.109-servicing.22417.49 -> To Version 6.0.109-servicing.22420.4 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.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 +++++----- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index a98e00e54..a06c030f2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,21 @@ - + - + - + - + - + @@ -42,15 +42,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f8562c4c..ed870fc46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + 70d47a6e9f9966238f9660d58e06ce1aa229e0b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + 70d47a6e9f9966238f9660d58e06ce1aa229e0b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + 70d47a6e9f9966238f9660d58e06ce1aa229e0b6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + 70d47a6e9f9966238f9660d58e06ce1aa229e0b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0d6217016675ceaca8a699e41a41a65343d5fbcd + 95bb9a2d1ac686c48c8fbc675113a32641727062 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0d6217016675ceaca8a699e41a41a65343d5fbcd + 95bb9a2d1ac686c48c8fbc675113a32641727062 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0d6217016675ceaca8a699e41a41a65343d5fbcd + 95bb9a2d1ac686c48c8fbc675113a32641727062 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 31309d1199d6839e91b6bcb1b2b844359e8accae + a3f689858f493108daa0d5260586b48875af4d2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 31309d1199d6839e91b6bcb1b2b844359e8accae + a3f689858f493108daa0d5260586b48875af4d2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5d275019237fbf9f4bf5d867f779c616ec264718 + 0a6ea378000e25e4cbcc17485513fd487fec5dab - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c5b159a97f5af3c690d6515f35241c04c16b2b80 + b58a38c7fadc6cbb9edc9bc38b6e755e9c3e2f0e https://github.com/dotnet/fsharp @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - b4a0ddac972ee1a94a7bd0f81339aa618ff92afc + 3f6c45a2580cd9387b643163de8136a9691764c8 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 9c8a8c4d7..c477aa4e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22417.1 + 6.0.9-servicing.22418.3 - 6.0.9-servicing.22417.4 + 6.0.9-servicing.22419.5 @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 0.2.0 - 6.0.109-servicing.22417.49 - 6.0.109-servicing.22417.49 + 6.0.109-servicing.22420.4 + 6.0.109-servicing.22420.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22416.9 - 6.0.9-servicing.22416.9 + 6.0.9-servicing.22419.5 + 6.0.9-servicing.22419.5 6.0.9 6.0.9 6.0.9 @@ -78,8 +78,8 @@ - 6.0.9-servicing.22417.4 - 6.0.9-servicing.22417.4 + 6.0.9-servicing.22419.11 + 6.0.9-servicing.22419.11 6.0.9 6.0.9 From f68d61faf21479c7bcfdf8fc3388d4921774f9bb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 21 Aug 2022 05:03:48 +0000 Subject: [PATCH 09/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220820.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.109-servicing.22420.4 -> To Version 6.0.109-servicing.22420.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index a06c030f2..f99ca70b1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed870fc46..da8570f3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 70d47a6e9f9966238f9660d58e06ce1aa229e0b6 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 70d47a6e9f9966238f9660d58e06ce1aa229e0b6 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 70d47a6e9f9966238f9660d58e06ce1aa229e0b6 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 70d47a6e9f9966238f9660d58e06ce1aa229e0b6 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 95bb9a2d1ac686c48c8fbc675113a32641727062 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a3f689858f493108daa0d5260586b48875af4d2c + f89584a628a705a85a1c04f4a571f85bd7b6284a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a3f689858f493108daa0d5260586b48875af4d2c + f89584a628a705a85a1c04f4a571f85bd7b6284a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0a6ea378000e25e4cbcc17485513fd487fec5dab + ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b58a38c7fadc6cbb9edc9bc38b6e755e9c3e2f0e + a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c477aa4e3..208ff34ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22418.3 + 6.0.9-servicing.22419.10 - 6.0.9-servicing.22419.5 + 6.0.9-servicing.22420.4 @@ -56,8 +56,8 @@ - 6.0.109-servicing.22420.4 - 6.0.109-servicing.22420.4 + 6.0.109-servicing.22420.9 + 6.0.109-servicing.22420.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.9-servicing.22419.11 - 6.0.9-servicing.22419.11 + 6.0.9-servicing.22420.3 + 6.0.9-servicing.22420.3 6.0.9 6.0.9 From 58a93139d80490d0724b4d862ba8ee00ceae45d3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 Aug 2022 01:38:28 +0000 Subject: [PATCH 10/14] Merged PR 25186: [internal/release/6.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.DotNet.Common.ItemTemplates**: from 6.0.109 to 6.0.109 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.109-servicing.22419.5 to 6.0.109-servicing.22420.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.109 to 6.0.109 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220821.3 - **Date Produced**: August 21, 2022 4:38:16 PM UTC - **Commit**: 7fffe6d57cecdb3a726b915334d1add560bd6134 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.109-servicing.22420.9 to 6.0.109-servicing.22421.3][1] - **Microsoft.NET.Sdk**: [from 6.0.109-servicing.22420.9 to 6.0.109-servicing.22421.3][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.109 to 6.0.109][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.109-servicing.22419.5 to 6.0.109-servicing.22420.11][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.109 to 6.0.109][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf89584a&targetVersion=GC7fffe6d&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC95bb9a2&targetVersion=GC2410d64&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index f99ca70b1..064b33cd4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da8570f3f..b8c1e4f86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 95bb9a2d1ac686c48c8fbc675113a32641727062 + 2410d6496db6fd9153ffac85eedfd80f57390999 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 95bb9a2d1ac686c48c8fbc675113a32641727062 + 2410d6496db6fd9153ffac85eedfd80f57390999 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 95bb9a2d1ac686c48c8fbc675113a32641727062 + 2410d6496db6fd9153ffac85eedfd80f57390999 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f89584a628a705a85a1c04f4a571f85bd7b6284a + 7fffe6d57cecdb3a726b915334d1add560bd6134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f89584a628a705a85a1c04f4a571f85bd7b6284a + 7fffe6d57cecdb3a726b915334d1add560bd6134 diff --git a/eng/Versions.props b/eng/Versions.props index 208ff34ad..7bc5a5bc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.109-servicing.22420.9 - 6.0.109-servicing.22420.9 + 6.0.109-servicing.22421.3 + 6.0.109-servicing.22421.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 934d6b31dff5b1009d0a1dfd602fd2fa9fa068fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Sep 2022 14:36:42 -0700 Subject: [PATCH 11/14] Update dependencies from https://github.com/dotnet/arcade build 20220913.7 (#14498) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- eng/common/templates/job/source-build.yml | 4 ++-- eng/common/templates/jobs/jobs.yml | 2 +- eng/common/templates/post-build/post-build.yml | 8 ++++---- global.json | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ebd698e0..b683ba993 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a23d6a848..94638a227 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22412.2 + 6.0.0-beta.22463.7 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 9ff6a10a6..aaeb83b4d 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -53,7 +53,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 991ae05f5..5b1b77d1c 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -40,7 +40,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 variables: diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 88f6f75a6..b6137f44a 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,10 +46,10 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 48918df74..9c4becbc8 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -89,7 +89,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 270607126..fc022ca9b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -100,7 +100,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -137,7 +137,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -197,7 +197,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -254,7 +254,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml diff --git a/global.json b/global.json index 0aaa96317..9d1e2d901 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.108", + "dotnet": "6.0.109", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22412.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7" } } From 8aec008f2ecfecc775ddec389f863a39d37c3e4f Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 21 Sep 2022 21:54:18 -0700 Subject: [PATCH 12/14] Fix MS.Extensions versions in dotnet-format (#14566) --- .../patches/format/0001-Fix-MicrosoftExtensionsVersion.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch index 7d5d03116..efe43e2ae 100644 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch @@ -36,8 +36,8 @@ index 6b628c2..9b579ea 100644 - - + -+ -+ ++ ++ From c736ce2bddf49b8276bfc096d593d49d7da337ec Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 27 Sep 2022 23:44:43 -0700 Subject: [PATCH 13/14] Update windows images for release/6.0.1xx --- .vsts-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d2a36f01c..f63ac7c00 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -48,10 +48,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore-Svc-Public - demands: ImageOverride -equals build.windows.10.amd64.vs2019.open + demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals build.windows.10.amd64.vs2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration @@ -62,10 +62,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore-Svc-Public - demands: ImageOverride -equals build.windows.10.amd64.vs2019.open + demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals build.windows.10.amd64.vs2019 + demands: ImageOverride -equals windows.vs2019.amd64 timeoutInMinutes: 180 strategy: matrix: @@ -119,10 +119,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore-Svc-Public - demands: ImageOverride -equals build.windows.10.amd64.vs2019.open + demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals build.windows.10.amd64.vs2019 + demands: ImageOverride -equals windows.vs2019.amd64 timeoutInMinutes: 180 strategy: matrix: @@ -406,7 +406,7 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017 + demands: ImageOverride -equals windows.vs2017.amd64 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: From 32d8c6f54dfcef1bae3011d7986ef767f7942717 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Oct 2022 09:37:46 -0700 Subject: [PATCH 14/14] Update branding to 6.0.111 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c083f75ae..91eac63e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 10 + 11 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor)